framework/inc/classes/imagewrapper.hxx | 4 ++--
framework/inc/classes/menumanager.hxx | 4 ++--
framework/inc/dispatch/closedispatcher.hxx | 4 ++--
framework/inc/dispatch/dispatchinformationprovider.hxx | 4 ++--
framework/inc/dispatch/dispatchprovider.hxx | 4 ++--
framework/inc/dispatch/interceptionhelper.hxx | 4 ++--
framework/inc/dispatch/mailtodispatcher.hxx | 4 ++--
framework/inc/dispatch/menudispatcher.hxx | 4 ++--
framework/inc/dispatch/oxt_handler.hxx | 4 ++--
framework/inc/dispatch/popupmenudispatcher.hxx | 4 ++--
framework/inc/dispatch/servicehandler.hxx | 4 ++--
framework/inc/dispatch/startmoduledispatcher.hxx | 4 ++--
framework/inc/dispatch/systemexec.hxx | 4 ++--
framework/inc/helper/dockingareadefaultacceptor.hxx | 4 ++--
framework/inc/helper/mischelper.hxx | 10
+++++-----
framework/inc/helper/ocomponentaccess.hxx | 4 ++--
framework/inc/helper/ocomponentenumeration.hxx | 4 ++--
framework/inc/helper/oframes.hxx | 4 ++--
framework/inc/helper/persistentwindowstate.hxx | 4 ++--
framework/inc/helper/statusindicator.hxx | 4 ++--
framework/inc/helper/statusindicatorfactory.hxx | 4 ++--
framework/inc/helper/tagwindowasmodified.hxx | 4 ++--
framework/inc/helper/titlebarupdate.hxx | 4 ++--
framework/inc/helper/uiconfigelementwrapperbase.hxx | 4 ++--
framework/inc/helper/uielementwrapperbase.hxx | 4 ++--
framework/inc/helper/vclstatusindicator.hxx | 4 ++--
framework/inc/interaction/quietinteraction.hxx | 4 ++--
framework/inc/jobs/helponstartup.hxx | 4 ++--
framework/inc/jobs/job.hxx | 4 ++--
framework/inc/jobs/shelljob.hxx | 4 ++--
framework/inc/pch/precompiled_fwe.hxx | 2 +-
framework/inc/pch/precompiled_fwi.hxx | 2 +-
framework/inc/pch/precompiled_fwk.hxx | 10
++--------
framework/inc/pch/precompiled_fwl.hxx | 2 +-
framework/inc/recording/dispatchrecorder.hxx | 4 ++--
framework/inc/recording/dispatchrecordersupplier.hxx | 4 ++--
framework/inc/services/desktop.hxx | 4 ++--
framework/inc/services/dispatchhelper.hxx | 4 ++--
framework/inc/services/layoutmanager.hxx | 4 ++--
framework/inc/services/mediatypedetectionhelper.hxx | 4 ++--
framework/inc/services/uriabbreviation.hxx | 4 ++--
framework/inc/tabwin/tabwinfactory.hxx | 4 ++--
framework/inc/uiconfiguration/graphicnameaccess.hxx | 4 ++--
framework/inc/uiconfiguration/imagemanager.hxx | 4 ++--
framework/inc/uiconfiguration/moduleimagemanager.hxx | 4 ++--
framework/inc/uielement/constitemcontainer.hxx | 4 ++--
framework/inc/uielement/itemcontainer.hxx | 4 ++--
framework/inc/uielement/rootitemcontainer.hxx | 4 ++--
framework/inc/uielement/statusbaritem.hxx | 4 ++--
framework/inc/uielement/statusbarmanager.hxx | 4 ++--
framework/inc/uielement/statusindicatorinterfacewrapper.hxx | 4 ++--
framework/inc/uielement/toolbarmanager.hxx | 4 ++--
framework/inc/uielement/uicommanddescription.hxx | 4 ++--
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4 ++--
framework/inc/uifactory/factoryconfiguration.hxx | 4 ++--
framework/inc/uifactory/menubarfactory.hxx | 4 ++--
framework/inc/xml/acceleratorconfigurationreader.hxx | 4 ++--
framework/inc/xml/imagesdocumenthandler.hxx | 4 ++--
framework/inc/xml/menudocumenthandler.hxx | 4 ++--
framework/inc/xml/saxnamespacefilter.hxx | 4 ++--
framework/inc/xml/statusbardocumenthandler.hxx | 4 ++--
framework/inc/xml/toolboxdocumenthandler.hxx | 4 ++--
framework/source/accelerators/documentacceleratorconfiguration.cxx | 4 ++--
framework/source/accelerators/globalacceleratorconfiguration.cxx | 3 ++-
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 4 ++--
framework/source/classes/menumanager.cxx | 4 ++--
framework/source/fwe/dispatch/interaction.cxx | 6
+++---
framework/source/fwe/helper/documentundoguard.cxx | 4 ++--
framework/source/fwe/interaction/preventduplicateinteraction.cxx | 2 +-
framework/source/fwi/uielement/constitemcontainer.cxx | 4 ++--
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 7
+++----
framework/source/inc/dispatch/loaddispatcher.hxx | 4 ++--
framework/source/inc/dispatch/windowcommanddispatch.hxx | 2 +-
framework/source/inc/loadenv/loadenv.hxx | 1 -
framework/source/jobs/jobdispatch.cxx | 4 ++--
framework/source/jobs/jobexecutor.cxx | 4 ++--
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 4 ++--
framework/source/loadenv/loadenv.cxx | 3 ++-
framework/source/services/ContextChangeEventMultiplexer.cxx | 4 ++--
framework/source/services/autorecovery.cxx | 4 ++--
framework/source/services/modulemanager.cxx | 4 ++--
framework/source/services/pathsettings.cxx | 4 ++--
framework/source/services/sessionlistener.cxx | 4 ++--
framework/source/services/substitutepathvars.cxx | 4 ++--
framework/source/services/taskcreatorsrv.cxx | 4 ++--
framework/source/services/urltransformer.cxx | 4 ++--
framework/source/uiconfiguration/globalsettings.cxx | 4 ++--
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 4 ++--
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 4 ++--
framework/source/uiconfiguration/uicategorydescription.cxx | 4 ++--
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 4 ++--
framework/source/uiconfiguration/windowstateconfiguration.cxx | 8
++++----
framework/source/uielement/menubarmanager.cxx | 4 ++--
framework/source/uielement/newmenucontroller.cxx | 1 -
framework/source/uielement/popuptoolbarcontroller.cxx | 4 ++--
framework/source/uielement/recentfilesmenucontroller.cxx | 1 -
framework/source/uielement/saveasmenucontroller.cxx | 1 -
framework/source/uielement/uicommanddescription.cxx | 4 ++--
framework/source/uifactory/addonstoolbarfactory.cxx | 4 ++--
framework/source/uifactory/uicontrollerfactory.cxx | 4 ++--
framework/source/uifactory/uielementfactorymanager.cxx | 4 ++--
framework/source/uifactory/windowcontentfactorymanager.cxx | 4 ++--
include/framework/interaction.hxx | 5 -----
include/framework/preventduplicateinteraction.hxx | 4 ++--
include/framework/titlehelper.hxx | 4 ++--
105 files changed, 202 insertions(+), 216 deletions(-)
New commits:
commit 431f2ce81893db21f23572926e8a5b045c67e9ae
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Fri Aug 14 10:23:57 2015 +0900
framework: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I6acff50f23bcbac58c689caf2a7f07dbd5404e57
Reviewed-on: https://gerrit.libreoffice.org/17734
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/framework/inc/classes/imagewrapper.hxx
b/framework/inc/classes/imagewrapper.hxx
index ce5aa68..90e279a 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/image.hxx>
#include <framework/fwedllapi.h>
@@ -31,7 +31,7 @@ namespace framework
{
class FWE_DLLPUBLIC ImageWrapper :
- public ::cppu::WeakImplHelper2<
::com::sun::star::awt::XBitmap,
+ public ::cppu::WeakImplHelper<
::com::sun::star::awt::XBitmap,
::com::sun::star::lang::XUnoTunnel >
{
public:
diff --git a/framework/inc/classes/menumanager.hxx
b/framework/inc/classes/menumanager.hxx
index 07de83d..ea97658 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -31,7 +31,7 @@
#include <rtl/ustring.hxx>
#include <vcl/menu.hxx>
#include <vcl/accel.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -43,7 +43,7 @@ namespace framework
class BmkMenu;
class AddonMenu;
class AddonPopupMenu;
-class MenuManager : public ::cppu::WeakImplHelper1<
css::frame::XStatusListener >
+class MenuManager : public ::cppu::WeakImplHelper< css::frame::XStatusListener
>
{
public:
MenuManager(
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index e8e9d05..3080ed4 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -37,7 +37,7 @@
#include <com/sun/star/frame/DispatchResultState.hpp>
#include <boost/scoped_ptr.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/evntpost.hxx>
#include <vcl/vclptr.hxx>
@@ -55,7 +55,7 @@ namespace framework{
or some other menu entries. Or we terminate the whole
application in case this backing mode should not
be used.
*/
-class CloseDispatcher : public ::cppu::WeakImplHelper2<
+class CloseDispatcher : public ::cppu::WeakImplHelper<
css::frame::XNotifyingDispatch,
// => XDispatch
css::frame::XDispatchInformationProvider >
{
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx
b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 0dd129a..851b021 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -30,7 +30,7 @@
#include <cppuhelper/weakref.hxx>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/svapp.hxx>
namespace framework{
@@ -38,7 +38,7 @@ namespace framework{
/*-************************************************************************************************************
@short a helper to merge dispatch information of different
sources together.
*//*-*************************************************************************************************************/
-class DispatchInformationProvider : public ::cppu::WeakImplHelper1<
css::frame::XDispatchInformationProvider >
+class DispatchInformationProvider : public ::cppu::WeakImplHelper<
css::frame::XDispatchInformationProvider >
{
// member
diff --git a/framework/inc/dispatch/dispatchprovider.hxx
b/framework/inc/dispatch/dispatchprovider.hxx
index dadcfd3..4b2eb03 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
@@ -76,7 +76,7 @@ enum EDispatchHelper
*/
class DispatchProvider : private TransactionBase ,
// interfaces
- public ::cppu::WeakImplHelper1<
css::frame::XDispatchProvider >
+ public ::cppu::WeakImplHelper<
css::frame::XDispatchProvider >
{
/* member */
private:
diff --git a/framework/inc/dispatch/interceptionhelper.hxx
b/framework/inc/dispatch/interceptionhelper.hxx
index e032017..e2a9ad9 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <tools/wldcrd.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <deque>
@@ -47,7 +47,7 @@ namespace framework{
@attention Don't use this class as direct member - use it dynamicly. Do
not derive from this class.
We hold a weakreference to our owner not to our superclass.
*/
-class InterceptionHelper : public ::cppu::WeakImplHelper3<
+class InterceptionHelper : public ::cppu::WeakImplHelper<
css::frame::XDispatchProvider,
css::frame::XDispatchProviderInterception,
css::lang::XEventListener >
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx
b/framework/inc/dispatch/mailtodispatcher.hxx
index 189e109..e4a1c82 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -49,7 +49,7 @@ namespace framework{
@devstatus ready to use
*/
-class MailToDispatcher : public ::cppu::WeakImplHelper3<
+class MailToDispatcher : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch> // =>
XDispatch
diff --git a/framework/inc/dispatch/menudispatcher.hxx
b/framework/inc/dispatch/menudispatcher.hxx
index 633874b..16c1904 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -41,7 +41,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -64,7 +64,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
@devstatus ready to use
*//*-*************************************************************************************************************/
-class MenuDispatcher : public ::cppu::WeakImplHelper2<
+class MenuDispatcher : public ::cppu::WeakImplHelper<
css::frame::XDispatch ,
css::frame::XFrameActionListener >
{
diff --git a/framework/inc/dispatch/oxt_handler.hxx
b/framework/inc/dispatch/oxt_handler.hxx
index 999c2dd..d199240 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -51,7 +51,7 @@ namespace framework{
@devstatus ready
@threadsafe yes
*//*-*************************************************************************************************************/
-class Oxt_Handler : public ::cppu::WeakImplHelper3<
+class Oxt_Handler : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XNotifyingDispatch, // =>
XDispatch
css::document::XExtendedFilterDetection >
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx
b/framework/inc/dispatch/popupmenudispatcher.hxx
index d216326..40f9214 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -43,7 +43,7 @@
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/uri/XUriReference.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -66,7 +66,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
@devstatus ready to use
*//*-*************************************************************************************************************/
-class PopupMenuDispatcher : public ::cppu::WeakImplHelper5<
+class PopupMenuDispatcher : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XDispatchProvider,
css::frame::XDispatch,
diff --git a/framework/inc/dispatch/servicehandler.hxx
b/framework/inc/dispatch/servicehandler.hxx
index e84049a..ffb77bb 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -53,7 +53,7 @@ namespace framework{
@devstatus ready to use
*/
-class ServiceHandler : public ::cppu::WeakImplHelper3<
+class ServiceHandler : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo ,
css::frame::XDispatchProvider ,
css::frame::XNotifyingDispatch > // =>
XDispatch
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx
b/framework/inc/dispatch/startmoduledispatcher.hxx
index 979f794..84589df 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -37,7 +37,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/evntpost.hxx>
namespace framework{
@@ -45,7 +45,7 @@ namespace framework{
/**
@short helper to handle all URLs related to the StartModule
*/
-class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
+class StartModuleDispatcher : public ::cppu::WeakImplHelper<
css::frame::XNotifyingDispatch,
// => XDispatch
css::frame::XDispatchInformationProvider >
{
diff --git a/framework/inc/dispatch/systemexec.hxx
b/framework/inc/dispatch/systemexec.hxx
index b4517e9..f8ec78c 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -51,7 +51,7 @@ namespace framework{
@devstatus ready to use
*/
-class SystemExec : public ::cppu::WeakImplHelper3<
+class SystemExec : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo ,
css::frame::XDispatchProvider ,
css::frame::XNotifyingDispatch > // =>
XDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx
b/framework/inc/helper/dockingareadefaultacceptor.hxx
index cfc547c..abc2320 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -28,12 +28,12 @@
#include <com/sun/star/ui/XDockingAreaAcceptor.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
-class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1<
::com::sun::star::ui::XDockingAreaAcceptor >
+class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper<
::com::sun::star::ui::XDockingAreaAcceptor >
{
public:
diff --git a/framework/inc/helper/mischelper.hxx
b/framework/inc/helper/mischelper.hxx
index 7f45aa6..414ab46 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/XContextChangeEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/lang.h>
#include <svl/languageoptions.hxx>
@@ -150,7 +150,7 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString >
&rLangItems,
//OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
//which forwards the events to the OriginalListener without taking ownership of
//it.
-class WeakContainerListener : public
::cppu::WeakImplHelper1<com::sun::star::container::XContainerListener>
+class WeakContainerListener : public
::cppu::WeakImplHelper<com::sun::star::container::XContainerListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::container::XContainerListener>
mxOwner;
@@ -205,7 +205,7 @@ class WeakContainerListener : public
::cppu::WeakImplHelper1<com::sun::star::con
}
};
-class WeakChangesListener : public
::cppu::WeakImplHelper1<com::sun::star::util::XChangesListener>
+class WeakChangesListener : public
::cppu::WeakImplHelper<com::sun::star::util::XChangesListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::util::XChangesListener>
mxOwner;
@@ -242,7 +242,7 @@ class WeakChangesListener : public
::cppu::WeakImplHelper1<com::sun::star::util:
}
};
-class WeakEventListener : public
::cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
+class WeakEventListener : public
::cppu::WeakImplHelper<com::sun::star::lang::XEventListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::lang::XEventListener>
mxOwner;
@@ -269,7 +269,7 @@ class WeakEventListener : public
::cppu::WeakImplHelper1<com::sun::star::lang::X
}
};
-class WeakDocumentEventListener : public
::cppu::WeakImplHelper1<com::sun::star::document::XDocumentEventListener>
+class WeakDocumentEventListener : public
::cppu::WeakImplHelper<com::sun::star::document::XDocumentEventListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::document::XDocumentEventListener>
mxOwner;
diff --git a/framework/inc/helper/ocomponentaccess.hxx
b/framework/inc/helper/ocomponentaccess.hxx
index baa2d39..7bd96b1 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
@@ -54,7 +54,7 @@ namespace framework{
@devstatus ready to use
*//*-*************************************************************************************************************/
-class OComponentAccess : public ::cppu::WeakImplHelper1<
::com::sun::star::container::XEnumerationAccess >
+class OComponentAccess : public ::cppu::WeakImplHelper<
::com::sun::star::container::XEnumerationAccess >
{
// public methods
diff --git a/framework/inc/helper/ocomponentenumeration.hxx
b/framework/inc/helper/ocomponentenumeration.hxx
index e1e5078..05b6489 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -50,7 +50,7 @@ namespace framework{
@threadsafe yes
*//*-*************************************************************************************************************/
-class OComponentEnumeration : public ::cppu::WeakImplHelper2<
::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener
>
+class OComponentEnumeration : public ::cppu::WeakImplHelper<
::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener
>
{
// public methods
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 67b7e57..9f177c4 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/frame/XFrames.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
@@ -54,7 +54,7 @@ namespace framework{
@devstatus deprecated
*//*-*************************************************************************************************************/
-class OFrames : public ::cppu::WeakImplHelper1<
::com::sun::star::frame::XFrames >
+class OFrames : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XFrames >
{
public:
diff --git a/framework/inc/helper/persistentwindowstate.hxx
b/framework/inc/helper/persistentwindowstate.hxx
index 13dc1e1..c3f7708 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -52,7 +52,7 @@ namespace framework{
@devstatus ready
@threadsafe yes
*//*-*************************************************************************************************************/
-class PersistentWindowState : public ::cppu::WeakImplHelper2<
+class PersistentWindowState : public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::frame::XFrameActionListener >
// => XEventListener
{
diff --git a/framework/inc/helper/statusindicator.hxx
b/framework/inc/helper/statusindicator.hxx
index 6043cf2..032d244 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
// include all others
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
@@ -52,7 +52,7 @@ namespace framework{
@devstatus ready to use
@threadsafe yes
*/
-class StatusIndicator : public ::cppu::WeakImplHelper1<
css::task::XStatusIndicator >
+class StatusIndicator : public ::cppu::WeakImplHelper<
css::task::XStatusIndicator >
{
// member
diff --git a/framework/inc/helper/statusindicatorfactory.hxx
b/framework/inc/helper/statusindicatorfactory.hxx
index 7e6981f..d8d3838 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -49,7 +49,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/status.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/thread.hxx>
namespace framework{
@@ -139,7 +139,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack;
@devstatus ready to use
@threadsafe yes
*/
-class StatusIndicatorFactory : public ::cppu::WeakImplHelper4<
+class StatusIndicatorFactory : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo
, css::lang::XInitialization
, css::task::XStatusIndicatorFactory
diff --git a/framework/inc/helper/tagwindowasmodified.hxx
b/framework/inc/helper/tagwindowasmodified.hxx
index a9feec6..6bea1ab 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -46,7 +46,7 @@ namespace framework{
@devstatus draft
@threadsafe yes
*//*-*************************************************************************************************************/
-class TagWindowAsModified : public ::cppu::WeakImplHelper3<
+class TagWindowAsModified : public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::frame::XFrameActionListener, //
=> XEventListener
css::util::XModifyListener >
// => XEventListener
diff --git a/framework/inc/helper/titlebarupdate.hxx
b/framework/inc/helper/titlebarupdate.hxx
index c53628f..7dd4944 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/frame/XTitleChangeListener.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustrbuf.hxx>
namespace framework{
@@ -42,7 +42,7 @@ namespace framework{
@devstatus draft
@threadsafe yes
*//*-*************************************************************************************************************/
-class TitleBarUpdate : public ::cppu::WeakImplHelper3<
+class TitleBarUpdate : public ::cppu::WeakImplHelper<
css::lang::XInitialization
, css::frame::XTitleChangeListener // =>
XEventListener
, css::frame::XFrameActionListener > // =>
XEventListener
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx
b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 970317f..6ce61ee 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -37,12 +37,12 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework
{
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::ui::XUIElement,
::com::sun::star::ui::XUIElementSettings,
::com::sun::star::lang::XInitialization,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx
b/framework/inc/helper/uielementwrapperbase.hxx
index a672a9f..dca1cfb 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -33,12 +33,12 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework
{
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::ui::XUIElement,
::com::sun::star::lang::XInitialization,
::com::sun::star::lang::XComponent,
diff --git a/framework/inc/helper/vclstatusindicator.hxx
b/framework/inc/helper/vclstatusindicator.hxx
index c5e1155..3d4f86d 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -28,14 +28,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/status.hxx>
namespace framework {
// declaration
-class VCLStatusIndicator : public ::cppu::WeakImplHelper1<
css::task::XStatusIndicator >
+class VCLStatusIndicator : public ::cppu::WeakImplHelper<
css::task::XStatusIndicator >
{
// member
diff --git a/framework/inc/interaction/quietinteraction.hxx
b/framework/inc/interaction/quietinteraction.hxx
index 5f084fd..540f727 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -42,7 +42,7 @@ namespace framework{
- InteractiveAugmentedIOException
All other requests will be aborted.
*/
-class QuietInteraction : public ::cppu::WeakImplHelper1<
+class QuietInteraction : public ::cppu::WeakImplHelper<
css::task::XInteractionHandler >
{
// member
diff --git a/framework/inc/jobs/helponstartup.hxx
b/framework/inc/jobs/helponstartup.hxx
index 45a8f97..ff98d63 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -24,7 +24,7 @@
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/task/XJob.hpp>
@@ -41,7 +41,7 @@ namespace framework{
@author as96863
*/
-class HelpOnStartup : public ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob
>
+class HelpOnStartup : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob
>
{
// member
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 7f01fec..8ed4a48 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/util/XCloseListener.hpp>
#include <com/sun/star/frame/DispatchResultEvent.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/conditn.hxx>
#include <rtl/ustring.hxx>
@@ -49,7 +49,7 @@ namespace framework{
synchronously or asynchronous, control its lifetime
and differe between jobs with and without configuration.
*/
-class Job : public ::cppu::WeakImplHelper3<
+class Job : public ::cppu::WeakImplHelper<
css::task::XJobListener
, css::frame::XTerminateListener
, css::util::XCloseListener >
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 2412edc..1610cd0 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -24,7 +24,7 @@
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/task/XJob.hpp>
@@ -45,7 +45,7 @@ namespace framework{
@author as96863
*/
-class ShellJob : public ::cppu::WeakImplHelper2<
::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
+class ShellJob : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
{
// member
diff --git a/framework/inc/pch/precompiled_fwe.hxx
b/framework/inc/pch/precompiled_fwe.hxx
index 55820ec..166ab64 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -59,7 +59,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/proptypehlp.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/framework/inc/pch/precompiled_fwi.hxx
b/framework/inc/pch/precompiled_fwi.hxx
index 8d21c91..d33de57 100644
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ b/framework/inc/pch/precompiled_fwi.hxx
@@ -31,7 +31,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/config.h>
diff --git a/framework/inc/pch/precompiled_fwk.hxx
b/framework/inc/pch/precompiled_fwk.hxx
index 7b4c36e..8919ad8 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -279,16 +279,10 @@
#include <config_folders.h>
#include <config_orcus.h>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/proptypehlp.hxx>
diff --git a/framework/inc/pch/precompiled_fwl.hxx
b/framework/inc/pch/precompiled_fwl.hxx
index 533ca06..9bb5ac5 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -63,7 +63,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <i18nlangtag/mslangid.hxx>
diff --git a/framework/inc/recording/dispatchrecorder.hxx
b/framework/inc/recording/dispatchrecorder.hxx
index abe2c91..143d882 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -41,12 +41,12 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
class DispatchRecorder
- : public ::cppu::WeakImplHelper3<
+ : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo
, css::frame::XDispatchRecorder
, css::container::XIndexReplace >
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx
b/framework/inc/recording/dispatchrecordersupplier.hxx
index 88ad6b6..e924fa2 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -44,7 +44,7 @@ namespace framework{
@threadsafe yes
*/
-class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2<
+class DispatchRecorderSupplier : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo
,
css::frame::XDispatchRecorderSupplier >
{
diff --git a/framework/inc/services/desktop.hxx
b/framework/inc/services/desktop.hxx
index 40d349c..dc3d4d7 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -49,7 +49,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/numberedcollection.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <unotools/cmdoptions.hxx>
@@ -88,7 +88,7 @@ enum ELoadState
@devstatus ready to use
@threadsafe yes
*//*-*************************************************************************************************************/
-typedef cppu::WeakComponentImplHelper6<
+typedef cppu::WeakComponentImplHelper<
css::lang::XServiceInfo ,
css::frame::XDesktop2 ,
css::frame::XTasksSupplier ,
diff --git a/framework/inc/services/dispatchhelper.hxx
b/framework/inc/services/dispatchhelper.hxx
index 3210bf1..34e31fa 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/DispatchResultEvent.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/conditn.hxx>
namespace framework{
@@ -45,7 +45,7 @@ namespace framework{
All these steps are done inside one method call here.
*/
-class DispatchHelper : public ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener
>
+class DispatchHelper : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener
>
{
// member
diff --git a/framework/inc/services/layoutmanager.hxx
b/framework/inc/services/layoutmanager.hxx
index a015ee2..d1e042d 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -49,7 +49,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/propertycontainer.hxx>
@@ -67,7 +67,7 @@ namespace framework
{
class InfoHelperBuilder;
}
- typedef ::cppu::WeakImplHelper3 < ::com::sun::star::lang::XServiceInfo
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo
,
::com::sun::star::frame::XLayoutManager2
, ::com::sun::star::awt::XWindowListener
> LayoutManager_Base;
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx
b/framework/inc/services/mediatypedetectionhelper.hxx
index 3c0ca99..6b397c3 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/util/XStringMapping.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
// namespaces
@@ -44,7 +44,7 @@ namespace framework{
@devstatus deprecated
*//*-*************************************************************************************************************/
-class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2<
::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
+class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper<
::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
{
// public methods
diff --git a/framework/inc/services/uriabbreviation.hxx
b/framework/inc/services/uriabbreviation.hxx
index 8ba08a7..a0a2e6c 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -29,12 +29,12 @@
#include <com/sun/star/util/XStringAbbreviation.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework
{
-class UriAbbreviation: public ::cppu::WeakImplHelper2<
::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo>
+class UriAbbreviation: public ::cppu::WeakImplHelper<
::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo>
{
public:
explicit UriAbbreviation(::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context);
diff --git a/framework/inc/tabwin/tabwinfactory.hxx
b/framework/inc/tabwin/tabwinfactory.hxx
index 483356a..8d42f64 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -34,13 +34,13 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/XToolkit2.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
namespace framework
{
-class TabWinFactory : public ::cppu::WeakImplHelper2<
::com::sun::star::lang::XSingleComponentFactory,
com::sun::star::lang::XServiceInfo>
+class TabWinFactory : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XSingleComponentFactory,
com::sun::star::lang::XServiceInfo>
{
public:
TabWinFactory( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx
b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 305d977..1e200c6 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework
{
- class GraphicNameAccess : public ::cppu::WeakImplHelper1<
::com::sun::star::container::XNameAccess >
+ class GraphicNameAccess : public ::cppu::WeakImplHelper<
::com::sun::star::container::XNameAccess >
{
public:
GraphicNameAccess();
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx
b/framework/inc/uiconfiguration/imagemanager.hxx
index 1a5ee6d..44b2e11 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -37,7 +37,7 @@
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustring.hxx>
@@ -48,7 +48,7 @@
namespace framework
{
class ImageManagerImpl;
- class ImageManager : public ::cppu::WeakImplHelper2<
::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
+ class ImageManager : public ::cppu::WeakImplHelper<
::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
{
public:
ImageManager( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx
b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index ab6e9c2..86e0671 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/ui/ConfigurationEvent.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <rtl/ustring.hxx>
@@ -53,7 +53,7 @@ namespace framework
{
class ImageManagerImpl;
- class ModuleImageManager : public ::cppu::WeakImplHelper1<
::com::sun::star::ui::XImageManager>
+ class ModuleImageManager : public ::cppu::WeakImplHelper<
::com::sun::star::ui::XImageManager>
{
public:
ModuleImageManager( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uielement/constitemcontainer.hxx
b/framework/inc/uielement/constitemcontainer.hxx
index f91729b..80df091 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <vector>
@@ -44,7 +44,7 @@ namespace framework
class RootItemContainer;
class ItemContainer;
-class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4<
+class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper<
css::container::XIndexAccess,
css::lang::XUnoTunnel
,
css::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/itemcontainer.hxx
b/framework/inc/uielement/itemcontainer.hxx
index 5fde1b4..bf64c9e 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include <fwidllapi.h>
@@ -38,7 +38,7 @@
namespace framework
{
class ConstItemContainer;
-class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper1<
::com::sun::star::container::XIndexContainer>
+class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper<
::com::sun::star::container::XIndexContainer>
{
friend class ConstItemContainer;
diff --git a/framework/inc/uielement/rootitemcontainer.hxx
b/framework/inc/uielement/rootitemcontainer.hxx
index 11490a7..a785f65 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -34,7 +34,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <vector>
@@ -44,7 +44,7 @@ namespace framework
{
class ConstItemContainer;
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
css::container::XIndexContainer,
css::lang::XSingleComponentFactory,
css::lang::XUnoTunnel > RootItemContainer_BASE;
diff --git a/framework/inc/uielement/statusbaritem.hxx
b/framework/inc/uielement/statusbaritem.hxx
index e05cd37..fe86779 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARITEM_HXX
#include <com/sun/star/ui/XStatusbarItem.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <vcl/vclptr.hxx>
@@ -31,7 +31,7 @@ namespace framework
struct AddonStatusbarItemData;
-typedef cppu::WeakComponentImplHelper1< com::sun::star::ui::XStatusbarItem >
StatusbarItem_Base;
+typedef cppu::WeakComponentImplHelper< com::sun::star::ui::XStatusbarItem >
StatusbarItem_Base;
class StatusbarItem : protected cppu::BaseMutex,
public StatusbarItem_Base
diff --git a/framework/inc/uielement/statusbarmanager.hxx
b/framework/inc/uielement/statusbarmanager.hxx
index 2167b0c..0159a66 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <vcl/status.hxx>
#include <vcl/vclptr.hxx>
@@ -44,7 +44,7 @@ namespace framework
{
class FrameworkStatusBar;
-class StatusBarManager : public ::cppu::WeakImplHelper3<
+class StatusBarManager : public ::cppu::WeakImplHelper<
css::frame::XFrameActionListener,
css::lang::XComponent,
css::ui::XUIConfigurationListener >
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 02a54b7..9eb9535 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -29,14 +29,14 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
namespace framework
{
-class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1<
::com::sun::star::task::XStatusIndicator>
+class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper<
::com::sun::star::task::XStatusIndicator>
{
public:
StatusIndicatorInterfaceWrapper( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
rStatusIndicatorImpl );
diff --git a/framework/inc/uielement/toolbarmanager.hxx
b/framework/inc/uielement/toolbarmanager.hxx
index 9fc9803..9a43da9 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -45,7 +45,7 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <tools/link.hxx>
@@ -60,7 +60,7 @@ class ToolBox;
namespace framework
{
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::frame::XFrameActionListener,
::com::sun::star::frame::XStatusListener,
::com::sun::star::lang::XComponent,
diff --git a/framework/inc/uielement/uicommanddescription.hxx
b/framework/inc/uielement/uicommanddescription.hxx
index 00fe3fc..9aa7a6a 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -28,13 +28,13 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustring.hxx>
namespace framework
{
-typedef ::cppu::WeakComponentImplHelper2< com::sun::star::lang::XServiceInfo,
+typedef ::cppu::WeakComponentImplHelper< com::sun::star::lang::XServiceInfo,
com::sun::star::container::XNameAccess > UICommandDescription_BASE;
class UICommandDescription : private cppu::BaseMutex,
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index b704d7e..da81951 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -28,14 +28,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
#include <unordered_map>
namespace framework {
- class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper1<
::com::sun::star::container::XContainerListener>
+ class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper<
::com::sun::star::container::XContainerListener>
{
public:
ConfigurationAccess_FactoryManager( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>&
rxContext, const OUString& _sRoot );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx
b/framework/inc/uifactory/factoryconfiguration.hxx
index a913129..842a481 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
#include <unordered_map>
@@ -43,7 +43,7 @@ namespace framework
// Configuration access class for PopupMenuControllerFactory implementation
class ConfigurationAccess_ControllerFactory : // interfaces
- public
::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
+ public
::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener>
{
public:
ConfigurationAccess_ControllerFactory( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
rxContext, const OUString& _sRoot );
diff --git a/framework/inc/uifactory/menubarfactory.hxx
b/framework/inc/uifactory/menubarfactory.hxx
index da1e734..abb0004 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -26,13 +26,13 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustring.hxx>
namespace framework
{
-typedef ::cppu::WeakImplHelper2<
+typedef ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::ui::XUIElementFactory> MenuBarFactory_BASE;
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx
b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 0fb8bfe..07c4685 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -30,12 +30,12 @@
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <salhelper/singletonref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
namespace framework{
-class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1<
css::xml::sax::XDocumentHandler >
+class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper<
css::xml::sax::XDocumentHandler >
{
// const, types
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx
b/framework/inc/xml/imagesdocumenthandler.hxx
index abc52a3..2b7e7c3 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -26,7 +26,7 @@
#include <xml/imagesconfiguration.hxx>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unordered_map>
#include <stdtypes.h>
@@ -35,7 +35,7 @@ namespace framework{
// Hash code function for using in all hash maps of follow implementation.
-class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler >
+class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler >
{
public:
enum Image_XML_Entry
diff --git a/framework/inc/xml/menudocumenthandler.hxx
b/framework/inc/xml/menudocumenthandler.hxx
index 0c04906..c4cd80d 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -28,14 +28,14 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <framework/fwedllapi.h>
namespace framework{
class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
- public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler >
+ public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler >
{
public:
ReadMenuDocumentHandlerBase();
diff --git a/framework/inc/xml/saxnamespacefilter.hxx
b/framework/inc/xml/saxnamespacefilter.hxx
index b6764f2..35de8d8 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -24,7 +24,7 @@
#include <xml/xmlnamespaces.hxx>
#include <rtl/ustring.hxx>
#include <vcl/menu.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <stack>
#include <framework/fwedllapi.h>
@@ -33,7 +33,7 @@ namespace framework
{
class FWE_DLLPUBLIC SaxNamespaceFilter :
- public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler >
+ public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler >
{
public:
SaxNamespaceFilter( ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler >& rSax1DocumentHandler );
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx
b/framework/inc/xml/statusbardocumenthandler.hxx
index 579c33c..0c5cb63 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unordered_map>
#include <stdtypes.h>
@@ -36,7 +36,7 @@ namespace framework{
// Hash code function for using in all hash maps of follow implementation.
class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
- public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler >
+ public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler >
{
public:
enum StatusBar_XML_Entry
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx
b/framework/inc/xml/toolboxdocumenthandler.hxx
index 493527b..c91ff36 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <stdtypes.h>
#include <framework/fwedllapi.h>
@@ -35,7 +35,7 @@ namespace framework{
// Hash code function for using in all hash maps of follow implementation.
class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
- public ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler >
+ public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler >
{
public:
enum ToolBox_XML_Entry
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx
b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 19884dd..41e315f 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -48,7 +48,7 @@ namespace {
based accelerator configuration.
*/
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
XMLBasedAcceleratorConfiguration,
css::lang::XServiceInfo> DocumentAcceleratorConfiguration_BASE;
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index a20b20a..3569194 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <vcl/svapp.hxx>
@@ -39,7 +40,7 @@ namespace {
implements a read/write access to the global
accelerator configuration.
*/
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
XCUBasedAcceleratorConfiguration,
css::lang::XServiceInfo > GlobalAcceleratorConfiguration_BASE;
class GlobalAcceleratorConfiguration : public
GlobalAcceleratorConfiguration_BASE
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 3d42c8e..5ceaa74 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
using namespace framework;
@@ -45,7 +45,7 @@ namespace {
implements a read/write access to a module
dependent accelerator configuration.
*/
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
XCUBasedAcceleratorConfiguration,
css::lang::XServiceInfo > ModuleAcceleratorConfiguration_BASE;
diff --git a/framework/source/classes/menumanager.cxx
b/framework/source/classes/menumanager.cxx
index 7ae1e2c..6e95b4c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -54,7 +54,7 @@
#include <osl/mutex.hxx>
#include <osl/file.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::cppu;
using namespace ::com::sun::star::uno;
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-class StringLength : public ::cppu::WeakImplHelper1< XStringWidth >
+class StringLength : public ::cppu::WeakImplHelper< XStringWidth >
{
public:
StringLength() {}
diff --git a/framework/source/fwe/dispatch/interaction.cxx
b/framework/source/fwe/dispatch/interaction.cxx
index 49acb01..cf0f3a9 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -39,7 +39,7 @@ namespace framework{
@implements XInteractionFilterSelect
- @base ImplInheritanceHelper1
+ @base ImplInheritanceHelper
ContinuationBase
@devstatus ready to use
@@ -83,7 +83,7 @@ OUString SAL_CALL ContinuationFilterSelect::getFilter()
throw( css::uno::Runtime
return m_sFilter;
}
-class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1<
::com::sun::star::task::XInteractionRequest >
+class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::task::XInteractionRequest >
{
public:
RequestFilterSelect_Impl( const OUString& sURL );
@@ -187,7 +187,7 @@ uno::Reference < task::XInteractionRequest >
RequestFilterSelect::GetRequest()
return uno::Reference < task::XInteractionRequest > (pImp);
}
-class InteractionRequest_Impl : public ::cppu::WeakImplHelper1<
::com::sun::star::task::XInteractionRequest >
+class InteractionRequest_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::task::XInteractionRequest >
{
uno::Any m_aRequest;
uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
diff --git a/framework/source/fwe/helper/documentundoguard.cxx
b/framework/source/fwe/helper/documentundoguard.cxx
index f055b0c..0f564575 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <tools/diagnose_ex.h>
@@ -46,7 +46,7 @@ namespace framework
//= UndoManagerContextListener
- typedef ::cppu::WeakImplHelper1 < XUndoManagerListener
+ typedef ::cppu::WeakImplHelper < XUndoManagerListener
> UndoManagerContextListener_Base;
class UndoManagerContextListener : public UndoManagerContextListener_Base
{
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index c4a62bb..a2c079d 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -72,7 +72,7 @@ css::uno::Any SAL_CALL
PreventDuplicateInteraction::queryInterface( const css::u
if ( !xHandler.is() )
return css::uno::Any();
}
- return ::cppu::WeakImplHelper1< css::task::XInteractionHandler2
>::queryInterface( aType );
+ return ::cppu::WeakImplHelper< css::task::XInteractionHandler2
>::queryInterface( aType );
}
void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference<
css::task::XInteractionRequest >& xRequest)
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx
b/framework/source/fwi/uielement/constitemcontainer.cxx
index ac07760..cea61f6 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/servicehelper.hxx>
using namespace cppu;
@@ -53,7 +53,7 @@ static int SAL_CALL compare_OUString_Property_Impl( const
void *arg1, const void
}
class OPropertySetHelperInfo_Impl
- : public WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >
+ : public WeakImplHelper< ::com::sun::star::beans::XPropertySetInfo >
{
Sequence < Property > aInfos;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index b963daa..b423f4b 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -46,8 +46,7 @@
#include <com/sun/star/form/XReset.hpp>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <salhelper/singletonref.hxx>
// definition
@@ -63,7 +62,7 @@ const char CFG_ENTRY_MODULES[] = "Modules";
implements a read/write access to the accelerator configuration.
*/
class XMLBasedAcceleratorConfiguration : public IStorageListener,
- public ::cppu::WeakImplHelper2<
+ public ::cppu::WeakImplHelper<
css::form::XReset,
// TODO use XPresetHandler instead if available
css::ui::XAcceleratorConfiguration > // => css::ui::XUIConfigurationPersistence
// css::ui::XUIConfigurationStorage
@@ -234,7 +233,7 @@ class XMLBasedAcceleratorConfiguration : public
IStorageListener,
};
-class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4<
+class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper<
css::util::XChangesListener,
css::lang::XComponent,
css::form::XReset,
// TODO use XPresetHandler instead if available
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx
b/framework/source/inc/dispatch/loaddispatcher.hxx
index 17db900..f5a477c 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework{
@@ -35,7 +35,7 @@ namespace framework{
@author as96863
*/
-class LoadDispatcher : public ::cppu::WeakImplHelper2<
css::frame::XNotifyingDispatch, // => XDispatch => XInterface
+class LoadDispatcher : public ::cppu::WeakImplHelper<
css::frame::XNotifyingDispatch, // => XDispatch => XInterface
css::frame::XSynchronousDispatch >
{
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx
b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index dbcd165..95c239d 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/weakref.hxx>
#include <tools/link.hxx>
namespace com { namespace sun { namespace star { namespace uno {
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 7a6f317..d2fa915 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -35,7 +35,6 @@
#include <rtl/ref.hxx>
#include <unotools/mediadescriptor.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <cppuhelper/implbase2.hxx>
namespace framework {
diff --git a/framework/source/jobs/jobdispatch.cxx
b/framework/source/jobs/jobdispatch.cxx
index 0681909..693a675 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <unotools/configpaths.hxx>
@@ -55,7 +55,7 @@ namespace {
real job. We do it, control the life cycle of this internal
wrapped job and inform any interested listener if it finish.
*/
-class JobDispatch : public ::cppu::WeakImplHelper4<
+class JobDispatch : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo
, css::lang::XInitialization
, css::frame::XDispatchProvider
diff --git a/framework/source/jobs/jobexecutor.cxx
b/framework/source/jobs/jobexecutor.cxx
index 5ce6b99..3a798e5 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/frame/XModuleManager2.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/configpaths.hxx>
#include <rtl/ref.hxx>
@@ -49,7 +49,7 @@ using namespace framework;
namespace {
-typedef cppu::WeakComponentImplHelper4<
+typedef cppu::WeakComponentImplHelper<
css::lang::XServiceInfo
, css::task::XJobExecutor
, css::container::XContainerListener // => lang.XEventListener
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 8ad4f13..c41aeee 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -53,12 +53,12 @@
#include <com/sun/star/awt/XDockableWindow.hpp>
#include <com/sun/star/awt/XDockableWindowListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace framework
{
-class ToolbarLayoutManager : public ::cppu::WeakImplHelper3<
::com::sun::star::awt::XDockableWindowListener,
+class ToolbarLayoutManager : public ::cppu::WeakImplHelper<
::com::sun::star::awt::XDockableWindowListener,
::com::sun::star::ui::XUIConfigurationListener,
::com::sun::star::awt::XWindowListener >
{
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 79e56a0..6f6cc12 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -81,6 +81,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
#include <vcl/svapp.hxx>
+#include <cppuhelper/implbase.hxx>
#include <config_orcus.h>
@@ -91,7 +92,7 @@ namespace framework {
using namespace com::sun::star;
-class LoadEnvListener : public ::cppu::WeakImplHelper2<
css::frame::XLoadEventListener ,
+class LoadEnvListener : public ::cppu::WeakImplHelper<
css::frame::XLoadEventListener ,
css::frame::XDispatchResultListener >
{
private:
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx
b/framework/source/services/ContextChangeEventMultiplexer.cxx
index d672704..dd558ed 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -42,7 +42,7 @@ using namespace css::uno;
namespace {
-typedef ::cppu::WeakComponentImplHelper3 <
+typedef ::cppu::WeakComponentImplHelper <
css::ui::XContextChangeEventMultiplexer,
css::lang::XServiceInfo,
css::lang::XEventListener
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 05d2fc6..1b0033f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -71,7 +71,7 @@
#include <comphelper/configurationhelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/mediadescriptor.hxx>
@@ -159,7 +159,7 @@ public:
of documents - including features of an EmergencySave in
case a GPF occurs.
*/
-typedef ::cppu::WeakComponentImplHelper5<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::frame::XDispatch,
css::document::XDocumentEventListener, // =>
css.lang.XEventListener
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index 4b9d383..f8f176d 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -41,7 +41,7 @@
namespace {
class ModuleManager:
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XModuleManager2,
css::container::XContainerQuery >,
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index db5f427..5296c8f 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -38,7 +38,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -79,7 +79,7 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID)
disable it in case only the new schema must be used.
*/
-typedef ::cppu::WeakComponentImplHelper3<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::util::XChangesListener, // => XEventListener
css::util::XPathSettings> // => XPropertySet
diff --git a/framework/source/services/sessionlistener.cxx
b/framework/source/services/sessionlistener.cxx
index fa131d4..cd15171 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/pathoptions.hxx>
@@ -75,7 +75,7 @@ namespace {
if flush failed</li>
</ul>
*/
-typedef cppu::WeakImplHelper4<
+typedef cppu::WeakImplHelper<
css::lang::XInitialization,
css::frame::XSessionManagerListener2,
css::frame::XStatusListener,
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index faaf2a1..e2e9d12 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -22,7 +22,7 @@
#include <helper/networkdomain.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/configitem.hxx>
#include <unotools/localfilehelper.hxx>
@@ -218,7 +218,7 @@ struct ReSubstUserVarOrder
typedef std::list< ReSubstFixedVarOrder > ReSubstFixedVarOrderVector;
typedef std::list< ReSubstUserVarOrder > ReSubstUserVarOrderVector;
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
css::util::XStringSubstitution,
css::lang::XServiceInfo > SubstitutePathVariables_BASE;
diff --git a/framework/source/services/taskcreatorsrv.cxx
b/framework/source/services/taskcreatorsrv.cxx
index e26f481..e8f03b1 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -36,7 +36,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svtools/colorcfg.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -47,7 +47,7 @@ using namespace framework;
namespace {
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::lang::XSingleServiceFactory> TaskCreatorService_BASE;
diff --git a/framework/source/services/urltransformer.cxx
b/framework/source/services/urltransformer.cxx
index 13c2208..097864b 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -19,7 +19,7 @@
#include <services.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/urlobj.hxx>
#include <rtl/ref.hxx>
@@ -32,7 +32,7 @@
namespace {
-class URLTransformer : public ::cppu::WeakImplHelper2<
css::util::XURLTransformer, css::lang::XServiceInfo>
+class URLTransformer : public ::cppu::WeakImplHelper<
css::util::XURLTransformer, css::lang::XServiceInfo>
{
public:
URLTransformer() {}
diff --git a/framework/source/uiconfiguration/globalsettings.cxx
b/framework/source/uiconfiguration/globalsettings.cxx
index 6ce4811..91412c7 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -31,7 +31,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
// Defines
@@ -51,7 +51,7 @@ namespace framework
// Configuration access class for WindowState supplier implementation
-class GlobalSettings_Access : public ::cppu::WeakImplHelper2<
+class GlobalSettings_Access : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XComponent,
::com::sun::star::lang::XEventListener>
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 49fd22c..2ea03bf 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/frame/XModuleManager2.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
@@ -53,7 +53,7 @@ using namespace framework;
namespace {
-typedef cppu::WeakComponentImplHelper2<
+typedef cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::ui::XModuleUIConfigurationManagerSupplier >
ModuleUIConfigurationManagerSupplier_BASE;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 7af1c79..62325ad 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
@@ -67,7 +67,7 @@ using namespace framework;
namespace {
-class ModuleUIConfigurationManager : public cppu::WeakImplHelper3<
+class ModuleUIConfigurationManager : public cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::lang::XComponent,
css::ui::XModuleUIConfigurationManager2
>
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx
b/framework/source/uiconfiguration/uicategorydescription.cxx
index 2985457..95321da 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/configmgr.hxx>
@@ -62,7 +62,7 @@ static const char CONFIGURATION_ROOT_ACCESS[] =
"/org.openoffice.O
static const char CONFIGURATION_CATEGORY_ELEMENT_ACCESS[] =
"/Commands/Categories";
static const char CONFIGURATION_PROPERTY_NAME[] = "Name";
-class ConfigurationAccess_UICategory : public
::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
+class ConfigurationAccess_UICategory : public
::cppu::WeakImplHelper<XNameAccess,XContainerListener>
{
osl::Mutex aMutex;
public:
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index bbb25d0..8c79778 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <rtl/ref.hxx>
@@ -59,7 +59,7 @@ using namespace framework;
namespace {
-class UIConfigurationManager : public ::cppu::WeakImplHelper2<
+class UIConfigurationManager : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo ,
css::ui::XUIConfigurationManager2 >
{
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx
b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index bfa14d5..a6253bc 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -37,8 +37,8 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/debug.hxx>
@@ -101,7 +101,7 @@ static const char* CONFIGURATION_PROPERTIES[] =
// Configuration access class for WindowState supplier implementation
-class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2<
XNameContainer, XContainerListener >
+class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper<
XNameContainer, XContainerListener >
{
public:
ConfigurationAccess_WindowState( const
OUString& aWindowStateConfigFile, const Reference< XComponentContext >&
rxContext );
@@ -1274,7 +1274,7 @@ bool
ConfigurationAccess_WindowState::impl_initializeConfigAccess()
return false;
}
-typedef ::cppu::WeakComponentImplHelper2< css::container::XNameAccess,
+typedef ::cppu::WeakComponentImplHelper< css::container::XNameAccess,
css::lang::XServiceInfo> WindowStateConfiguration_BASE;
class WindowStateConfiguration : private cppu::BaseMutex,
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index a7f6c94..946571e 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -71,7 +71,7 @@
#include <vcl/settings.hxx>
#include <osl/mutex.hxx>
#include <osl/file.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <svtools/miscopt.hxx>
@@ -696,7 +696,7 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16
nItemId)
namespace {
class QuietInteractionContext:
- public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >,
+ public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext >,
private boost::noncopyable
{
public:
diff --git a/framework/source/uielement/newmenucontroller.cxx
b/framework/source/uielement/newmenucontroller.cxx
index daa2db7..5cc190e 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -38,7 +38,6 @@
#include <vcl/i18nhelp.hxx>
#include <vcl/settings.hxx>
#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <osl/file.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/acceleratorexecute.hxx>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index aa52908..ddfe8a7 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/processfactory.hxx>
#include <framework/menuconfiguration.hxx>
@@ -48,7 +48,7 @@ using namespace framework;
namespace {
-typedef cppu::ImplInheritanceHelper1< svt::ToolboxController,
+typedef cppu::ImplInheritanceHelper< svt::ToolboxController,
css::lang::XServiceInfo >
ToolBarBase;
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 7f8cbb3..1863251 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -20,7 +20,6 @@
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
diff --git a/framework/source/uielement/saveasmenucontroller.cxx
b/framework/source/uielement/saveasmenucontroller.cxx
index f02d849..f628c25 100644
--- a/framework/source/uielement/saveasmenucontroller.cxx
+++ b/framework/source/uielement/saveasmenucontroller.cxx
@@ -20,7 +20,6 @@
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index cbf0d61..d4eb039 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/container/XContainer.hpp>
#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unotools/configmgr.hxx>
#include <vcl/mnemonic.hxx>
@@ -79,7 +79,7 @@ namespace framework
// Configuration access class for PopupMenuControllerFactory implementation
class ConfigurationAccess_UICommand : // Order is necessary for right
initialization!
- public
::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
+ public
::cppu::WeakImplHelper<XNameAccess,XContainerListener>
{
osl::Mutex m_aMutex;
public:
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx
b/framework/source/uifactory/addonstoolbarfactory.cxx
index 713f95c..2b2653b 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <rtl/ref.hxx>
@@ -51,7 +51,7 @@ using namespace framework;
namespace {
-class AddonsToolBarFactory : public ::cppu::WeakImplHelper2<
css::lang::XServiceInfo ,
+class AddonsToolBarFactory : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo ,
css::ui::XUIElementFactory >
{
public:
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx
b/framework/source/uifactory/uicontrollerfactory.cxx
index c962987..3cacf90 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -26,7 +26,7 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace css::uno;
@@ -38,7 +38,7 @@ using namespace framework;
namespace {
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::frame::XUIControllerFactory > UIControllerFactory_BASE;
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx
b/framework/source/uifactory/uielementfactorymanager.cxx
index 39483ee..e4dc538 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -36,7 +36,7 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
@@ -347,7 +347,7 @@ bool
ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aEleme
namespace {
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::ui::XUIElementFactoryManager> UIElementFactoryManager_BASE;
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx
b/framework/source/uifactory/windowcontentfactorymanager.cxx
index a72fae4..699042a 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
@@ -40,7 +40,7 @@ using namespace framework;
namespace {
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
com::sun::star::lang::XServiceInfo,
com::sun::star::lang::XSingleComponentFactory >
WindowContentFactoryManager_BASE;
diff --git a/include/framework/interaction.hxx
b/include/framework/interaction.hxx
index aa43a85..f3cbe3d 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <framework/fwedllapi.h>
@@ -55,8 +54,6 @@ namespace framework{
@implements XInteractionRequest
- @base WeakImplHelper1
-
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
@@ -81,8 +78,6 @@ class FWE_DLLPUBLIC RequestFilterSelect
@implements XInteractionRequest
- @base WeakImplHelper1
-
@devstatus ready to use
@threadsafe no (used on once position only!)
*//*-*************************************************************************************************************/
diff --git a/include/framework/preventduplicateinteraction.hxx
b/include/framework/preventduplicateinteraction.hxx
index 449e07e..99e3a03 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/task/XInteractionHandler2.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -52,7 +52,7 @@ struct ThreadHelpBase2
};
class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
- ,public ::cppu::WeakImplHelper1<
css::task::XInteractionHandler2 >
+ ,public ::cppu::WeakImplHelper<
css::task::XInteractionHandler2 >
{
// structs, types etc.
diff --git a/include/framework/titlehelper.hxx
b/include/framework/titlehelper.hxx
index 817c8ec..b239ec5 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -35,7 +35,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <rtl/ustrbuf.hxx>
@@ -51,7 +51,7 @@ namespace framework{
@threadsafe
*/
class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
- , public ::cppu::WeakImplHelper5< css::frame::XTitle
,
+ , public ::cppu::WeakImplHelper< css::frame::XTitle
,
css::frame::XTitleChangeBroadcaster,
css::frame::XTitleChangeListener ,
css::frame::XFrameActionListener ,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
