fpicker/source/win32/filepicker/VistaFilePicker.hxx | 5 +++--
vcl/unx/kde/UnxFilePicker.hxx | 6 ++++--
vcl/unx/kde4/KDE4FilePicker.hxx | 6 ++++--
3 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit d4b904f7d15be8460dbff4cf6c8d500aea5a4fa3
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 20 08:41:56 2013 +0200
more fixes for my FilePicker changes
in 4b51374a7021d52f7f1be1861e2ee6a011b30ecd "fdo#46808, Adapt
ui::dialogs::FilePicker UNO service to new style"
Change-Id: Ie23b49d9eb6e491b543d44da124e50efa5b65376
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index edb7eaf..0986838 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase6.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ustring.hxx>
@@ -43,11 +43,12 @@ namespace vista{
// types
//-----------------------------------------------------------------------------
-typedef ::cppu::WeakComponentImplHelper5<
+typedef ::cppu::WeakComponentImplHelper6<
css::ui::dialogs::XFilePicker2,
css::ui::dialogs::XFilePicker3,
css::ui::dialogs::XFilePickerControlAccess,
css::ui::dialogs::XFilePreview,
+ css::lang::XInitialization,
css::lang::XServiceInfo > TVistaFilePickerBase;
//-----------------------------------------------------------------------------
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 4eab183..37ba21c 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -20,11 +20,12 @@
#ifndef _UNXFILEPICKER_HXX_
#define _UNXFILEPICKER_HXX_
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase5.hxx>
#include <osl/conditn.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
@@ -46,11 +47,12 @@ protected:
class UnxFilePicker :
public UnxFilePickerDummy,
- public cppu::WeakComponentImplHelper4<
+ public cppu::WeakComponentImplHelper5<
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
// TODO ::com::sun::star::ui::dialogs::XFilePreview,
+ ::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XServiceInfo >
{
protected:
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 04c15b5..7db8e81 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -19,9 +19,10 @@
#pragma once
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase5.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
@@ -42,11 +43,12 @@ class QLayout;
class ResMgr;
class KDE4FilePicker :
- public cppu::WeakComponentImplHelper4<
+ public cppu::WeakComponentImplHelper5<
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
// TODO ::com::sun::star::ui::dialogs::XFilePreview,
+ ::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XServiceInfo >
{
protected:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
