fdo#38838 Replaced some use of (Uni)String with OUString.

Change-Id: Iad623c9300919fbae34279268a5a720f978c6434
Reviewed-on: https://gerrit.libreoffice.org/2514
Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b811e325dd7a..2389beb6a7ab 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1439,7 +1439,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                     else
                     {
                         // create new style
-                        String aHelpFile;
+                        OUString aHelpFile;
                         pMySheet = static_cast<SfxStyleSheet*>( &mxStyleSheetPool->Make(aName, SD_STYLE_FAMILY_MASTERPAGE, pHisSheet->GetMask()) );
                         pMySheet->SetHelpId( aHelpFile, pHisSheet->GetHelpId(aHelpFile) );
                         pMySheet->GetItemSet().ClearItem(0);  // Delete all
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 8fb287fc21a4..86c6915d1763 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -193,7 +193,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
     * outline levels
     **************************************************************************/
     String aName(SdResId(STR_LAYOUT_OUTLINE));
-    String aHelpFile;
+    OUString aHelpFile;
 
     SfxStyleSheetBase* pParent = NULL;
     SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE );
@@ -599,7 +599,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
 
 void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets)
 {
-    String aHelpFile;
+    OUString aHelpFile;
 
     sal_uInt32 nCount = rSourcePool.aStyles.size();
 
@@ -659,7 +659,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
     std::vector<String> aNameList;
     CreateLayoutSheetNames(rLayoutName,aNameList);
 
-    String sEmpty;
+    OUString sEmpty;
     for (std::vector<String>::const_iterator it = aNameList.begin(); it != aNameList.end(); ++it)
     {
         pSheet = Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
@@ -784,7 +784,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleS
 void SdStyleSheetPool::CreatePseudosIfNecessary()
 {
     String aName;
-    String aHelpFile;
+    OUString aHelpFile;
     SfxStyleSheetBase* pSheet = NULL;
     SfxStyleSheetBase* pParent = NULL;
 
@@ -869,7 +869,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
 
 void SdStyleSheetPool::UpdateStdNames()
 {
-    String aHelpFile;
+    OUString aHelpFile;
     sal_uInt32  nCount = aStyles.size();
     std::vector<SfxStyleSheetBase*> aEraseList;
 
@@ -880,7 +880,7 @@ void SdStyleSheetPool::UpdateStdNames()
         if( !pStyle->IsUserDefined() )
         {
             String aOldName     = pStyle->GetName();
-            sal_uLong nHelpId       = pStyle->GetHelpId( aHelpFile );
+            sal_uLong nHelpId   = pStyle->GetHelpId( aHelpFile );
             SfxStyleFamily eFam = pStyle->GetFamily();
 
             sal_Bool bHelpKnown = sal_True;
@@ -972,7 +972,7 @@ void SdStyleSheetPool::UpdateStdNames()
 void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
                                          Font& rBulletFont )
 {
-    String aHelpFile;
+    OUString aHelpFile;
     sal_uLong nHelpId = pSheet->GetHelpId( aHelpFile );
     SfxItemSet& rSet = pSheet->GetItemSet();
 
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 08540496fedd..52a60e509703 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -662,7 +662,7 @@ bool SdStyleSheet::SetName( const UniString& rName )
 
 // --------------------------------------------------------------------
 
-void SdStyleSheet::SetHelpId( const String& r, sal_uLong nId )
+void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
 {
     SfxStyleSheet::SetHelpId( r, nId );
 
@@ -1073,7 +1073,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
 
         if( (pEntry->nWID == EE_PARA_NUMBULLET) && (GetFamily() == SD_STYLE_FAMILY_MASTERPAGE) )
         {
-            String aStr;
+            OUString aStr;
             const sal_uInt32 nTempHelpId = GetHelpId( aStr );
 
             if( (nTempHelpId >= HID_PSEUDOSHEET_OUTLINE2) && (nTempHelpId <= HID_PSEUDOSHEET_OUTLINE9) )
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index da0c3ad39aa0..087d20e2f9f1 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -238,7 +238,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
             if ( pStyleSheet && pStyleSheet->GetFamily() != SD_STYLE_FAMILY_PSEUDO )
             {
                 SfxStyleSheet* pOldStyleSheet = mpView->GetStyleSheet();
-                String aStr;
+                OUString aStr;
 
                 if( // if the object had no style sheet, allow all
                     !pOldStyleSheet ||