fdo#38838 UniString -> OUString in cui

Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6
Reviewed-on: https://gerrit.libreoffice.org/1203
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>

8 files changed, 45 insertions, 45 deletions

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d81de7b20320..05efd9579abd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1283,7 +1283,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
             aLevelLB.InsertEntry( OUString::valueOf(i));
         if(pSaveNum->GetLevelCount() > 1)
         {
-            String sEntry( OUString("1 - ") );
+            OUString sEntry( "1 - " );
             sEntry += OUString::valueOf( pSaveNum->GetLevelCount() );
             aLevelLB.InsertEntry(sEntry);
             aLevelLB.SelectEntry(sEntry);
@@ -2504,7 +2504,7 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
         else
         {
             //#i5153# painting gray or black rectangles as 'normal' numbering text
-            String sMsg( "Preview" );
+            OUString sMsg( "Preview" );
             long nWidth = pVDev->GetTextWidth(sMsg);
             long nTextHeight = pVDev->GetTextHeight();
             long nRectHeight = nTextHeight * 2 / 3;
@@ -2708,7 +2708,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     Point aPos(250,0);
 
     pDebugFixedText->SetPosSizePixel(aPos, aSize);
-    pDebugFixedText->SetText( OUString("Das ist ein Debug-Text") );
+    pDebugFixedText->SetText( "Das ist ein Debug-Text" );
 #endif
 
     aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
@@ -3047,8 +3047,8 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
             aLevelLB.InsertEntry( OUString::valueOf(i) );
         if(pSaveNum->GetLevelCount() > 1)
         {
-            String sEntry( OUString("1 - ") );
-            sEntry.Append( OUString::valueOf( pSaveNum->GetLevelCount() ) );
+            OUString sEntry( "1 - " );
+            sEntry += OUString::valueOf( pSaveNum->GetLevelCount() );
             aLevelLB.InsertEntry(sEntry);
             aLevelLB.SelectEntry(sEntry);
         }
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f8c3aff2977b..6893994b9686 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -131,7 +131,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
 {
     // Truncate the name if necessary ...
     String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+    aString.AppendAscii( ": " );
 
     XPropertyListRef pList = GetList();
     if( !pList.is() )
@@ -143,7 +143,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
     if ( aURL.getBase().getLength() > 18 )
     {
         aString += String(aURL.getBase()).Copy( 0, 15 );
-        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+        aString.AppendAscii( "..." );
     }
     else
         aString += String (aURL.getBase());
@@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
 
                 // handle CMYK-values (0..100%)
                 // and adjust MetricFields respectively
-                String aStrUnit( RTL_CONSTASCII_USTRINGPARAM( " %" ) );
+                String aStrUnit( " %" );
 
                 aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
                 aMtrFldColorModel1.SetCustomUnitText( aStrUnit );
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
 void SvxColorTabPage::FillUserData()
 {
     // the color model is saved in the Ini-file
-    SetUserData( UniString::CreateFromInt32( eCM ) );
+    SetUserData( OUString::valueOf( eCM ) );
 }
 
 //------------------------------------------------------------------------
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a5a37a0c8179..c8fcb0555eb6 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -195,7 +195,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
 
             // determining (and possibly cutting) the name and
             // displaying it in the GroupBox
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( ": " );
             INetURLObject   aURL( pGradientList->GetPath() );
 
             aURL.Append( pGradientList->GetName() );
@@ -204,7 +204,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
             if ( aURL.getBase().getLength() > 18 )
             {
                 aString += String(aURL.getBase()).Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                aString.AppendAscii( "..." );
             }
             else
                 aString += String(aURL.getBase());
@@ -420,7 +420,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
     {
         aName  = aNewName;
         aName += sal_Unicode(' ');
-        aName += UniString::CreateFromInt32( j++ );
+        aName += OUString::valueOf( j++ );
         bDifferent = sal_True;
 
         for( long i = 0; i < nCount && bDifferent; i++ )
@@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
         ::sfx2::FileDialogHelper aDlg(
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
-        String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sog" ) );
+        String aStrFilterType( "*.sog" );
         aDlg.AddFilter( aStrFilterType, aStrFilterType );
         INetURLObject aFile( SvtPathOptions().GetPalettePath() );
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -669,12 +669,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
                 // determining (possibly cutting) the name
                 // and displaying it in the GroupBox
                 String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                aString.AppendAscii( ": " );
 
                 if ( aURL.getBase().getLength() > 18 )
                 {
                     aString += String(aURL.getBase()).Copy( 0, 15 );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                    aString.AppendAscii( "..." );
                 }
                 else
                     aString += String(aURL.getBase());
@@ -714,7 +714,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
 {
     ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
-    String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sog" ) );
+    String aStrFilterType( "*.sog" );
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -725,7 +725,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
         aFile.Append( pGradientList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension(rtl::OUString("sog"));
+            aFile.SetExtension( OUString("sog") );
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -745,12 +745,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
             // determining (possibly cutting) the name
             // and displaying it in the GroupBox
             String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-            aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            aString.AppendAscii( ": " );
 
             if ( aURL.getBase().getLength() > 18 )
             {
                 aString += String(aURL.getBase()).Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                aString.AppendAscii( "..." );
             }
             else
                 aString += String(aURL.getBase());
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 20cfeafa42a2..07d7267c3fc9 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -181,7 +181,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
 
             // determining (possibly cutting) the name
             // and displaying it in the GroupBox
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( ": " );
             INetURLObject   aURL( pHatchingList->GetPath() );
 
             aURL.Append( pHatchingList->GetName() );
@@ -190,7 +190,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
             if ( aURL.getBase().getLength() > 18 )
             {
                 aString += String(aURL.getBase()).Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                aString.AppendAscii( "..." );
             }
             else
                 aString += String(aURL.getBase());
@@ -471,7 +471,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
     {
         aName  = aNewName;
         aName += sal_Unicode(' ');
-        aName += UniString::CreateFromInt32( j++ );
+        aName += OUString::valueOf( j++ );
         bDifferent = sal_True;
 
         for( long i = 0; i < nCount && bDifferent; i++ )
@@ -679,7 +679,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
         ::sfx2::FileDialogHelper aDlg(
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
-        String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soh" ) );
+        String aStrFilterType( "*.soh" );
         aDlg.AddFilter( aStrFilterType, aStrFilterType );
         INetURLObject aFile( SvtPathOptions().GetPalettePath() );
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -709,12 +709,12 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
                 // determining (and possibly cutting) the name
                 // and displaying it in the GroupBox
                 String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                aString.AppendAscii( ": " );
 
                 if ( aURL.getBase().getLength() > 18 )
                 {
                     aString += String(aURL.getBase()).Copy( 0, 15 );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                    aString.AppendAscii( "..." );
                 }
                 else
                     aString += String(aURL.getBase());
@@ -750,7 +750,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
 {
     ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
-    String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soh" ) );
+    String aStrFilterType( "*.soh" );
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -761,7 +761,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
         aFile.Append( pHatchingList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension(rtl::OUString("soh"));
+            aFile.SetExtension( OUString("soh") );
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -781,12 +781,12 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
             // determining (and possibly cutting) the name
             // and displaying it in the GroupBox
             String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-            aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            aString.AppendAscii( ": " );
 
             if ( aURL.getBase().getLength() > 18 )
             {
                 aString += String(aURL.getBase()).Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+                aString.AppendAscii( "..." );
             }
             else
                 aString += String(aURL.getBase());
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 4af57482850e..991ae9d132c3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -271,16 +271,16 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
         GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
 
         PopupMenu* pPopup = new PopupMenu;
-        rtl::OUString aEmptyStr;
-        const rtl::OUString *pUIName = NULL;
+        OUString aEmptyStr;
+        const OUString *pUIName = NULL;
         sal_uInt32 i = 0;
         nNumMenuGalleryItems = aGrfNames.size();
-        for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i)
+        for(std::vector<OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i)
         {
             pUIName = &(*it);
 
             // Convert URL encodings to UI characters (e.g. %20 for spaces)
-            rtl::OUString aPhysicalName;
+            OUString aPhysicalName;
             if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName))
             {
                 pUIName = &aPhysicalName;
@@ -344,7 +344,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
         pView->ShowSdrPage(pPage);
 
         PopupMenu* pPopup = new PopupMenu;
-        rtl::OUString aEmptyStr;
+        OUString aEmptyStr;
 
         // Generate invisible square to give all symbols a
         // bitmap size, which is independent from specific glyph
@@ -1800,7 +1800,7 @@ void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt )
 void SvxLineTabPage::FillUserData()
 {
     // Write the synched value to the INI file
-    UniString aStrUserData = UniString::CreateFromInt32( (sal_Int32) aCbxSynchronize.IsChecked() );
+    OUString aStrUserData = OUString::valueOf( (sal_Int32) aCbxSynchronize.IsChecked() );
     SetUserData( aStrUserData );
 }
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 2bd6c2848330..4718ec5d13c8 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -191,7 +191,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 
             // determining (and possibly cutting) the name
             // and displaying it in the GroupBox
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( ": " );
             INetURLObject   aURL( pDashList->GetPath() );
 
             aURL.Append( pDashList->GetName() );
@@ -553,7 +553,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
     {
         aName = aNewName;
         aName += sal_Unicode(' ');
-        aName += UniString::CreateFromInt32( j++ );
+        aName += OUString::valueOf( j++ );
         bDifferent = sal_True;
 
         for ( long i = 0; i < nCount && bDifferent; i++ )
@@ -754,7 +754,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
         ::sfx2::FileDialogHelper aDlg(
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
-        String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) );
+        String aStrFilterType( "*.sod" );
         aDlg.AddFilter( aStrFilterType, aStrFilterType );
         INetURLObject aFile( SvtPathOptions().GetPalettePath() );
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -814,7 +814,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
 {
     ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
-    String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.sod" ) );
+    String aStrFilterType( "*.sod" );
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -825,7 +825,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
         aFile.Append( pDashList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension(rtl::OUString("sod"));
+            aFile.SetExtension( OUString("sod") );
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 9f25566c6bc2..31ce1116f586 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
         {
             aName = aNewName;
             aName += sal_Unicode(' ');
-            aName += UniString::CreateFromInt32( j++ );
+            aName += OUString::valueOf( j++ );
             bDifferent = sal_True;
 
             for( long i = 0; i < nCount && bDifferent; i++ )
@@ -556,7 +556,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
         ::sfx2::FileDialogHelper aDlg(
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
-        String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soe" ) );
+        String aStrFilterType( "*.soe" );
         aDlg.AddFilter( aStrFilterType, aStrFilterType );
         INetURLObject aFile( SvtPathOptions().GetPalettePath() );
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -613,7 +613,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
 {
     ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
-    String aStrFilterType( RTL_CONSTASCII_USTRINGPARAM( "*.soe" ) );
+    String aStrFilterType( "*.soe" );
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
@@ -624,7 +624,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
         aFile.Append( pLineEndList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension(rtl::OUString("soe"));
+            aFile.SetExtension( OUString("soe") );
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 752a5b0a57cb..a7939bc7ab96 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -1559,7 +1559,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl)
 void SvxPositionSizeTabPage::FillUserData()
 {
     // matching is saved in the Ini-file
-    UniString aStr = UniString::CreateFromInt32( (sal_Int32) maCbxScale.IsChecked() );
+    OUString aStr = OUString::valueOf( (sal_Int32) maCbxScale.IsChecked() );
     SetUserData( aStr );
 }