targeted string re-work

Change-Id: I103e7171a5a523c388af14ec453299990c99c8c1

7 files changed, 65 insertions, 65 deletions

diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index d0fe61ebe5f3..ae648c1c877e 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -402,7 +402,7 @@ String impl_getFilter( const String& _rURL )
     {
         css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
+                ::rtl::OUString("com.sun.star.document.TypeDetection") ),
                 css::uno::UNO_QUERY );
         if ( xTypeDetection.is() )
         {
@@ -419,7 +419,7 @@ String impl_getFilter( const String& _rURL )
                 {
                     ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
                     sFilter = lTypeProps.getUnpackedValueOrDefault(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString() );
+                        ::rtl::OUString("PreferredFilter"), ::rtl::OUString() );
                 }
             }
         }
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 3bb6497b6678..fbb253e3b84b 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -386,7 +386,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
     SfxFilterFlags nMust,
     SfxFilterFlags nDont ) const
 {
-    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
+    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY );
     ::rtl::OUString sTypeName;
     try
     {
@@ -421,7 +421,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
     const SfxFilter* pOldFilter = *ppFilter;
 
     // no detection service -> nothing to do !
-    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
+    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY );
     if (!xDetection.is())
         return ERRCODE_ABORT;
 
@@ -467,7 +467,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
             // The DocumentService property is only a preselection, and all preselections are considered as optional!
             // This "wrong" type will be sorted out now because we match only allowed filters to the detected type
             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1);
-            lQuery[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+            lQuery[0].Name = ::rtl::OUString("Name");
             lQuery[0].Value <<= sTypeName;
 
             const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
@@ -610,7 +610,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
             ::rtl::OUString aValue;
 
             // try to get the preferred filter (works without loading all filters!)
-            if ( (aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"))] >>= aValue) && !aValue.isEmpty() )
+            if ( (aProps[::rtl::OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() )
             {
                 const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue );
                 if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) )
@@ -625,7 +625,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
                     {
                         // preferred filter belongs to another document type; now we must search the filter
                         m_rImpl.InitForIterating();
-                        aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] >>= aValue;
+                        aProps[::rtl::OUString("Name")] >>= aValue;
                         pFilter = GetFilter4EA( aValue, nMust, nDont );
                         if ( pFilter )
                             return pFilter;
@@ -658,7 +658,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMedia
     }
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+    aSeq[0].Name = ::rtl::OUString("MediaType");
     aSeq[0].Value <<= rMediaType;
     return GetFilterForProps( aSeq, nMust, nDont );
 }
@@ -687,7 +687,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl
     }
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+    aSeq[0].Name = ::rtl::OUString("Name");
     aSeq[0].Value <<= ::rtl::OUString( rType );
     return GetFilterForProps( aSeq, nMust, nDont );
 }
@@ -726,7 +726,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
         sExt.Erase(0,1);
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions"));
+    aSeq[0].Name = ::rtl::OUString("Extensions");
     ::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1);
     aExts[0] = sExt;
     aSeq[0].Value <<= aExts;
@@ -740,7 +740,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
     ::rtl::OUString aName = SotExchange::GetFormatName( nId );
-    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClipboardFormat"));
+    aSeq[0].Name = ::rtl::OUString("ClipboardFormat");
     aSeq[0].Value <<= aName;
     return GetFilterForProps( aSeq, nMust, nDont );
 }
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 300eac3aed9c..bcb60dac94b5 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -147,7 +147,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
 
     // Who we are
     String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
-    ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+    ::rtl::OUString os( "$_OS" );
     ::rtl::Bootstrap::expandMacros(os);
     sGenerator.SearchAndReplaceAscii( "%1", os );
     OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
@@ -227,7 +227,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
 
         uno::Reference < script::XTypeConverter > xConverter(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
+                ::rtl::OUString("com.sun.star.script.Converter")),
                 uno::UNO_QUERY_THROW );
         uno::Reference<beans::XPropertySet> xUserDefinedProps(
             i_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -267,7 +267,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
     {
         rtl::OStringBuffer sOut;
         ::rtl::OUString aStr;
-        uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
+        uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
         if ( (aAny >>= aStr) && !aStr.isEmpty() )
         {
             String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI );
@@ -283,7 +283,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
             }
         }
 
