ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

20 files changed, 36 insertions, 39 deletions

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3d1df1bf1cf5..5bbd61dd4530 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -259,8 +259,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
     SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
 
     aStbStatus.InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE );
-    aStbStatus.InsertItem( 2, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm / 9999,99 cm " ) ), SIB_CENTER | SIB_IN );
-    aStbStatus.InsertItem( 3, 10 + GetTextWidth( String::CreateFromAscii( " 9999,99 cm x 9999,99 cm " ) ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 2, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN );
+    aStbStatus.InsertItem( 3, 10 + GetTextWidth( rtl::OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN );
     aStbStatus.InsertItem( 4, 20, SIB_CENTER | SIB_IN );
 
     Resize();
@@ -572,7 +572,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
 
     aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
-    aStr.Append( String::CreateFromAscii( " / " ) );
+    aStr.Append( rtl::OUString(" / ") );
     aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) );
 
     aStbStatus.SetItemText( 2, aStr );
@@ -589,7 +589,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0];
 
     aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
-    aStr.Append( String::CreateFromAscii( " x " ) );
+    aStr.Append( rtl::OUString(" x ") );
     aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) );
 
     aStbStatus.SetItemText( 3, aStr );
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 936748b79d7c..5ac29eb15944 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -72,7 +72,7 @@ IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< X
 
     pItemInfo = new SfxItemInfo[ 1 ];
     memset( pItemInfo, 0, sizeof( SfxItemInfo ) );
-    pIMapPool = new SfxItemPool( String::CreateFromAscii( "IMapItemPool" ),
+    pIMapPool = new SfxItemPool( rtl::OUString("IMapItemPool"),
                                  SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, pItemInfo );
     pIMapPool->FreezeIdRanges();
 }
@@ -650,8 +650,8 @@ void IMapWindow::DoMacroAssign()
         SfxItemSet      aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
 
         SfxEventNamesItem aNamesItem(SID_EVENTCONFIG);
-        aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT );
-        aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT );
+        aNamesItem.AddEvent( rtl::OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT );
+        aNamesItem.AddEvent( rtl::OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT );
         aSet.Put( aNamesItem );
 
         SvxMacroItem    aMacroItem(SID_ATTR_MACROITEM);
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 9e98d91b36de..97704f8f9ab2 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -130,7 +130,7 @@ SfxItemPresentation  SvxGridItem::GetPresentation
             return SFX_ITEM_PRESENTATION_NONE;
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
-            rText = String::CreateFromAscii("SvxGridItem");
+            rText = rtl::OUString("SvxGridItem");
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index da43952284de..7305b1664f0f 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -274,7 +274,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
         Size aDrawSize( 0, aRect.GetHeight() / 6);
         aFont.SetSize(aDrawSize);
         SetFont(aFont);
-        String sText(String::CreateFromAscii("ABC"));
+        String sText(rtl::OUString("ABC"));
         Point aMove(1, GetTextHeight());
         sal_Unicode cArrow = 0x2193;
         long nAWidth = GetTextWidth(String(sText.GetChar(0)));
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 294ba3c33e25..9ad1db82b843 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -857,7 +857,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
         break;
         case RubyAdjust_INDENT_BLOCK:
         {
-            long nCharWidth = GetTextWidth(String::CreateFromAscii("X"));
+            long nCharWidth = GetTextWidth(rtl::OUString("X"));
             if(nOutTextWidth < (nRightEnd - nLeftStart - nCharWidth))
             {
                 nCharWidth /= 2;
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 0e9a9e6b1ddc..3ffdc0113a66 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::text;
 
 #define FLYINFLY_BORDER 3
 #define DEMOTEXT        "Ij"
-#define C2S(cChar) UniString::CreateFromAscii(cChar)
-
 
 SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) :
 
@@ -172,7 +170,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
         {
             aFont.SetSize(Size(0, aParaPrtArea.GetHeight() - 2));
             SetFont(aFont);
-            aParaPrtArea.SetSize(Size(GetTextWidth(C2S(DEMOTEXT)), GetTextHeight()));
+            aParaPrtArea.SetSize(Size(GetTextWidth(rtl::OUString(DEMOTEXT)), GetTextHeight()));
         }
         else
         {
@@ -218,7 +216,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
     }
     else
     {
-        sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
+        sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(rtl::OUString(DEMOTEXT));
 
         aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3);
         aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L)));
