targeted string re-work

Change-Id: Icdf89cd23f34b9d599512414b14907c9ac67cffb

14 files changed, 95 insertions, 96 deletions

diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 05e34cbd8153..0713384a8df9 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -86,7 +86,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
 
     sal_Int32 nLen = url.indexOf(':');
     nLen = url.indexOf(':',nLen+1);
-    ::rtl::OUString aDSN(RTL_CONSTASCII_USTRINGPARAM("DSN=")), aUID, aPWD, aSysDrvSettings;
+    ::rtl::OUString aDSN("DSN="), aUID, aPWD, aSysDrvSettings;
     aDSN += url.copy(nLen+1);
 
     const char* pUser       = "user";
@@ -109,12 +109,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         else if(!pBegin->Name.compareToAscii(pUser))
         {
             pBegin->Value >>= aUID;
-            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";UID=")) + aUID;
+            aDSN = aDSN + ::rtl::OUString(";UID=") + aUID;
         }
         else if(!pBegin->Name.compareToAscii(pPwd))
         {
             pBegin->Value >>= aPWD;
-            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";PWD=")) + aPWD;
+            aDSN = aDSN + ::rtl::OUString(";PWD=") + aPWD;
         }
         else if(!pBegin->Name.compareToAscii(pUseCatalog))
         {
@@ -123,7 +123,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         else if(!pBegin->Name.compareToAscii(pSysDrv))
         {
             pBegin->Value >>= aSysDrvSettings;
-            aDSN += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+            aDSN += ::rtl::OUString(";");
             aDSN += aSysDrvSettings;
         }
     }
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 9a7e04b16206..4b424beaa1ea 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -213,7 +213,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
-    ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
+    ::rtl::OUString aVal("\"");
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -557,7 +557,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:"));
+    ::rtl::OUString aValue("sdbc:skeleton:");
     return aValue;
 }
 // -------------------------------------------------------------------------
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
index 83984ec95e2c..0318a1b66f01 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
@@ -79,7 +79,7 @@ void SkeletonDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString SkeletonDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.SkeletonDriver"));
+    return rtl::OUString("com.sun.star.comp.sdbc.SkeletonDriver");
         // this name is referenced in the configuration and in the skeleton.xml
         // Please take care when changing it.
 }
@@ -89,7 +89,7 @@ Sequence< ::rtl::OUString > SkeletonDriver::getSupportedServiceNames_Static(  )
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
     return aSNS;
 }
 
@@ -134,7 +134,7 @@ sal_Bool SAL_CALL SkeletonDriver::acceptsURL( const ::rtl::OUString& url )
 {
     // here we have to look if we support this url format
     // change the URL format to your needs, but please aware that the first on who accepts the URl wins.
-    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:")),14));
+    return (!url.compareTo(::rtl::OUString("sdbc:skeleton:"),14));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL SkeletonDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index 7a9f8454dae6..d5aec8b6feb3 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -57,14 +57,14 @@ using namespace com::sun::star::util;
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 ::rtl::OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)    \
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.skeleton.ResultSet"));
+    return ::rtl::OUString("com.sun.star.sdbcx.skeleton.ResultSet");
 }
 // -------------------------------------------------------------------------
  Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