-        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
+        aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName") );
         if ( (aAny >>= aStr) && !aStr.isEmpty() )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
@@ -294,13 +294,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         }
 
         sal_Int32 nVal = SIZE_NOT_SET;
-        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
+        aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") );
         if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth)
                 .append('=').append(nVal);
         }
-        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
+        aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") );
         if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight)
@@ -308,10 +308,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         }
 
         sal_Bool bVal = sal_True;
-        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")) );
+        aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll") );
         if ( (aAny >>= bVal) && !bVal )
         {
-            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) );
+            aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") );
             if ( aAny >>= bVal )
             {
                 const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
@@ -321,10 +321,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         }
 
         // frame border (MS+Netscape-Extension)
-        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) );
+        aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") );
         if ( (aAny >>= bVal) && !bVal )
         {
-            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) );
+            aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") );
             if ( aAny >>= bVal )
             {
                 const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 4f693a1bb269..fd2e6fee2c71 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -169,17 +169,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
             uno::Sequence < beans::PropertyValue > aProperties(3);
             beans::PropertyValue *pValues = aProperties.getArray();
 
-            ::rtl::OUString aType(RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
+            ::rtl::OUString aType(STAR_BASIC );
             ::rtl::OUString aLib  = pMacro->GetLibName();
             ::rtl::OUString aMacro = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+            pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
             pValues[ 0 ].Value <<= aType;
 
-            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
+            pValues[ 1 ].Name = ::rtl::OUString(PROP_LIBRARY );
             pValues[ 1 ].Value <<= aLib;
 
-            pValues[ 2 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+            pValues[ 2 ].Name = ::rtl::OUString(PROP_MACRO_NAME );
             pValues[ 2 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -192,10 +192,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
             ::rtl::OUString aLib   = pMacro->GetLibName();
             ::rtl::OUString aMacro = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+            pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
             pValues[ 0 ].Value <<= aLib;
 
-            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
+            pValues[ 1 ].Name = ::rtl::OUString(PROP_SCRIPT );
             pValues[ 1 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -207,10 +207,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
 
             ::rtl::OUString aMacro  = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
-            pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
+            pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
+            pValues[ 0 ].Value <<= ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
 
-            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+            pValues[ 1 ].Name = ::rtl::OUString(PROP_MACRO_NAME );
             pValues[ 1 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -241,7 +241,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
     {
         xSupplier = uno::Reference < document::XEventsSupplier >
                 ( ::comphelper::getProcessServiceFactory()->createInstance(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), uno::UNO_QUERY );
+                rtl::OUString("com.sun.star.frame.GlobalEventBroadcaster")), uno::UNO_QUERY );
     }
 
     if ( xSupplier.is() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 0fcc340bdbd2..fe35177e86b2 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -124,7 +124,7 @@ using namespace ::cppu;
 
 #define IODLG_CONFIGNAME        String(DEFINE_CONST_UNICODE("FilePicker_Save"))
 #define IMPGRF_CONFIGNAME       String(DEFINE_CONST_UNICODE("FilePicker_Graph"))
-#define USERITEM_NAME           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserItem" ))
+#define USERITEM_NAME           ::rtl::OUString("UserItem" )
 
 //-----------------------------------------------------------------------------
 
@@ -133,9 +133,9 @@ namespace sfx2
 
 const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
 {
-    static const OUString aSD_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SdExportLastFilter" ) );
-    static const OUString aSI_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SiExportLastFilter" ) );
-    static const OUString aSW_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SwExportLastFilter" ) );
+    static const OUString aSD_EXPORT_IDENTIFIER( "SdExportLastFilter"  );
+    static const OUString aSI_EXPORT_IDENTIFIER( "SiExportLastFilter"  );
+    static const OUString aSW_EXPORT_IDENTIFIER( "SwExportLastFilter"  );
 
     const OUString* pRet = NULL;
 
@@ -491,7 +491,7 @@ void FileDialogHelper_Impl::updateExportButton()
     uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY );
     if ( xCtrlAccess.is() )
     {
-        OUString sEllipses( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+        OUString sEllipses( "..."  );
         OUString sOldLabel( xCtrlAccess->getLabel( CommonFilePickerElementIds::PUSHBUTTON_OK ) );
 
         // initialize button label; we need the label with the mnemonic char
@@ -507,7 +507,7 @@ void FileDialogHelper_Impl::updateExportButton()
         OUString sLabel = maButtonLabel;
         // filter with options -> append ellipses on export button label
         if ( CheckFilterOptionsCapability( getCurentSfxFilter() ) )
-            sLabel += OUString( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+            sLabel += OUString( "..."  );
 
         if ( sOldLabel != sLabel )
         {
@@ -1072,26 +1072,26 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
         else
         {
             aInitArguments[0] <<= NamedValue(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateDescription" ) ),
+                                    ::rtl::OUString( "TemplateDescription"  ),
                                     makeAny( nTemplateDescription )
                                 );
 
             ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir );
 
             aInitArguments[1] <<= NamedValue(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ),
+                                    ::rtl::OUString( "StandardDir"  ),
                                     makeAny( sStandardDirTemp )
                                 );
 
             aInitArguments[2] <<= NamedValue(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BlackList" ) ),
+                                    ::rtl::OUString( "BlackList"  ),
                                     makeAny( rBlackList )
                                 );
 
 
             if ( mpPreferredParentWindow )
                 aInitArguments[3] <<= NamedValue(
-                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),
+                                        ::rtl::OUString( "ParentWindow"  ),
                                         makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) )
                                     );
         }
@@ -1208,7 +1208,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
     // forward these ids to the file picker
     try
     {
-        const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) );
+        const ::rtl::OUString sHelpIdPrefix( INET_HID_SCHEME  );
         // the ids for the single controls
         uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY );
         if ( xControlAccess.is() )
@@ -1799,7 +1799,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
 
     uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
     uno::Reference< XContainerQuery > xFilterCont(
-        xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))),
+        xSMGR->createInstance(::rtl::OUString("com.sun.star.document.FilterFactory")),
         UNO_QUERY);
     if ( ! xFilterCont.is() )
         return;
@@ -2328,9 +2328,9 @@ FileDialogHelper::FileDialogHelper(
     if ( aExtName.indexOf( (sal_Unicode)'*' ) != 0 )
     {
         if ( !aExtName.isEmpty() && aExtName.indexOf( (sal_Unicode)'.' ) != 0 )
-            aWildcard = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+            aWildcard = ::rtl::OUString( "*."  );
         else
-            aWildcard = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) );
+            aWildcard = ::rtl::OUString( "*"  );
     }
 
     aWildcard += aExtName;
@@ -2695,7 +2695,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
 
 ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet)
 {
-    uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
+    uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
     if( xInteractionHandler.is() )
     {
         // TODO: need a save way to distinguish MS filters from other filters
@@ -2723,8 +2723,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf
                     if ( aEncryptionKey.getLength() )
                     {
                         ::comphelper::SequenceAsHashMap aHashData;
-                        aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= aEncryptionKey;
-                        aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= aUniqueID;
+                        aHashData[ ::rtl::OUString( "STD97EncryptionKey"  ) ] <<= aEncryptionKey;
+                        aHashData[ ::rtl::OUString( "STD97UniqueID"  ) ] <<= aUniqueID;
 
                         pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) );
                     }
@@ -2743,7 +2743,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf
             if ( bMSType )
             {
                 // the empty password has 0 as Hash
-                sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pCurrentFilter->GetServiceName() ) );
+                sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument"  ).equals( pCurrentFilter->GetServiceName() ) );
                 if ( nHash )
                     pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( nHash ) ) );
             }
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index e91c512e6868..770149f1d52a 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -162,8 +162,8 @@ namespace sfx2
     void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const ::rtl::OUString& _rLogicalClassName,
         FilterClass& /* [out] */ _rClass )
     {
-        static const ::rtl::OUString sDisplaNameNodeName( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" ) );
-        static const ::rtl::OUString sSubFiltersNodeName( RTL_CONSTASCII_USTRINGPARAM( "Filters" ) );
+        static const ::rtl::OUString sDisplaNameNodeName( "DisplayName"  );
+        static const ::rtl::OUString sSubFiltersNodeName( "Filters"  );
 
             // the description node for the current class
         OConfigurationNode aClassDesc = _rClassesNode.openNode( _rLogicalClassName );
@@ -885,7 +885,7 @@ namespace sfx2
         {
             ::comphelper::SequenceAsHashMap lFilterProps (xFilterList->nextElement());
             ::rtl::OUString                 sFilterName  = lFilterProps.getUnpackedValueOrDefault(
-                                                             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
+                                                             ::rtl::OUString("Name"),
                                                              ::rtl::OUString());
             if (!sFilterName.isEmpty())
                 m_lFilters.push_back(sFilterName);
@@ -1187,9 +1187,9 @@ namespace sfx2
                                   const ::rtl::OUString& _rExtension,
                                   sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl )
     {
-        static ::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
-        static ::rtl::OUString sOpenBracket( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
-        static ::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+        static ::rtl::OUString sAllFilter( "(*.*)" );
+        static ::rtl::OUString sOpenBracket( " ("  );
+        static ::rtl::OUString sCloseBracket( ")" );
         ::rtl::OUString sRet = _rDisplayText;
 
         if ( sRet.indexOf( sAllFilter ) == -1 )
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 645f3d3de7cd..039f03dbd3d9 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -242,8 +242,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
                 ::com::sun::star::uno::Reference
                     < ::com::sun::star::util::XURLTransformer > xTrans(
                         ::comphelper::getProcessServiceFactory()->createInstance(
-                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                "com.sun.star.util.URLTransformer" )) ),
+                            rtl::OUString(
+                                "com.sun.star.util.URLTransformer" ) ),
                         UNO_QUERY );
 
                 ::com::sun::star::util::URL aURL;
@@ -264,8 +264,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
                     xProv = ::com::sun::star::uno::Reference
                         < ::com::sun::star::frame::XDispatchProvider > (
                             ::comphelper::getProcessServiceFactory()->createInstance(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                    "com.sun.star.frame.Desktop" )) ),
+                                rtl::OUString(
+                                    "com.sun.star.frame.Desktop" ) ),
                             UNO_QUERY );
                 }
 
@@ -484,13 +484,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
         }
         else if ( !aMacroName.isEmpty() )
         {
-            aScript = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
+            aScript = rtl::OUString( MACRO_PRFIX  );
             if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
                 aScript += String('.');
 
             aScript += String('/');
             aScript += aMacroName;
-            aScript += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) );
+            aScript += rtl::OUString( MACRO_POSTFIX  );
         }
         else
             // wrong properties
@@ -549,7 +549,7 @@ css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement()
     ::osl::ResettableMutexGuard aLock(m_aLock);
     if (m_pEnumerationIt == m_lModels.end())
         throw css::container::NoSuchElementException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("End of model enumeration reached.")),
+                    ::rtl::OUString("End of model enumeration reached."),
                     static_cast< css::container::XEnumeration* >(this));
     css::uno::Reference< css::frame::XModel > xModel(*m_pEnumerationIt, UNO_QUERY);
     ++m_pEnumerationIt;
@@ -575,7 +575,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference
     pImp                   = new GlobalEventConfig();
     m_xEvents              = pImp;
     m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >(
-                        xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.JobExecutor"))),
+                        xSMGR->createInstance(::rtl::OUString("com.sun.star.task.JobExecutor")),
                         UNO_QUERY);
     m_refCount--;
 }
@@ -698,7 +698,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const css::uno::Any& aElement )
     aElement >>= xDoc;
     if (!xDoc.is())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
+                ::rtl::OUString("Cant locate at least the model parameter."),
                 static_cast< css::container::XSet* >(this),
                 0);
 
@@ -735,7 +735,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const css::uno::Any& aElement )
     aElement >>= xDoc;
     if (!xDoc.is())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
+                ::rtl::OUString("Cant locate at least the model parameter."),
                 static_cast< css::container::XSet* >(this),
                 0);