@@ -680,7 +678,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
     }
     else
     {
-        DrawText(aParaPrtArea, C2S(DEMOTEXT));
+        DrawText(aParaPrtArea, rtl::OUString(DEMOTEXT));
         DrawRect_Impl(aDrawObj, m_aBlankCol, m_aBlankFrameCol );
     }
 
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 3e3e1e3f2b0b..dbfd5586cab6 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -167,7 +167,7 @@ namespace svx
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return s_nFormat;
@@ -651,7 +651,7 @@ namespace svx
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return s_nFormat;
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 36e5586d9d3c..9a89732ff71b 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -71,12 +71,12 @@ namespace svx
         static sal_uInt32 s_nFormFormat = (sal_uInt32)-1;
         if ( _bExtractForm && (sal_uInt32)-1 == s_nFormFormat )
         {
-            s_nFormFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" ));
+            s_nFormFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" ));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!");
         }
         else if ( !_bExtractForm && (sal_uInt32)-1 == s_nReportFormat)
         {
-            s_nReportFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\""));
+            s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return _bExtractForm ? s_nFormFormat : s_nReportFormat;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 13c8f3ecebc5..0ad52138a046 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -478,7 +478,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
     m_aRecordOf.SetSizePixel(Size(nTextWidth,nH));
     nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width());
 
-    nTextWidth = m_aRecordCount.GetTextWidth( String::CreateFromAscii("0000000 (00000) *") );
+    nTextWidth = m_aRecordCount.GetTextWidth( rtl::OUString("0000000 (00000) *") );
     m_aRecordCount.SetPosPixel(Point(nX,nY) );
     m_aRecordCount.SetSizePixel(Size(nTextWidth,nH));
     nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width());
@@ -702,7 +702,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
                 else
                     aText = String::CreateFromInt32(pParent->GetRowCount());
                 if(!pParent->m_bRecordCountFinal)
-                    aText += String::CreateFromAscii(" *");
+                    aText += rtl::OUString(" *");
             }
             else
                 aText = String();
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index b980704b1898..1b8b1b066437 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -57,7 +57,7 @@ namespace svx
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
         if ( SOT_FORMATSTR_ID_XFORMS == nFormatId )
         {
-            return SetString( ::rtl::OUString( String::CreateFromAscii("XForms-Transferable") ), _rFlavor );
+            return SetString(rtl::OUString("XForms-Transferable"), _rFlavor);
         }
         return sal_False;
     }
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index cbee3dfdc90c..d98787cc5974 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2225,7 +2225,7 @@ namespace svxform
         if ( sInstName.isEmpty() )
         {
             SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" );
-            String sTemp = String::CreateFromAscii( "untitled" );
+            String sTemp = rtl::OUString("untitled");
             sTemp += String::CreateFromInt32( nPageId );
             sInstName = sTemp;
         }
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index fc1b92c23e2f..24a0b87d6a95 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -130,7 +130,7 @@ sal_uInt32 OFilterItemExchange::getFormatId()
     static sal_uInt32 s_nFormat = (sal_uInt32)-1;
     if ((sal_uInt32)-1 == s_nFormat)
     {
-        s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
+        s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
         DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!");
     }
     return s_nFormat;
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c13198482aa8..1d9be6d061d6 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -343,7 +343,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!");
         }
         return s_nFormat;
@@ -355,7 +355,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!");
         }
         return s_nFormat;
@@ -367,7 +367,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!");
         }
         return s_nFormat;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index ab4189f9c2ba..a39bb920a9c3 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -233,7 +233,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
 {
     m_pImpl->acquire();
     SetPool( &SFX_APP()->GetPool() );
-    SetName( String::CreateFromAscii( "Form" ) );
+    SetName( rtl::OUString("Form") );
 
     SetView(m_pFormView);
 }
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index ddf5f46f8305..e59f6bd83700 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1000,8 +1000,8 @@ void FmSearchEngine::SearchNextImpl()
         {   // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen
             // sollen, muss ich normieren
             UniString aTmp(strSearchExpression);
-            static const UniString s_sStar = UniString::CreateFromAscii("\\*");
-            static const UniString s_sQuotation = UniString::CreateFromAscii("\\?");
+            const rtl::OUString s_sStar("\\*");
+            const rtl::OUString s_sQuotation("\\?");
             aTmp.SearchAndReplaceAll('*', s_sStar);
             aTmp.SearchAndReplaceAll('?', s_sQuotation);
             strSearchExpression = aTmp;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ca621e899835..195b47eb892a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1090,7 +1090,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
 
         if ( !xWizard.is() )
         {
-            ShowServiceNotAvailableError( NULL, String::CreateFromAscii( pWizardAsciiName ), sal_True );
+            ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True );
         }
         else
         {
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index b3f61406466f..20c2d6d72949 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -425,7 +425,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr );
                         XBitmapListRef xBitmapList =
                             XPropertyList::CreatePropertyList(XBITMAP_LIST,
-                            String::CreateFromAscii("TmpList"))->AsBitmapList();
+                            rtl::OUString("TmpList"))->AsBitmapList();
                         xBitmapList->Insert( pEntry );
                         xBitmapList->SetDirty( sal_False );
                         pFillAttrLB->Fill( xBitmapList );
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 1bfd3d577c91..6599e85b0d0d 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -141,7 +141,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString&
     maCommand( rCmd ),
     mxFrame( rFrame )
 {
-    Size aSize( GetTextWidth( String::CreateFromAscii("-100 %") ), GetTextHeight() );
+    Size aSize( GetTextWidth( rtl::OUString("-100 %") ), GetTextHeight() );
 
     aSize.Width() += 20, aSize.Height() += 6;
     SetSizePixel( aSize );
@@ -161,7 +161,7 @@ ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const rtl::OUString&
         const long nMinVal = ( maCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:GrafTransparence" ) )) ? 0 : -100;
 
         SetUnit( FUNIT_CUSTOM );
-        SetCustomUnitText( String::CreateFromAscii(" %") );
+        SetCustomUnitText( rtl::OUString(" %") );
         SetDecimalDigits( 0 );
 
         SetMin( nMinVal );
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 78a2e14de9e6..9d647d283095 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -437,7 +437,7 @@ SvxMetricField::SvxMetricField(
     aCurTxt( String() ),
     mxFrame( rFrame )
 {
-    Size aSize = Size(GetTextWidth( String::CreateFromAscii("99,99mm") ),GetTextHeight());
+    Size aSize = Size(GetTextWidth( rtl::OUString("99,99mm") ),GetTextHeight());
     aSize.Width() += 20;
     aSize.Height() += 6;
     SetSizePixel( aSize );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 014d48344c31..64dd7646ad0a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -384,7 +384,7 @@ void SvxStyleBox_Impl::Select()
                 bClear = true;
                 //not only apply default style but also call 'ClearFormatting'
                 Sequence< PropertyValue > aEmptyVals;
-                SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ResetAttributes"),
+                SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ResetAttributes"),
                     aEmptyVals);
             }
             else if( aSelEntry == aMoreKey && GetSelectEntryPos() == ( GetEntryCount() - 1 ) )
@@ -425,7 +425,7 @@ void SvxStyleBox_Impl::Select()
             if( bCreateNew )
             {
                 aArgs[0].Name   = OUString("Param");
-                SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs);
+                SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:StyleNewByExample"), aArgs);
             }
             else
             {
@@ -1046,8 +1046,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram
 
 {
     BindListener();
-    String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" ));
-    AddStatusListener( sCommand );
+    AddStatusListener(rtl::OUString(".uno:BorderReducedMode"));
     aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
 
     /*