summaryrefslogtreecommitdiff
path: root/scripting/source
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-08-29 07:48:41 +0900
committerMichael Stahl <mstahl@redhat.com>2015-09-03 17:53:31 +0000
commitf3c7e6953675f4ed85a5212a6af3ee189400f34e (patch)
tree5e0cecee96c3d90b095c3dda64033f5376cc226e /scripting/source
parent6e88d63829ad46c1cbb5c0c5b40c578430713817 (diff)
scripting: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants. Change-Id: I2a59d42efbb1aeef5078d0b0744b5a3c0559affa Reviewed-on: https://gerrit.libreoffice.org/18123 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'scripting/source')
-rw-r--r--scripting/source/basprov/baslibnode.hxx4
-rw-r--r--scripting/source/basprov/basmethnode.hxx4
-rw-r--r--scripting/source/basprov/basmodnode.hxx4
-rw-r--r--scripting/source/basprov/basprov.hxx4
-rw-r--r--scripting/source/basprov/basscript.hxx4
-rw-r--r--scripting/source/dlgprov/DialogModelProvider.hxx4
-rw-r--r--scripting/source/dlgprov/dlgevtatt.hxx8
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx4
-rw-r--r--scripting/source/protocolhandler/scripthandler.hxx4
-rw-r--r--scripting/source/provider/ActiveMSPList.cxx1
-rw-r--r--scripting/source/provider/ActiveMSPList.hxx4
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx12
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.hxx4
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx4
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.cxx1
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.hxx4
-rw-r--r--scripting/source/provider/ProviderCache.hxx1
-rw-r--r--scripting/source/provider/ScriptImpl.hxx4
-rw-r--r--scripting/source/provider/URIHelper.hxx4
-rw-r--r--scripting/source/stringresource/stringresource.hxx11
20 files changed, 43 insertions, 47 deletions
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 5b13c271b51f..43fa4cacd5f9 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
class BasicManager;
@@ -38,7 +38,7 @@ namespace basprov
// class BasicLibraryNodeImpl
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index ae45a30828d2..24631eb21e67 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -28,7 +28,7 @@
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
class SbMethod;
@@ -43,7 +43,7 @@ namespace basprov
// class BasicMethodNodeImpl
- typedef ::cppu::WeakImplHelper2<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::browse::XBrowseNode,
::com::sun::star::script::XInvocation > BasicMethodNodeImpl_BASE;
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 6cc8bd59b90f..7efbb69f2500 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
class SbModule;
@@ -37,7 +37,7 @@ namespace basprov
// class BasicModuleNodeImpl
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index b798d5589939..b552d4e89173 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/script/provider/XScriptProvider.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
class BasicManager;
@@ -42,7 +42,7 @@ namespace basprov
// class BasicProviderImpl
- typedef ::cppu::WeakImplHelper4<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization,
::com::sun::star::script::provider::XScriptProvider,
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 203a3f691e2e..0cf87fbf51b1 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -23,7 +23,7 @@
#include "bcholder.hxx"
#include <com/sun/star/script/provider/XScript.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <basic/sbmeth.hxx>
@@ -40,7 +40,7 @@ namespace basprov
// class BasicScriptImpl
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index ef1f468be98c..c225cd86cff6 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -22,7 +22,7 @@
#include "sal/config.h"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase4.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/lang/XInitialization.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
@@ -32,7 +32,7 @@
namespace dlgprov{
class DialogModelProvider:
- public ::cppu::WeakImplHelper4<
+ public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::container::XNameContainer,
css::beans::XPropertySet,
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 3f12f257c3d7..b0441c77413b 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
@@ -42,7 +42,7 @@ namespace dlgprov
OUStringHash,
std::equal_to< OUString > > ListenerHash;
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
@@ -84,7 +84,7 @@ namespace dlgprov
// class DialogAllListenerImpl
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE;
@@ -118,7 +118,7 @@ namespace dlgprov
// class DialogScriptListenerImpl
- typedef ::cppu::WeakImplHelper1<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::script::XScriptListener > DialogScriptListenerImpl_BASE;
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 1a183b379b8e..55444436a74a 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/script/XScriptEventsAttacher.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <memory>
@@ -63,7 +63,7 @@ namespace dlgprov
const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
- typedef ::cppu::WeakImplHelper4<
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization,
::com::sun::star::awt::XDialogProvider2,
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 309a8a66b0c5..11231c342c43 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
@@ -61,7 +61,7 @@ namespace scripting_protocolhandler
{
class ScriptProtocolHandler :
-public ::cppu::WeakImplHelper4< css::frame::XDispatchProvider,
+public ::cppu::WeakImplHelper< css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch, css::lang::XServiceInfo, css::lang::XInitialization >
{
private:
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 281b1e6c3811..2b1595ee0840 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -19,7 +19,6 @@
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <util/MiscUtils.hxx>
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 93e4bc8f87d0..e19f8904eee5 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -21,7 +21,7 @@
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -51,7 +51,7 @@ typedef std::unordered_map< OUString,
class NonDocMSPCreator;
-class ActiveMSPList : public ::cppu::WeakImplHelper1< css::lang::XEventListener >
+class ActiveMSPList : public ::cppu::WeakImplHelper< css::lang::XEventListener >
{
public:
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e173f45c8dd1..1dfe7d3c9631 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -22,7 +22,7 @@
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/mediadescriptor.hxx>
@@ -51,7 +51,7 @@ using namespace ::sf_misc;
namespace browsenodefactory
{
class BrowseNodeAggregator :
- public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+ public ::cppu::WeakImplHelper< browse::XBrowseNode >
{
private:
OUString m_Name;
@@ -172,7 +172,7 @@ struct alphaSort
}
};
class LocationBrowseNode :
- public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+ public ::cppu::WeakImplHelper< browse::XBrowseNode >
{
private:
BrowseNodeAggregatorHash* m_hBNA;
@@ -370,7 +370,7 @@ struct alphaSortForBNodes
}
};
-typedef ::cppu::WeakImplHelper1< browse::XBrowseNode > t_BrowseNodeBase;
+typedef ::cppu::WeakImplHelper< browse::XBrowseNode > t_BrowseNodeBase;
class DefaultBrowseNode :
public t_BrowseNodeBase
{
@@ -529,7 +529,7 @@ public:
};
class DefaultRootBrowseNode :
- public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+ public ::cppu::WeakImplHelper< browse::XBrowseNode >
{
private:
@@ -596,7 +596,7 @@ public:
class SelectorBrowseNode :
- public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+ public ::cppu::WeakImplHelper< browse::XBrowseNode >
{
private:
Reference< XComponentContext > m_xComponentContext;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 35dd242b79ab..74cb3021042f 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SCRIPTING_SOURCE_PROVIDER_BROWSENODEFACTORYIMPL_HXX
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace browsenodefactory
{
class BrowseNodeFactoryImpl :
- public ::cppu::WeakImplHelper2 <
+ public ::cppu::WeakImplHelper <
css::script::browse::XBrowseNodeFactory,
css::lang::XServiceInfo >
{
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 47fa67939213..ef69111d5f43 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -39,7 +39,7 @@
namespace func_provider
{
- typedef ::cppu::WeakImplHelper5<
+ typedef ::cppu::WeakImplHelper<
css::script::provider::XScriptProvider,
css::script::browse::XBrowseNode, css::lang::XServiceInfo,
css::lang::XInitialization,
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 4a676709e89a..d2d4493c0d35 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index a732a8438670..ff3ac813c06d 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -22,7 +22,7 @@
#include "rtl/ustring.hxx"
#include "rtl/ref.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -38,7 +38,7 @@ namespace func_provider
{
class MasterScriptProviderFactory :
- public ::cppu::WeakImplHelper2 <
+ public ::cppu::WeakImplHelper <
css::script::provider::XScriptProviderFactory,
css::lang::XServiceInfo >
{
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index b3658876fd81..3a07daa83b02 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -22,7 +22,6 @@
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 3a53d62137fc..7f3a508ffcd9 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
#define INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -36,7 +36,7 @@ namespace func_provider
{
class ScriptImpl :
- public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::provider::XScript >
+ public ::cppu::WeakImplHelper < ::drafts::com::sun::star::script::framework::provider::XScript >
{
public:
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index e4162e82ca14..47a629ea112e 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -29,13 +29,13 @@
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace func_provider
{
class ScriptingFrameworkURIHelper :
- public ::cppu::WeakImplHelper3<
+ public ::cppu::WeakImplHelper<
css::script::provider::XScriptURIHelper,
css::lang::XServiceInfo,
css::lang::XInitialization >
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 5992ea808efe..50edd33f8bd3 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -28,8 +28,7 @@
#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
@@ -91,7 +90,7 @@ typedef std::vector< LocaleItem* > LocaleItemVector;
typedef std::vector< LocaleItem* >::iterator LocaleItemVectorIt;
typedef std::vector< LocaleItem* >::const_iterator LocaleItemVectorConstIt;
-typedef ::cppu::WeakImplHelper2<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::resource::XStringResourceManager > StringResourceImpl_BASE;
@@ -233,7 +232,7 @@ public:
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef ::cppu::ImplInheritanceHelper1<
+typedef ::cppu::ImplInheritanceHelper<
StringResourceImpl,
::com::sun::star::resource::XStringResourcePersistence > StringResourcePersistenceImpl_BASE;
@@ -408,7 +407,7 @@ public:
};
-typedef ::cppu::ImplInheritanceHelper2<
+typedef ::cppu::ImplInheritanceHelper<
StringResourcePersistenceImpl,
::com::sun::star::lang::XInitialization,
::com::sun::star::resource::XStringResourceWithStorage > StringResourceWithStorageImpl_BASE;
@@ -530,7 +529,7 @@ public:
};
-typedef ::cppu::ImplInheritanceHelper2<
+typedef ::cppu::ImplInheritanceHelper<
StringResourcePersistenceImpl,
::com::sun::star::lang::XInitialization,
::com::sun::star::resource::XStringResourceWithLocation > StringResourceWithLocationImpl_BASE;