module svl: all String and some bool and related clean-up

Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
Reviewed-on: https://gerrit.libreoffice.org/4733
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

5 files changed, 20 insertions, 20 deletions

diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 6b5fbf6f5fdf..d0e6741ce308 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -51,11 +51,11 @@ enum ScAutoFontColorMode
 
 class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem
 {
-    String*         pName;
+    OUString*       pName;
     ScStyleSheet*   pStyle;
 public:
     static ScDocument* pDoc;
-                            ScPatternAttr(SfxItemSet* pItemSet, const String& rStyleName);
+                            ScPatternAttr(SfxItemSet* pItemSet, const OUString& rStyleName);
                             ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = NULL);
                             ScPatternAttr(SfxItemPool* pItemPool);
                             ScPatternAttr(const ScPatternAttr& rPatternAttr);
@@ -115,7 +115,7 @@ public:
 
     void                    SetStyleSheet(ScStyleSheet* pNewStyle, bool bClearDirectFormat = true);
     const ScStyleSheet*     GetStyleSheet() const  { return pStyle; }
-    const String*           GetStyleName() const;
+    const OUString*         GetStyleName() const;
     void                    UpdateStyleSheet();
     void                    StyleToName();
 
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index f2a025536835..f3abe11b0924 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -47,13 +47,13 @@ public:
     void                CopyStdStylesFrom( ScStyleSheetPool* pSrcPool );
 
     void                CopyStyleFrom( ScStyleSheetPool* pSrcPool,
-                                        const String& rName, SfxStyleFamily eFamily );
+                                       const OUString& rName, SfxStyleFamily eFamily );
 
-    ScStyleSheet*       FindCaseIns( const String& rName, SfxStyleFamily eFam );
+    ScStyleSheet*       FindCaseIns( const OUString& rName, SfxStyleFamily eFam );
 
-    const String*       GetForceStdName() const { return pForceStdName; }
+    const OUString*     GetForceStdName() const { return pForceStdName; }
 
-    virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam,
+    virtual SfxStyleSheetBase& Make( const OUString&, SfxStyleFamily eFam,
                                      sal_uInt16 nMask = SFXSTYLEBIT_ALL, sal_uInt16 nPos = 0xffff );
 
 protected:
@@ -61,15 +61,15 @@ protected:
 
     using SfxStyleSheetPool::Create;    // calcwarnings: Create(const SfxStyleSheet&) - ever used?
 
-    virtual SfxStyleSheetBase* Create( const String&    rName,
+    virtual SfxStyleSheetBase* Create( const OUString&  rName,
                                        SfxStyleFamily   eFamily,
-                                       sal_uInt16           nMask);
+                                       sal_uInt16       nMask);
     virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle );
 
 private:
     SfxStyleSheetBase*  pActualStyleSheet;
     ScDocument*         pDoc;
-    const String*       pForceStdName;
+    const OUString*       pForceStdName;
 };
 
 #endif     // SC_STLPOOL_HXX
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index c66d53642b4e..28e4a9d04d01 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -51,17 +51,17 @@ public:
 
                         ScStyleSheet( const ScStyleSheet& rStyle );
 
-    virtual bool        SetParent        ( const String& rParentName );
+    virtual bool        SetParent        ( const OUString& rParentName );
     virtual SfxItemSet& GetItemSet       ();
     virtual bool        IsUsed           () const;
     virtual bool        HasFollowSupport () const;
     virtual bool        HasParentSupport () const;
 
-    virtual const String& GetName() const;
-    virtual const String& GetParent() const;
-    virtual const String& GetFollow() const;
+    virtual const OUString& GetName() const;
+    virtual const OUString& GetParent() const;
+    virtual const OUString& GetFollow() const;
 
-    virtual bool SetName( const String& );
+    virtual bool SetName( const OUString& );
 
             void                SetUsage( ScStyleSheet::Usage eUse ) const
                                     { eUsage = eUse; }
@@ -71,10 +71,10 @@ public:
 protected:
     virtual             ~ScStyleSheet();
 
-                ScStyleSheet( const String&     rName,
+                ScStyleSheet( const OUString&   rName,
                               ScStyleSheetPool& rPool,
                               SfxStyleFamily    eFamily,
-                              sal_uInt16            nMask );
+                              sal_uInt16        nMask );
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index 33fd541c348e..50357f109e2d 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -31,7 +31,7 @@ public:
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual OUString GetComment() const;
 
 private:
@@ -53,7 +53,7 @@ public:
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat(SfxRepeatTarget& rTarget);
-    virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual bool CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual OUString GetComment() const;
 
 private:
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 1dbb74e3bb4c..c132a8af4410 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -30,7 +30,7 @@ class SvNumberFormatter;
 
 class ScNumFormatAbbrev
 {
-    String sFormatstring;
+    OUString sFormatstring;
     LanguageType eLnge;
     LanguageType eSysLnge;
 public: