String to OUString

Change-Id: I5ff57ede2217f1464571fb2beaa62a34425064ae
Reviewed-on: https://gerrit.libreoffice.org/5826
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

8 files changed, 50 insertions, 52 deletions

diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7010a3394647..ed4cee8f74b8 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star {
 } } }
 
 class SdPage;
-class String;
 
 namespace sd {
 
@@ -72,7 +71,7 @@ private:
     static bool importTransitionsFile( TransitionPresetList& rList,
                                        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
                                        UStringMap& rTransitionNameMape,
-                                       String aFilaname );
+                                       OUString aFilename );
 };
 
 }
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 72f2a96a7f8f..7a230c22be1e 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -46,22 +46,22 @@ public:
     sal_Bool                    mbDimHide;      ///< hide rather than dim
     Color                       maBlueScreen;   ///< identifies "background pixels"
     Color                       maDimColor;     ///< for fading the object
-    String                      maSoundFile;    ///< Path to the sound file in MS DOS notation
+    OUString                    maSoundFile;    ///< Path to the sound file in MS DOS notation
     sal_Bool                    mbSoundOn;      ///< Sound on / off
     sal_Bool                    mbPlayFull;     ///< play sound completely.
     SdrPathObj*                 mpPathObj;      ///< The path object
     ::com::sun::star::presentation::ClickAction     meClickAction;  ///< Action at mouse click
     ::com::sun::star::presentation::AnimationEffect meSecondEffect; ///< for object fading.
     ::com::sun::star::presentation::AnimationSpeed  meSecondSpeed;  ///< for object fading.
-    String                      maSecondSoundFile; ///< for object fading.
+    OUString                    maSecondSoundFile; ///< for object fading.
     sal_Bool                    mbSecondSoundOn;   ///< for object fading.
     sal_Bool                    mbSecondPlayFull;  ///< for object fading.
     sal_uInt16                  mnVerb;            ///< for OLE object
     sal_uLong                   mnPresOrder;
-    SdrObject&              mrObject;
+    SdrObject&                  mrObject;
 
-    SD_DLLPUBLIC void                    SetBookmark( const String& rBookmark );
-    SD_DLLPUBLIC String                  GetBookmark();
+    SD_DLLPUBLIC void           SetBookmark( const OUString& rBookmark );
+    SD_DLLPUBLIC OUString       GetBookmark();
 public:
                             SdAnimationInfo(SdrObject& rObject);
                             SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index cbf1e84e7637..812936464fde 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -41,7 +41,7 @@ public:
 
 private:
     PageVec       maPages;
-    String          aName;
+    OUString        aName;
     SdDrawDocument* pDoc;
 
     // this is a weak reference to a possible living api wrapper for this custom show
@@ -70,8 +70,8 @@ public:
     /** Removes all occurences of pPage. */
     void RemovePage( const SdPage* pPage );
 
-    void   SetName(const String& rName);
-    String GetName() const;
+    void   SetName(const OUString& rName);
+    OUString GetName() const;
 
     SdDrawDocument* GetDoc() const { return pDoc; }
 
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 46790a497466..22fb05b58eb2 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -99,8 +99,8 @@ struct StyleReplaceData
 {
     SfxStyleFamily  nFamily;
     SfxStyleFamily  nNewFamily;
-    String          aName;
-    String          aNewName;
+    OUString        aName;
+    OUString        aNewName;
 };
 
 enum DocCreationMode
@@ -153,7 +153,7 @@ private:
     SdTransferable *    mpCreatingTransferable;
     sal_Bool                mbHasOnlineSpellErrors;
     sal_Bool                mbInitialOnlineSpellingEnabled;
-    String              maBookmarkFile;
+    OUString            maBookmarkFile;
     ::sd::DrawDocShellRef   mxBookmarkDocShRef;
 
     sd::PresentationSettings maPresentationSettings;
@@ -222,7 +222,7 @@ public:
 
     SvxNumType          GetPageNumType() const;
     void                SetPageNumType(SvxNumType eType) { mePageNumType = eType; }
-    SD_DLLPUBLIC String              CreatePageNumValue(sal_uInt16 nNum) const;
+    SD_DLLPUBLIC OUString CreatePageNumValue(sal_uInt16 nNum) const;
 
     DocumentType        GetDocumentType() const { return meDocType; }
 
@@ -247,10 +247,10 @@ public:
     virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
 
     void                RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, sal_Bool bOnlyDuplicatePages=sal_False, sal_Bool bUndo=sal_True );
-    SD_DLLPUBLIC void   SetMasterPage(sal_uInt16 nSdPageNum, const String& rLayoutName,
+    SD_DLLPUBLIC void   SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName,
                                       SdDrawDocument* pSourceDoc, sal_Bool bMaster, sal_Bool bCheckMasters);
 
-    SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile);
+    SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile);
     SdDrawDocument*     OpenBookmarkDoc(SfxMedium& rMedium);
 
     sal_Bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
@@ -331,7 +331,7 @@ public:
 
     SD_DLLPUBLIC void   CloseBookmarkDoc();
 
-    SdrObject*          GetObj(const String& rObjName) const;
+    SdrObject*          GetObj(const OUString& rObjName) const;
 
     /** Return the first page that has the given name.  Regular pages and
         notes pages are searched first.  When not found then the master
@@ -346,7 +346,7 @@ public:
             Returns the index of the page with the given name or
             SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist.
     */
-    sal_uInt16 GetPageByName(const String& rPgName, sal_Bool& rbIsMasterPage ) const;
+    sal_uInt16 GetPageByName(const OUString& rPgName, sal_Bool& rbIsMasterPage ) const;
     SD_DLLPUBLIC SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
     SD_DLLPUBLIC sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
 
@@ -410,7 +410,7 @@ public:
     void                SetTextDefaults() const;
 
     void                CreateLayoutTemplates();
-    void                RenameLayoutTemplate(const String& rOldLayoutName, const String& rNewName);
+    void                RenameLayoutTemplate(const OUString& rOldLayoutName, const OUString& rNewName);
 
     void                CreateDefaultCellStyles();
 
@@ -497,8 +497,8 @@ public:
     sal_uInt16 CreatePage (
         SdPage* pCurrentPage,
         PageKind ePageKind,
-        const String& sStandardPageName,
-        const String& sNotesPageName,
+        const OUString& sStandardPageName,
+        const OUString& sNotesPageName,
         AutoLayout eStandardLayout,
         AutoLayout eNotesLayout,
         sal_Bool bIsPageBack,
@@ -547,8 +547,8 @@ public:
     sal_uInt16 DuplicatePage (
         SdPage* pCurrentPage,
         PageKind ePageKind,
-        const String& sStandardPageName,
-        const String& sNotesPageName,
+        const OUString& sStandardPageName,
+        const OUString& sNotesPageName,
         sal_Bool bIsPageBack,
         sal_Bool bIsPageObj,
         const sal_Int32 nInsertPosition = -1);
@@ -566,7 +566,7 @@ public:
      */
     SD_DLLPUBLIC SdStyleSheetPool* GetSdStyleSheetPool() const;
 
-       void UpdatePageRelativeURLs(const String& rOldName, const String& rNewName);
+       void UpdatePageRelativeURLs(const OUString& rOldName, const OUString& rNewName);
 
     void SetCalcFieldValueHdl( ::Outliner* pOutliner);
 
@@ -613,8 +613,8 @@ private:
     sal_uInt16 InsertPageSet (
         SdPage* pCurrentPage,
         PageKind ePageKind,
-        const String& sStandardPageName,
-        const String& sNotesPageName,
+        const OUString& sStandardPageName,
+        const OUString& sNotesPageName,
         sal_Bool bIsPageBack,
         sal_Bool bIsPageObj,
         SdPage* pStandardPage,
@@ -639,7 +639,7 @@ private:
     void SetupNewPage (
         SdPage* pPreviousPage,
         SdPage* pPage,
-        const String& sPageName,
+        const OUString& sPageName,
         sal_uInt16 nInsertionPoint,
         sal_Bool bIsPageBack,
         sal_Bool bIsPageObj);
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 4a1b455ab62f..9f9e1c6a7c91 100644
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
@@ -31,7 +31,7 @@ class SdPageLink : public ::sfx2::SvBaseLink
     SdPage* pPage;
 
 public:
-    SdPageLink(SdPage* pPg, const String& rFileName, const String& rBookmarkName);
+    SdPageLink(SdPage* pPg, const OUString& rFileName, const OUString& rBookmarkName);
     virtual ~SdPageLink();
 
     virtual void Closed();
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 204e6cb1b85b..e63aa0d7570f 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -39,7 +39,6 @@ namespace sd {
     class DrawView;
 }
 
-class String;
 class SfxObjectShell;
 class SfxObjectShellLock;
 class SvxFieldData;
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index aaf29122bb31..0cc72cfc9a54 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -71,16 +71,16 @@ namespace sd {
     struct SD_DLLPUBLIC HeaderFooterSettings
     {
         bool mbHeaderVisible;
-        String maHeaderText;
+        OUString maHeaderText;
 
         bool mbFooterVisible;
-        String maFooterText;
+        OUString maFooterText;
 
         bool mbSlideNumberVisible;
 
         bool mbDateTimeVisible;
         bool mbDateTimeIsFixed;
-        String maDateTimeText;
+        OUString maDateTimeText;
         int meDateTimeFormat;
 
         HeaderFooterSettings();
@@ -119,10 +119,10 @@ protected:
     sal_Bool    mbSoundOn;                ///< with / without sound.
     sal_Bool    mbExcluded;               ///< will (not) be displayed during show.
     OUString    maLayoutName;             ///< Name of the layout
-    String      maSoundFile;              ///< Path to sound file (MSDOS notation).
+    OUString    maSoundFile;              ///< Path to sound file (MSDOS notation).
     bool        mbLoopSound;
     bool        mbStopSound;
-    String      maCreatedPageName;        ///< generated page name by GetPageName.
+    OUString    maCreatedPageName;        ///< generated page name by GetPageName.
     OUString    maFileName;               ///< file name.
     OUString    maBookmarkName;           ///< Bookmark name.
     sal_Bool    mbScaleObjects;           ///< Objects should be scaled
@@ -180,7 +180,7 @@ public:
     SdrObject*      CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
     SdrObject*      GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false );
     PresObjKind     GetPresObjKind(SdrObject* pObj) const;
-    String          GetPresObjText(PresObjKind eObjKind) const;
+    OUString        GetPresObjText(PresObjKind eObjKind) const;
     SfxStyleSheet* GetStyleSheetForMasterPageBackground() const;
     SfxStyleSheet*  GetStyleSheetForPresObj(PresObjKind eObjKind) const;
     bool            RestoreDefaultText( SdrObject* pObj );
@@ -209,7 +209,7 @@ public:
     virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum);
     virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum);
 
-    void        SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr );
+    void        SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const OUString& rStr );
 
     void        SetPageKind(PageKind ePgType)        { mePageKind = ePgType; }
     PageKind    GetPageKind() const                  { return mePageKind; }
