More RTL_CONSTASCII_USTRINGPARAM removals

15 files changed, 55 insertions, 69 deletions

diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 91efb1460bcc..5c39d6fa6400 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell);
 LeftImpressPaneShell::LeftImpressPaneShell (void)
     : SfxShell()
 {
-    SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
+    SetName(rtl::OUString("LeftImpressPane"));
 }
 
 
@@ -96,7 +96,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell);
 LeftDrawPaneShell::LeftDrawPaneShell (void)
     : SfxShell()
 {
-    SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
+    SetName(rtl::OUString("LeftDrawPane"));
 }
 
 
@@ -129,7 +129,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell );
 ToolPanelPaneShell::ToolPanelPaneShell()
     :SfxShell()
 {
-    SetName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ToolPanel" )) );
+    SetName(rtl::OUString("ToolPanel"));
 }
 
 ToolPanelPaneShell::~ToolPanelPaneShell(void)
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index c0adcfe0869c..a98fa13b3e4d 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -107,19 +107,19 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL)
 
     if (rsURL.isEmpty())
         nPriority = 100;
-    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
+    else if (rsURL.indexOf("presnt")>=0)
     {
         nPriority = 30;
     }
-    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
+    else if (rsURL.indexOf("layout")>=0)
     {
         nPriority = 20;
     }
-    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
+    else if (rsURL.indexOf("educate")>=0)
     {
         nPriority = 40;
     }
-    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("finance")))>=0)
+    else if (rsURL.indexOf("finance")>=0)
     {
         nPriority = 40;
     }
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f8adf5f75769..d73f12542f62 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -302,7 +302,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
         bDisableCtrls = sal_True;
         aBtnStop.Enable();
         aBtnStop.Update();
-        String aStr( RTL_CONSTASCII_USTRINGPARAM( "Animator:" ) ); // Hier sollte man sich noch etwas gescheites ausdenken!
+        rtl::OUString aStr("Animator:"); // Hier sollte man sich noch etwas gescheites ausdenken!
         pProgress = new SfxProgress( NULL, aStr, nFullTime );
     }
 
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 0ee36b7873ef..a8e98cafcee0 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -110,11 +110,11 @@ void SdPagesField::Modify()
 
     ::uno::Any a;
     ::uno::Sequence< ::beans::PropertyValue > aArgs( 1 );
