[Libreoffice-commits] core.git: ure/source

[Stephan Bergmann]

 ure/source/uretest/cppmain.cc   |    4 ++--
 ure/source/uretest/cppserver.cc |    4 ++--
 ure/source/uretest/cpptest.cc   |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 79ed69ed92694f607691c539cf179b4bc2068589
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 26 17:57:16 2017 +0100

    ure/source/uretest is !LIBO_INTERNAL_ONLY
    
    ...so revert the relevant parts of d1a9c73ea16f5b4838f639ce2bb2226d9b9b334a
    "tdf#88206 replace cppu::WeakImplHelper* misc"
    
    Change-Id: I0ee5bf227fc541672dfb73e57657640cbccbf7f3

diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ef56fa9..ab38ef9 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -55,7 +55,7 @@
 #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
 #include "com/sun/star/util/theMacroExpander.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase.hxx"
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/unourl.hxx"
@@ -77,7 +77,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper< css::lang::XMain > {
+class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
 public:
     explicit Service(
         css::uno::Reference< css::uno::XComponentContext > const & context):
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 340c367..69b33c3 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -27,7 +27,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase.hxx"
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -40,7 +40,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper< ::test::types::XServer > {
+class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > {
 public:
     Service() {}
 
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 79a63af..d1f112d 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -25,7 +25,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase.hxx"
+#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.h"
@@ -38,7 +38,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper< test::types::XTest > {
+class Service: public cppu::WeakImplHelper1< test::types::XTest > {
 public:
     Service() {}