5 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 712c3b398578..22dff3573389 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -998,7 +998,7 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
     }
 
     if( nHelpId && ImplGetResMgr() )
-        aHelpStr = String( ResId( nHelpId, *ImplGetResMgr() ) );
+        aHelpStr = ResId(nHelpId, *ImplGetResMgr()).toString();
 
     return aHelpStr;
 }
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index eaca00dc0c9c..39536d7dfd15 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3675,7 +3675,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
         ResMgr* pResMgr = ImplGetResMgr();
         if( pResMgr )
         {
-            String aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
+            rtl::OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
             MenuItemData* pData = pItemList->Insert(
                 0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF );
                 pData->bIsTemporary = sal_True;
@@ -5163,15 +5163,15 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
         aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 );
         aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) );
         aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) );
-        aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) );
+        aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString() );
 
         aFloatBtn.SetClickHdl( LINK( this, MenuBarWindow, FloatHdl ) );
         aFloatBtn.SetSymbol( SYMBOL_FLOAT );
-        aFloatBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_RESTORE, *pResMgr ) ) );
+        aFloatBtn.SetQuickHelpText( ResId(SV_HELPTEXT_RESTORE, *pResMgr).toString() );
 
         aHideBtn.SetClickHdl( LINK( this, MenuBarWindow, HideHdl ) );
         aHideBtn.SetSymbol( SYMBOL_HIDE );
-        aHideBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_MINIMIZE, *pResMgr ) ) );
+        aHideBtn.SetQuickHelpText( ResId(SV_HELPTEXT_MINIMIZE, *pResMgr).toString() );
     }
 
     ImplInitStyleSettings();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 4e5e796657f9..6863d2e81507 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -520,7 +520,7 @@ void WarningBox::SetDefaultCheckBoxText()
 {
     ResMgr* pResMgr = ImplGetResMgr();
     if( pResMgr )
-        maCheckBoxText = XubString( ResId( SV_STDTEXT_DONTWARNAGAIN, *pResMgr ) );
+        maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString();
 }
 
 // -----------------------------------------------------------------------
@@ -611,7 +611,7 @@ void QueryBox::SetDefaultCheckBoxText()
 {
     ResMgr* pResMgr = ImplGetResMgr();
     if( pResMgr )
-        maCheckBoxText = XubString( ResId( SV_STDTEXT_DONTASKAGAIN, *pResMgr ) );
+        maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString();
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ddbbc76d3a3b..f3386100d5ef 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -65,7 +65,7 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re
     : Window( i_pParent, i_rId )
     , maOrigSize( 10, 10 )
     , maPageVDev( *this )
-    , maToolTipString( String( VclResId( SV_PRINT_PRINTPREVIEW_TXT ) ) )
+    , maToolTipString(VclResId( SV_PRINT_PRINTPREVIEW_TXT).toString())
     , mbGreyscale( false )
     , maHorzDim( this, WB_HORZ | WB_CENTER  )
     , maVertDim( this, WB_VERT | WB_VCENTER )
@@ -732,11 +732,11 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
     , maHelpButton( this, VclResId( SV_PRINT_HELP ) )
     , maPController( i_rController )
-    , maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) )
+    , maNoPageStr( VclResId( SV_PRINT_NOPAGES ).toString() )
     , mnCurPage( 0 )
     , mnCachedPages( 0 )
-    , maPrintToFileText( String( VclResId( SV_PRINT_TOFILE_TXT ) ) )
-    , maDefPrtText( String( VclResId( SV_PRINT_DEFPRT_TXT ) ) )
+    , maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ).toString() )
+    , maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ).toString() )
     , mbShowLayoutPage( sal_True )
 {
     FreeResource();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 64bec907b4f3..2d5d88113a09 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2708,7 +2708,7 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
             XubString aStr;
             ResMgr* pResMgr = ImplGetResMgr();
             if( pResMgr )
-                aStr = XubString( ResId( nHelpResId, *pResMgr ) );
+                aStr = ResId( nHelpResId, *pResMgr ).toString();
             if ( rHEvt.GetMode() & HELPMODE_BALLOON )
                 Help::ShowBalloon( this, aHelpRect.Center(), aHelpRect, aStr );
             else