-    aArgs[0].Name   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagesPerRow" ));
+    aArgs[0].Name   = "PagesPerRow";
     aItem.QueryValue( a );
     aArgs[0].Value  = a;
     SfxToolBoxControl::Dispatch( ::uno::Reference< ::frame::XDispatchProvider >( m_xFrame->getController(), ::uno::UNO_QUERY ),
-                                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PagesPerRow" )),
+                                 ".uno:PagesPerRow",
                                  aArgs );
 /*
     rBindings.GetDispatcher()->Execute(
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 814730f56066..80ff333c4fbd 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -434,15 +434,15 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
 
     // Set text and icon of the 'Open...' button.
     {
-        String sText (GetUiTextForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))));
+        String sText (GetUiTextForCommand(".uno:Open"));
         // Remove the mnemonic and add a leading space so that icon and text
         // are not too close together.
-        sText.SearchAndReplaceAll(String(RTL_CONSTASCII_USTRINGPARAM("~")),String());
-        sText.Insert(String(RTL_CONSTASCII_USTRINGPARAM(" ")),0);
+        sText.SearchAndReplaceAll(rtl::OUString("~"),String());
+        sText.Insert(rtl::OUString(" "),0);
         mpPage1OpenPB->SetText(sText);
         // Place icon left of text and both centered in the button.
         mpPage1OpenPB->SetModeImage(
-            GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open")))
+            GetUiIconForCommand(".uno:Open")
         );
         mpPage1OpenPB->EnableImageDisplay(sal_True);
         mpPage1OpenPB->EnableTextDisplay(sal_True);
@@ -629,7 +629,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     UpdatePreview( sal_True );
 
     //check whether we should start with a template document initialy and preselect it
-    const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) );
+    const ::rtl::OUString aServiceName( "com.sun.star.presentation.PresentationDocument" );
     String aStandardTemplate( SfxObjectFactory::GetStandardTemplate( aServiceName ) );
     if( aStandardTemplate.Len() )
     {
@@ -784,11 +784,10 @@ void    AssistentDlgImpl::ScanDocmenu   (void)
         SvtHistoryOptions().GetList (ePICKLIST);
 
     uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-    uno::Reference< container::XNameAccess > xFilterFactory( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) ) ), uno::UNO_QUERY );
+    uno::Reference< container::XNameAccess > xFilterFactory( xFactory->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
 
     Reference< ::com::sun::star::ucb::XSimpleFileAccess > xFileAccess(
-        xFactory->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
+        xFactory->createInstance("com.sun.star.ucb.SimpleFileAccess"),
         UNO_QUERY_THROW);
 
     sal_uInt32 nCount = aHistory.getLength();
@@ -1579,12 +1578,10 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview )
         }
         else
         {
-            const String aTargetStr( RTL_CONSTASCII_USTRINGPARAM("_default") );
-
             SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
             aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aDocFile ));
             aReq.AppendItem( SfxStringItem( SID_REFERER, aEmptyStr ) );
-            aReq.AppendItem( SfxStringItem( SID_TARGETNAME, aTargetStr ) );
+            aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) );
             aReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
             aReq.AppendItem( SfxBoolItem( SID_PREVIEW, bDocPreview ) );
 
@@ -1757,11 +1754,9 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL
             if ( ! xFactory.is())
                 break;
 
-            ::rtl::OUString sModuleIdentifier (
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+            ::rtl::OUString sModuleIdentifier ("com.sun.star.presentation.PresentationDocument");
             Reference<container::XNameAccess> xNameAccess (
-                xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.frame.UICommandDescription"))),
+                xFactory->createInstance("com.sun.star.frame.UICommandDescription"),
                 UNO_QUERY);
             if ( ! xNameAccess.is())
                 break;
@@ -1818,12 +1813,10 @@ Image AssistentDlgImpl::GetUiIconForCommand (const ::rtl::OUString& sCommandURL)
             if ( ! xFactory.is())
                 break;
 
-            ::rtl::OUString sModuleIdentifier (
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+            ::rtl::OUString sModuleIdentifier ("com.sun.star.presentation.PresentationDocument");
 
             Reference<com::sun::star::ui::XModuleUIConfigurationManagerSupplier> xSupplier (
-                xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),
+                xFactory->createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"),
                 UNO_QUERY_THROW);
 
             Reference<com::sun::star::ui::XUIConfigurationManager> xManager (
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index a6f7859a82b3..44df98dfd0c5 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -319,25 +319,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
 {
     String aDescr;
     aDescr = String(SdResId(STR_ALL_FILES));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.*"));
 
     // setup filter
 #if defined UNX
     aDescr = String(SdResId(STR_AU_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.au;*.snd" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.au;*.snd" ));
     aDescr = String(SdResId(STR_VOC_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.voc" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.voc" ));
     aDescr = String(SdResId(STR_WAV_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.wav" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.wav" ));
     aDescr = String(SdResId(STR_AIFF_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.aiff" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.aiff" ));
     aDescr = String(SdResId(STR_SVX_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.svx" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.svx" ));
 #else
     aDescr = String(SdResId(STR_WAV_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.wav;*.mp3;*.ogg" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.wav;*.mp3;*.ogg" ));
     aDescr = String(SdResId(STR_MIDI_FILE));
-    mpImpl->AddFilter( aDescr, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.mid" ) ) );
+    mpImpl->AddFilter( aDescr, rtl::OUString("*.mid" ));
 #endif
 }
 
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 26d847ea7c1b..c9e63575732f 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -113,11 +113,11 @@ void GlueEscDirLB::Select()
     {
         Any a;
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GlueEscapeDirection" ));
+        aArgs[0].Name   = "GlueEscapeDirection";
         aItem.QueryValue( a );
         aArgs[0].Value  = a;
         SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ),
-                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GlueEscapeDirection" )),
+                                    ".uno:GlueEscapeDirection",
                                     aArgs );
     }
 /*
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 64686d90694b..cda852dd40a9 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -92,8 +92,7 @@ MorphDlg::~MorphDlg()
 
 void MorphDlg::LoadSettings()
 {
-    SvStorageStreamRef  xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii(
-                               RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ),
+    SvStorageStreamRef  xIStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) ,
                                SD_OPTION_LOAD ) );
     sal_uInt16              nSteps;
     sal_Bool                bOrient, bAttrib;
@@ -119,8 +118,7 @@ void MorphDlg::LoadSettings()
 
 void MorphDlg::SaveSettings() const
 {
-    SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii(
-                               RTL_CONSTASCII_STRINGPARAM( SD_OPTION_MORPHING ) ),
+    SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( rtl::OUString(SD_OPTION_MORPHING) ,
                                SD_OPTION_STORE ) );
 
     if( xOStm.Is() )
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index b012fb4de122..b83cad717bba 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -185,7 +185,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
     try
     {
         Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-        Reference< XIndexAccess > xMultiMon( xFactory->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.DisplayAccess" ) ) ), UNO_QUERY_THROW );
+        Reference< XIndexAccess > xMultiMon( xFactory->createInstance("com.sun.star.awt.DisplayAccess" ), UNO_QUERY_THROW );
         maGrpMonitor.Show( true );
         maFtMonitor.Show( true );
         maLBMonitor.Show( true );
@@ -204,9 +204,9 @@ void SdStartPresentationDlg::InitMonitorSettings()
             Reference< XPropertySet > xMonProps( xMultiMon, UNO_QUERY );
             if( xMonProps.is() ) try
             {
-                const OUString sPropName1( RTL_CONSTASCII_USTRINGPARAM( "IsUnifiedDisplay" ) );
+                const OUString sPropName1( "IsUnifiedDisplay" );
                 xMonProps->getPropertyValue( sPropName1 ) >>= bUnifiedDisplay;
-                const OUString sPropName2( RTL_CONSTASCII_USTRINGPARAM( "DefaultDisplay" ) );
+                const OUString sPropName2( "DefaultDisplay" );
                 xMonProps->getPropertyValue( sPropName2 ) >>= nPrimaryIndex;
             }
             catch( Exception& )
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index c5f68ffd17b3..520f5a4a4926 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -44,7 +44,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
     static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", sal_True));
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
-            aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
+            aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" );
     if ( fp )
         return fp();
     return 0;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index f44032d26ecf..1ce334a4b0d8 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -209,10 +209,8 @@ SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::ge
 sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
 {
     if (mnListBoxDropFormatId == SAL_MAX_UINT32)
-        mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "application/x-openoffice-treelistbox-moveonly;"
-                    "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")));
+        mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(rtl::OUString(
+        "application/x-openoffice-treelistbox-moveonly;windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""));
     return mnListBoxDropFormatId;
 }
 
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 507739a585ee..2571bee8ea2b 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -486,7 +486,7 @@ void SdTPAction::OpenFileDialog()
             // links on the desktop to directories.
             aFileDialog.AddFilter (
                 String (SfxResId (STR_SFX_FILTERNAME_ALL)),
-                String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
+                rtl::OUString("*.*"));
 
 
             if( aFileDialog.Execute() == ERRCODE_NONE )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d7552c837ed0..807d7a21a986 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -728,8 +728,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void)
             if ( ! xFactory.is())
                 break;
 
-            Reference<frame::XDesktop> xDesktop (xFactory->createInstance (
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY);
+            Reference<frame::XDesktop> xDesktop (xFactory->createInstance ("com.sun.star.frame.Desktop"), UNO_QUERY);
             if ( ! xDesktop.is())
                 break;
 
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index db7c590f3656..d4fad0a854fe 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -347,8 +347,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl)
 void SdVectorizeDlg::LoadSettings()
 {
     SvStorageStreamRef  xIStm( SD_MOD()->GetOptionStream(
-                               UniString::CreateFromAscii(
-                               RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ),
+                               rtl::OUString( SD_OPTION_VECTORIZE ) ,
                                SD_OPTION_LOAD ) );
     sal_uInt16              nLayers;
     sal_uInt16              nReduce;
@@ -381,8 +380,7 @@ void SdVectorizeDlg::LoadSettings()
 void SdVectorizeDlg::SaveSettings() const
 {
     SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
-                              UniString::CreateFromAscii(
-                              RTL_CONSTASCII_STRINGPARAM( SD_OPTION_VECTORIZE ) ),
+                              rtl::OUString(SD_OPTION_VECTORIZE)  ,
                               SD_OPTION_STORE ) );
 
     if( xOStm.Is() )
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d0025669e857..89d300303d60 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -341,12 +341,12 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
     else
     {
         if( nError == ERRCODE_IO_BROKENPACKAGE )
-            SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX );
 
         // TODO/LATER: correct error handling?!
         //pStore->SetError( SVSTREAM_WRONGVERSION, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
         else
-            SetError( ERRCODE_ABORT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+            SetError( ERRCODE_ABORT, OSL_LOG_PREFIX );
     }
 
     // tell SFX to change viewshell when in preview mode
@@ -575,7 +575,7 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
     }
 
     if( GetError() == ERRCODE_NONE )
-        SetError( nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+        SetError( nVBWarning, OSL_LOG_PREFIX );
 
     return bRet;
 }
@@ -729,28 +729,28 @@ sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark)
         SdrObject* pObj = NULL;
 
         rtl::OUString sBookmark( rBookmark );
-        const rtl::OUString sInteraction( RTL_CONSTASCII_USTRINGPARAM( "action?" ) );
+        const rtl::OUString sInteraction( "action?" );
         if ( sBookmark.match( sInteraction ) )
         {
-            const rtl::OUString sJump( RTL_CONSTASCII_USTRINGPARAM( "jump=" ) );
+            const rtl::OUString sJump( "jump=" );
             if ( sBookmark.match( sJump, sInteraction.getLength() ) )
             {
                 rtl::OUString aDestination( sBookmark.copy( sInteraction.getLength() + sJump.getLength() ) );
-                if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "firstslide" ) ) ) )
+                if ( aDestination.match( "firstslide" ) )
                 {
                     nPageNumber = 1;
                 }
-                else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "lastslide" ) ) ) )
+                else if ( aDestination.match( "lastslide" ) )
                 {
                     nPageNumber = mpDoc->GetPageCount() - 2;
                 }
-                else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "previousslide" ) ) ) )
+                else if ( aDestination.match( "previousslide" ) )
                 {
                     SdPage* pPage = pDrawViewShell->GetActualPage();
                     nPageNumber = pPage->GetPageNum();
                     nPageNumber = nPageNumber > 2 ? nPageNumber - 2 : SDRPAGE_NOTFOUND;
                 }
-                else if ( aDestination.match( String( RTL_CONSTASCII_USTRINGPARAM( "nextslide" ) ) ) )
+                else if ( aDestination.match( "nextslide" ) )
                 {
                     SdPage* pPage = pDrawViewShell->GetActualPage();
                     nPageNumber = pPage->GetPageNum() + 2;
@@ -971,13 +971,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
         {
                 *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
                 *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE : SOT_FORMATSTR_ID_STARDRAW_8;
-                *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Draw 8")); // HACK: method will be removed with new storage API
+                *pFullTypeName = "Draw 8"; // HACK: method will be removed with new storage API
         }
         else
         {
                 *pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
                 *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARIMPRESS_8_TEMPLATE : SOT_FORMATSTR_ID_STARIMPRESS_8;
-                *pFullTypeName = String(RTL_CONSTASCII_USTRINGPARAM("Impress 8")); // HACK: method will be removed with new storage API
+                *pFullTypeName = "Impress 8"; // HACK: method will be removed with new storage API
         }
     }