fpicker/source/aqua/SalAquaFilePicker.hxx | 4 ++--
fpicker/source/aqua/SalAquaFolderPicker.hxx | 4 ++--
fpicker/source/office/OfficeFolderPicker.hxx | 4 ++--
fpicker/source/office/commonpicker.hxx | 4 ++--
fpicker/source/office/fpinteraction.hxx | 4 ++--
fpicker/source/win32/filepicker/FilePicker.hxx | 4 ++--
fpicker/source/win32/filepicker/VistaFilePicker.hxx | 4 ++--
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 4 ++--
fpicker/source/win32/folderpicker/FolderPicker.hxx | 4 ++--
fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 1 -
fpicker/test/svdem.cxx | 1 -
11 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit b73d8b16d5509d54460189547746352d5454448c
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Aug 13 08:06:26 2015 +0900
fpicker: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I448557260d5a1a2534b40e2ad33e8f9d9e72b80e
Reviewed-on: https://gerrit.libreoffice.org/17686
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx
b/fpicker/source/aqua/SalAquaFilePicker.hxx
index db68ae4..9a32f31 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
@@ -35,7 +35,7 @@
// Implementation class for the XFilePicker Interface
-typedef ::cppu::WeakComponentImplHelper4 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
::com::sun::star::lang::XInitialization,
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx
b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index e8f95d7..9de88bd 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -37,7 +37,7 @@
class SalAquaFolderPicker :
public SalAquaPicker,
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
::com::sun::star::ui::dialogs::XFolderPicker2,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XEventListener >
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx
b/fpicker/source/office/OfficeFolderPicker.hxx
index b2697ae..ab72367 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -31,7 +31,7 @@
class Dialog;
typedef
- cppu::ImplInheritanceHelper3<
+ cppu::ImplInheritanceHelper<
svt::OCommonPicker, com::sun::star::ui::dialogs::XFolderPicker2,
com::sun::star::ui::dialogs::XAsynchronousExecutableDialog,
com::sun::star::lang::XServiceInfo >
diff --git a/fpicker/source/office/commonpicker.hxx
b/fpicker/source/office/commonpicker.hxx
index b74f1a9..30c1ed7 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/ui/dialogs/XControlInformation.hpp>
#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -43,7 +43,7 @@ namespace svt
{
- typedef ::cppu::WeakComponentImplHelper5 <
::com::sun::star::ui::dialogs::XControlAccess
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::ui::dialogs::XControlAccess
,
::com::sun::star::ui::dialogs::XControlInformation
,
::com::sun::star::lang::XEventListener
,
::com::sun::star::util::XCancellable
diff --git a/fpicker/source/office/fpinteraction.hxx
b/fpicker/source/office/fpinteraction.hxx
index dd116f9..7567018 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
#define INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -31,7 +31,7 @@ namespace svt
//= OFilePickerInteractionHandler
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::task::XInteractionHandler
+ typedef ::cppu::WeakImplHelper <
::com::sun::star::task::XInteractionHandler
> OFilePickerInteractionHandler_Base;
/** a InteractionHandler implementation which extends another handler with
some customizability
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx
b/fpicker/source/win32/filepicker/FilePicker.hxx
index befe27d..0ba7214 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILEPICKER_HXX
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -45,7 +45,7 @@ protected:
osl::Mutex m_rbHelperMtx;
};
-typedef ::cppu::WeakComponentImplHelper6 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index d2ef115..f133303 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ustring.hxx>
@@ -44,7 +44,7 @@ namespace vista{
// types
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
css::ui::dialogs::XFilePicker2,
css::ui::dialogs::XFilePicker3,
css::ui::dialogs::XFilePickerControlAccess,
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index ea960e5..fc5ed9f 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
@@ -81,7 +81,7 @@ const OUString BMP_EXTENSION( "bmp" );
// a test client
-class FilePickerListener : public WeakImplHelper1< XFilePickerListener >
+class FilePickerListener : public WeakImplHelper< XFilePickerListener >
{
public:
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx
b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 191219a..44bffab 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
#define INCLUDED_FPICKER_SOURCE_WIN32_FOLDERPICKER_FOLDERPICKER_HXX
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -36,7 +36,7 @@
class CFolderPicker :
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
com::sun::star::ui::dialogs::XFolderPicker2,
com::sun::star::lang::XServiceInfo >
{
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 7550308..304175d 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <stdio.h>
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 61217a7..929eee6 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
