From 96087f52d9ab00e80fd4ff57aa3ce3b29c2204ef Mon Sep 17 00:00:00 2001 From: Vishv Brahmbhatt Date: Fri, 9 Aug 2013 18:50:52 +0530 Subject: Fixed a broken unit-test. Added a new component of "unoxml/source/service/unoxml" in makefile of 'sd_uimpress'. Also few changes in "drawdoc.cxx".Please ignore the changes of unit-test XML file, it has to be deleted in subsequent commit. Change-Id: I50eb516444820c8037aebc8859a322116989d3bf --- sd/CppunitTest_sd_uimpress.mk | 1 + sd/source/core/drawdoc.cxx | 4 +- .../config/soffice.cfg/simpress/layoutlist.xml | 71 ++++++++++++++++------ 3 files changed, 54 insertions(+), 22 deletions(-) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index f17a2d784227..f232a917ce62 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ i18npool/util/i18npool \ linguistic/source/lng \ ucb/source/core/ucb1 \ + unoxml/source/service/unoxml \ )) $(eval $(call gb_CppunitTest_use_configuration,sd_uimpress)) diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 97e3367270cf..a4089cbf91d5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -1015,7 +1015,7 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const OUString& rAuthor ) // to get the root element of the xml file Reference getRoot() { - const Reference xContext( comphelper_getProcessComponentContext() ); + const Reference xContext( ::comphelper::getProcessComponentContext() ); Reference< XMultiServiceFactory > xServiceFactory( xContext->getServiceManager() , UNO_QUERY_THROW ); Reference< util::XMacroExpander > xMacroExpander = util::theMacroExpander::get( xContext ); Reference< XMultiServiceFactory > xConfigProvider = configuration::theDefaultProvider::get( xContext ); @@ -1056,7 +1056,7 @@ Reference getRoot() aURL = aSysPath; } - const Reference xDocBuilder( css::xml::dom::DocumentBuilder::create( comphelper::getComponentContext (xServiceFactory) ) ); + const Reference xDocBuilder( DocumentBuilder::create( comphelper::getComponentContext (xServiceFactory) )); const Reference xDoc = xDocBuilder->parseURI( aURL ); const Reference xRoot = xDoc->getDocumentElement(); return xRoot; //this loops seems to work only once,so returning the root element diff --git a/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml b/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml index cfe1f1e58e85..d02bf2acfa39 100644 --- a/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml +++ b/test/user-template/user/config/soffice.cfg/simpress/layoutlist.xml @@ -3,30 +3,61 @@ --> - - + + - - - - + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit