targeted string re-work

Change-Id: Ibc811f2ef501a91172e096a700821ab6bd9406ea

3 files changed, 31 insertions, 31 deletions

diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 8de0a45f9029..f7ef9a7fe5fb 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -77,7 +77,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
     {
         Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         if( xFactProp.is())
-            xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
+            xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext;
     }
     catch( uno::Exception& )
     {}
@@ -465,9 +465,9 @@ void SchXMLImportHelper::DeleteDataSeries(
     {
         (void)ex; // avoid warning for pro build
         OSL_FAIL( OUStringToOString(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
+                        OUString(  "Exception caught. Type: " ) +
                         OUString::createFromAscii( typeid( ex ).name()) +
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
+                        OUString(  ", Message: " ) +
                         ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
     }
 }
@@ -536,7 +536,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
                 {
                     xResult.set(
                         xContext->getServiceManager()->createInstanceWithContext(
-                            OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DataSeries" )),
+                            OUString( "com.sun.star.chart2.DataSeries" ),
                             xContext ), uno::UNO_QUERY_THROW );
                 }
                 if( xResult.is() )
@@ -548,9 +548,9 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
     {
         (void)ex; // avoid warning for pro build
         OSL_FAIL( OUStringToOString(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
+                        OUString(  "Exception caught. Type: " ) +
                         OUString::createFromAscii( typeid( ex ).name()) +
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
+                        OUString(  ", Message: " ) +
                         ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
     }
     return xResult;
@@ -608,8 +608,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( sal_uInt16 nPrefix, const OUStr
         if (xDPS.is()) {
             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
                 mxServiceFactory->createInstance(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.xml.dom.SAXDocumentBuilder"))),
+                    ::rtl::OUString(
+                        "com.sun.star.xml.dom.SAXDocumentBuilder")),
                     uno::UNO_QUERY_THROW);
             pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
                 ? new SvXMLMetaDocumentContext(*this,
@@ -683,7 +683,7 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
 
                 if ( !xChartDoc->getDataProvider().is() )
                 {
-                    const OUString aDataProviderServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"));
+                    const OUString aDataProviderServiceName( "com.sun.star.chart2.data.DataProvider");
                     const uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames());
                     const OUString * pBegin = aServiceNames.getConstArray();
                     const OUString * pEnd = pBegin + aServiceNames.getLength();
@@ -724,14 +724,14 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
 
 Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw()
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisImporter" ) );
+    const OUString aServiceName(  "com.sun.star.comp.Chart.XMLOasisImporter"  );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 OUString SAL_CALL SchXMLImport_getImplementationName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ) );
+    return OUString(  "SchXMLImport"  );
 }
 
 Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -746,14 +746,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Referenc
 
 Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw()
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisStylesImporter" ) );
+    const OUString aServiceName(  "com.sun.star.comp.Chart.XMLOasisStylesImporter"  );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Styles" ) );
+    return OUString(  "SchXMLImport.Styles"  );
 }
 
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -766,14 +766,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const R
 
 Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw()
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisContentImporter" ) );
+    const OUString aServiceName(  "com.sun.star.comp.Chart.XMLOasisContentImporter"  );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Content" ) );
+    return OUString(  "SchXMLImport.Content"  );
 }
 
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -786,14 +786,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const
 
 Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw()
 {
-    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisMetaImporter" ) );
+    const OUString aServiceName(  "com.sun.star.comp.Chart.XMLOasisMetaImporter"  );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Meta" ) );
+    return OUString(  "SchXMLImport.Meta"  );
 }
 
 Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -819,7 +819,7 @@ OUString SAL_CALL SchXMLImport::getImplementationName() throw( uno::RuntimeExcep
         case IMPORT_SETTINGS:
         // there is no settings component in chart
         default:
-            return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ));
+            return OUString( "SchXMLImport" );
     }
 }
 
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 6a5892f4c810..26aa8f9b148e 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -102,7 +102,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
                 uno::Any aAny;
                 aAny <<= GetXMLToken( XML_TEXT );
                 xConvPropSet->setPropertyValue(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Class")), aAny );
+                        ::rtl::OUString("Class"), aAny );
 
                 uno::Reference< beans::XPropertySet > xPropSet =
                     getExportInfo().is()
@@ -118,7 +118,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
                 // get filter component
                 xDocHandler = uno::Reference< xml::sax::XDocumentHandler >(
                     xFactory->createInstanceWithArguments(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
+                        ::rtl::OUString("com.sun.star.comp.Oasis2OOoTransformer"),
                         aArgs),
                     uno::UNO_QUERY_THROW );
 
@@ -196,14 +196,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportComponent_getSupportedServi
     throw()
 {
     const rtl::OUString aServiceName(
-        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.XMLOasisMetaExporter" ) );
+         "com.sun.star.document.XMLOasisMetaExporter"  );
     const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw()
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLMetaExportComponent" ) );
+    return rtl::OUString(  "XMLMetaExportComponent"  );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance(
@@ -217,14 +217,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceName
     throw()
 {
     const rtl::OUString aServiceName(
-        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.XMLMetaExporter" ) );
+         "com.sun.star.document.XMLMetaExporter"  );
     const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
     return aSeq;
 }
 
 rtl::OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw()
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLMetaExportOOo" ) );
+    return rtl::OUString(  "XMLMetaExportOOo"  );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 92178880fdea..7bb3f4e0ce20 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -81,8 +81,8 @@ XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
         SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
         sal_Bool bDefault )
 :   SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily, bDefault )
-,   msIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) )
-,   msFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) )
+,   msIsPhysical(  "IsPhysical"  )
+,   msFollowStyle(  "FollowStyle"  )
 ,   mxStyles( &rStyles )
 {
 }
@@ -207,15 +207,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
                 {
                     aValues.realloc( nLen + 2 );
                     PropertyValue *pProps = aValues.getArray() + nLen;
-                    pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
+                    pProps->Name = rtl::OUString("ParaStyleName");
                     OUString sParent( GetParentName() );
                     if( !sParent.isEmpty() )
                         sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
                     else
-                        sParent =  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
+                        sParent =  rtl::OUString("Standard");
                     pProps->Value <<= sParent;
                     ++pProps;
-                    pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName"));
+                    pProps->Name = rtl::OUString("ParaConditionalStyleName");
                     pProps->Value <<= sParent;
                 }
 
@@ -224,8 +224,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
                 {
                     Sequence< OUString > aPropNames(1);
                     aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ?
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName")) :
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName"));
+                        rtl::OUString("ParaAutoStyleName") :
+                        rtl::OUString("CharAutoStyleName");
                     Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
                     if( aAny.hasElements() )
                     {