diff options
| author | Vishv Brahmbhatt <vishvbrahmbhatt19@gmail.com> | 2013-08-09 18:50:52 +0530 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-08-26 14:47:26 +0200 |
| commit | 96087f52d9ab00e80fd4ff57aa3ce3b29c2204ef (patch) | |
| tree | 017c5972e33e7d52bcdf8e18d535992c2a0e8c22 /sd | |
| parent | 07dccf031f07c6684f75df235df4a2113c2910ff (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 1 | ||||
| -rw-r--r-- | sd/source/core/drawdoc.cxx | 4 |
2 files changed, 3 insertions, 2 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<XElement> getRoot() { - const Reference<css::uno::XComponentContext> xContext( comphelper_getProcessComponentContext() ); + const Reference<css::uno::XComponentContext> 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<XElement> getRoot() aURL = aSysPath; } - const Reference<XDocumentBuilder> xDocBuilder( css::xml::dom::DocumentBuilder::create( comphelper::getComponentContext (xServiceFactory) ) ); + const Reference<XDocumentBuilder> xDocBuilder( DocumentBuilder::create( comphelper::getComponentContext (xServiceFactory) )); const Reference<XDocument> xDoc = xDocBuilder->parseURI( aURL ); const Reference<XElement> xRoot = xDoc->getDocumentElement(); return xRoot; //this loops seems to work only once,so returning the root element |