removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations

s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms

Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

16 files changed, 59 insertions, 59 deletions

diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 5c5e75e9a827..b5a94597daad 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -138,7 +138,7 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::O
     uno::Sequence< OUString> aNames(GetNodeNames(rScheme));
     ::rtl::OUString* pIter = aNames.getArray();
     ::rtl::OUString* pEnd    = pIter + aNames.getLength();
-    ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("/"));
+    ::rtl::OUString sSep("/");
     for(;pIter != pEnd;++pIter)
     {
         *pIter = rScheme + sSep + *pIter;
@@ -251,9 +251,9 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
 
     // fill display names
     TDisplayNames aDisplayNameMap;
-    ::rtl::OUString sEntryNames(RTL_CONSTASCII_USTRINGPARAM("EntryNames"));
+    ::rtl::OUString sEntryNames("EntryNames");
     uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sEntryNames);
-    ::rtl::OUString sDisplayName(RTL_CONSTASCII_USTRINGPARAM("/DisplayName"));
+    ::rtl::OUString sDisplayName("/DisplayName");
     ::rtl::OUString* pIter = aComponentNames.getArray();
     ::rtl::OUString* pEnd  = pIter + aComponentNames.getLength();
     for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
@@ -302,7 +302,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
     } // if(!sScheme.getLength())
 
     m_sLoadedScheme = sScheme;
-    ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/"));
+    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/");
     sBase += sScheme;
 
     sal_Bool bFound = ExistsScheme(sScheme);
@@ -317,10 +317,10 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
 
     if ( sScheme != "default" )
     {
-        ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default"));
+        ::rtl::OUString sDefault("default");
         if ( ExistsScheme(sDefault) )
         {
-            ::rtl::OUString sBaseDefault(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/default"));
+            ::rtl::OUString sBaseDefault("ExtendedColorScheme/ColorSchemes/default");
             aComponentNames = GetPropertyNames(sBaseDefault);
             FillComponentColors(aComponentNames,aDisplayNameMap);
         }
@@ -334,7 +334,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme)
 // -----------------------------------------------------------------------------
 void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUString >& _rComponents,const TDisplayNames& _rDisplayNames)
 {
-    const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("/Entries"));
+    const ::rtl::OUString sColorEntries("/Entries");
     ::rtl::OUString* pIter = _rComponents.getArray();
     ::rtl::OUString* pEnd  = pIter + _rComponents.getLength();
     for(;pIter != pEnd;++pIter)
@@ -348,8 +348,8 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
             uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(sEntry);
             uno::Sequence < ::rtl::OUString > aDefaultColorNames = aColorNames;
 
-            const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color"));
-            const ::rtl::OUString sDefaultColor(RTL_CONSTASCII_USTRINGPARAM("/DefaultColor"));
+            const ::rtl::OUString sColor("/Color");
+            const ::rtl::OUString sDefaultColor("/DefaultColor");
             lcl_addString(aColorNames,sColor);
             lcl_addString(aDefaultColorNames,sDefaultColor);
             uno::Sequence< uno::Any > aColors = GetProperties( aColorNames );
@@ -416,10 +416,10 @@ void ExtendedColorConfig_Impl::Commit()
 {
     if ( m_sLoadedScheme.isEmpty() )
         return;
-    const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("Entries"));
-    const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color"));
-    ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/"));
-    const ::rtl::OUString s_sSep(RTL_CONSTASCII_USTRINGPARAM("/"));
+    const ::rtl::OUString sColorEntries("Entries");
+    const ::rtl::OUString sColor("/Color");
+    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes/");
+    const ::rtl::OUString s_sSep("/");
     sBase += m_sLoadedScheme;
 
     TComponents::iterator aIter = m_aConfigValues.begin();
@@ -450,7 +450,7 @@ void ExtendedColorConfig_Impl::Commit()
                 pPropValues->Value <<= aConIter->second.getColor();
                 // the default color will never be changed
             }
-            ::rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes"));
+            ::rtl::OUString s("ExtendedColorScheme/ColorSchemes");
             SetSetProperties(s, aPropValues);
         }
     }
@@ -470,7 +470,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
 // -----------------------------------------------------------------------------
 sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName)
 {
-    ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes"));
+    ::rtl::OUString sBase("ExtendedColorScheme/ColorSchemes");
 
     uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase);
     sBase += ::rtl::OUString("/") + _sSchemeName;
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 4c8ea3f38ed7..f5a9d053eaa7 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -263,10 +263,10 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
 void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
 {
     // the ignore counters for the help agent URLs
-    const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
-    const ::rtl::OUString sPathSeparator(      RTL_CONSTASCII_USTRINGPARAM( "/" ));
-    const ::rtl::OUString sURLLocalPath(       RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
-    const ::rtl::OUString sCounterLocalPath(   RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
+    const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
+    const ::rtl::OUString sPathSeparator( "/" );
+    const ::rtl::OUString sURLLocalPath( "/Name" );
+    const ::rtl::OUString sCounterLocalPath( "/Counter" );
 
     // get the names of all the nodes containing ignore counters
     // collect the node names we have to ask
@@ -323,10 +323,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
 {
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
 
-    const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
-    const ::rtl::OUString sPathSeparator(      RTL_CONSTASCII_USTRINGPARAM( "/" ));
-    const ::rtl::OUString sURLLocalPath(       RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
-    const ::rtl::OUString sCounterLocalPath(   RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
+    const ::rtl::OUString sIgnoreListNodePath( "HelpAgent/IgnoreList" );
+    const ::rtl::OUString sPathSeparator( "/" );
+    const ::rtl::OUString sURLLocalPath( "/Name" );
+    const ::rtl::OUString sCounterLocalPath( "/Counter" );
 
     // get the current URL/counter pairs (as they're persistent at the moment)
     Sequence< ::rtl::OUString > aNodeNames;
@@ -410,7 +410,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
     ::rtl::OUString sNewNodeName;
     Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
     Sequence< Any >             aNewCounterDataValues(2);
-    const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+    const ::rtl::OUString sNodeNameBase( "URL" );
     for (   ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
             aCollectNew != aURLIgnoreCounters.end();
             ++aCollectNew
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 25b1269270fa..8213006459ea 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -986,7 +986,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
 
     try
     {
-        OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
+        OUString aPropName( "Title" );
         bool canRename = true;
         ::ucbhelper::Content aContent( aURL, mxCmdEnv, comphelper::getProcessComponentContext() );
 
@@ -2115,8 +2115,8 @@ void SvtFileView_Impl::implEnumerationSuccess()
 // -----------------------------------------------------------------------
 void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue )
 {
-    OUString aTab(       RTL_CONSTASCII_USTRINGPARAM( "\t" ));
-    OUString aTabString( RTL_CONSTASCII_USTRINGPARAM( "%09" ));
+    OUString aTab( "\t" );
+    OUString aTabString( "%09" );
     sal_Int32 iPos;
 
     while ( ( iPos = aValue.indexOf( aTab ) ) >= 0 )
@@ -2129,8 +2129,8 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
     ::osl::MutexGuard aGuard( maMutex );
 
     OUString aValue;
-    OUString aTab(     RTL_CONSTASCII_USTRINGPARAM( "\t" ));
-    OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " ));
+    OUString aTab( "\t" );
+    OUString aDateSep( ", " );
 
     std::vector< SortingData_Impl* >::iterator aIt;
 
@@ -2180,7 +2180,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
-    OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" ));
+    OUString aTab( "\t" );
 
     sal_uInt32 nCount = (sal_uInt32) rList.getLength();
 
@@ -2466,8 +2466,8 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r
     pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
 
     OUString aValue;
-    OUString aTab(     RTL_CONSTASCII_USTRINGPARAM( "\t" ));
-    OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " ));
+    OUString aTab( "\t" );
+    OUString aDateSep( ", " );
 
     // title, type, size, date
     aValue = pData->GetTitle();
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 10c7c5056b34..7628d36e7871 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -193,7 +193,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
     mbAllSel                = sal_False;
     mbDropPos               = sal_False;
 
-    ::rtl::OUString aGregorian( RTL_CONSTASCII_USTRINGPARAM( "gregorian"));
+    ::rtl::OUString aGregorian( "gregorian");
     maCalendarWrapper.loadCalendar( aGregorian,
             Application::GetAppLocaleDataWrapper().getLanguageTag().getLocale());
     if (maCalendarWrapper.getUniqueID() != aGregorian)
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 639ddfe8dca9..74984e68b55e 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -346,7 +346,7 @@ void AssignmentPersistentData::Commit()
         ::rtl::OUString sAssignment;
         if (hasFieldAssignment(_rLogicalName))
         {
-            ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/"));
+            ::rtl::OUString sFieldPath("Fields/");
             sFieldPath += _rLogicalName;
             sFieldPath += ::rtl::OUString("/AssignedFieldName");
             sAssignment = getStringProperty(sFieldPath);
@@ -417,7 +417,7 @@ void AssignmentPersistentData::Commit()
         }
 
         // Fields
-        ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields"));
+        ::rtl::OUString sDescriptionNodePath("Fields");
 
         // Fields/<field>
         ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath);
@@ -449,7 +449,7 @@ void AssignmentPersistentData::Commit()
             // nothing to do
             return;
 
-        ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields"));
+        ::rtl::OUString sDescriptionNodePath("Fields");
         Sequence< ::rtl::OUString > aNames(&_rLogicalName, 1);
         ClearNodeElements(sDescriptionNodePath, aNames);
     }
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 92c64ff6f177..38e738e1a102 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -76,7 +76,7 @@ short SvColorDialog::Execute()
     short ret = 0;
     try
     {
-        const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
+        const OUString sColor( "Color" );
         Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
 
         Reference< com::sun::star::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) );
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 29078cc949dd..b268cc4b2a3e 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -105,7 +105,7 @@ void SvObjectServerList::FillInsertObjects()
         uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory =
             configuration::theDefaultProvider::get(xContext);
 
-        ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
+        ::rtl::OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" );
         uno::Sequence< uno::Any > aArguments( 1 );
         beans::PropertyValue aPathProp;
         aPathProp.Name = ::rtl::OUString( "nodepath" );
@@ -121,10 +121,10 @@ void SvObjectServerList::FillInsertObjects()
             uno::Sequence< ::rtl::OUString > seqNames= xNameAccess->getElementNames();
             sal_Int32 nInd;
 
-            ::rtl::OUString aStringProductName( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" ) );
+            ::rtl::OUString aStringProductName( "%PRODUCTNAME" );
             sal_Int32 nStringProductNameLength = aStringProductName.getLength();
 
-            ::rtl::OUString aStringProductVersion( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" ) );
+            ::rtl::OUString aStringProductVersion( "%PRODUCTVERSION" );
             sal_Int32 nStringProductVersionLength = aStringProductVersion.getLength();
 
             for( nInd = 0; nInd < seqNames.getLength(); nInd++ )
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index b8942d56ba12..b3b81b4bbb49 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -370,7 +370,7 @@ awt::Size ExportDialog::GetOriginalSize()
             aTransformation.m11 = aViewTransformation.get(1,1);
             aTransformation.m12 = aViewTransformation.get(1,2);
 
-            const OUString sViewTransformation( RTL_CONSTASCII_USTRINGPARAM( "ViewTransformation" ) );
+            const OUString sViewTransformation( "ViewTransformation" );
             uno::Sequence< beans::PropertyValue > aViewInformation( 1 );
             aViewInformation[ 0 ].Value <<= aTransformation;
             aViewInformation[ 0 ].Name  = sViewTransformation;
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 52f8b52baaaa..cba578609be9 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1148,7 +1148,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
 void
 GraphicObject::InspectForGraphicObjectImageURL( const Reference< XInterface >& xIf,  std::vector< rtl::OUString >& rvEmbedImgUrls )
 {
-    static rtl::OUString sImageURL(RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ) );
+    static rtl::OUString sImageURL( "ImageURL" );
     Reference< XPropertySet > xProps( xIf, UNO_QUERY );
     if ( xProps.is() )
     {
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index da76739afc95..4057f6a5180d 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -252,7 +252,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::getSupportedServiceNa
 // --------------------------------------------------------
 uno::Sequence< ::rtl::OUString > SAL_CALL ODocumentCloser::impl_staticGetSupportedServiceNames()
 {
-    const rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.DocumentCloser" ) );
+    const rtl::OUString aServiceName( "com.sun.star.embed.DocumentCloser" );
     return uno::Sequence< rtl::OUString >( &aServiceName, 1 );
 }
 
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index 217272d24477..bdba8a91b9da 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
 bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
 {
     bool bRes = false;
-    const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
+    const static rtl::OUString sNamedRanges("NamedRanges");
     uno::Reference< sheet::XCellRangeReferrer > xReferrer;
     try
     {
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 4caf4fb0f663..9dfb5208eeaf 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -105,7 +105,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
                         if ( xPers.is() )
                         {
                             uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage();
-                            ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ));
+                            ::rtl::OUString aName( "Dummy" );
                             SvStream* pStream = NULL;
                             sal_Bool bDeleteStream = sal_False;
                             uno::Sequence < beans::PropertyValue > aEmpty;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 8b8990903f05..38a273d8e46a 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -222,14 +222,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
 
         if( xMimeType.is() )
         {
-            const ::rtl::OUString aClassNameString(RTL_CONSTASCII_USTRINGPARAM( "classname" ));
-            const ::rtl::OUString aTypeNameString(RTL_CONSTASCII_USTRINGPARAM( "typename" ));
-            const ::rtl::OUString aDisplayNameString(RTL_CONSTASCII_USTRINGPARAM( "displayname" ));
-            const ::rtl::OUString aViewAspectString(RTL_CONSTASCII_USTRINGPARAM( "viewaspect" ));
-            const ::rtl::OUString aWidthString(RTL_CONSTASCII_USTRINGPARAM( "width" ));
-            const ::rtl::OUString aHeightString(RTL_CONSTASCII_USTRINGPARAM( "height" ));
-            const ::rtl::OUString aPosXString(RTL_CONSTASCII_USTRINGPARAM( "posx" ));
-            const ::rtl::OUString aPosYString(RTL_CONSTASCII_USTRINGPARAM( "posy" ));
+            const ::rtl::OUString aClassNameString( "classname" );
+            const ::rtl::OUString aTypeNameString( "typename" );
+            const ::rtl::OUString aDisplayNameString( "displayname" );
+            const ::rtl::OUString aViewAspectString( "viewaspect" );
+            const ::rtl::OUString aWidthString( "width" );
+            const ::rtl::OUString aHeightString( "height" );
+            const ::rtl::OUString aPosXString( "posx" );
+            const ::rtl::OUString aPosYString( "posy" );
 
             if( xMimeType->hasParameter( aClassNameString ) )
             {
@@ -1345,7 +1345,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
         Reference< XComponentContext >          xContext( ::comphelper::getProcessComponentContext() );
         Reference< XMimeContentTypeFactory >    xMimeFact = MimeContentTypeFactory::create( xContext );
         DataFlavorEx                            aFlavorEx;
-        const ::rtl::OUString                   aCharsetStr(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
+        const ::rtl::OUString                   aCharsetStr( "charset" );
 
 
         for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ )
@@ -2279,7 +2279,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
                 if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
                 {
                     // special handling for text/plain media types
-                    const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
+                    const ::rtl::OUString aCharsetString( "charset" );
 
                     if( !xRequestType2->hasParameter( aCharsetString ) ||
                         xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ||
@@ -2291,7 +2291,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
                 else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) )
                 {
                     // special handling for application/x-openoffice media types
-                    const ::rtl::OUString aFormatString(RTL_CONSTASCII_USTRINGPARAM( "windows_formatname" ));
+                    const ::rtl::OUString aFormatString( "windows_formatname" );
 
                     if( xRequestType1->hasParameter( aFormatString ) &&
                         xRequestType2->hasParameter( aFormatString ) &&
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index e268ddf5ada2..4b1ba9410842 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -157,7 +157,7 @@ bool StateEventHelper::isCommandEnabled()
         SolarMutexGuard aSolarGuard;
         if ( m_xDispatchProvider.is() && m_xURLTransformer.is() )
         {
-            ::rtl::OUString aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" ));
+            ::rtl::OUString aSelf( "_self" );
 
             aTargetURL.Complete = m_aCommandURL;
             m_xURLTransformer->parseStrict( aTargetURL );
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 0469e928c3c3..140f37aa4060 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -317,7 +317,7 @@ throw( ::com::sun::star::uno::RuntimeException )
     // Just use the main part of the URL for popup menu controllers
     sal_Int32     nQueryPart( 0 );
     sal_Int32     nSchemePart( 0 );
-    rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" ));
+    rtl::OUString aMainURL( "vnd.sun.star.popup:" );
 
     nSchemePart = aURL.indexOf( ':' );
     if (( nSchemePart > 0 ) &&
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 8fa36eb35faf..a3272144fa68 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -741,7 +741,7 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& Service
 Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames(  )
     throw(RuntimeException)
 {
-    const ::rtl::OUString aSN( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.image.ImageMap" ) );
+    const ::rtl::OUString aSN( "com.sun.star.image.ImageMap" );
     return Sequence< ::rtl::OUString >( &aSN, 1 );
 }