diff options
author | Noel Grandin <noel@peralex.com> | 2013-03-05 15:51:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-03-07 08:23:42 +0200 |
commit | 8c31a6baf06e711d5e45d477abedfa6afb7ffe51 (patch) | |
tree | 55a8ae79e0ec700a7e1b64599dd0dacdda8f5a3c | |
parent | fdo#46808, simplify OConfigurationTreeRoot constructor (diff) | |
download | core-8c31a6baf06e711d5e45d477abedfa6afb7ffe51.tar.gz core-8c31a6baf06e711d5e45d477abedfa6afb7ffe51.zip |
fdo#46808 use document::DocumentRevisionListPersistence constructor
Change-Id: I1a591ec4061c73657c26552d41c58b970696038f
26 files changed, 64 insertions, 57 deletions
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 7f8b9330b9cc..29fe221b2d3e 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj)) diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index 5304cd6d2c75..0a77e006f553 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj)) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 4f1aaf34207c..4175bb61724c 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase)) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 7d616737142e..e08fd4b2cee6 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -118,6 +118,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj)) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 74ced87da3e6..453028b1e7ff 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj)) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index ce86c01117f3..fda5431ccec3 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj)) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 59b577ad39b0..291262ce9818 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -129,6 +129,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test)) diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 66dd61995ecb..f989dcf5f851 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test)) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 9f8308f79916..64071caaa025 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_modelobj)) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index b9acb355652c..33adc3e4cecf 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj)) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 0d80f8d70c9f..7650a4cc2552 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -119,6 +119,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj)) diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index c43dc51c8e5f..0f18fee8458f 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj)) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index d64832d9cff1..23caa57b745f 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -124,6 +124,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\ unoxml/source/service/unoxml \ xmlsecurity/util/xsec_fw \ xmlsecurity/util/xmlsecurity \ + xmloff/util/xo \ )) ifeq ($(OS),WNT) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index efa20b605833..98fc1396a6ad 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetobj)) diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 2244f13b8aea..8b472bc1b364 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -120,6 +120,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsobj)) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 453a87aab30e..9a5967328ca2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -111,6 +111,7 @@ using namespace ::com::sun::star::io; #include <sot/stg.hxx> #include <unotools/saveopt.hxx> #include <svl/documentlockfile.hxx> +#include <com/sun/star/document/DocumentRevisionListPersistence.hpp> #include "helper.hxx" #include <sfx2/request.hxx> // SFX_ITEMSET_SET @@ -3101,17 +3102,14 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR if ( ( !_bNoReload || !pImp->m_bVersionsAlreadyLoaded ) && !pImp->aVersions.getLength() && ( !pImp->m_aName.isEmpty() || !pImp->m_aLogicName.isEmpty() ) && GetStorage().is() ) { - uno::Reference < document::XDocumentRevisionListPersistence > xReader( comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY ); - if ( xReader.is() ) + uno::Reference < document::XDocumentRevisionListPersistence > xReader = + document::DocumentRevisionListPersistence::create( comphelper::getProcessComponentContext() ); + try + { + pImp->aVersions = xReader->load( GetStorage() ); + } + catch ( const uno::Exception& ) { - try - { - pImp->aVersions = xReader->load( GetStorage() ); - } - catch ( const uno::Exception& ) - { - } } } @@ -3123,17 +3121,14 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR uno::Sequence < util::RevisionTag > SfxMedium::GetVersionList( const uno::Reference < embed::XStorage >& xStorage ) { - uno::Reference < document::XDocumentRevisionListPersistence > xReader( comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY ); - if ( xReader.is() ) + uno::Reference < document::XDocumentRevisionListPersistence > xReader = + document::DocumentRevisionListPersistence::create( comphelper::getProcessComponentContext() ); + try + { + return xReader->load( xStorage ); + } + catch ( const uno::Exception& ) { - try - { - return xReader->load( xStorage ); - } - catch ( const uno::Exception& ) - { - } } return uno::Sequence < util::RevisionTag >(); @@ -3210,18 +3205,15 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ ) if ( !pImp->aVersions.getLength() ) return true; - uno::Reference < document::XDocumentRevisionListPersistence > xWriter( comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY ); - if ( xWriter.is() ) + uno::Reference < document::XDocumentRevisionListPersistence > xWriter = + document::DocumentRevisionListPersistence::create( comphelper::getProcessComponentContext() ); + try + { + xWriter->store( GetStorage(), pImp->aVersions ); + return true; + } + catch ( const uno::Exception& ) { - try - { - xWriter->store( GetStorage(), pImp->aVersions ); - return true; - } - catch ( const uno::Exception& ) - { - } } } diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index ef0dd02b7bba..b9f04fa1fe44 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -1846,7 +1846,7 @@ sal_Bool getTextProperty_Impl( Content& rContent, if ( SfxURLRelocator_Impl::propertyCanContainOfficeDir( rPropName ) ) { - SfxURLRelocator_Impl aRelocImpl( ::comphelper::getProcessServiceFactory() ); + SfxURLRelocator_Impl aRelocImpl( ::comphelper::getProcessComponentContext() ); aRelocImpl.makeAbsoluteURL( rPropValue ); } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 9251b5f11512..b067332248da 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -176,7 +176,7 @@ public: class SfxDocTplService_Impl { - uno::Reference< XMultiServiceFactory > mxFactory; + uno::Reference< XComponentContext > mxContext; uno::Reference< XCommandEnvironment > maCmdEnv; uno::Reference< XDocumentProperties> m_xDocProps; uno::Reference< XTypeDetection > mxType; @@ -268,7 +268,7 @@ class SfxDocTplService_Impl void updateData( DocTemplates_EntryData_Impl *pData ); public: - SfxDocTplService_Impl( uno::Reference< XMultiServiceFactory > xFactory ); + SfxDocTplService_Impl( const uno::Reference< XComponentContext > & xContext ); ~SfxDocTplService_Impl(); sal_Bool init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; } @@ -451,7 +451,7 @@ void SfxDocTplService_Impl::init_Impl() } OUString const aService = OUString( SERVICENAME_TYPEDETECTION ); - mxType = uno::Reference< XTypeDetection > ( mxFactory->createInstance( aService ), UNO_QUERY ); + mxType = uno::Reference< XTypeDetection > ( mxContext->getServiceManager()->createInstanceWithContext(aService, mxContext), UNO_QUERY ); getDirList(); readFolderList(); @@ -580,9 +580,7 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); - uno::Reference< XComponentContext > xCtx( - comphelper::getComponentContext( mxFactory ) ); - uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(xCtx); + uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext); const rtl::OUString aPrefix( "vnd.sun.star.expand:" ); @@ -1122,10 +1120,10 @@ bool SfxURLRelocator_Impl::propertyCanContainOfficeDir( // public SfxDocTplService_Impl //----------------------------------------------------------------------------- -SfxDocTplService_Impl::SfxDocTplService_Impl( uno::Reference< XMultiServiceFactory > xFactory ) -: maRelocator( xFactory ) +SfxDocTplService_Impl::SfxDocTplService_Impl( const uno::Reference< XComponentContext > & xContext ) +: maRelocator( xContext ) { - mxFactory = xFactory; + mxContext = xContext; mpUpdater = NULL; mbIsInitialized = sal_False; mbLocaleSet = sal_False; @@ -1290,7 +1288,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate { uno::Reference< io::XInputStream > xLocStream = aLocContent.openStream(); if ( xLocStream.is() ) - aUINames = DocTemplLocaleHelper::ReadGroupLocalizationSequence( xLocStream, comphelper::getComponentContext(mxFactory) ); + aUINames = DocTemplLocaleHelper::ReadGroupLocalizationSequence( xLocStream, mxContext ); } catch( uno::Exception& ) {} @@ -1378,7 +1376,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU sal_Bool bResult = sal_False; try { uno::Reference< beans::XPropertySet > xTempFile( - io::TempFile::create(comphelper::getComponentContext(mxFactory)), + io::TempFile::create(mxContext), uno::UNO_QUERY_THROW ); ::rtl::OUString aTempURL; @@ -1390,7 +1388,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU if ( !xOutStream.is() ) throw uno::RuntimeException(); - DocTemplLocaleHelper::WriteGroupLocalizationSequence( xOutStream, aUINames, comphelper::getComponentContext(mxFactory)); + DocTemplLocaleHelper::WriteGroupLocalizationSequence( xOutStream, aUINames, mxContext); try { // the SAX writer might close the stream xOutStream->closeOutput(); @@ -2212,7 +2210,7 @@ SFX_IMPL_SINGLEFACTORY( SfxDocTplService ) //----------------------------------------------------------------------------- SfxDocTplService::SfxDocTplService( const uno::Reference< XMultiServiceFactory >& xFactory ) { - pImp = new SfxDocTplService_Impl( xFactory ); + pImp = new SfxDocTplService_Impl( comphelper::getComponentContext(xFactory) ); } //----------------------------------------------------------------------------- @@ -2806,8 +2804,8 @@ DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle } // ----------------------------------------------------------------------- -SfxURLRelocator_Impl::SfxURLRelocator_Impl( uno::Reference< XMultiServiceFactory > xFactory ) -: mxFactory( xFactory ) +SfxURLRelocator_Impl::SfxURLRelocator_Impl( const uno::Reference< XComponentContext > & xContext ) +: mxContext( xContext ) { } @@ -2824,12 +2822,9 @@ void SfxURLRelocator_Impl::initOfficeInstDirs() osl::MutexGuard aGuard( maMutex ); if ( !mxOfficeInstDirs.is() ) { - OSL_ENSURE( mxFactory.is(), "No service manager!" ); + OSL_ENSURE( mxContext.is(), "No service manager!" ); - uno::Reference< XComponentContext > xCtx( - comphelper::getComponentContext( mxFactory ) ); - - mxOfficeInstDirs = theOfficeInstallationDirectories::get(xCtx); + mxOfficeInstDirs = theOfficeInstallationDirectories::get(mxContext); } } } @@ -2846,8 +2841,7 @@ void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url ) { if ( !mxMacroExpander.is() ) { - ::comphelper::ComponentContext aContext( mxFactory ); - mxMacroExpander.set( theMacroExpander::get(aContext.getUNOContext()), UNO_QUERY_THROW ); + mxMacroExpander.set( theMacroExpander::get(mxContext), UNO_QUERY_THROW ); } io_url = mxMacroExpander->expandMacros( io_url ); } diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx index 031ca663bb7b..1406d60e9cf8 100644 --- a/sfx2/source/inc/sfxurlrelocator.hxx +++ b/sfx2/source/inc/sfxurlrelocator.hxx @@ -20,7 +20,6 @@ #ifndef _SFX_SFXURLRELOCATOR_HXX_ #define _SFX_SFXURLRELOCATOR_HXX_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> #include <com/sun/star/util/XMacroExpander.hpp> @@ -30,7 +29,7 @@ class SfxURLRelocator_Impl { ::osl::Mutex maMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; ::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > mxOfficeInstDirs; ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander; @@ -40,7 +39,7 @@ public: void makeRelocatableURL( rtl::OUString & rURL ); void makeAbsoluteURL( rtl::OUString & rURL ); - SfxURLRelocator_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ); + SfxURLRelocator_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); ~SfxURLRelocator_Impl(); private: diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 23e8e752810d..8e482d2e5081 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ unoxml/source/service/unoxml \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ xmloff/source/transform/xof \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 14ebcf18130b..36fad9b670c9 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -91,6 +91,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\ unoxml/source/service/unoxml \ uui/util/uui \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport)) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index 5c22725b01ab..30c2e4749259 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -90,6 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\ unoxml/source/service/unoxml \ uui/util/uui \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport)) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 868001a04206..bc58ee9bef46 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -95,6 +95,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlexport,\ unotools/util/utl \ unoxml/source/service/unoxml \ writerfilter/util/writerfilter \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport)) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 567e8c7ca036..016aba3b8f15 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\ unotools/util/utl \ unoxml/source/service/unoxml \ writerfilter/util/writerfilter \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport)) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 94c94456c8f3..6017d1464c9c 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\ unotools/util/utl \ unoxml/source/service/unoxml \ writerfilter/util/writerfilter \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport)) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 5575c5058a84..9513b8f441e4 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\ unotools/util/utl \ unoxml/source/service/unoxml \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ + xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export)) |