convert svx/source/tbxctrls/*.cxx from String to OUString

Change-Id: I2f59ac54fda1e11353d81e8d5bd9fe5993c9ffdb

9 files changed, 79 insertions, 90 deletions

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index aef36cebd877..00f407807de0 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -250,7 +250,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
             {
                 if ( pColorItem )
                 {
-                    String aString( pColorItem->GetName() );
+                    OUString aString( pColorItem->GetName() );
                     ::Color aColor = pColorItem->GetColorValue();
 
                     pFillAttrLB->SelectEntry( aString );
@@ -265,20 +265,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         pFillAttrLB->GetSelectEntryColor() != aColor )
                     {
                         sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
-                        String aTmpStr;
+                        OUString aTmpStr;
                         if( nCount > 0 )
                         {
                             // Last entry gets tested against temporary color
                             aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
-                            if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
-                                 aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+                            if(  aTmpStr[0] == TMP_STR_BEGIN &&
+                                 aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
                             {
                                 pFillAttrLB->RemoveEntry( nCount - 1 );
                             }
                         }
-                        aTmpStr = TMP_STR_BEGIN;
-                        aTmpStr += aString;
-                        aTmpStr += TMP_STR_END;
+                        aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
 
                         //pFillAttrLB->SetUpdateMode( sal_False );
                         sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
@@ -295,30 +293,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
             {
                 if ( pGradientItem )
                 {
-                    String aString( pGradientItem->GetName() );
+                    OUString aString( pGradientItem->GetName() );
                     pFillAttrLB->SelectEntry( aString );
                     // Check if the entry is not in the list
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
                         sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
-                        String aTmpStr;
+                        OUString aTmpStr;
                         if( nCount > 0 )
                         {
                             // Last entry gets tested against temporary entry
                             aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
-                            if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
-                                 aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+                            if(  aTmpStr[0] == TMP_STR_BEGIN &&
+                                 aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
                             {
                                 pFillAttrLB->RemoveEntry( nCount - 1 );
                             }
                         }
-                        aTmpStr = TMP_STR_BEGIN;
-                        aTmpStr += aString;
-                        aTmpStr += TMP_STR_END;
+                        aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
 
                         XGradientEntry* pEntry = new XGradientEntry( pGradientItem->GetGradientValue(), aTmpStr );
-                        String aEmptyString = String();
-                         XGradientList aGradientList( aEmptyString );
+                        XGradientList aGradientList( "" );
                         aGradientList.Insert( pEntry );
                         aGradientList.SetDirty( sal_False );
                         const Bitmap aBmp = aGradientList.GetUiBitmap( 0 );
@@ -343,30 +338,27 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
             {
                 if ( pHatchItem )
                 {
-                    String aString( pHatchItem->GetName() );
+                    OUString aString( pHatchItem->GetName() );
                     pFillAttrLB->SelectEntry( aString );
                     // Check if the entry is not in the list
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
                         sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
-                        String aTmpStr;
+                        OUString aTmpStr;
                         if( nCount > 0 )
                         {
                             // Last entry gets tested against temporary entry
                             aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
-                            if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
-                                 aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+                            if(  aTmpStr[0] == TMP_STR_BEGIN &&
+                                 aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
                             {
                                 pFillAttrLB->RemoveEntry( nCount - 1 );
                             }
                         }
-                        aTmpStr = TMP_STR_BEGIN;
-                        aTmpStr += aString;
-                        aTmpStr += TMP_STR_END;
+                        aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
 
                         XHatchEntry* pEntry = new XHatchEntry( pHatchItem->GetHatchValue(), aTmpStr );
-                        String aEmptyString = String();
-                        XHatchList aHatchList( aEmptyString );
+                        XHatchList aHatchList( "" );
                         aHatchList.Insert( pEntry );
                         aHatchList.SetDirty( sal_False );
                         const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
@@ -394,7 +386,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // SfxObjectShell::Current()    &&
                     // SfxObjectShell::Current()->GetItem( SID_BITMAP_LIST ) )
                 {
-                    String aString( pBitmapItem->GetName() );
+                    OUString aString( pBitmapItem->GetName() );
                     // Bitmap aBitmap( pBitmapItem->GetValue() );
 
                     // SvxBitmapListItem aItem( *(const SvxBitmapListItem*)(
@@ -404,20 +396,18 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
                         sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
-                        String aTmpStr;
+                        OUString aTmpStr;
                         if( nCount > 0 )
                         {
                             // Last entry gets tested against temporary entry
                             aTmpStr = pFillAttrLB->GetEntry( nCount - 1 );
-                            if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
-                                 aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+                            if(  aTmpStr[0] == TMP_STR_BEGIN &&
+                                 aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
                             {
                                 pFillAttrLB->RemoveEntry( nCount - 1 );
                             }
                         }
-                        aTmpStr = TMP_STR_BEGIN;
-                        aTmpStr += aString;
-                        aTmpStr += TMP_STR_END;
+                        aTmpStr = OUString(TMP_STR_BEGIN) + aString + OUString(TMP_STR_END);
 
                         XBitmapEntry* pEntry = new XBitmapEntry(pBitmapItem->GetGraphicObject(), aTmpStr);
                         XBitmapListRef xBitmapList =
@@ -458,7 +448,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
         if( pState->ISA( SvxGradientListItem ) &&
             eXFS == XFILL_GRADIENT )
         {
-            String aString( pFillAttrLB->GetSelectEntry() );
+            OUString aString( pFillAttrLB->GetSelectEntry() );
             pFillAttrLB->Clear();
             pFillAttrLB->Fill( ( (SvxGradientListItem*)pState )->GetGradientList() );
             pFillAttrLB->SelectEntry( aString );
@@ -466,7 +456,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
         if( pState->ISA( SvxHatchListItem ) &&
             eXFS == XFILL_HATCH )
         {
-            String aString( pFillAttrLB->GetSelectEntry() );
+            OUString aString( pFillAttrLB->GetSelectEntry() );
             pFillAttrLB->Clear();
             pFillAttrLB->Fill( ( (SvxHatchListItem*)pState )->GetHatchList() );
             pFillAttrLB->SelectEntry( aString );
@@ -474,7 +464,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
         if( pState->ISA( SvxBitmapListItem ) &&
             eXFS == XFILL_BITMAP )
         {
-            String aString( pFillAttrLB->GetSelectEntry() );
+            OUString aString( pFillAttrLB->GetSelectEntry() );
             pFillAttrLB->Clear();
             pFillAttrLB->Fill( ( (SvxBitmapListItem*)pState )->GetBitmapList() );
             pFillAttrLB->SelectEntry( aString );
@@ -695,19 +685,18 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
             case XFILL_SOLID:
             {
                 // Entry gets tested against temporary color
-                String aTmpStr = pLbFillAttr->GetSelectEntry();
-                if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+                OUString aTmpStr = pLbFillAttr->GetSelectEntry();
+                if( aTmpStr[0] == TMP_STR_BEGIN && aTmpStr[aTmpStr.getLength()-1] == TMP_STR_END )
                 {
-                    aTmpStr.Erase( aTmpStr.Len()-1, 1 );
-                    aTmpStr.Erase( 0, 1 );
+                    aTmpStr = aTmpStr.copy(1, aTmpStr.getLength()-2);
                 }
 
                 XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() );
 
-                aArgs[0].Name = OUString( "FillColor" );
+                aArgs[0].Name = "FillColor";
                 aXFillColorItem.QueryValue( a );
                 aArgs[0].Value = a;
-                ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillColor" ),
+                ((SvxFillToolBoxControl*)GetData())->Dispatch( ".uno:FillColor",
                                                                aArgs );
             }
             break;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index ed8d50061d92..9101a5e55af5 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -178,8 +178,8 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId)
     sal_uInt32 nFavorite;
     for( nFavorite = 1; nFavorite <= nFavCount; nFavorite++ )
     {
-        String aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE));
-        aStr += sal_Unicode(' ');
+        OUString aStr(SVX_RESSTR(RID_SVXFLOAT3D_FAVORITE));
+        aStr += " ";
         aStr += OUString::number((sal_Int32)nFavorite);
         Image aThumbImage( maFavoritesHorizontal[nFavorite-1] );
         maCtlFavorites.InsertItem( (sal_uInt16)nFavorite, aThumbImage, aStr );
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 58c7dd1cd7ba..38d2ec8ddb54 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -588,13 +588,13 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 {
     SfxItemPool&    rPool = rView.GetModel()->GetItemPool();
     SfxItemSet      aSet( rPool, SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST );
-    String          aUndoStr;
+    OUString        aUndoStr;
     const bool      bUndo = rView.IsUndoEnabled();
 
     if( bUndo )
     {
         aUndoStr = rView.GetDescriptionOfMarkedObjects();
-        aUndoStr.Append( sal_Unicode(' ') );
+        aUndoStr += " ";
     }
 
     const SfxItemSet*   pArgs = rReq.GetArgs();
@@ -612,7 +612,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafRedItem( ((SfxInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFRED ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFRED );
             }
         }
         break;
@@ -623,7 +623,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafGreenItem( ((SfxInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGREEN ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGREEN );
             }
         }
         break;
@@ -634,7 +634,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafBlueItem( ((SfxInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFBLUE ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFBLUE );
             }
         }
         break;
@@ -645,7 +645,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafLuminanceItem( ((SfxInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFLUMINANCE ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFLUMINANCE );
             }
         }
         break;
@@ -656,7 +656,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafContrastItem( ((SfxInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCONTRAST ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCONTRAST );
             }
         }
         break;
@@ -667,7 +667,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafGamma100Item( ((SfxUInt32Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGAMMA ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFGAMMA );
             }
         }
         break;
@@ -678,7 +678,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafTransparenceItem( ((SfxUInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFTRANSPARENCY ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFTRANSPARENCY );
             }
         }
         break;
@@ -689,7 +689,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
             {
                 aSet.Put( SdrGrafModeItem( (GraphicDrawMode) ((SfxUInt16Item*)pItem)->GetValue() ));
                 if( bUndo )
-                    aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFMODE ) ) );
+                    aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFMODE );
             }
         }
         break;
@@ -739,7 +739,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 
                     SfxNoLayoutSingleTabDialog  aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
                                                     aCropDlgAttr, 950 );
-                    const String        aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
+                    const OUString        aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
 
                     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
                     DBG_ASSERT(pFact, "Dialogdiet error!");
@@ -756,7 +756,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 
                         if( pOutAttr )
                         {
-                            aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ) ) );
+                            aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP );
 
                             // set crop attributes
                             if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) )
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 10ec85d8781b..7af34f18adfc 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -421,7 +421,7 @@ void SvxColorBox::ReleaseFocus_Impl()
 SvxMetricField::SvxMetricField(
     Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
     MetricField( pParent, nBits ),
-    aCurTxt( String() ),
+    aCurTxt(),
     mxFrame( rFrame )
 {
     Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight());
@@ -457,7 +457,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem )
             SetMetricValue( *this, pItem->GetValue(), ePoolUnit );
     }
     else
-        SetText( String() );
+        SetText( "" );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index ba93c47f8d24..71b723605381 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -74,9 +74,9 @@ private:
     DECL_LINK( SelectHdl, void * );
 
 public:
-                            TableWindow( sal_uInt16                     nSlotId,
-                                         const OUString&       rCmd,
-                                         const String&              rText,
+                            TableWindow( sal_uInt16                 nSlotId,
+                                         const OUString&            rCmd,
+                                         const OUString&            rText,
                                          ToolBox&                   rParentTbx,
                                          const Reference< XFrame >& rFrame );
                             ~TableWindow();
@@ -104,7 +104,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl)
 
 // -----------------------------------------------------------------------
 
-TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ),
     aTableButton( this ),
     nCol( 0 ),
@@ -132,7 +132,7 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const String
 
     aTableButton.SetPosSizePixel( Point( TABLE_POS_X + TABLE_CELL_WIDTH, TABLE_HEIGHT + 5 ),
             Size( TABLE_WIDTH - TABLE_POS_X - 2*TABLE_CELL_WIDTH, 24 ) );
-    aTableButton.SetText( String( SVX_RESSTR( RID_SVXSTR_MORE ) ) );
+    aTableButton.SetText( SVX_RESSTR( RID_SVXSTR_MORE ) );
     aTableButton.SetClickHdl( LINK( this, TableWindow, SelectHdl ) );
     aTableButton.Show();
 
@@ -283,14 +283,14 @@ void TableWindow::Paint( const Rectangle& )
     // the text near the mouse cursor telling the table dimensions
     if ( nCol && nLine )
     {
-        String aText;
+        OUString aText;
         aText += OUString::number( nCol );
-        aText.AppendAscii( " x " );
+        aText += " x ";
         aText += OUString::number( nLine );
         if(GetId() == FN_SHOW_MULTIPLE_PAGES)
         {
-            aText += ' ';
-            aText += String(SVX_RESSTR(RID_SVXSTR_PAGES));
+            aText += " ";
+            aText += SVX_RESSTR(RID_SVXSTR_PAGES);
         }
 
         Size aTextSize( GetTextWidth( aText ), GetTextHeight() );
@@ -312,7 +312,7 @@ void TableWindow::Paint( const Rectangle& )
 
         // #i95350# force RTL output
         if ( IsRTLEnabled() )
-            aText.Insert( 0x202D, 0 );
+            aText = OUString(0x202D) + aText;
 
         DrawText( Point( nTextX, nTextY ), aText );
     }
@@ -409,7 +409,7 @@ private:
 
     void UpdateSize_Impl( long nNewCol );
 public:
-                            ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
+                            ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
 
     void                    KeyInput( const KeyEvent& rKEvt );
     virtual void            MouseMove( const MouseEvent& rMEvt );
@@ -424,7 +424,7 @@ public:
 
 // -----------------------------------------------------------------------
 
-ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
     bInitialKeyInput(true),
     m_bMod1(false),
@@ -657,7 +657,7 @@ void ColumnsWindow::Paint( const Rectangle& )
 
     SetLineColor();
     SetFillColor( aFaceColor );
-    String aText;
+    OUString aText;
     if ( nCol )
         aText = OUString::number(nCol);
     else
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 34fd302646e9..cf30761e83ac 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -268,7 +268,7 @@ void SvxUndoRedoControl::StateChanged(
         {
             SfxStringItem& rItem = *(SfxStringItem *)pState;
             ToolBox& rBox = GetToolBox();
-            String aQuickHelpText = MnemonicGenerator::EraseAllMnemonicChars( rItem.GetValue() );
+            OUString aQuickHelpText = MnemonicGenerator::EraseAllMnemonicChars( rItem.GetValue() );
             rBox.SetQuickHelpText( GetId(), aQuickHelpText );
         }
         SvxListBoxControl::StateChanged( nSID, eState, pState );
@@ -306,7 +306,7 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow()
     rListBox.SetSelectHdl( LINK( this, SvxUndoRedoControl, SelectHdl ) );
 
     for( sal_uInt32 n = 0; n < aUndoRedoList.size(); n++ )
-        rListBox.InsertEntry( String( aUndoRedoList[n] ));
+        rListBox.InsertEntry( aUndoRedoList[n] );
 
     rListBox.SelectEntryPos( 0 );
     aActionStr = SVX_RESSTR(SID_UNDO == GetSlotId() ?
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c809f6199694..cc29e1f9f862 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -179,7 +179,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
         SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
         DBG_ASSERT( pBox, "Window not found!" );
 
-        String aString( pBox->GetSelectEntry() );
+        OUString aString( pBox->GetSelectEntry() );
         pBox->Clear();
         pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_INVISIBLE) );
         pBox->InsertEntry( SVX_RESSTR(RID_SVXSTR_SOLID) );
@@ -232,7 +232,7 @@ void SvxLineWidthToolBoxControl::StateChanged(
         if ( eState == SFX_ITEM_DISABLED )
         {
             pFld->Disable();
-            pFld->SetText( String() );
+            pFld->SetText( "" );
         }
         else
         {
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 540e6e783a19..9c6b63e59328 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -128,7 +128,7 @@ class SvxStyleBox_Impl : public ComboBox
     using Window::IsVisible;
 public:
     SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
-                        const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, bool bInSpecialMode );
+                        const Reference< XFrame >& _xFrame,const OUString& rClearFormatKey, const OUString& rMoreKey, bool bInSpecialMode );
     ~SvxStyleBox_Impl();
 
     void            SetFamily( SfxStyleFamily eNewFamily );
@@ -160,9 +160,9 @@ private:
     Reference< XDispatchProvider >  m_xDispatchProvider;
     Reference< XFrame >             m_xFrame;
     OUString                        m_aCommand;
-    String                          aClearFormatKey;
-    String                          aMoreKey;
-    String                          sDefaultStyle;
+    OUString                        aClearFormatKey;
+    OUString                        aMoreKey;
+    OUString                        sDefaultStyle;
     bool                            bInSpecialMode;
 
     void            ReleaseFocus();
@@ -182,7 +182,7 @@ private:
     SAL_WNODEPRECATED_DECLARATIONS_POP
     Font                           aCurFont;
     Size                           aLogicalSize;
-    String                         aCurText;
+    OUString                       aCurText;
     sal_uInt16                     nFtCount;
     bool                           bRelease;
     Reference< XDispatchProvider > m_xDispatchProvider;
@@ -329,12 +329,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
 
 SvxStyleBox_Impl::SvxStyleBox_Impl(
     Window*                                 pParent,
-    const OUString&                    rCommand,
+    const OUString&                         rCommand,
     SfxStyleFamily                          eFamily,
     const Reference< XDispatchProvider >&   rDispatchProvider,
     const Reference< XFrame >&              _xFrame,
-    const String&                           rClearFormatKey,
-    const String&                           rMoreKey,
+    const OUString&                         rClearFormatKey,
+    const OUString&                         rMoreKey,
     bool                                    bInSpec) :
 
     ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ),
@@ -1717,11 +1717,11 @@ void SfxStyleControllerItem_Impl::StateChanged(
 
 struct SvxStyleToolBoxControl::Impl
 {
-    String                              aClearForm;
-    String                              aMore;
+    OUString                     aClearForm;
+    OUString                     aMore;
     ::std::vector< OUString >    aDefaultStyles;
-    sal_Bool                        bSpecModeWriter;
-    sal_Bool                        bSpecModeCalc;
+    sal_Bool                     bSpecModeWriter;
+    sal_Bool                     bSpecModeCalc;
 
     inline Impl( void )
         :aClearForm         ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
@@ -2262,7 +2262,7 @@ void SvxFontNameToolBoxControl::StateChanged(
                 pBox->Update( pFontItem );
         }
         else
-            pBox->SetText( String() );
+            pBox->SetText( "" );
         pBox->SaveValue();
     }
 
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index dc7e1dd1c361..6131c24ebc56 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -61,7 +61,7 @@ protected:
 
 private:
     FontHeightToolBoxControl*                  m_pCtrl;
-    String                                     m_aCurText;
+    OUString                                   m_aCurText;
     Size                                       m_aLogicalSize;
     bool                                       m_bRelease;
     uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
@@ -91,7 +91,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
 {
     SetSizePixel( LogicToPixel( m_aLogicalSize, MAP_APPFONT ));
     SetValue( 0 );
-    SetText( String() );
+    SetText( "" );
 }
 
 // -----------------------------------------------------------------------
@@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase )
     {
         // Wert in der Anzeige l"oschen
         SetValue( -1L );
-        SetText( String() );
+        SetText( "" );
     }
     SaveValue();
 }