[Libreoffice-commits] core.git: desktop/test

Stephan Bergmann sbergman at redhat.com
Mon Sep 14 05:03:01 PDT 2015


 desktop/test/deployment/active/active_native.cxx   |    4 ++--
 desktop/test/deployment/passive/passive_native.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8cdf71a97cd53e9e1035017febf226765cf0697d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 14 14:02:20 2015 +0200

    Extensions are not built against LIBO_INTERNAL_ONLY
    
    Change-Id: I5a41b9f92678586da14fbb89f469fb11e06485a5

diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index db9c4dd..06da72a 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -59,7 +59,7 @@
 namespace {
 
 class Provider:
-    public cppu::WeakImplHelper<
+    public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
     private boost::noncopyable
 {
@@ -150,7 +150,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-    public cppu::WeakImplHelper<
+    public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatch >,
     private boost::noncopyable
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 6cbff69..70b11cc 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
@@ -56,7 +56,7 @@
 namespace {
 
 class Provider:
-    public cppu::WeakImplHelper<
+    public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatchProvider >,
     private boost::noncopyable
 {
@@ -147,7 +147,7 @@ Provider::queryDispatches(
 }
 
 class Dispatch:
-    public cppu::WeakImplHelper<
+    public cppu::WeakImplHelper2<
         css::lang::XServiceInfo, css::frame::XDispatch >,
     private boost::noncopyable
 {


More information about the Libreoffice-commits mailing list