[Libreoffice-commits] core.git: extensions/source extensions/test
Takeshi Abe
tabe at fixedpoint.jp
Thu Aug 6 01:14:47 PDT 2015
extensions/source/bibliography/bibbeam.hxx | 1 -
extensions/source/bibliography/bibload.cxx | 4 ++--
extensions/source/bibliography/datman.hxx | 8 ++++----
extensions/source/bibliography/framectr.cxx | 4 ++--
extensions/source/bibliography/framectr.hxx | 4 ++--
extensions/source/bibliography/general.cxx | 4 ++--
extensions/source/bibliography/loadlisteneradapter.hxx | 4 ++--
extensions/source/bibliography/toolbar.hxx | 4 ++--
extensions/source/config/ldap/ldapuserprofilebe.hxx | 4 ++--
extensions/source/logging/consolehandler.cxx | 4 ++--
extensions/source/logging/csvformatter.cxx | 4 ++--
extensions/source/logging/filehandler.cxx | 4 ++--
extensions/source/logging/logger.cxx | 6 +++---
extensions/source/logging/plaintextformatter.cxx | 4 ++--
extensions/source/ole/ole2uno.hxx | 2 --
extensions/source/ole/oleobjw.cxx | 2 +-
extensions/source/ole/oleobjw.hxx | 6 ++----
extensions/source/ole/unoconversionutilities.hxx | 1 +
extensions/source/ole/unoobjw.cxx | 1 -
extensions/source/ole/unoobjw.hxx | 3 ++-
extensions/source/plugin/inc/plugin/impl.hxx | 1 -
extensions/source/propctrlr/browserlistbox.cxx | 4 ++--
extensions/source/propctrlr/commoncontrol.hxx | 6 +++---
extensions/source/propctrlr/composeduiupdate.cxx | 3 ++-
extensions/source/propctrlr/defaultforminspection.cxx | 1 -
extensions/source/propctrlr/defaulthelpprovider.hxx | 4 ++--
extensions/source/propctrlr/eventhandler.cxx | 4 ++--
extensions/source/propctrlr/eventhandler.hxx | 4 ++--
extensions/source/propctrlr/formgeometryhandler.cxx | 3 ++-
extensions/source/propctrlr/genericpropertyhandler.cxx | 3 ++-
extensions/source/propctrlr/genericpropertyhandler.hxx | 4 ++--
extensions/source/propctrlr/inspectormodelbase.hxx | 4 ++--
extensions/source/propctrlr/objectinspectormodel.cxx | 2 --
extensions/source/propctrlr/propcontroller.hxx | 4 ++--
extensions/source/propctrlr/propertycomposer.hxx | 4 ++--
extensions/source/propctrlr/propertycontrolextender.hxx | 4 ++--
extensions/source/propctrlr/propertyhandler.hxx | 4 ++--
extensions/source/propctrlr/propeventtranslation.hxx | 4 ++--
extensions/source/propctrlr/sqlcommanddesign.hxx | 4 ++--
extensions/source/propctrlr/stringrepresentation.cxx | 4 ++--
extensions/source/propctrlr/taborder.cxx | 4 ++--
extensions/source/resource/ResourceIndexAccess.cxx | 3 ++-
extensions/source/resource/ResourceIndexAccess.hxx | 4 ++--
extensions/source/resource/oooresourceloader.cxx | 4 ++--
extensions/source/resource/oooresourceloader.hxx | 4 ++--
extensions/source/scanner/scanwin.cxx | 4 ++--
extensions/source/update/check/updatecheck.cxx | 4 ++--
extensions/source/update/check/updatecheckconfig.hxx | 4 ++--
extensions/source/update/check/updatecheckjob.cxx | 4 ++--
extensions/source/update/check/updatehdl.hxx | 4 ++--
extensions/source/update/check/updateprotocol.cxx | 2 --
extensions/source/update/feed/updatefeed.cxx | 13 ++++++-------
extensions/source/update/ui/updatecheckui.cxx | 4 ++--
extensions/test/ole/cpnt/cpnt.cxx | 7 +++----
54 files changed, 101 insertions(+), 109 deletions(-)
New commits:
commit 975875d53a8afa7ae2df944f7a584870c663bc6a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Aug 4 17:52:31 2015 +0900
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants in extensions.
Change-Id: I45e9dc5769150181df88791b3f748002ca713c02
Reviewed-on: https://gerrit.libreoffice.org/17517
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index aea7d49..3569ff5 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/form/XForm.hpp>
// #100312# -----------------
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <vcl/splitwin.hxx>
#include "toolbar.hxx"
#include "formcontrolcontainer.hxx"
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 229b328..6aafbc4 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -60,7 +60,7 @@
#include "framectr.hxx"
#include "datman.hxx"
#include <bibconfig.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::frame;
-class BibliographyLoader : public cppu::WeakImplHelper4
+class BibliographyLoader : public cppu::WeakImplHelper
< XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
{
HdlBibModul m_pBibMod;
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index fb5db53..854820f 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -25,14 +25,14 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/form/runtime/XFormController.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <com/sun/star/form/XLoadable.hpp>
#include <comphelper/broadcasthelper.hxx>
// #100312# --------------------
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/vclptr.hxx>
namespace vcl { class Window; }
@@ -50,7 +50,7 @@ struct BibDBDescriptor;
// #100312# ---------------------
class BibInterceptorHelper
- :public cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatchProviderInterceptor >
+ :public cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor >
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xMasterDispatchProvider;
@@ -76,7 +76,7 @@ public:
virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef cppu::WeakComponentImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener
+typedef cppu::WeakComponentImplHelper < ::com::sun::star::beans::XPropertyChangeListener
, ::com::sun::star::form::XLoadable
> BibDataManager_Base;
class BibDataManager
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index c3016be..790b32e 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -30,7 +30,7 @@
#include "bib.hrc"
#include <toolkit/helper/vclunohelper.hxx>
#include "bibconfig.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/svapp.hxx>
#include "bibliography.hrc"
#include <comphelper/processfactory.hxx>
@@ -130,7 +130,7 @@ const CmdToInfoCache& GetCommandToInfoCache()
}
-class BibFrameCtrl_Impl : public cppu::WeakImplHelper1 < XFrameActionListener >
+class BibFrameCtrl_Impl : public cppu::WeakImplHelper < XFrameActionListener >
{
public:
Mutex aMutex;
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 60d7d45..ce93e27 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#include "bibmod.hxx"
@@ -50,7 +50,7 @@ public:
typedef boost::ptr_vector<BibStatusDispatch> BibStatusDispatchArr;
-class BibFrameController_Impl : public cppu::WeakImplHelper5 <
+class BibFrameController_Impl : public cppu::WeakImplHelper <
::com::sun::star::lang::XServiceInfo,
::com::sun::star::frame::XController,
::com::sun::star::frame::XDispatch,
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 19e8168..bab2494 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/builder.hxx>
#include <vcl/settings.hxx>
#include "general.hxx"
@@ -68,7 +68,7 @@ static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos
return sRet;
}
-class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener>
+class BibPosListener :public cppu::WeakImplHelper <sdbc::XRowSetListener>
{
VclPtr<BibGeneralPage> pParentPage;
public:
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index e6347cf..8bd3346 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -22,7 +22,7 @@
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/form/XLoadable.hpp>
@@ -120,7 +120,7 @@ namespace bib
virtual void _reloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
};
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base;
class OLoadListenerAdapter
:public OLoadListenerAdapter_Base
,public OComponentAdapterBase
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index efa5b2c..6c79ce1 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -29,13 +29,13 @@
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
#include <vcl/timer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
class BibDataManager;
class BibToolBar;
-class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame::XStatusListener>
+class BibToolBarListener: public cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener>
{
private:
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index fff0b6b..9f56e8d 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include "ldapaccess.hxx"
@@ -41,7 +41,7 @@ namespace container = css::container;
struct LdapDefinition;
-typedef cppu::WeakComponentImplHelper2<css::beans::XPropertySet,
+typedef cppu::WeakComponentImplHelper<css::beans::XPropertySet,
lang::XServiceInfo> BackendBase ;
struct LdapProfileMutexHolder { osl::Mutex mMutex; };
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 6433d3b..f08dd66 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -61,7 +61,7 @@ namespace logging
namespace LogLevel = ::com::sun::star::logging::LogLevel;
- typedef ::cppu::WeakComponentImplHelper3 < XConsoleHandler
+ typedef ::cppu::WeakComponentImplHelper < XConsoleHandler
, XServiceInfo
, XInitialization
> ConsoleHandler_Base;
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 12c82dd..230c5ee 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
@@ -50,7 +50,7 @@ namespace logging
using ::com::sun::star::uno::XInterface;
// formats for csv files as defined by RFC4180
- typedef ::cppu::WeakImplHelper2 < XCsvLogFormatter
+ typedef ::cppu::WeakImplHelper < XCsvLogFormatter
, XServiceInfo
> CsvFormatter_Base;
class CsvFormatter : public CsvFormatter_Base
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 7bf9611..23ff7ec 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -33,7 +33,7 @@
#include <tools/diagnose_ex.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -68,7 +68,7 @@ namespace logging
using ::com::sun::star::util::XStringSubstitution;
using ::com::sun::star::beans::NamedValue;
- typedef ::cppu::WeakComponentImplHelper3 < XLogHandler
+ typedef ::cppu::WeakComponentImplHelper < XLogHandler
, XServiceInfo
, XInitialization
> FileHandler_Base;
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 71330c0..654994e 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -31,7 +31,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
#include <map>
@@ -57,7 +57,7 @@ namespace logging
namespace LogLevel = ::com::sun::star::logging::LogLevel;
- typedef ::cppu::WeakImplHelper2 < XLogger
+ typedef ::cppu::WeakImplHelper < XLogger
, XServiceInfo
> EventLogger_Base;
class EventLogger :public ::cppu::BaseMutex
@@ -103,7 +103,7 @@ namespace logging
bool impl_nts_isLoggable_nothrow( ::sal_Int32 _nLevel );
};
- typedef ::cppu::WeakImplHelper2 < XLoggerPool
+ typedef ::cppu::WeakImplHelper < XLoggerPool
, XServiceInfo
> LoggerPool_Base;
/** administrates a pool of XLogger instances, where a logger is keyed by its name,
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 70ba037..7eec7b0 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
@@ -48,7 +48,7 @@ namespace logging
using ::com::sun::star::logging::LogRecord;
using ::com::sun::star::uno::XInterface;
- typedef ::cppu::WeakImplHelper2 < XLogFormatter
+ typedef ::cppu::WeakImplHelper < XLogFormatter
, XServiceInfo
> PlainTextFormatter_Base;
class PlainTextFormatter : public PlainTextFormatter_Base
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 37302fc..ae96a69 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -36,8 +36,6 @@
#include <com/sun/star/reflection/InvocationTargetException.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/factory.hxx>
#include <sal/types.h>
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index eb49637..5f57dda 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -149,7 +149,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
// properties. Note: Currently the basic runtime doesn't call put properties directly, it should... after all the basic runtime should know whether it is calling a put or get property.
// For the moment for ease of merging we will let the XDirectInvoke and XAuthomationInvocation interfaces stay side by side ( and for the momemnt at least I would prefer the basic
// runtime to call XAutomationInvocation instead of XDirectInvoke
- return WeakImplHelper7<XBridgeSupplier2,
+ return WeakImplHelper<XBridgeSupplier2,
XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >::queryInterface(t);
}
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 9601101..de287db 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -26,9 +26,7 @@
#include <unordered_map>
#include <vector>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
@@ -60,7 +58,7 @@ typedef std::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncInd
// This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
// The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper7< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
+class IUnknownWrapper_Impl : public WeakImplHelper< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
public UnoConversionUtilities<IUnknownWrapper_Impl>
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 6be0884..7ab6977 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -30,6 +30,7 @@
#include "com/sun/star/bridge/oleautomation/Decimal.hpp"
#include "typelib/typedescription.hxx"
#include "ole2uno.hxx"
+#include <cppuhelper/weakref.hxx>
#include "unotypewrapper.hxx"
#include <unordered_map>
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index a860e84..8286026 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -42,7 +42,6 @@
#include <osl/interlck.h>
#include <com/sun/star/uno/genfunc.h>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
#include "comifaces.hxx"
#include "jscriptclasses.hxx"
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index f31ef1b..67c725c 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/script/InvocationInfo.hpp>
#include <salhelper/simplereferenceobject.hxx>
+#include <cppuhelper/implbase.hxx>
#include "comifaces.hxx"
#include "ole2uno.hxx"
@@ -102,7 +103,7 @@ typedef std::unordered_map
*****************************************************************************/
-class InterfaceOleWrapper_Impl : public WeakImplHelper2<XBridgeSupplier2, XInitialization>,
+class InterfaceOleWrapper_Impl : public WeakImplHelper<XBridgeSupplier2, XInitialization>,
public IDispatchEx,
public UnoConversionUtilities<InterfaceOleWrapper_Impl>,
public IUnoObjectWrapper
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index fdd05b7..efbe9e3 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -68,7 +68,6 @@
#include "com/sun/star/awt/XGraphics.hpp"
#include <com/sun/star/uno/XComponentContext.hpp>
-#include "cppuhelper/implbase3.hxx"
#include "cppuhelper/implbase2.hxx"
#include "cppuhelper/implbase1.hxx"
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index d22cec4..fddd0ec 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -31,7 +31,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/asyncnotification.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
@@ -119,7 +119,7 @@ namespace pcr
/** implementation for of <type scope="com::sun::star::inspection">XPropertyControlContext</type>
which forwards all events to a non-UNO version of this interface
*/
- typedef ::cppu::WeakImplHelper1< XPropertyControlContext > PropertyControlContext_Impl_Base;
+ typedef ::cppu::WeakImplHelper< XPropertyControlContext > PropertyControlContext_Impl_Base;
class PropertyControlContext_Impl :public PropertyControlContext_Impl_Base
,public ::comphelper::IEventProcessor
{
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 758ff19..7b631a7 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <tools/link.hxx>
#include <vcl/window.hxx>
@@ -175,7 +175,7 @@ namespace pcr
*/
template < class CONTROL_INTERFACE, class CONTROL_WINDOW >
class CommonBehaviourControl :public ::comphelper::OBaseMutex
- ,public ::cppu::WeakComponentImplHelper1< CONTROL_INTERFACE >
+ ,public ::cppu::WeakComponentImplHelper< CONTROL_INTERFACE >
,public IModifyListener
{
protected:
@@ -183,7 +183,7 @@ namespace pcr
typedef CONTROL_WINDOW WindowType;
typedef ::comphelper::OBaseMutex MutexBaseClass;
- typedef ::cppu::WeakComponentImplHelper1< CONTROL_INTERFACE > ComponentBaseClass;
+ typedef ::cppu::WeakComponentImplHelper< CONTROL_INTERFACE > ComponentBaseClass;
protected:
ControlHelper m_aImplControl;
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index fdeff63..1fba41a 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/inspection/PropertyLineElement.hpp>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
+#include <cppuhelper/implbase.hxx>
#include <algorithm>
@@ -69,7 +70,7 @@ namespace pcr
typedef void (ComposedPropertyUIUpdate::*FNotifySingleUIChange)();
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::inspection::XObjectInspectorUI
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XObjectInspectorUI
> CachedInspectorUI_Base;
struct CachedInspectorUI:
public CachedInspectorUI_Base, private boost::noncopyable
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index f4a2716..beda207 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <osl/diagnose.h>
#include <sal/macros.h>
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index 87ab132..3052438 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace vcl { class Window; }
@@ -37,7 +37,7 @@ namespace pcr
//= DefaultHelpProvider
- typedef ::cppu::WeakImplHelper2 < ::com::sun::star::inspection::XPropertyControlObserver
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XPropertyControlObserver
, ::com::sun::star::lang::XInitialization
> DefaultHelpProvider_Base;
class DefaultHelpProvider : public DefaultHelpProvider_Base
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index b800f88..b521709 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -54,7 +54,7 @@
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/evtmethodhelper.hxx>
#include <comphelper/types.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
@@ -319,7 +319,7 @@ namespace pcr
}
}
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameReplace
> EventHolder_Base;
/* An UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */
class EventHolder : public EventHolder_Base
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 475c973..c4c8a20c 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/listenernotification.hxx>
@@ -71,7 +71,7 @@ namespace pcr
//= EventHandler
- typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler
+ typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler
, ::com::sun::star::lang::XServiceInfo
> EventHandler_Base;
class EventHandler : public EventHandler_Base
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 0196d3f..426887f 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/componentbase.hxx>
#include <tools/diagnose_ex.h>
@@ -123,7 +124,7 @@ namespace pcr
in the XShape implementation, which broadcasts way too generous and unspecified
*/
typedef ::comphelper::ComponentBase ShapeGeometryChangeNotifier_CBase;
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener
> ShapeGeometryChangeNotifier_IBase;
class ShapeGeometryChangeNotifier :public BroadcastHelperBase
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index b561efa..de94363 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/extract.hxx>
#include <tools/debug.hxx>
@@ -174,7 +175,7 @@ namespace pcr
return sDescription;
}
- typedef ::cppu::WeakImplHelper1 < XActionListener
+ typedef ::cppu::WeakImplHelper < XActionListener
> UrlClickHandler_Base;
class UrlClickHandler : public UrlClickHandler_Base
{
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 1efce04..52dcad6 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <rtl/ref.hxx>
@@ -50,7 +50,7 @@ namespace pcr
//= GenericPropertyHandler
- typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler
+ typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler
, ::com::sun::star::lang::XServiceInfo
> GenericPropertyHandler_Base;
class GenericPropertyHandler : public GenericPropertyHandler_Base
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 34ed5fb..64930e8 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <comphelper/broadcasthelper.hxx>
@@ -42,7 +42,7 @@ namespace pcr
//= ImplInspectorModel
- typedef ::cppu::WeakImplHelper3 < ::com::sun::star::inspection::XObjectInspectorModel
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XObjectInspectorModel
, ::com::sun::star::lang::XInitialization
, ::com::sun::star::lang::XServiceInfo
> ImplInspectorModel_Base;
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 0f0f076..5084e08 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -25,8 +25,6 @@
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/implbase3.hxx>
-
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 4d04ecb..e4c1414 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -52,7 +52,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <map>
@@ -71,7 +71,7 @@ namespace pcr
struct OLineDescriptor;
// #95343#------------------------------------------------------------------------------------
- typedef ::cppu::WeakImplHelper7 < ::com::sun::star::lang::XServiceInfo
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::awt::XFocusListener
, ::com::sun::star::awt::XLayoutConstrains
, ::com::sun::star::beans::XPropertyChangeListener
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index 159d437..f8c534e 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/listenernotification.hxx>
@@ -44,7 +44,7 @@ namespace pcr
//= PropertyComposer
- typedef ::cppu::WeakComponentImplHelper2 < ::com::sun::star::inspection::XPropertyHandler
+ typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler
, ::com::sun::star::beans::XPropertyChangeListener
> PropertyComposer_Base;
/** implements an <type>XPropertyHandler</type> which composes it's information
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index 3795917..acf7027 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/awt/XKeyListener.hpp>
#include <com/sun/star/inspection/XPropertyControl.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -36,7 +36,7 @@ namespace pcr
//= PropertyControlExtender
struct PropertyControlExtender_Data;
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XKeyListener
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XKeyListener
> PropertyControlExtender_Base;
class PropertyControlExtender : public PropertyControlExtender_Base
{
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index ba4b841..c0a81c0 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/interlck.h>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
@@ -64,7 +64,7 @@ namespace pcr
//= PropertyHandler
class OPropertyInfoService;
- typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::inspection::XPropertyHandler
+ typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler
> PropertyHandler_Base;
/** the base class for property handlers
*/
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index c69ae7b..4b818563 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace pcr
@@ -31,7 +31,7 @@ namespace pcr
//= PropertyEventTranslation
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener
> PropertyEventTranslation_Base;
class PropertyEventTranslation : public PropertyEventTranslation_Base
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 43c1cdf..1b0a656 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -29,7 +29,7 @@
#include <connectivity/dbtools.hxx>
#include <tools/link.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
@@ -42,7 +42,7 @@ namespace pcr
//= SQLCommandDesigner
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener
> SQLCommandDesigner_Base;
/** encapsulates the code for calling and managing a query design frame, used
for interactively designing the Command property of a ->RowSet
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 3a658a1..61278a1 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -22,7 +22,7 @@
#include "boost/noncopyable.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/implbase3.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/inspection/XStringRepresentation.hpp"
@@ -64,7 +64,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
class StringRepresentation:
- public ::cppu::WeakImplHelper3<
+ public ::cppu::WeakImplHelper<
lang::XServiceInfo,
inspection::XStringRepresentation,
lang::XInitialization>,
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index caaff6c..ec114bd 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -24,7 +24,7 @@
#include "formstrings.hxx"
#include <comphelper/types.hxx>
#include <comphelper/property.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/runtime/FormController.hpp>
#include <vcl/scrbar.hxx>
@@ -43,7 +43,7 @@ namespace pcr
//= OSimpleTabModel
- class OSimpleTabModel : public ::cppu::WeakImplHelper1< XTabControllerModel>
+ class OSimpleTabModel : public ::cppu::WeakImplHelper< XTabControllerModel>
{
Sequence< Reference< XControlModel > > m_aModels;
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 77cdc21..9b47ae2 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -11,6 +11,7 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <tools/rcid.h>
#include <tools/resary.hxx>
@@ -36,7 +37,7 @@ namespace
return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr()));
}
- class ResourceIndexAccessBase : public cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
+ class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess>
{
public:
ResourceIndexAccessBase( ::boost::shared_ptr<ResMgr> pResMgr)
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index 9a837cb..596c0af 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -26,7 +26,7 @@ class ResMgr;
namespace extensions { namespace resource
{
/** This class provides access to tools library text resources */
- class ResourceIndexAccess : public cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess>
+ class ResourceIndexAccess : public cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess>
{
public:
/** The ctor takes a sequence with one element: the name of the resource, e.g. svt */
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 1db99c6..edba159 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -23,7 +23,7 @@
#include <vcl/settings.hxx>
#include <tools/simplerm.hxx>
#include <tools/rcid.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <boost/shared_ptr.hpp>
@@ -89,7 +89,7 @@ namespace extensions { namespace resource
return aResource;
}
- typedef ::cppu::WeakImplHelper1 < XResourceBundle
+ typedef ::cppu::WeakImplHelper < XResourceBundle
> OpenOfficeResourceBundle_Base;
class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base
{
diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx
index 99350c7..cdb131b 100644
--- a/extensions/source/resource/oooresourceloader.hxx
+++ b/extensions/source/resource/oooresourceloader.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <functional>
#include <map>
@@ -49,7 +49,7 @@ namespace extensions { namespace resource
}
};
- class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper1< ::com::sun::star::resource::XResourceBundleLoader>
+ class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< ::com::sun::star::resource::XResourceBundleLoader>
{
public:
typedef ::std::map<
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 5d83fa2..ec24953 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
#include <prewin.h>
@@ -74,7 +74,7 @@ enum TwainState
TWAIN_STATE_CANCELED = 3
};
-class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
+class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener >
{
friend LRESULT CALLBACK TwainMsgProc( int nCode, WPARAM wParam, LPARAM lParam );
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 5ed8a94..a410363 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -21,7 +21,7 @@
#include "updatecheck.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@@ -301,7 +301,7 @@ public:
};
-class MenuBarButtonJob : public ::cppu::WeakImplHelper1< task::XJob >
+class MenuBarButtonJob : public ::cppu::WeakImplHelper< task::XJob >
{
public:
MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck);
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index 5377da6..5134f4e 100644
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIG_HXX
#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIG_HXX
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -77,7 +77,7 @@ private:
* component, as this is not supported by the OOo configuration for extendable groups.
*/
-class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
+class UpdateCheckConfig : public ::cppu::WeakImplHelper<
::com::sun::star::container::XNameReplace,
::com::sun::star::util::XChangesBatch,
::com::sun::star::lang::XServiceInfo >
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 1be1d20..e725bb3 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -25,7 +25,7 @@
#include "updateprotocol.hxx"
#include <boost/scoped_ptr.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
@@ -63,7 +63,7 @@ private:
};
class UpdateCheckJob :
- public ::cppu::WeakImplHelper3< task::XJob, lang::XServiceInfo, frame::XTerminateListener >
+ public ::cppu::WeakImplHelper< task::XJob, lang::XServiceInfo, frame::XTerminateListener >
{
virtual ~UpdateCheckJob();
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index 9a82b2f..8c55a4d 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -34,7 +34,7 @@
#include "com/sun/star/frame/XTerminateListener.hpp"
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-#include "cppuhelper/implbase4.hxx"
+#include <cppuhelper/implbase.hxx>
#include "actionlistener.hxx"
@@ -68,7 +68,7 @@ enum UpdateState {
};
class UpdateHandler : ::boost::noncopyable,
- public cppu::WeakImplHelper4< com::sun::star::awt::XActionListener,
+ public cppu::WeakImplHelper< com::sun::star::awt::XActionListener,
com::sun::star::awt::XTopWindowListener,
com::sun::star::task::XInteractionHandler,
com::sun::star::frame::XTerminateListener >
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index b10a97f..086f7bd 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -36,8 +36,6 @@
#include <osl/diagnose.h>
#include <osl/process.h>
-#include <cppuhelper/implbase1.hxx>
-
namespace container = css::container ;
namespace deployment = css::deployment ;
namespace lang = css::lang ;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index c04ed46..ca02cc3 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -19,8 +19,7 @@
#include <config_folders.h>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/Property.hpp>
@@ -75,7 +74,7 @@ namespace
#ifdef DEBUG
-class InputStreamWrapper : public ::cppu::WeakImplHelper1< io::XInputStream >
+class InputStreamWrapper : public ::cppu::WeakImplHelper< io::XInputStream >
{
uno::Reference< io::XInputStream > m_xStream;
@@ -117,7 +116,7 @@ public:
-class ActiveDataSink : public ::cppu::WeakImplHelper1< io::XActiveDataSink >
+class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink >
{
uno::Reference< io::XInputStream > m_xStream;
@@ -133,7 +132,7 @@ public:
class UpdateInformationProvider :
- public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider,
+ public ::cppu::WeakImplHelper< deployment::XUpdateInformationProvider,
ucb::XWebDAVCommandEnvironment,
lang::XServiceInfo >
{
@@ -223,7 +222,7 @@ private:
-class UpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
+class UpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
{
public:
UpdateInformationEnumeration(const uno::Reference< xml::dom::XNodeList >& xNodeList,
@@ -290,7 +289,7 @@ private:
-class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
+class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
{
public:
SingleUpdateInformationEnumeration(const uno::Reference< xml::dom::XElement >& xElement)
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 0f922ee..03d8b21 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -20,7 +20,7 @@
#include <list>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -119,7 +119,7 @@ public:
};
-class UpdateCheckUI : public ::cppu::WeakImplHelper3
+class UpdateCheckUI : public ::cppu::WeakImplHelper
< lang::XServiceInfo, document::XDocumentEventListener, beans::XPropertySet >
{
uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 1794484..7cf7e0b 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -35,8 +35,7 @@
#include <com/sun/star/reflection/XIdlReflection.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Reference.h>
#include <rtl/ustring.h>
#include <com/sun/star/uno/Reference.hxx>
@@ -67,7 +66,7 @@ using namespace com::sun::star::reflection;
#define KEY1 L"/oletest.OleTestImpl/UNO/SERVICES"
#define KEY2 L"oletest.OleTest"
-class OComponent : public WeakImplHelper7<
+class OComponent : public WeakImplHelper<
XTestSequence, XTestStruct, XTestOther, XTestInterfaces,
XSimple, XTestInParameters, XIdentity >
{
@@ -304,7 +303,7 @@ public: // XTestSequence
virtual Reference< XInterface > SAL_CALL getThis( ) throw (RuntimeException);
};
-class EventListener: public WeakImplHelper1<XEventListener>
+class EventListener: public WeakImplHelper<XEventListener>
{
public:
EventListener(): bCalled( sal_False)
More information about the Libreoffice-commits
mailing list