diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 08:11:42 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:41:48 -0500 |
| commit | 6573aa15d49b9eb661f03d80b2c3245ac3eec472 (patch) | |
| tree | b5597fce63e1d3a30fc9dea6f89953e75c670b41 /xmloff/source/meta | |
| parent | 9bbb849dd892fc79df4b2a06253c8cf02cbbcbdf (diff) | |
targeted string re-work
Change-Id: I1e47f90e387724e74312091e577f010fb16ca72f
Diffstat (limited to 'xmloff/source/meta')
| -rw-r--r-- | xmloff/source/meta/xmlmetai.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 64a7f5883407..41a7fb261e99 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -147,9 +147,9 @@ lcl_initDocumentProperties(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + ::rtl::OUString( "SvXMLMetaDocumentContext::initDocumentProperties: " - "properties init exception")), + "properties init exception"), rImport, makeAny(e)); } } @@ -165,14 +165,14 @@ lcl_initGenerator(SvXMLImport & rImport, try { uno::Reference< xml::xpath::XXPathAPI > const xPath( rImport.getServiceFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.xpath.XPathAPI"))), + ::rtl::OUString( + "com.sun.star.xml.xpath.XPathAPI")), uno::UNO_QUERY_THROW ); xPath->registerNS(GetXMLToken(XML_NP_OFFICE),GetXMLToken(XML_N_OFFICE)); xPath->registerNS(GetXMLToken(XML_NP_META), GetXMLToken(XML_N_META)); - ::rtl::OUString const expr(RTL_CONSTASCII_USTRINGPARAM( - "string(/office:document-meta/office:meta/meta:generator)")); + ::rtl::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); OUString const value(xObj->getString()); @@ -181,8 +181,8 @@ lcl_initGenerator(SvXMLImport & rImport, throw; } catch (const uno::Exception& e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "SvXMLMetaDocumentContext::initGenerator: exception")), + ::rtl::OUString( + "SvXMLMetaDocumentContext::initGenerator: exception"), rImport, makeAny(e)); } } @@ -267,7 +267,7 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con OUStringBuffer sBuffer( i_rBuildId.copy( nBegin+1, nEnd-nBegin-1 ) ); const OUString sBuildCompare( - RTL_CONSTASCII_USTRINGPARAM( "$Build-" ) ); + "$Build-" ); nBegin = i_rBuildId.indexOf( sBuildCompare, nEnd ); if ( nBegin != -1 ) { @@ -289,11 +289,11 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con (i_rBuildId.compareToAscii( RTL_CONSTASCII_STRINGPARAM("OpenOffice.org 1") ) == 0)) { - sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("645$8687")); + sBuildId = OUString("645$8687"); } if ((i_rBuildId.compareToAscii( RTL_CONSTASCII_STRINGPARAM("NeoOffice/2") ) == 0) ) { - sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("680$9134")); // fake NeoOffice as OpenOffice.org 2.2 release + sBuildId = OUString("680$9134"); // fake NeoOffice as OpenOffice.org 2.2 release } } @@ -301,7 +301,7 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con { if( xImportInfo.is() ) { - const OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("BuildId")); + const OUString aPropName("BuildId"); uno::Reference< beans::XPropertySetInfo > xSetInfo( xImportInfo->getPropertySetInfo()); if( xSetInfo.is() && xSetInfo->hasPropertyByName( aPropName ) ) |