@@ -235,8 +235,8 @@ public:
     void        SetScaleObjects(sal_Bool bScale)        { mbScaleObjects = bScale; }
     sal_Bool        IsScaleObjects() const              { return mbScaleObjects; }
 
-    void        SetSoundFile(const String& rStr)    { maSoundFile = rStr; }
-    String      GetSoundFile() const                { return maSoundFile; }
+    void        SetSoundFile(const OUString& rStr)    { maSoundFile = rStr; }
+    OUString    GetSoundFile() const                { return maSoundFile; }
 
     void        SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; }
     bool        IsLoopSound() const                 { return mbLoopSound; }
@@ -265,10 +265,10 @@ public:
     void            SetLayoutName(OUString aName);
     virtual OUString GetLayoutName() const       { return maLayoutName; }
 
-    void            SetFileName(const String& aName) { maFileName = aName; }
-    virtual String  GetFileName() const       { return maFileName; }
-    void            SetBookmarkName(const String& aName) { maBookmarkName = aName; }
-    virtual String  GetBookmarkName() const       { return maBookmarkName; }
+    void            SetFileName(const OUString& aName) { maFileName = aName; }
+    virtual OUString GetFileName() const       { return maFileName; }
+    void            SetBookmarkName(const OUString& aName) { maBookmarkName = aName; }
+    virtual OUString GetBookmarkName() const       { return maBookmarkName; }
     SdPageLink*     GetLink() { return mpPageLink; }
 
     void            ConnectLink();
@@ -277,10 +277,10 @@ public:
     void    ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
                          sal_Bool bScaleAllObj);
 
-    const String&   GetName() const;
-    String          GetRealName() const { return FmFormPage::GetName(); };
+    const OUString&   GetName() const;
+    OUString          GetRealName() const { return FmFormPage::GetName(); };
 
-    void    SetPresentationLayout(const String& rLayoutName,
+    void    SetPresentationLayout(const OUString& rLayoutName,
                                   sal_Bool bReplaceStyleSheets = sal_True,
                                   sal_Bool bSetMasterPage = sal_True,
                                   sal_Bool bReverseOrder = sal_False);
@@ -324,7 +324,7 @@ public:
 
     /** Set the name of the page and broadcast a model change.
     */
-    virtual void SetName (const String& rName);
+    virtual void SetName (const OUString& rName);
 
     const sd::HeaderFooterSettings& getHeaderFooterSettings() const;
     void setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings );
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 3696a8ca5a56..80fcabcd9a39 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -60,10 +60,10 @@ public:
     void                SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet)  { mpActualStyleSheet = pActStyleSheet; }
     SfxStyleSheetBase*  GetActualStyleSheet()                                   { return mpActualStyleSheet; }
 
-    SfxStyleSheetBase*  GetTitleSheet(const String& rLayoutName);
+    SfxStyleSheetBase*  GetTitleSheet(const OUString& rLayoutName);
 
                         // Caller has to delete the list
-    void                CreateOutlineSheetList(const String& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles);
+    void                CreateOutlineSheetList(const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles);
 
     /** creates all layout style sheets for the givin layout name if they
         don't exist yet.
@@ -73,10 +73,10 @@ public:
                             had to be created. This is used to assert errors in documents
                             when styles are missing.
     */
-    SD_DLLPUBLIC void                CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool bCheck = sal_False );
-    void                CreateLayoutSheetNames(const String& rLayoutName, std::vector<String> &aNameList) const;
-    void                CreateLayoutSheetList(const String& rLayoutName, SdStyleSheetVector& rLayoutSheets);
-    void                CopyLayoutSheets(const String& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
+    SD_DLLPUBLIC void                CreateLayoutStyleSheets(const OUString& rLayoutName, sal_Bool bCheck = sal_False );
+    void                CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
+    void                CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
+    void                CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
     void                CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
     void                CopyCellSheets(SdStyleSheetPool& rSourcePool);
     void                CopyTableStyles(SdStyleSheetPool& rSourcePool);