-    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
+    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
index eda38de35d78..4df406e82f55 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
 
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column")) + ::rtl::OUString::valueOf(column);
+    return ::rtl::OUString("Column") + ::rtl::OUString::valueOf(column);
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index c462272daff1..0d57aa223777 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -67,9 +67,9 @@ void REGISTER_PROVIDER(
         const Sequence< OUString>& Services,
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
-    OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
+    OUString aMainKeyName("/");
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
+    aMainKeyName += OUString("/UNO/SERVICES");
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not create a registry key !");
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index 64d2e0f1811c..e26d7f6f5869 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -98,7 +98,7 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
     {
         // open the stream if it was not suplied by the framework
         Reference< XSimpleFileAccess > xSFI(mxMSF->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY);
+            OUString("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY);
         if (sURL.getLength() > 0 && xSFI.is())
         {
             try
@@ -153,25 +153,25 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
             // return type for class found
             if      (aMimeType.equals("application/x-vnd.oasis.opendocument.text") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.text"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_writer"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_writer");
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.text-master") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.text-master"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_master");
            else if (aMimeType.equals("application/x-vnd.oasis.openoffice.text-global") ||
                       aMimeType.equals("application/vnd.oasis.openoffice.text-global"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_master");
            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.spreadsheet") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.spreadsheet"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_calc"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_calc");
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.drawing") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.drawing"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_draw"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_draw");
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_impress");
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
-                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress"));
+                sTypeName = OUString("devguide_FlatXMLType_Cpp_impress");
         }
     }
     return sTypeName;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index b74e21dc8eee..c998eb8b5b23 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -162,7 +162,7 @@ sal_Bool XFlatXml::importer(
     // create SAX parser that will read the document file
     // and provide events to xHandler passed to this call
     Reference < XParser > xSaxParser( m_rServiceFactory->createInstance(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY );
+        OUString("com.sun.star.xml.sax.Parser")), UNO_QUERY );
     OSL_ASSERT(xSaxParser.is());
     if(!xSaxParser.is())return sal_False;
 
@@ -213,7 +213,7 @@ sal_Bool XFlatXml::exporter(
         // get the document writer
         m_rDocumentHandler = Reference<XExtendedDocumentHandler>(
             m_rServiceFactory->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))),
+            OUString("com.sun.star.xml.sax.Writer")),
                 UNO_QUERY);
         OSL_ASSERT(m_rDocumentHandler.is());
         if (!m_rDocumentHandler.is()) return sal_False;
@@ -303,8 +303,8 @@ Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "devguide.officedev.samples.filter.FlatXmlCpp"));
+            seqNames.getArray()[0] = OUString(
+                "devguide.officedev.samples.filter.FlatXmlCpp");
             pNames = &seqNames;
         }
     }
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index 49519dc2ac5f..ea74e86bb1ee 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -63,7 +63,7 @@ SAL_IMPLEMENT_MAIN()
     // instantiate a sample service with the servicemanager.
     Reference< XInterface > rInstance =
         rServiceManager->createInstanceWithContext(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")),
+            OUString("com.sun.star.bridge.UnoUrlResolver"),
             rComponentContext );
 
     // Query for the XUnoUrlResolver interface
