Some removal/replacement of the String/UniString with OUString

10 files changed, 45 insertions, 51 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 6376827fa7b7..71fb02415349 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -147,7 +147,7 @@ SdPublishingDesign::SdPublishingDesign()
     String  aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
     sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
-    m_aCompression = UniString::CreateFromInt32( nCompression );
+    m_aCompression = OUString::valueOf( nCompression );
     m_aCompression.Append( sal_Unicode('%') );
 
     SvtUserOptions aUserOptions;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f311e77ef78..fd5aa1eb1fb5 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -120,9 +120,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
 
     // Welches Oject wird gerade angezeigt?
-    String info = UniString::CreateFromInt32( pProgrInfo->GetCurObj() );
-    info.Append( sal_Unicode('/') );
-    info.Append( UniString::CreateFromInt32( pProgrInfo->GetObjCount() ) );
+    OUString info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurObj() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetObjCount() ) );
     aFiObjInfo.SetText(info);
 
     // Wieviele Actions sind schon aufgebrochen?
@@ -132,9 +132,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = UniString::CreateFromInt32( pProgrInfo->GetCurAction() );
-        info.Append( sal_Unicode('/') );
-        info.Append( UniString::CreateFromInt32( pProgrInfo->GetActionCount() ) );
+        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurAction() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetActionCount() ) );
         aFiActInfo.SetText(info);
     }
 
@@ -145,9 +145,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = UniString::CreateFromInt32( pProgrInfo->GetCurInsert() );
-        info.Append( sal_Unicode('/') );
-        info.Append( UniString::CreateFromInt32( pProgrInfo->GetInsertCount() ) );
+        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurInsert() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetInsertCount() ) );
         aFiInsInfo.SetText(info);
     }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index aed9b5dbb03d..7fc0c58e55a9 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -124,28 +124,28 @@ CopyDlg::~CopyDlg()
 {
     String& rStr = GetExtraData();
 
-    rStr = rtl::OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue()));
+    rStr = OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += UniString::CreateFromInt32( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
+    rStr += OUString::valueOf( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
     rStr.Append( TOKEN );
 
-    rStr += UniString::CreateFromInt32( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
+    rStr += OUString::valueOf( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 7ea9c52f3a27..bb7841137733 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -195,25 +195,21 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             SdCustomShow* pShow = new SdCustomShow( *(*pCustomShowList)[nPos] );
-            String aStr( pShow->GetName() );
-            String aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
+            OUString aStr( pShow->GetName() );
+            OUString aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
 
-            sal_uInt16 nStrPos = aStr.Search( aStrCopy );
+            sal_uInt16 nStrPos = aStr.indexOf( aStrCopy );
             sal_uInt16 nNum = 1;
             if( nStrPos == STRING_NOTFOUND )
             {
-                aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
-                aStr.Append( aStrCopy );
-                aStr.Append( UniString::CreateFromInt32( nNum ) );
-                aStr.Append( sal_Unicode(')') );
-                nStrPos = aStr.Search( aStrCopy );
+                aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
+                nStrPos = aStr.indexOf( aStrCopy );
             }
-            nStrPos = nStrPos + (sal_uInt16)aStrCopy.Len();
+            nStrPos = nStrPos + (sal_uInt16)aStrCopy.getLength();
             // Um nicht ins Nirvana zu greifen (--> Endlosschleife)
-            if( nStrPos >= aStr.Len() )
+            if( nStrPos >= aStr.getLength() )
             {
-                aStr.Append( sal_Unicode(' ') );
-                aStr.Append( UniString::CreateFromInt32( nNum ) );
+                aStr = aStr + " " + OUString::valueOf( nNum );
             }
 
             // Name ueberpruefen...
@@ -226,7 +222,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                      pCustomShow != NULL && bDifferent;
                      pCustomShow = (SdCustomShow*) pCustomShowList->Next() )
                 {
-                    if( aStr == pCustomShow->GetName() )
+                    if( aStr == OUString( pCustomShow->GetName() ) )
                         bDifferent = sal_False;
                 }
                 if( !bDifferent )
@@ -235,8 +231,8 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
 
                     const CharClass* pCharClass = rDoc.GetCharClass();
                     while( pCharClass->isDigit( aStr, nStrPos ) )
-                        aStr.Erase( nStrPos, 1 );
-                    aStr.Insert( UniString::CreateFromInt32( ++nNum ), nStrPos);
+                        aStr = aStr.replaceAt( nStrPos, 1, "" );
+                    aStr = aStr.copy( 0, nStrPos) + OUString::valueOf( ++nNum ) + aStr.copy( nStrPos);
                 }
 
             }
@@ -338,7 +334,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
          nPage++ )
     {
         pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD );
-        String aStr( pPage->GetName() );
+        OUString aStr( pPage->GetName() );
         aLbPages.InsertEntry( aStr );
     }
     //aLbPages.SelectEntryPos( 0 );
@@ -359,7 +355,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
     else
     {
         rpCustomShow = new SdCustomShow( &rDoc );
-        aEdtName.SetText( String( SdResId( STR_NEW_CUSTOMSHOW ) ) );
+        aEdtName.SetText( OUString( SdResId( STR_NEW_CUSTOMSHOW ) ) );
         aEdtName.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
         rpCustomShow->SetName( aEdtName.GetText() );
     }
@@ -412,7 +408,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
 
             for( sal_uInt16 i = 0; i < nCount; i++ )
             {
-                String aStr = aLbPages.GetSelectEntry( i );
+                OUString aStr = aLbPages.GetSelectEntry( i );
                 pEntry = aLbCustomPages.InsertEntry( aStr,
                                             0, sal_False, nPosCP );
 
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9103971cfa1a..787d717f47f7 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -184,24 +184,24 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
 
     // Titel setzen und
     // entsprechende Seiten zum Dialog hinzufuegen
-    String aTitle;
+    OUString aTitle;
 
     switch( ePO )
     {
         case PO_TITLE:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_TITLE ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_TITLE ));
         break;
 
         case PO_SUBTITLE:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
         break;
 
         case PO_BACKGROUND:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
         break;
 
         case PO_BACKGROUNDOBJECTS:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
         break;
 
         case PO_OUTLINE_1:
@@ -213,13 +213,11 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         case PO_OUTLINE_7:
         case PO_OUTLINE_8:
         case PO_OUTLINE_9:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_OUTLINE ));
-            aTitle.Append( sal_Unicode(' ') );
-            aTitle.Append( UniString::CreateFromInt32( ePO - PO_OUTLINE_1 + 1 ) );
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " + OUString::valueOf( ePO - PO_OUTLINE_1 + 1 );
         break;
 
         case PO_NOTES:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_NOTES ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_NOTES ));
         break;
     }
     SetText( aTitle );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e92b1ae2e98e..01c04d7984e9 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -837,7 +837,7 @@ String SdTPAction::GetEditText( sal_Bool bFullDocDestination )
             {
                 const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos();
                 if( nPos < aVerbVector.size() )
-                    aStr = UniString::CreateFromInt32( aVerbVector[ nPos ] );
+                    aStr = OUString::valueOf( aVerbVector[ nPos ] );
                 return aStr;
             }
         case presentation::ClickAction_DOCUMENT:
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index ecb7d9efa5e6..77960f056cc0 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -679,9 +679,9 @@ void    SdTpOptionsMisc::SetDrawMode()
 
 String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
 {
-    String aScale( UniString::CreateFromInt32( nX ) );
+    String aScale( OUString::valueOf( nX ) );
     aScale.Append( TOKEN );
-    aScale.Append( UniString::CreateFromInt32( nY ) );
+    aScale.Append( OUString::valueOf( nY ) );
 
     return( aScale );
 }
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 14b2b51f33f4..5d13cc7238d6 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -112,7 +112,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
         {
             aName = aNewName;
             aName.Append( sal_Unicode(' ') );
-            aName.Append( UniString::CreateFromInt32( j++ ) );
+            aName.Append( OUString::valueOf( j++ ) );
             bDifferent = sal_True;
             for( long i = 0; i < nCount && bDifferent; i++ )
             {
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index cfb3f2f7a44d..0f465660d402 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -138,7 +138,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
             String aStr(SdResId( STR_LAYOUT_OUTLINE ));
             aStyleName.Append( aStr );
             aStyleName.Append( sal_Unicode(' ') );
-            aStyleName.Append( UniString::CreateFromInt32( nDepth ) );
+            aStyleName.Append( OUString::valueOf( nDepth ) );
         }
 
         SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool();
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index bb17fd4ac00f..d933768a4454 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -83,7 +83,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
         if ( !aStr.Len() )
         {
             aStr = String( SdResId( STR_PAGE ) );
-            aStr.Append( UniString::CreateFromInt32( nPage + 1 ) );
+            aStr.Append( OUString::valueOf( nPage + 1 ) );
         }
 
         aPageNameList[ nPage ] = aStr;