configmgr/inc/pch/precompiled_configmgr.hxx | 6 ++----
configmgr/qa/unit/test.cxx | 4 ++--
configmgr/source/configurationprovider.cxx | 8 ++++----
configmgr/source/configurationregistry.cxx | 7 +++----
configmgr/source/readonlyaccess.cxx | 4 ++--
configmgr/source/readwriteaccess.cxx | 4 ++--
configmgr/source/update.cxx | 4 ++--
7 files changed, 17 insertions(+), 20 deletions(-)
New commits:
commit 5d75fc9dbbff29e531348a36d5cb49a5ca0d611d
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Sun Jul 12 21:05:40 2015 +0900
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, in configmgr.
Change-Id: I0cf82ab487ed879aa385d6065e908e347c0778e8
Reviewed-on: https://gerrit.libreoffice.org/16964
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx
b/configmgr/inc/pch/precompiled_configmgr.hxx
index bcc533e..2a43a2a 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -101,12 +101,10 @@
#include <config_folders.h>
#include <cppu/unotype.hxx>
#include <cppuhelper/basemutex.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/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index a6954ad..544a808 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.h>
#include <osl/thread.hxx>
@@ -111,7 +111,7 @@ private:
};
class RecursiveTest:
- public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
+ public cppu::WeakImplHelper< css::beans::XPropertyChangeListener >
{
public:
RecursiveTest(Test const & theTest, int count, bool * destroyed);
diff --git a/configmgr/source/configurationprovider.cxx
b/configmgr/source/configurationprovider.cxx
index a9fcd67..31b87b6 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -45,9 +45,9 @@
#include <com/sun/star/util/XRefreshable.hpp>
#include <cppu/unotype.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
@@ -81,7 +81,7 @@ void badNodePath() {
}
typedef
- cppu::WeakComponentImplHelper5<
+ cppu::WeakComponentImplHelper<
css::lang::XServiceInfo, css::lang::XMultiServiceFactory,
css::util::XRefreshable, css::util::XFlushable,
css::lang::XLocalizable >
@@ -369,7 +369,7 @@ void Service::flushModifications() const {
}
class Factory:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
css::lang::XSingleComponentFactory, css::lang::XServiceInfo >
{
public:
diff --git a/configmgr/source/configurationregistry.cxx
b/configmgr/source/configurationregistry.cxx
index b2e7408..d1f640e 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -48,8 +48,7 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <cppu/unotype.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
@@ -68,7 +67,7 @@ namespace configmgr { namespace configuration_registry {
namespace {
class Service:
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::registry::XSimpleRegistry,
css::util::XFlushable >
{
@@ -152,7 +151,7 @@ private:
};
class RegistryKey:
- public cppu::WeakImplHelper1< css::registry::XRegistryKey >
+ public cppu::WeakImplHelper< css::registry::XRegistryKey >
{
public:
RegistryKey(Service & service, css::uno::Any const & value):
diff --git a/configmgr/source/readonlyaccess.cxx
b/configmgr/source/readonlyaccess.cxx
index 9989eac..afaef97 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
@@ -41,7 +41,7 @@ namespace configmgr { namespace read_only_access {
namespace {
class Service:
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::lang::XInitialization,
css::container::XHierarchicalNameAccess >
{
diff --git a/configmgr/source/readwriteaccess.cxx
b/configmgr/source/readwriteaccess.cxx
index 19f0eb4..e6c4fa0 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/util/ChangesSet.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
@@ -43,7 +43,7 @@ namespace configmgr { namespace read_write_access {
namespace {
class Service:
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
css::lang::XServiceInfo, css::lang::XInitialization,
css::configuration::XReadWriteAccess >
{
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 13694d8..5d40285 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
@@ -57,7 +57,7 @@ std::set< OUString > seqToSet(
}
class Service:
- public cppu::WeakImplHelper1< css::configuration::XUpdate >
+ public cppu::WeakImplHelper< css::configuration::XUpdate >
{
public:
explicit Service(css::uno::Reference< css::uno::XComponentContext > const
context):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
