targeted string re-work

Change-Id: I33d07b10cd862d601604a557382a4ab66f67a1fd

5 files changed, 55 insertions, 55 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 007c079ee306..498cdfcc365c 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -435,8 +435,8 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
 
     sal_Bool bSameLetterHeights = sal_False;
     SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
-    const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
-    const rtl::OUString sSameLetterHeights( RTL_CONSTASCII_USTRINGPARAM ( "SameLetterHeights" ) );
+    const rtl::OUString sTextPath( "TextPath"  );
+    const rtl::OUString sSameLetterHeights( "SameLetterHeights"  );
     com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights );
     if ( pAny )
         *pAny >>= bSameLetterHeights;
@@ -839,7 +839,7 @@ Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator
     if ( !mxBreakIterator.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
+        Reference < XInterface > xI = xMSF->createInstance( rtl::OUString("com.sun.star.i18n.BreakIterator") );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index e098381db132..4c0c96ab1eff 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -553,7 +553,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
     aNew.RecoveryState = E_NOT_RECOVERED_YET;
 
     // patch DisplayName! Because the document title contain more then the file name ...
-    sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")));
+    sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString(" - "));
     if (i > 0)
         aNew.DisplayName = aNew.DisplayName.copy(0, i);
 
@@ -1030,9 +1030,9 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
 
     FreeResource();
 
-    ::rtl::OUString CFG_PACKAGE_RECOVERY( RTL_CONSTASCII_USTRINGPARAM  ( "org.openoffice.Office.Recovery/" ));
-    ::rtl::OUString CFG_PATH_CRASHREPORTER( RTL_CONSTASCII_USTRINGPARAM( "CrashReporter"                 ));
-    ::rtl::OUString CFG_ENTRY_ENABLED( RTL_CONSTASCII_USTRINGPARAM     ( "Enabled"                       ));
+    ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/" );
+    ::rtl::OUString CFG_PATH_CRASHREPORTER( "CrashReporter"                 );
+    ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled"                       );
 
     sal_Bool bCrashRepEnabled( sal_False );
     css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
@@ -1995,16 +1995,16 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
 
 #if defined(WNT)
-            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
+            OUString    ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
 #elif defined( MACOSX )
-            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
+            OUString    ustrValue = OUString("~");
 #else
-            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
+            OUString    ustrValue = OUString("$SYSUSERCONFIG");
 #endif
             Bootstrap::expandMacros( ustrValue );
 
 #if defined(WNT)
-            ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
+            ustrValue += OUString("/user/crashdata");
 #endif
             return ustrValue;
         }
@@ -2019,8 +2019,8 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
             ::rtl::OUString aURL = GetCrashConfigDir();
 
-            aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-            aURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PRVFILE ) );
+            aURL += ::rtl::OUString( "/"  );
+            aURL += ::rtl::OUString( PRVFILE  );
 
             return aURL;
         }
@@ -2078,7 +2078,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             String  aPreview = LoadCrashFile( GetPreviewURL() );
             ErrorRepSendDialog *pMainDlg = (ErrorRepSendDialog *)_pParent;
 
-            String aSeperator = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\r\n\r\n================\r\n\r\n" ) );
+            String aSeperator = ::rtl::OUString( "\r\n\r\n================\r\n\r\n"  );
 
             String aContent = pMainDlg->GetDocType();
             if ( aContent.Len() > 0 )
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 6e2c2bd251bc..de0e9c7283eb 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -256,7 +256,7 @@ void FontPrevWin_Impl::_CheckScript()
     {
         Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
         xBreak = Reference< XBreakIterator >(xMSF->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),UNO_QUERY);
