diff options
25 files changed, 5 insertions, 48 deletions
diff --git a/embeddedobj/qa/cppunit/general.cxx b/embeddedobj/qa/cppunit/general.cxx index ba862d3a86f0..c49462a9f2a1 100644 --- a/embeddedobj/qa/cppunit/general.cxx +++ b/embeddedobj/qa/cppunit/general.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; class EmbeddedobjGeneralTest : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -39,7 +38,6 @@ void EmbeddedobjGeneralTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx index 7903715e4113..2fa209e82f63 100644 --- a/framework/qa/cppunit/dispatchtest.cxx +++ b/framework/qa/cppunit/dispatchtest.cxx @@ -131,7 +131,6 @@ uno::Reference<frame::XDispatch> MyInterceptor::queryDispatch(const util::URL& r class DispatchTest : public test::BootstrapFixture, public unotest::MacrosTest { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; void dispatchCommand(const uno::Reference<lang::XComponent>& xComponent, const OUString& rCommand, const uno::Sequence<beans::PropertyValue>& rPropertyValues); @@ -144,7 +143,6 @@ void DispatchTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index e93a6a583b43..590c9a7f7e93 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -45,6 +45,9 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase bool const m_bNeedUCB; bool const m_bAssertOnDialog; +protected: + css::uno::Reference<css::uno::XComponentContext> mxComponentContext; + public: DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx index 26cd05bb22b5..d40c56c54427 100644 --- a/lotuswordpro/qa/cppunit/import_test.cxx +++ b/lotuswordpro/qa/cppunit/import_test.cxx @@ -37,7 +37,6 @@ public: uno::Reference<lang::XComponent>& getComponent() { return mxComponent; } private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; }; @@ -45,7 +44,6 @@ void LotusWordProTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx index f7fa171ff1ab..8a435363da92 100644 --- a/oox/qa/unit/drawingml.cxx +++ b/oox/qa/unit/drawingml.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; class OoxDrawingmlTest : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -39,7 +38,6 @@ void OoxDrawingmlTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/oox/qa/unit/mathml.cxx b/oox/qa/unit/mathml.cxx index 3a5f928dad06..f352aad069c6 100644 --- a/oox/qa/unit/mathml.cxx +++ b/oox/qa/unit/mathml.cxx @@ -21,7 +21,6 @@ using namespace ::com::sun::star; class OoxMathmlTest : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -34,7 +33,6 @@ void OoxMathmlTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx index 1391138b166b..f5c30187d7da 100644 --- a/oox/qa/unit/shape.cxx +++ b/oox/qa/unit/shape.cxx @@ -23,7 +23,6 @@ char const DATA_DIRECTORY[] = "/oox/qa/unit/data/"; class OoxShapeTest : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -37,7 +36,6 @@ void OoxShapeTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx index fa3701735ec1..d9c969e0d422 100644 --- a/oox/qa/unit/vml.cxx +++ b/oox/qa/unit/vml.cxx @@ -25,7 +25,6 @@ char const DATA_DIRECTORY[] = "/oox/qa/unit/data/"; class OoxVmlTest : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -39,7 +38,6 @@ void OoxVmlTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index 5923651c9db1..eca5d6c5fb2f 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; class SdUiImpressTest : public test::BootstrapFixture, public unotest::MacrosTest { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -48,7 +47,6 @@ void SdUiImpressTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/sfx2/qa/cppunit/test_classification.cxx b/sfx2/qa/cppunit/test_classification.cxx index 060e4adece32..b824ca219efe 100644 --- a/sfx2/qa/cppunit/test_classification.cxx +++ b/sfx2/qa/cppunit/test_classification.cxx @@ -26,7 +26,6 @@ namespace /// Tests the handling of the .uno:ClassificationApply command in various applications. class ClassificationTest : public test::BootstrapFixture, public unotest::MacrosTest { - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; void dispatchCommand(const uno::Reference<lang::XComponent>& xComponent, const OUString& rCommand, const uno::Sequence<beans::PropertyValue>& rPropertyValues); void testClassification(); @@ -49,7 +48,6 @@ void ClassificationTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx index 6d3f23175b74..a835dee951bd 100644 --- a/svx/qa/unit/unodraw.cxx +++ b/svx/qa/unit/unodraw.cxx @@ -33,7 +33,6 @@ char const DATA_DIRECTORY[] = "/svx/qa/unit/data/"; class UnodrawTest : public test::BootstrapFixture, public unotest::MacrosTest { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -45,7 +44,6 @@ void UnodrawTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/sw/qa/api/SwXDocumentIndex.cxx b/sw/qa/api/SwXDocumentIndex.cxx index e08eb9c00685..e76db35124fe 100644 --- a/sw/qa/api/SwXDocumentIndex.cxx +++ b/sw/qa/api/SwXDocumentIndex.cxx @@ -45,7 +45,6 @@ class SwXDocumentIndex final : public test::BootstrapFixture, public apitest::XServiceInfo, public apitest::XComponent { - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<text::XTextDocument> mxTextDocument; uno::Reference<text::XTextRange> mxTextRange; uno::Reference<text::XTextContent> mxTextContent; @@ -81,7 +80,6 @@ void SwXDocumentIndex::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); mxTextDocument = uno::Reference<text::XTextDocument>( loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"), diff --git a/sw/qa/api/SwXDocumentSettings.cxx b/sw/qa/api/SwXDocumentSettings.cxx index 84907fa5da83..5f91f645a12d 100644 --- a/sw/qa/api/SwXDocumentSettings.cxx +++ b/sw/qa/api/SwXDocumentSettings.cxx @@ -38,7 +38,6 @@ class SwXDocumentSettings final : public test::BootstrapFixture, public apitest::XServiceInfo { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -63,7 +62,6 @@ void SwXDocumentSettings::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/sw/qa/api/SwXTextFrame.cxx b/sw/qa/api/SwXTextFrame.cxx index 19fe73f808b7..09237028a5ed 100644 --- a/sw/qa/api/SwXTextFrame.cxx +++ b/sw/qa/api/SwXTextFrame.cxx @@ -41,7 +41,6 @@ class SwXTextFrame final : public test::BootstrapFixture, public apitest::XServiceInfo, public apitest::XComponent { - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<text::XTextDocument> mxTextDocument; public: @@ -67,7 +66,6 @@ void SwXTextFrame::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); mxTextDocument = uno::Reference<text::XTextDocument>( loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"), diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 7e71b34ccaed..771c1fe482d9 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -108,6 +108,8 @@ void test::BootstrapFixture::setUp() #if OSL_DEBUG_LEVEL > 0 Scheduler::ProcessEventsToIdle(); #endif + + mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); } test::BootstrapFixture::~BootstrapFixture() diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index c760fc7e1cf4..d55e09a13091 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -81,7 +81,6 @@ using PageHolder = /// Tests the PDF export filter. class PdfExportTest : public test::BootstrapFixture, public unotest::MacrosTest { - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; utl::TempFile maTempFile; SvMemoryStream maMemory; @@ -212,7 +211,6 @@ void PdfExportTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); FPDF_LIBRARY_CONFIG config; diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx index ab3dc7cec6c3..8f78ac1558b6 100644 --- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx @@ -26,7 +26,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -39,7 +38,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx index c3b52060646b..1552d762fc0f 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx @@ -26,7 +26,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -39,7 +38,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx index 00c83c913d96..3b1d75cbcfba 100644 --- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx @@ -27,7 +27,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -40,7 +39,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx index 2071f1fdf67d..4c694ac3d083 100644 --- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx +++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx @@ -27,7 +27,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -40,7 +39,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx index 06c5611afe37..ce17941b4983 100644 --- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx +++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx @@ -29,7 +29,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -42,7 +41,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx index 1678aac52773..fef468a80b4d 100644 --- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx @@ -24,7 +24,6 @@ namespace class Test : public test::BootstrapFixture, public unotest::MacrosTest { private: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; public: @@ -37,7 +36,6 @@ void Test::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index f9f821773b18..d7c9447a1ad1 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -39,7 +39,6 @@ class EPUBExportTest : public test::BootstrapFixture, public XmlTestTools { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; utl::TempFile maTempFile; xmlDocPtr mpXmlDoc = nullptr; @@ -64,7 +63,6 @@ void EPUBExportTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); } diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx index 97e0b7d28f97..7e61e7dc2c87 100644 --- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx @@ -39,8 +39,6 @@ char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/pdfsigning/data/"; class PDFSigningTest : public test::BootstrapFixture { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; - /** * Sign rInURL once and save the result as rOutURL, asserting that rInURL * had nOriginalSignatureCount signatures. @@ -64,8 +62,6 @@ void PDFSigningTest::setUp() { test::BootstrapFixture::setUp(); - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); - #ifndef _WIN32 // Set up cert8.db and key3.db in workdir/CppunitTest/ OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY); diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 7c1d8292c2bc..5a3cdb55f608 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -63,7 +63,6 @@ char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/signing/data/"; class SigningTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools { protected: - uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; uno::Reference<xml::crypto::XSEInitializer> mxSEInitializer; uno::Reference<xml::crypto::XXMLSecurityContext> mxSecurityContext; @@ -140,7 +139,6 @@ void SigningTest::setUp() #endif // Initialize crypto after setting up the environment variables. - mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); mxSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext); mxSecurityContext = mxSEInitializer->createSecurityContext(OUString()); |