@@ -77,8 +77,8 @@ SAL_IMPLEMENT_MAIN()
     try
     {
         // resolve the uno-url
-        rInstance = rResolver->resolve( OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" )) );
+        rInstance = rResolver->resolve( OUString(
+            "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" ) );
 
         if( ! rInstance.is() )
         {
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index 47daa7559af0..a41008172fc8 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -72,7 +72,7 @@ using ::rtl::OUStringToOString;
 //============================================================================
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
-    OUString sConnectionString(RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager"));
+    OUString sConnectionString("uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager");
 
     sal_Int32 nCount = (sal_Int32)rtl_getAppCommandArgCount();
 
@@ -101,7 +101,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     */
     Reference< XInterface > xInterface =
         xMultiComponentFactoryClient->createInstanceWithContext(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")),
+            OUString("com.sun.star.bridge.UnoUrlResolver"),
             xComponentContext );
 
     Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY );
@@ -122,7 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     // gets the server component context as property of the office component factory
     Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
-    xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xComponentContext;
+    xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xComponentContext;
 
     // gets the service manager from the office
     Reference< XMultiComponentFactory > xMultiComponentFactoryServer(
@@ -133,7 +133,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     */
     Reference < XComponentLoader > xComponentLoader(
         xMultiComponentFactoryServer->createInstanceWithContext(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ) ),
+            OUString( "com.sun.star.frame.Desktop"  ),
             xComponentContext ), UNO_QUERY );
 
     /* Loads a component specified by an URL into the specified new or existing
@@ -147,7 +147,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     osl::FileBase::getAbsoluteFileURL( sWorkingDir, sDocPathUrl, sAbsoluteDocUrl);
 
     Reference< XComponent > xComponent = xComponentLoader->loadComponentFromURL(
-        sAbsoluteDocUrl, OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0,
+        sAbsoluteDocUrl, OUString( "_blank" ), 0,
         Sequence < ::com::sun::star::beans::PropertyValue >() );
 
     // dispose the local service manager
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
index 1c944c1dd9dd..ad7f95a5f4aa 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
@@ -49,9 +49,9 @@ using com::sun::star::document::XEventBroadcaster;
 Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments )
     throw ( IllegalArgumentException, Exception, RuntimeException )
 {
-    Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) ), UNO_QUERY );
+    Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString("com.sun.star.frame.GlobalEventBroadcaster") ), UNO_QUERY );
     Reference < com::sun::star::document::XEventListener > xLstner( mxMSF->createInstance(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Office.MyListener")) ), UNO_QUERY );
+        ::rtl::OUString("com.sun.star.comp.Office.MyListener") ), UNO_QUERY );
     if ( xBrd.is() )
         xBrd->addEventListener( xLstner );
     return Any();
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index 94d15d80f8b6..cdcda6b30691 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -92,11 +92,11 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
         return css::uno::Any();
 
     css::uno::Reference< css::lang::XServiceInfo > xInfo(xModel, css::uno::UNO_QUERY);
-    sal_Bool bCalc   = xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")));
+    sal_Bool bCalc   = xInfo->supportsService(::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"));
     sal_Bool bWriter = (
-                         xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))) &&
-                        !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"))) &&
-                        !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument")))
+                         xInfo->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")) &&
+                        !xInfo->supportsService(::rtl::OUString("com.sun.star.text.WebDocument")) &&
+                        !xInfo->supportsService(::rtl::OUString("com.sun.star.text.GlobalDocument"))
                        );
 
     // We are interested only in Writer and Calc. However, here we are
@@ -123,7 +123,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
 ::rtl::OUString SAL_CALL MyListener::getImplementationName()
     throw (css::uno::RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME));
+    return ::rtl::OUString(MYLISTENER_IMPLEMENTATIONNAME);
 }
 
 
@@ -131,7 +131,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa
     throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_SERVICENAME));
+    lNames[0] = ::rtl::OUString(MYLISTENER_SERVICENAME);
     return lNames;
 }
 
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 7602b129f86b..98a897acc22d 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -78,14 +78,13 @@ void BaseDispatch::ShowMessageBox( const Reference< XFrame >& rFrame, const ::rt
 {
     if ( !mxToolkit.is() )
         mxToolkit = Reference< XToolkit > ( mxMSF->createInstance(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                            "com.sun.star.awt.Toolkit" ))), UNO_QUERY );
+            ::rtl::OUString( "com.sun.star.awt.Toolkit" )), UNO_QUERY );
     if ( rFrame.is() && mxToolkit.is() )
     {
         // describe window properties.
         WindowDescriptor                aDescriptor;
         aDescriptor.Type              = WindowClass_MODALTOP;
-        aDescriptor.WindowServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "infobox" ));
+        aDescriptor.WindowServiceName = ::rtl::OUString( "infobox" );
         aDescriptor.ParentIndex       = -1;
         aDescriptor.Parent            = Reference< XWindowPeer >( rFrame->getContainerWindow(), UNO_QUERY );
         aDescriptor.Bounds            = Rectangle(0,0,300,200);
@@ -201,7 +200,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches(
 ::rtl::OUString MyProtocolHandler_getImplementationName ()
     throw (RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME));
+    return ::rtl::OUString(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME);
 }
 
 sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName )
@@ -214,7 +213,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames(
     throw (RuntimeException)
 {
     Sequence < ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME));
+    aRet[0] = ::rtl::OUString(MYPROTOCOLHANDLER_SERVICENAME);
     return aRet;
 }
 
@@ -261,9 +260,9 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
         if ( !aURL.Path.compareToAscii("Command1" ) )
         {
             // open the OpenOffice.org web page
-            ::rtl::OUString sURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.openoffice.org")));
+            ::rtl::OUString sURL(::rtl::OUString("http://www.openoffice.org"));
             Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY );
+                ::rtl::OUString("com.sun.star.system.SystemShellExecute")), UNO_QUERY );
             if ( xSystemShellExecute.is() )
             {
                 try
@@ -281,17 +280,17 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
         {
             // remove the text if it's in our list
             Sequence< NamedValue > aRemoveArgs( 1 );
-            aRemoveArgs[0].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+            aRemoveArgs[0].Name  = rtl::OUString( "Text" );
             aRemoveArgs[0].Value <<= maComboBoxText;
-            SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveEntryText")), aRemoveArgs, sal_True );
+            SendCommand( aURL, ::rtl::OUString("RemoveEntryText"), aRemoveArgs, sal_True );
 
             // add the new text to the start of the list
             Sequence< NamedValue > aInsertArgs( 2 );
-            aInsertArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" ));
+            aInsertArgs[0].Name = rtl::OUString( "Pos" );
             aInsertArgs[0].Value <<= sal_Int32( 0 );
-            aInsertArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
+            aInsertArgs[1].Name = rtl::OUString( "Text" );
             aInsertArgs[1].Value <<= maComboBoxText;
-            SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InsertEntry")), aInsertArgs, sal_True );
+            SendCommand( aURL, ::rtl::OUString("InsertEntry"), aInsertArgs, sal_True );
         }
         else if ( !aURL.Path.compareToAscii("Command3" ) )
         {
@@ -308,15 +307,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
 
             // create new URL to address the combox box
             URL aCmdURL;
-            aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command2"));
-            aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:"));
+            aCmdURL.Path = rtl::OUString("Command2");
+            aCmdURL.Protocol = rtl::OUString("vnd.demo.complextoolbarcontrols.demoaddon:");
             aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol;
 
             // set the selected item as text into the combobox
             Sequence< NamedValue > aArgs( 1 );
-            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text"));
+            aArgs[0].Name = rtl::OUString("Text");
             aArgs[0].Value <<= aText;
-            SendCommand( aCmdURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetText")), aArgs, sal_True );
+            SendCommand( aCmdURL, ::rtl::OUString("SetText"), aArgs, sal_True );
         }
         else if ( !aURL.Path.compareToAscii("Command4" ) )
         {
@@ -341,8 +340,8 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
 
             // create new URL to address the image button
             URL aCmdURL;
-            aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command1"));
-            aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:"));
+            aCmdURL.Path = rtl::OUString("Command1");
+            aCmdURL.Protocol = rtl::OUString("vnd.demo.complextoolbarcontrols.demoaddon:");
             aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol;
 
             // create and initialize FeatureStateEvent with IsEnabled
@@ -398,18 +397,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aContextMenu( 3 );
-            aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 1"));
-            aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 2"));
-            aContextMenu[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 3"));
+            aContextMenu[0] = rtl::OUString("Command 1");
+            aContextMenu[1] = rtl::OUString("Command 2");
+            aContextMenu[2] = rtl::OUString("Command 3");
 
-            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
+            aArgs[0].Name = rtl::OUString("List");
             aArgs[0].Value <<= aContextMenu;
-            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True );
 
             // send command to check item on pos=0
-            aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" ));
+            aArgs[0].Name = rtl::OUString( "Pos" );
             aArgs[0].Value <<= sal_Int32( 0 );
-            SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, ::rtl::OUString("CheckItemPos"), aArgs, sal_True );
         }
         else if ( aURL.Path == "Command4" )
         {
@@ -420,20 +419,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aContextMenu( 2 );
-            aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Enabled"));
-            aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Disabled"));
+            aContextMenu[0] = rtl::OUString("Button Enabled");
+            aContextMenu[1] = rtl::OUString("Button Disabled");
 
-            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
+            aArgs[0].Name = rtl::OUString("List");
             aArgs[0].Value <<= aContextMenu;
-            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True );
 
             // set position according to enable/disable state of button
             sal_Int32 nPos( mbButtonEnabled ? 0 : 1 );
 
             // send command to check item on pos=0
-            aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" ));
+            aArgs[0].Name = rtl::OUString( "Pos" );
             aArgs[0].Value <<= nPos;
-            SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, ::rtl::OUString("CheckItemPos"), aArgs, sal_True );
         }
         else if ( aURL.Path == "Command5" )
         {
@@ -441,18 +440,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
             Sequence< NamedValue > aArgs( 5 );
 
             // send command to initialize spin button
-            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
+            aArgs[0].Name = rtl::OUString("Value");
             aArgs[0].Value <<= double( 0.0 );
-            aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UpperLimit"));
+            aArgs[1].Name = rtl::OUString("UpperLimit");
             aArgs[1].Value <<= double( 10.0 );
-            aArgs[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LowerLimit"));
+            aArgs[2].Name = rtl::OUString("LowerLimit");
             aArgs[2].Value <<= double( 0.0 );
-            aArgs[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step"));
+            aArgs[3].Name = rtl::OUString("Step");
             aArgs[3].Value <<= double( 0.1 );
-            aArgs[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputFormat"));
-            aArgs[4].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%.2f cm"));
+            aArgs[4].Name = rtl::OUString("OutputFormat");
+            aArgs[4].Value <<= rtl::OUString("%.2f cm");
 
-            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetValues")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString("SetValues"), aArgs, sal_True );
         }
         else if ( aURL.Path == "Command7" )
         {
@@ -462,20 +461,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aList( 10 );
-            aList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("White"));
-            aList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Black"));
-            aList[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Red"));
-            aList[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Blue"));
-            aList[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Green"));
-            aList[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Grey"));
-            aList[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yellow"));
-            aList[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orange"));
-            aList[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Brown"));
-            aList[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pink"));
-
-            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
+            aList[0] = rtl::OUString("White");
+            aList[1] = rtl::OUString("Black");
+            aList[2] = rtl::OUString("Red");
+            aList[3] = rtl::OUString("Blue");
+            aList[4] = rtl::OUString("Green");
+            aList[5] = rtl::OUString("Grey");
+            aList[6] = rtl::OUString("Yellow");
+            aList[7] = rtl::OUString("Orange");
+            aList[8] = rtl::OUString("Brown");
+            aList[9] = rtl::OUString("Pink");
+
+            aArgs[0].Name = rtl::OUString("List");
             aArgs[0].Value <<= aList;
-            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString("SetList"), aArgs, sal_True );
         }
 
         aListenerHelper.AddListener( mxFrame, xControl, aURL.Path );
diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx
index 0c598a0e7252..017b0da43c7d 100644
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@ -148,7 +148,7 @@ sal_Int32 PipeClientMain::run( const Sequence< OUString > & aArguments ) throw (
     {
         try {
             Reference < XInterface > r =
-                m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) );
+                m_xSMgr->createInstance( OUString("com.sun.star.bridge.UnoUrlResolver") );
             Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY );
 
             // connect to the remote process and retrieve the initial object
@@ -212,7 +212,7 @@ Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.RemoteClientSample"));
+            seqNames.getArray()[0] = OUString("com.sun.star.bridge.example.RemoteClientSample");
             pNames = &seqNames;
         }
     }