+                ::rtl::OUString("com.sun.star.i18n.BreakIterator") ),UNO_QUERY);
     }
     if( xBreak.is() )
     {
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 9326e6ae868d..f3daa69e0656 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -387,8 +387,8 @@ namespace
         Sequence< Type> aModelListeners;
         Sequence< Type> aControlListeners;
 
-        Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
-        Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
+        Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.beans.Introspection")), UNO_QUERY);
+        Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.beans.Introspection")), UNO_QUERY);
 
         if (xModelIntrospection.is() && xModel.is())
         {
@@ -523,8 +523,8 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
         {
             switch ( (TriState)xCheckBox->getState() )
             {
-                case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0" )); break;
-                case STATE_CHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "1" )); break;
+                case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString("0" ); break;
+                case STATE_CHECK: *_pCurrentText = ::rtl::OUString("1" ); break;
                 default: *_pCurrentText = ::rtl::OUString(); break;
             }
         }
@@ -651,7 +651,7 @@ DBG_NAME(FmXFormShell);
 //------------------------------------------------------------------------
 FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         :FmXFormShell_BASE(m_aMutex)
-        ,FmXFormShell_CFGBASE(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Misc")), CONFIG_MODE_DELAYED_UPDATE)
+        ,FmXFormShell_CFGBASE(::rtl::OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
         ,m_eNavigate( NavigationBarMode_NONE )
         ,m_nInvalidationEvent( 0 )
         ,m_nActivationEvent( 0 )
@@ -689,7 +689,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
     implAdjustConfigCache();
     // and register for changes on this settings
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
+    aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
     EnableNotification(aNames);
 }
 
@@ -1485,11 +1485,11 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
     {
         Sequence< Any > aDialogArgs( 3 );
         aDialogArgs[0] <<= NamedValue(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TabbingModel" ) ),
+            ::rtl::OUString( "TabbingModel"  ),
             makeAny( _rxForForm )
         );
         aDialogArgs[1] <<= NamedValue(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) ),
+            ::rtl::OUString( "ControlContext"  ),
             makeAny( getControlContainerForView() )
         );
 
@@ -1497,13 +1497,13 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
         if ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() )
             xParentWindow = VCLUnoHelper::GetInterface ( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow() );
         aDialogArgs[2] <<= NamedValue(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),
+            ::rtl::OUString( "ParentWindow"  ),
             makeAny( xParentWindow )
         );
 
         Reference< dialogs::XExecutableDialog > xDialog(
             ::comphelper::getProcessServiceFactory()->createInstanceWithArguments(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.ui.TabOrderDialog" ) ),
+                ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog"  ),
                 aDialogArgs
             ),
             UNO_QUERY
@@ -1691,7 +1691,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
         {
             try
             {
-                Any aVal( xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart"))) );
+                Any aVal( xSet->getPropertyValue(::rtl::OUString("TwoDigitDateStart")) );
                 aVal >>= n;
                 return sal_True;
             }
@@ -1724,7 +1724,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
+                    xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal);
                 }
                 catch(Exception&)
                 {
@@ -1765,7 +1765,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
+                    xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal);
                 }
                 catch(Exception&)
                 {
@@ -3044,7 +3044,7 @@ void FmXFormShell::startFiltering()
         {
             Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
             if (xModeSelector.is())
-                xModeSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) );
+                xModeSelector->setMode( ::rtl::OUString( "FilterMode"  ) );
         }
     }
 
@@ -3150,7 +3150,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
 
             Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
             if (xModeSelector.is())
