diff options
author | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-06-18 19:00:23 +0200 |
---|---|---|
committer | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-06-18 19:00:23 +0200 |
commit | 284bb120a9b13ee414463b8195f597346d578745 (patch) | |
tree | 517e63e24bfdc5e49d091f65b18c89b5bc97555d /testtools | |
parent | 068f752ed3360647b0ca98ebed9df9a5fe57d84f (diff) |
Update from master repository (DEV300_m82).
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 2 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 46204319966d..b66283617197 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -111,7 +111,7 @@ bool checkEmpty(rtl::OUString const & string, char const * message) { } //================================================================================================== -class TestBridgeImpl : protected osl::DebugBase<TestBridgeImpl>, +class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>, public WeakImplHelper2< XMain, XServiceInfo > { Reference< XComponentContext > m_xContext; diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 68c725240971..4b90974c956b 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -125,7 +125,7 @@ static void assign( TestData & rData, //================================================================================================== class Test_Impl : - protected osl::DebugBase<Test_Impl>, + public osl::DebugBase<Test_Impl>, public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall > { TestData _aData, _aStructData; @@ -475,7 +475,7 @@ public: }; //Dummy class for XComponent implementation -class Dummy : protected osl::DebugBase<Dummy>, +class Dummy : public osl::DebugBase<Dummy>, public WeakComponentImplHelperBase { public: |