diff options
Diffstat (limited to 'xmloff/source/meta')
-rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/meta/xmlmetai.cxx | 7 |
2 files changed, 7 insertions, 14 deletions
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 3f9d0eb71ca1..951eb5554d28 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -184,15 +184,12 @@ void XMLMetaExportComponent::_ExportContent() {} uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw() { - const OUString aServiceName( - "com.sun.star.document.XMLOasisMetaExporter" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return uno::Sequence< OUString > { "com.sun.star.document.XMLOasisMetaExporter" }; } OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw() { - return OUString( "XMLMetaExportComponent" ); + return OUString( "XMLMetaExportComponent" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance( @@ -205,15 +202,12 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw() { - const OUString aServiceName( - "com.sun.star.document.XMLMetaExporter" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return uno::Sequence< OUString > { "com.sun.star.document.XMLMetaExporter" }; } OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw() { - return OUString( "XMLMetaExportOOo" ); + return OUString( "XMLMetaExportOOo" ); } uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance( diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index ce4f96b8ac68..c6b6f6dc5ad0 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -146,17 +146,16 @@ lcl_initGenerator(SvXMLImport & rImport, xPath->registerNS(GetXMLToken(XML_NP_OFFICE),GetXMLToken(XML_N_OFFICE)); xPath->registerNS(GetXMLToken(XML_NP_META), GetXMLToken(XML_N_META)); - OUString const expr( "string(/office:document-meta/office:meta/meta:generator)"); uno::Reference< xml::xpath::XXPathObject > const xObj( - xPath->eval(xDoc.get(), expr), uno::UNO_SET_THROW); + xPath->eval(xDoc.get(), "string(/office:document-meta/office:meta/meta:generator)"), + uno::UNO_SET_THROW); OUString const value(xObj->getString()); SvXMLMetaDocumentContext::setBuildId(value, rImport.getImportInfo()); } catch (const uno::RuntimeException&) { throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - OUString( - "SvXMLMetaDocumentContext::initGenerator: exception"), + "SvXMLMetaDocumentContext::initGenerator: exception", rImport, makeAny(e)); } } |