-                xModeSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) );
+                xModeSelector->setMode( ::rtl::OUString( "DataMode"  ) );
         }
         if (bSave)  // execute the filter
         {
@@ -3206,7 +3206,7 @@ void FmXFormShell::CreateExternalView()
     // the frame the external view is displayed in
     sal_Bool bAlreadyExistent = m_xExternalViewController.is();
     Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame;
-    ::rtl::OUString sFrameName(RTL_CONSTASCII_USTRINGPARAM("_beamer"));
+    ::rtl::OUString sFrameName("_beamer");
     sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
 
     Reference< runtime::XFormController > xCurrentNavController( getNavController());
@@ -3476,7 +3476,7 @@ void FmXFormShell::CreateExternalView()
                 aColumnProps.realloc(pColumnProps - aColumnProps.getArray());
 
                 // columns props are a dispatch argument
-                pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
+                pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.*
                 pDispatchArgs->Value = makeAny(aColumnProps);
                 ++pDispatchArgs;
                 DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3563,7 +3563,7 @@ void FmXFormShell::CreateExternalView()
                 ++pDispatchArgs;
 
                 // the
-                pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
+                pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.*
                 pDispatchArgs->Value = makeAny(aListBoxDescription);
                 ++pDispatchArgs;
                 DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3614,7 +3614,7 @@ void FmXFormShell::implAdjustConfigCache()
 {
     // get (cache) the wizard usage flag
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
+    aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
     Sequence< Any > aFlags = GetProperties(aNames);
     if (1 == aFlags.getLength())
         m_bUseWizards = ::cppu::any2bool(aFlags[0]);
@@ -3646,7 +3646,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
     m_bUseWizards = _bUseThem;
 
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
+    aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
     Sequence< Any > aValues(1);
     aValues[0] = ::cppu::bool2any(m_bUseWizards);
     PutProperties(aNames, aValues);
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 7d0f8d7c5c5a..374bb29b54d3 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -484,7 +484,7 @@ public:
     {
     }
 
-    virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));}
+    virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString("Edit");}
     virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException );
 
 protected:
@@ -569,7 +569,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB
                   ,m_aFilterListeners(m_aMutex)
                   ,m_pControlBorderManager( new ::svxform::ControlBorderManager )
                   ,m_xFormOperations()
-                  ,m_aMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) )
+                  ,m_aMode( ::rtl::OUString( "DataMode"  ) )
                   ,m_aLoadEvent( LINK( this, FormController, OnLoad ) )
                   ,m_aToggleEvent( LINK( this, FormController, OnToggleAutoFields ) )
                   ,m_aActivationEvent( LINK( this, FormController, OnActivated ) )
@@ -715,7 +715,7 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.FormController"));
+    return ::rtl::OUString("org.openoffice.comp.svx.FormController");
 }
 
 //------------------------------------------------------------------------------
@@ -724,7 +724,7 @@ Sequence< ::rtl::OUString> SAL_CALL FormController::getSupportedServiceNames(voi
     // service names which are supported only, but cannot be used to created an
     // instance at a service factory
     Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 );
-    aNonCreatableServiceNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormControllerDispatcher" ) );
+    aNonCreatableServiceNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.FormControllerDispatcher"  );
 
     // services which can be used to created an instance at a service factory
     Sequence< ::rtl::OUString > aCreatableServiceNames( getSupportedServiceNames_Static() );
@@ -753,7 +753,7 @@ Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void)
     {
         aServices.realloc(2);
         aServices.getArray()[0] = FM_FORM_CONTROLLER;
-        aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController"));
+        aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController");
     }
     return aServices;
 }
