String::SearchAndReplaceAllAscii -> OUString::replaceAll

Change-Id: I5091835c9f71c712f15996e5c6263fc5f21f6f96

3 files changed, 20 insertions, 22 deletions

diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 597bd2929db4..efc480ad4d1c 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -155,24 +155,24 @@ void CompressGraphicsDialog::Update()
     Size aPixelSize = m_aGraphic.GetSizePixel();
     Size aOriginalSize100mm( pDummyVDev->PixelToLogic( m_aGraphic.GetSizePixel(), MAP_100TH_MM ) );
 
-    String aBitmapSizeString = String(SVX_RES(STR_IMAGE_ORIGINAL_SIZE));
+    OUString aBitmapSizeString = SVX_RESSTR(STR_IMAGE_ORIGINAL_SIZE);
     OUString aWidthString  = GetUnitString( aOriginalSize100mm.Width(),  eFieldUnit, cSeparator );
     OUString aHeightString = GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator );
-    aBitmapSizeString.SearchAndReplaceAllAscii( "$(WIDTH)",  aWidthString );
-    aBitmapSizeString.SearchAndReplaceAllAscii( "$(HEIGHT)", aHeightString );
-    aBitmapSizeString.SearchAndReplaceAllAscii( "$(WIDTH_IN_PX)",  OUString::valueOf(aPixelSize.Width()) );
-    aBitmapSizeString.SearchAndReplaceAllAscii( "$(HEIGHT_IN_PX)", OUString::valueOf(aPixelSize.Height()) );
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH)",  aWidthString);
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT)", aHeightString);
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(WIDTH_IN_PX)",  OUString::valueOf(aPixelSize.Width()));
+    aBitmapSizeString = aBitmapSizeString.replaceAll("$(HEIGHT_IN_PX)", OUString::valueOf(aPixelSize.Height()));
     m_pFixedText2->SetText(aBitmapSizeString);
 
     int aValX = (int) (aPixelSize.Width() / GetViewWidthInch());
 
-    String aViewSizeString = String(SVX_RES(STR_IMAGE_VIEW_SIZE));
+    OUString aViewSizeString = SVX_RESSTR(STR_IMAGE_VIEW_SIZE);
 
     aWidthString  = GetUnitString( m_aViewSize100mm.Width(),  eFieldUnit, cSeparator );
     aHeightString = GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSeparator );
-    aViewSizeString.SearchAndReplaceAllAscii( "$(WIDTH)",  aWidthString );
-    aViewSizeString.SearchAndReplaceAllAscii( "$(HEIGHT)", aHeightString );
-    aViewSizeString.SearchAndReplaceAllAscii( "$(DPI)", OUString::number( aValX) );
+    aViewSizeString = aViewSizeString.replaceAll("$(WIDTH)",  aWidthString);
+    aViewSizeString = aViewSizeString.replaceAll("$(HEIGHT)", aHeightString);
+    aViewSizeString = aViewSizeString.replaceAll("$(DPI)", OUString::number(aValX));
     m_pFixedText3->SetText(aViewSizeString);
 
     SvMemoryStream aMemStream;
@@ -181,8 +181,8 @@ void CompressGraphicsDialog::Update()
     aMemStream.Seek( STREAM_SEEK_TO_END );
     sal_Int32 aNativeSize = aMemStream.Tell();
 
-    String aNativeSizeString = String(SVX_RES(STR_IMAGE_CAPACITY));
-    aNativeSizeString.SearchAndReplaceAllAscii( "$(CAPACITY)",  OUString::valueOf(aNativeSize / 1024) );
+    OUString aNativeSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
+    aNativeSizeString = aNativeSizeString.replaceAll("$(CAPACITY)",  OUString::valueOf(aNativeSize / 1024));
     m_pFixedText5->SetText(aNativeSizeString);
 
     m_pFixedText6->SetText(String("??"));
@@ -328,8 +328,8 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl )
     {
         OUString aSizeAsString = OUString::valueOf(aSize / 1024);
 
-        String aNewSizeString = String(SVX_RES(STR_IMAGE_CAPACITY));
-        aNewSizeString.SearchAndReplaceAllAscii( "$(CAPACITY)",  aSizeAsString );
+        OUString aNewSizeString = SVX_RESSTR(STR_IMAGE_CAPACITY);
+        aNewSizeString = aNewSizeString.replaceAll("$(CAPACITY)", aSizeAsString);
         m_pFixedText6->SetText(aNewSizeString);
     }
     return 0L;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2bec2867d297..7e6e52e3317f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1574,9 +1574,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
                 sLabel = sFieldName;
 
             xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
-            String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) );
-            sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName );
-            xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( OUString( sObjectLabel ) ) );
+            OUString sObjectLabel(SVX_RESSTR(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName));
+            xLabelModel->setPropertyValue(FM_PROP_NAME, makeAny(sObjectLabel));
         }
 
         pLabel->SetLogicRect( ::Rectangle(
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 758c9bb684eb..34fd302646e9 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -213,11 +213,10 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount )
     else
         nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS;
 
-    aActionStr = String(SVX_RES(nId));
+    aActionStr = SVX_RESSTR(nId);
 
-    String aText( aActionStr );
-    aText.SearchAndReplaceAllAscii( "$(ARG1)", OUString::number( nCount ) );
-    pPopupWin->SetText( aText );
+    OUString aText = aActionStr.replaceAll("$(ARG1)", OUString::number(nCount));
+    pPopupWin->SetText(aText);
 }
 
 
@@ -310,8 +309,8 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow()
         rListBox.InsertEntry( String( aUndoRedoList[n] ));
 
     rListBox.SelectEntryPos( 0 );
-    aActionStr = String( SVX_RES( SID_UNDO == GetSlotId() ?
-                                  RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS ) );
+    aActionStr = SVX_RESSTR(SID_UNDO == GetSlotId() ?
+                                  RID_SVXSTR_NUM_UNDO_ACTIONS : RID_SVXSTR_NUM_REDO_ACTIONS);
     Impl_SetInfo( rListBox.GetSelectEntryCount() );
 
     // move focus in floating window without