summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-09-14 14:02:20 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-09-14 14:02:39 +0200
commit8cdf71a97cd53e9e1035017febf226765cf0697d (patch)
treeb1700eaa892bf522eb6b008fafa11b99a2df820e
parentgbuild: add a comment why C4589 is disabled (diff)
downloadcore-8cdf71a97cd53e9e1035017febf226765cf0697d.tar.gz
core-8cdf71a97cd53e9e1035017febf226765cf0697d.zip
Extensions are not built against LIBO_INTERNAL_ONLY
Change-Id: I5a41b9f92678586da14fbb89f469fb11e06485a5
-rw-r--r--desktop/test/deployment/active/active_native.cxx4
-rw-r--r--desktop/test/deployment/passive/passive_native.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index db9c4dd10bf8..06da72a3b274 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 6cbff6982c15..70b11ccebc03 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
{