[Libreoffice-commits] core.git: sfx2/inc sfx2/source
Takeshi Abe
tabe at fixedpoint.jp
Thu Sep 3 01:14:24 PDT 2015
sfx2/inc/pch/precompiled_sfx.hxx | 9 ++-------
sfx2/source/appl/appdispatchprovider.cxx | 4 ++--
sfx2/source/appl/appinit.cxx | 4 ++--
sfx2/source/appl/appopen.cxx | 1 -
sfx2/source/appl/childwin.cxx | 4 ++--
sfx2/source/appl/helpdispatch.hxx | 4 ++--
sfx2/source/appl/helpinterceptor.hxx | 9 ++++-----
sfx2/source/appl/imestatuswindow.cxx | 3 ++-
sfx2/source/appl/imestatuswindow.hxx | 4 ++--
sfx2/source/appl/macroloader.cxx | 1 -
sfx2/source/appl/newhelp.hxx | 1 -
sfx2/source/appl/opengrf.cxx | 1 -
sfx2/source/appl/sfxpicklist.cxx | 4 ++--
sfx2/source/appl/shutdownicon.cxx | 4 ++--
sfx2/source/appl/shutdownicon.hxx | 4 ++--
sfx2/source/appl/shutdowniconaqua.mm | 4 ++--
sfx2/source/appl/xpackcreator.cxx | 4 ++--
sfx2/source/bastyp/fltlst.cxx | 3 ++-
sfx2/source/bastyp/fltlst.hxx | 1 -
sfx2/source/control/querystatus.cxx | 4 ++--
sfx2/source/control/thumbnailviewacc.hxx | 8 ++++----
sfx2/source/dialog/filedlgimpl.hxx | 4 ++--
sfx2/source/dialog/mailmodel.cxx | 4 ++--
sfx2/source/doc/SfxDocumentMetaData.cxx | 8 ++++----
sfx2/source/doc/docfile.cxx | 1 -
sfx2/source/doc/doctemplates.cxx | 6 +++---
sfx2/source/doc/doctemplateslocal.hxx | 4 ++--
sfx2/source/doc/iframe.cxx | 4 ++--
sfx2/source/doc/objserv.cxx | 3 ++-
sfx2/source/doc/objxtor.cxx | 4 ++--
sfx2/source/doc/ownsubfilterservice.cxx | 4 ++--
sfx2/source/doc/plugin.cxx | 4 ++--
sfx2/source/doc/printhelper.cxx | 4 ++--
sfx2/source/doc/printhelper.hxx | 4 ++--
sfx2/source/doc/sfxbasemodel.cxx | 7 ++++---
sfx2/source/doc/sfxmodelfactory.cxx | 4 ++--
sfx2/source/inc/docundomanager.hxx | 4 ++--
sfx2/source/inc/eventsupplier.hxx | 4 ++--
sfx2/source/inc/macroloader.hxx | 4 ++--
sfx2/source/inc/statcach.hxx | 4 ++--
sfx2/source/inc/workwin.hxx | 4 ++--
sfx2/source/notify/globalevents.cxx | 7 +++----
sfx2/source/sidebar/CommandInfoProvider.cxx | 4 ++--
sfx2/source/sidebar/ControllerItem.cxx | 3 ++-
sfx2/source/view/frmload.cxx | 4 ++--
sfx2/source/view/ipclient.cxx | 4 ++--
sfx2/source/view/sfxbasecontroller.cxx | 9 ++++-----
sfx2/source/view/viewsh.cxx | 4 ++--
48 files changed, 96 insertions(+), 105 deletions(-)
New commits:
commit d465e8273f1ee54450f0bf59c41bda93c54b3db4
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 1 18:13:22 2015 +0900
sfx2: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Id9b4ad4d1fa700c5ea3dd7417292cf2ddb7ade50
Reviewed-on: https://gerrit.libreoffice.org/18229
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 6c7b649..b4e6f5d 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -496,14 +496,9 @@
#include <config_folders.h>
#include <config_options.h>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 51a08a8..0b00f72 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -32,7 +32,7 @@
#include <basic/basmgr.hxx>
#include <basic/sbuno.hxx>
#include <comphelper/sequence.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sfx2/app.hxx>
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno;
namespace {
-class SfxAppDispatchProvider : public ::cppu::WeakImplHelper3< css::frame::XAppDispatchProvider,
+class SfxAppDispatchProvider : public ::cppu::WeakImplHelper< css::frame::XAppDispatchProvider,
css::lang::XServiceInfo,
css::lang::XInitialization >
{
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 0c1b6d7..de9c673 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -43,7 +43,7 @@
#include <unotools/pathoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/edit.hxx>
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
-class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateListener, XServiceInfo >
+class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper< XTerminateListener, XServiceInfo >
{
public:
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 2a11004..144f6fd 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -42,7 +42,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 3c74643..4ba7106 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/app.hxx>
@@ -69,7 +69,7 @@ struct SfxChildWindow_Impl
-class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+class DisposeListener : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener >
{
public:
DisposeListener( SfxChildWindow* pOwner ,
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index 199b26a..93c03b3 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -20,11 +20,11 @@
#define INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
#include <com/sun/star/frame/XDispatch.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "helpinterceptor.hxx"
-class HelpDispatch_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatch >
+class HelpDispatch_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatch >
{
private:
HelpInterceptor_Impl& m_rInterceptor;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index f5ce4bb..47d9c74 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
#define INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
-#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
@@ -43,7 +42,7 @@ struct HelpHistoryEntry_Impl
typedef ::std::vector< HelpHistoryEntry_Impl* > HelpHistoryList_Impl;
class SfxHelpWindow_Impl;
-class HelpInterceptor_Impl : public ::cppu::WeakImplHelper3<
+class HelpInterceptor_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XDispatchProviderInterceptor,
::com::sun::star::frame::XInterceptorInfo,
@@ -116,7 +115,7 @@ public:
// HelpListener_Impl -----------------------------------------------------
-class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
+class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener >
{
private:
HelpInterceptor_Impl* pInterceptor;
@@ -137,7 +136,7 @@ public:
// HelpStatusListener_Impl -----------------------------------------------------
class HelpStatusListener_Impl : public
-::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
+::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener >
{
private:
::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDispatch;
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 2d4416d..84ee426 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -41,9 +41,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <vcl/svapp.hxx>
+#include <cppuhelper/implbase.hxx>
//TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver
-class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star::beans::XPropertyChangeListener>
+class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<com::sun::star::beans::XPropertyChangeListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener> mxOwner;
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 27a17f2..99bd176 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
namespace com { namespace sun { namespace star {
@@ -35,7 +35,7 @@ namespace sfx2 { namespace appl {
// The MS compiler needs this typedef work-around to accept the using
// declarations within ImeStatusWindow:
-typedef cppu::WeakImplHelper1< com::sun::star::beans::XPropertyChangeListener >
+typedef cppu::WeakImplHelper< com::sun::star::beans::XPropertyChangeListener >
ImeStatusWindow_Impl;
/** Control the behavior of any (platform-dependent) IME status windows.
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 7d6304c..f1634ca 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/frame/DispatchResultState.hpp>
#include <basic/basmgr.hxx>
#include <basic/sbuno.hxx>
-#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <framework/documentundoguard.hxx>
#include <rtl/ref.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index fd5e3d6..f3e35895 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 4c00188..82015b0 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -19,7 +19,6 @@
#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 2f378d7..006189d 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -32,7 +32,7 @@
#include <vcl/pngwrite.hxx>
#include <osl/file.hxx>
#include <unotools/localfilehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::util;
-class StringLength : public ::cppu::WeakImplHelper1< XStringWidth >
+class StringLength : public ::cppu::WeakImplHelper< XStringWidth >
{
public:
StringLength() {}
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 81bed21..572f4ca 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -49,7 +49,7 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/fcontnr.hxx>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sfx2/dispatch.hxx>
#include <comphelper/extract.hxx>
@@ -83,7 +83,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
# endif
#endif
-class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
+class SfxNotificationListener_Impl : public cppu::WeakImplHelper< XDispatchResultListener >
{
public:
virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 2744e11..0950d18 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -30,7 +30,7 @@
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <sfx2/sfxuno.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <sfx2/dllapi.h>
#include <tools/link.hxx>
@@ -40,7 +40,7 @@ namespace sfx2
class FileDialogHelper;
}
-typedef ::cppu::WeakComponentImplHelper4<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::lang::XInitialization,
::com::sun::star::frame::XTerminateListener,
::com::sun::star::lang::XServiceInfo,
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 234329f..19d9eaf 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -34,7 +34,7 @@
#include <com/sun/star/util/XStringWidth.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <set>
#include <vector>
@@ -137,7 +137,7 @@ struct RecentMenuEntry
rtl::OUString aPassword;
};
-class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
+class RecentFilesStringLength : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth >
{
public:
RecentFilesStringLength() {}
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 380b3ba..cc8e06b 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sot/stg.hxx>
@@ -38,7 +38,7 @@ using namespace css;
namespace {
-class OPackageStructureCreator : public ::cppu::WeakImplHelper2< embed::XPackageStructureCreator,
+class OPackageStructureCreator : public ::cppu::WeakImplHelper< embed::XPackageStructureCreator,
lang::XServiceInfo >
{
public:
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index b60cf35..c6ae1f9 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -30,6 +30,7 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
+#include <cppuhelper/implbase.hxx>
// namespaces
@@ -37,7 +38,7 @@
using namespace ::com::sun::star;
-class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util::XRefreshListener>
+class SfxRefreshListener : public ::cppu::WeakImplHelper<com::sun::star::util::XRefreshListener>
{
private:
SfxFilterListener *m_pOwner;
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 8c94677..446b671 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
#include <sfx2/fcontnr.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/util/XRefreshable.hpp>
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 6d72365..3b52772 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -28,7 +28,7 @@
#include <svl/itemset.hxx>
#include "itemdel.hxx"
#include <svl/visitem.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
class SfxQueryStatus_Impl:
- public cppu::WeakImplHelper1<css::frame::XStatusListener>,
+ public cppu::WeakImplHelper<css::frame::XStatusListener>,
private boost::noncopyable
{
public:
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 201aa09..4efa013 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -39,7 +39,7 @@
class ThumbnailView;
class ThumbnailViewItem;
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -158,7 +158,7 @@ private:
throw (::com::sun::star::lang::DisposedException);
};
-class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper5< ::com::sun::star::accessibility::XAccessible,
+class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent,
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index e0122ff..20fda81 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -22,7 +22,7 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <vcl/graph.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
@@ -40,7 +40,7 @@ namespace sfx2
typedef ::com::sun::star::beans::StringPair FilterPair;
class FileDialogHelper_Impl :
- public ::cppu::WeakImplHelper2<
+ public ::cppu::WeakImplHelper<
::com::sun::star::ui::dialogs::XFilePickerListener,
::com::sun::star::ui::dialogs::XDialogClosedListener >
{
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index c584078..8a07369 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -71,7 +71,7 @@
#include <comphelper/string.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
@@ -85,7 +85,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::system;
// - class PrepareListener_Impl ------------------------------------------
-class PrepareListener_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+class PrepareListener_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
{
bool m_bState;
public:
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 27e31f0..8556b0e 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -79,7 +79,7 @@
#include <limits>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
#include <com/sun/star/beans/PropertyBag.hpp>
@@ -115,7 +115,7 @@ namespace {
typedef std::vector<std::vector<std::pair<const char*, OUString> > >
AttrVector;
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::document::XDocumentProperties,
css::lang::XInitialization,
@@ -353,7 +353,7 @@ protected:
void createUserDefined();
};
-typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
+typedef ::cppu::ImplInheritanceHelper< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 88a24ee..f4732d2 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -60,7 +60,6 @@
#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/logging/DocumentIOLogRing.hpp>
#include <com/sun/star/logging/XSimpleLogRing.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 6b0f3a3..85c308d 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -30,7 +30,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -156,7 +156,7 @@ class GroupData_Impl;
typedef vector< GroupData_Impl* > GroupList_Impl;
-class TplTaskEnvironment : public ::cppu::WeakImplHelper1< ucb::XCommandEnvironment >
+class TplTaskEnvironment : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment >
{
uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
uno::Reference< ucb::XProgressHandler > m_xProgressHandler;
@@ -2205,7 +2205,7 @@ bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
}
-class SfxDocTplService: public ::cppu::WeakImplHelper3< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
+class SfxDocTplService: public ::cppu::WeakImplHelper< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
{
SfxDocTplService_Impl *pImp;
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 626f15e..9f22fc1 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-class DocTemplLocaleHelper : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
+class DocTemplLocaleHelper : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler >
{
// Relations info related strings
OUString m_aGroupListElement;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 0564141..319baed 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <svtools/miscopt.hxx>
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
namespace {
-class IFrameObject : public ::cppu::WeakImplHelper6 <
+class IFrameObject : public ::cppu::WeakImplHelper <
css::util::XCloseable,
css::lang::XEventListener,
css::frame::XSynchronousFrameLoader,
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 23ebbaf..82dd149 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -102,6 +102,7 @@
#include "guisaveas.hxx"
#include <sfx2/templatedlg.hxx>
#include <boost/scoped_ptr.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -122,7 +123,7 @@ void SfxObjectShell::InitInterface_Impl()
{
}
-class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
+class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener >
{
bool m_bGotOwnership;
bool m_bPreventClose;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 335b6f8..ff4e1ea 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -22,7 +22,7 @@
#include "arrdecl.hxx"
#include <map>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -148,7 +148,7 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent )
-class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
+class SfxModelListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener >
{
SfxObjectShell* mpDoc;
public:
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index a3e9f2e..d82b517 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XStream.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sfx2/objsh.hxx>
@@ -33,7 +33,7 @@ using namespace css;
namespace {
-class OwnSubFilterService : public cppu::WeakImplHelper2 < document::XFilter
+class OwnSubFilterService : public cppu::WeakImplHelper < document::XFilter
,lang::XServiceInfo >
{
uno::Reference< frame::XModel > m_xModel;
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index f51d381..d53b0b8 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
@@ -81,7 +81,7 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
return aPluginPropertyMap_Impl;
}
-class PluginObject : public ::cppu::WeakImplHelper5 <
+class PluginObject : public ::cppu::WeakImplHelper <
css::util::XCloseable,
css::lang::XEventListener,
css::frame::XSynchronousFrameLoader,
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 660c521..e293802 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -42,7 +42,7 @@
#include <ucbhelper/content.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/settings.hxx>
#include <sfx2/viewfrm.hxx>
@@ -93,7 +93,7 @@ Size impl_Size_Struct2Object( const awt::Size& aSize )
return aReturnValue ;
}
-class SfxPrintJob_Impl : public cppu::WeakImplHelper1
+class SfxPrintJob_Impl : public cppu::WeakImplHelper
<
com::sun::star::view::XPrintJob
>
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index ef4e31d..0eb1242 100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -32,13 +32,13 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
struct IMPL_PrintListener_DataContainer;
class SfxViewShell;
class SfxPrinter;
-class SfxPrintHelper : public cppu::WeakImplHelper3
+class SfxPrintHelper : public cppu::WeakImplHelper
< com::sun::star::view::XPrintable
, com::sun::star::view::XPrintJobBroadcaster
, com::sun::star::lang::XInitialization >
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 928dcc5..51baa58 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <comphelper/enumhelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <comphelper/processfactory.hxx>
@@ -141,7 +142,7 @@ using ::com::sun::star::frame::XModel;
/** This Listener is used to get notified when the XDocumentProperties of the
XModel change.
*/
-class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
+class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper<
util::XModifyListener >
{
@@ -315,7 +316,7 @@ sal_Int64 IMPL_SfxBaseModel_DataContainer::g_nInstanceCounter = 0;
// Listener that forwards notifications from the PrintHelper to the "real" listeners
-class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper1< view::XPrintJobListener >
+class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper< view::XPrintJobListener >
{
public:
IMPL_SfxBaseModel_DataContainer* m_pData;
@@ -1126,7 +1127,7 @@ void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XContr
namespace
{
- typedef ::cppu::WeakImplHelper1< XUndoAction > ControllerLockUndoAction_Base;
+ typedef ::cppu::WeakImplHelper< XUndoAction > ControllerLockUndoAction_Base;
class ControllerLockUndoAction : public ControllerLockUndoAction_Base
{
public:
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index c184456..f9ba312 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/namedvaluecollection.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
@@ -57,7 +57,7 @@ namespace sfx2
//= SfxModelFactory - declaration
- typedef ::cppu::WeakImplHelper2 < XSingleServiceFactory
+ typedef ::cppu::WeakImplHelper < XSingleServiceFactory
, XServiceInfo
> SfxModelFactory_Base;
/** implements a XSingleServiceFactory which can be used to created instances
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 81c9667..c5c71aa 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/document/XUndoManager.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
@@ -100,7 +100,7 @@ namespace sfx2
{
//= DocumentUndoManager
- typedef ::cppu::WeakImplHelper1 <css::document::XUndoManager> DocumentUndoManager_Base;
+ typedef ::cppu::WeakImplHelper <css::document::XUndoManager> DocumentUndoManager_Base;
struct DocumentUndoManager_Impl;
class DocumentUndoManager :public DocumentUndoManager_Base
,public SfxModelSubComponent
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 31be811..59cc618 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/task/XJobExecutor.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Type.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <sfx2/sfxuno.hxx>
@@ -50,7 +50,7 @@ class SvxMacro;
-class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameReplace, css::document::XEventListener >
+class SfxEvents_Impl : public ::cppu::WeakImplHelper< css::container::XNameReplace, css::document::XEventListener >
{
css::uno::Sequence< OUString > maEventNames;
css::uno::Sequence< css::uno::Any > maEventData;
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index ea3ce5b..bfbe963 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -35,13 +35,13 @@
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/sfxuno.hxx>
#include <tools/errcode.hxx>
class SfxObjectShell;
-class SfxMacroLoader : public cppu::WeakImplHelper4<
+class SfxMacroLoader : public cppu::WeakImplHelper<
css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch,
css::frame::XSynchronousDispatch,
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 20cd302..b5163ba 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/frame/FeatureStateEvent.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/bindings.hxx>
@@ -36,7 +36,7 @@
class SfxControllerItem;
class SfxDispatcher;
-class BindDispatch_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+class BindDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
{
friend class SfxStateCache;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 2d2386c..419fe52 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/frame/XLayoutManagerListener.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <rtl/ustring.hxx>
@@ -172,7 +172,7 @@ struct SfxObjectBarList_Impl
-class LayoutManagerListener : public ::cppu::WeakImplHelper2<
+class LayoutManagerListener : public ::cppu::WeakImplHelper<
css::frame::XLayoutManagerListener,
css::lang::XComponent >
{
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index 702f2de..d1f4a47 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -29,8 +29,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Type.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
@@ -57,7 +56,7 @@ public:
typedef ::std::vector< css::uno::Reference< css::frame::XModel > > TModelList;
class ModelCollectionEnumeration : public ModelCollectionMutexBase
- , public ::cppu::WeakImplHelper1< css::container::XEnumeration >
+ , public ::cppu::WeakImplHelper< css::container::XEnumeration >
{
private:
TModelList m_lModels;
@@ -81,7 +80,7 @@ public:
//TODO: remove support of obsolete document::XEventBroadcaster/Listener
class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
- , public ::cppu::WeakImplHelper3< css::lang::XServiceInfo
+ , public ::cppu::WeakImplHelper< css::lang::XServiceInfo
, css::frame::XGlobalEventBroadcaster
, css::document::XEventListener
>
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index 46bda04..9bb6639 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -21,7 +21,7 @@
#include <comphelper/processfactory.hxx>
#include <svtools/acceleratorexecute.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/frame/ModuleManager.hpp>
@@ -37,7 +37,7 @@ using ::rtl::OUString;
namespace
{
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::lang::XEventListener
> FrameListenerInterfaceBase;
class FrameListener
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 22dd244..5dfe738 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -30,13 +30,14 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <cppuhelper/compbase.hxx>
using namespace css;
using namespace css::uno;
namespace
{
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::frame::XFrameActionListener
> FrameActionListenerInterfaceBase;
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index a1be682..0d882f3 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -55,7 +55,7 @@
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <framework/interaction.hxx>
#include <rtl/ref.hxx>
@@ -103,7 +103,7 @@ using ::com::sun::star::frame::XModel2;
namespace {
-class SfxFrameLoader_Impl : public ::cppu::WeakImplHelper2< css::frame::XSynchronousFrameLoader, css::lang::XServiceInfo >
+class SfxFrameLoader_Impl : public ::cppu::WeakImplHelper< css::frame::XSynchronousFrameLoader, css::lang::XServiceInfo >
{
css::uno::Reference < css::uno::XComponentContext > m_aContext;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index e246983..4c8db1e 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -48,7 +48,7 @@
#include <sfx2/dispatch.hxx>
#include "workwin.hxx"
#include "guisaveas.hxx"
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svtools/ehdl.hxx>
#include <vcl/timer.hxx>
@@ -90,7 +90,7 @@ public:
// SfxInPlaceClient_Impl
-class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper5< embed::XEmbeddedClient,
+class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper< embed::XEmbeddedClient,
embed::XInplaceClient,
document::XEventListener,
embed::XStateChangeListener,
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 6b7ee56..7d55ca1 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -30,8 +30,7 @@
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/document/XCmisDocument.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/FrameActionEvent.hpp>
#include <com/sun/star/frame/FrameAction.hpp>
#include <com/sun/star/frame/CommandGroup.hpp>
@@ -190,7 +189,7 @@ void reschedule()
}
}
-class SfxStatusIndicator : public ::cppu::WeakImplHelper2< task::XStatusIndicator, lang::XEventListener >
+class SfxStatusIndicator : public ::cppu::WeakImplHelper< task::XStatusIndicator, lang::XEventListener >
{
friend class SfxBaseController;
Reference < XController > xOwner;
@@ -318,7 +317,7 @@ void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/
// declaration IMPL_SfxBaseController_ListenerHelper
-class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< frame::XFrameActionListener >
+class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper< frame::XFrameActionListener >
{
public:
explicit IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ;
@@ -332,7 +331,7 @@ private:
} ; // class IMPL_SfxBaseController_ListenerContainer
-class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper1< util::XCloseListener >
+class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper< util::XCloseListener >
{
public:
explicit IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index aeb5fdb..62ed8bd 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/frame/theUICommandDescription.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
@@ -96,7 +96,7 @@ using namespace ::cppu;
-class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1<
+class SfxClipboardChangeListener : public ::cppu::WeakImplHelper<
datatransfer::clipboard::XClipboardListener >
{
public:
More information about the Libreoffice-commits
mailing list