diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
| commit | f2574337dbf0d5d22d18ddbf0e8295c2ee6f4f3e (patch) | |
| tree | 2421fa506d7678110b547679b5b60473f44238b1 /testtools | |
| parent | a3e3f719efe2d7ca6afff7acea0dd3d264419865 (diff) | |
| parent | 5d7f1bb1e74ae49ae7215588d836bd1ca2004b10 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
smoketestdoc/data/Global.xml
smoketestdoc/data/OptionsDlg.xml
smoketestdoc/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 4 | ||||
| -rwxr-xr-x | testtools/source/cliversioning/version_libs/version_3_3.dll | bin | 0 -> 11776 bytes |
3 files changed, 3 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 18b4ac387974..96232a470717 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -114,7 +114,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 a49acf4a15b7..cde3533c71eb 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -127,7 +127,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; @@ -483,7 +483,7 @@ public: }; //Dummy class for XComponent implementation -class Dummy : protected osl::DebugBase<Dummy>, +class Dummy : public osl::DebugBase<Dummy>, public WeakComponentImplHelperBase { public: diff --git a/testtools/source/cliversioning/version_libs/version_3_3.dll b/testtools/source/cliversioning/version_libs/version_3_3.dll Binary files differnew file mode 100755 index 000000000000..a63a43632040 --- /dev/null +++ b/testtools/source/cliversioning/version_libs/version_3_3.dll |