@@ -3122,7 +3122,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
         {
             Reference< XMultiServiceFactory > xFactory( xConnection, UNO_QUERY_THROW );
             m_xComposer.set(
-                xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.SingleSelectQueryComposer" ) ) ),
+                xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer"  ) ),
                 UNO_QUERY_THROW );
 
             Reference< XPropertySet > xSet( xForm, UNO_QUERY );
@@ -3195,7 +3195,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         xQueryColumns->getByName(pRefValues[j].Name) >>= xSet;
 
                         // get the RealName
-                        xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
+                        xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName;
 
                         // compare the condition field name and the RealName
                         if (aCompare(aRealName, pRefValues[j].Name))
@@ -3208,7 +3208,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++)
                         {
                             xColumnsByIndex->getByIndex(n) >>= xSet;
-                            xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
+                            xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName;
                             if (aCompare(aRealName, pRefValues[j].Name))
                             {
                                 // get the column by its alias
@@ -3236,10 +3236,10 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         if (aRow.find((*iter).xText) != aRow.end())
                         {
                             ::rtl::OUString aCompText = aRow[(*iter).xText];
-                            aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+                            aCompText += ::rtl::OUString(" ");
                             ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
                             aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
-                            aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+                            aCompText += ::rtl::OUString(" ");
                             aCompText += ::comphelper::getString(pRefValues[j].Value);
                             aRow[(*iter).xText] = aCompText;
                         }
@@ -3329,7 +3329,7 @@ void FormController::startFiltering()
             Reference< XModeSelector >  xSelector(xControl, UNO_QUERY);
             if (xSelector.is())
             {
-                xSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) );
+                xSelector->setMode( ::rtl::OUString( "FilterMode"  ) );
 
                 // listening for new controls of the selector
                 Reference< XContainer >  xContainer(xSelector, UNO_QUERY);
@@ -3385,9 +3385,9 @@ void FormController::startFiltering()
                 {
                     // create a filter control
                     Sequence< Any > aCreationArgs( 3 );
-                    aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageParent")), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
-                    aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatter")), makeAny( xFormatter ) );
-                    aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlModel")), makeAny( xModel ) );
+                    aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString("MessageParent"), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
+                    aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString("NumberFormatter"), makeAny( xFormatter ) );
+                    aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString("ControlModel"), makeAny( xModel ) );
                     Reference< XControl > xFilterControl(
                         m_aContext.createComponentWithArguments( "com.sun.star.form.control.FilterControl", aCreationArgs ),
                         UNO_QUERY
@@ -3459,7 +3459,7 @@ void FormController::stopFiltering()
             Reference< XModeSelector >  xSelector(xControl, UNO_QUERY);
             if (xSelector.is())
             {
-                xSelector->setMode( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) );
+                xSelector->setMode( ::rtl::OUString( "DataMode"  ) );
 
                 // listening for new controls of the selector
                 Reference< XContainer >  xContainer(xSelector, UNO_QUERY);
@@ -3558,8 +3558,8 @@ Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedModes(void) thr
     {
         aModes.realloc(2);
         ::rtl::OUString* pModes = aModes.getArray();
-        pModes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
-        pModes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) );
+        pModes[0] = ::rtl::OUString( "DataMode"  );
+        pModes[1] = ::rtl::OUString( "FilterMode"  );
     }
     return aModes;
 }
@@ -3689,7 +3689,7 @@ namespace
     {
         try
         {
-            static ::rtl::OUString s_sFormsCheckRequiredFields( RTL_CONSTASCII_USTRINGPARAM( "FormsCheckRequiredFields" ) );
+            static ::rtl::OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields"  );
 
             // first, check whether the form has a property telling us the answer
             // this allows people to use the XPropertyContainer interface of a form to control
@@ -3711,7 +3711,7 @@ namespace
                 return sal_True;
 
             Reference< XPropertySet > xDataSourceSettings(
-                xDataSource->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings" ) ) ),
+                xDataSource->getPropertyValue( ::rtl::OUString( "Settings"  ) ),
                 UNO_QUERY_THROW );
 
             sal_Bool bShouldValidate = true;
@@ -4273,7 +4273,7 @@ bool FormController::ensureInteractionHandler()
         return false;
     m_bAttemptedHandlerCreation = true;
 
-    m_xInteractionHandler.set( m_aContext.createComponent( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) ), UNO_QUERY );
+    m_xInteractionHandler.set( m_aContext.createComponent( ::rtl::OUString( "com.sun.star.task.InteractionHandler"  ) ), UNO_QUERY );
     OSL_ENSURE( m_xInteractionHandler.is(), "FormController::ensureInteractionHandler: could not create an interaction handler!" );
     return m_xInteractionHandler.is();
 }