Changed SetText() / GetText() to take/return OUString

replaced lots of Len() with isEmpty()

Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0
Reviewed-on: https://gerrit.libreoffice.org/1795
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

9 files changed, 21 insertions, 21 deletions

diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 2d6e6a2536d9..6b83e9fa1dce 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -472,7 +472,7 @@ public:
     virtual void    LoseFocus();
     virtual void    Modify();
 
-    void            SetText( const XubString& rText );
+    void            SetText( const OUString& rText );
     void            Fill( const XubString& rName, const FontList* pList );
 
 private:
@@ -481,7 +481,7 @@ private:
     FontStyleBox&   operator =( const FontStyleBox& );
 };
 
-inline void FontStyleBox::SetText( const XubString& rText )
+inline void FontStyleBox::SetText( const OUString& rText )
 {
     aLastStyle = rText;
     ComboBox::SetText( rText );
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index 9f99b4ea205c..c9299d363c0a 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -129,9 +129,9 @@ namespace svt
         virtual Control&            GetControl() = 0;
 
         virtual String              GetText( LineEnd aSeparator ) const = 0;
-        virtual void                SetText( const String& _rStr ) = 0;
+        virtual void                SetText( const OUString& _rStr ) = 0;
 
-        virtual sal_Bool                IsReadOnly() const = 0;
+        virtual sal_Bool            IsReadOnly() const = 0;
         virtual void                SetReadOnly( sal_Bool bReadOnly ) = 0;
 
         virtual xub_StrLen          GetMaxTextLen() const = 0;
@@ -165,7 +165,7 @@ namespace svt
         virtual Control&            GetControl();
 
         virtual String              GetText( LineEnd aSeparator ) const;
-        virtual void                SetText( const String& _rStr );
+        virtual void                SetText( const OUString& _rStr );
 
         virtual sal_Bool                IsReadOnly() const;
         virtual void                SetReadOnly( sal_Bool bReadOnly );
diff --git a/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx
index 29318dd716c9..983bf6dae5e8 100644
--- a/svtools/inc/svtools/editimplementation.hxx
+++ b/svtools/inc/svtools/editimplementation.hxx
@@ -45,7 +45,7 @@ String GenericEditImplementation< EDIT >::GetText( LineEnd ) const
 
 //----------------------------------------------------------------------
 template <class EDIT>
-void GenericEditImplementation< EDIT >::SetText( const String& _rStr )
+void GenericEditImplementation< EDIT >::SetText( const OUString& _rStr )
 {
     m_rEdit.SetText( _rStr );
 }
diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx
index 4648511427dc..7f81ae6327ca 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx
@@ -44,8 +44,8 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
         ~MultiLineEditSyntaxHighlight();
 
         virtual void UpdateData();
-        virtual void SetText(const String& rNewText);
-        virtual void SetText( const XubString& rStr, const Selection& rNewSelection )
+        virtual void SetText(const OUString& rNewText);
+        virtual void SetText( const OUString& rStr, const Selection& rNewSelection )
                     { SetText( rStr ); SetSelection( rNewSelection ); }
 
         Color GetColorValue(TokenTypes aToken);
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index d1b1eeee281c..c7fdd4262610 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -75,8 +75,8 @@ public:
     void            SetOpenDialog( sal_Bool bOpen )     { mbOpenDlg = bOpen; }
     sal_Bool            IsOpenDialog() const            { return mbOpenDlg; }
 
-    void            SetText( const XubString& rStr );
-    XubString       GetText() const;
+    void            SetText( const OUString& rStr );
+    OUString        GetText() const;
     rtl::OUString   GetSelectedText() const         { return maEdit.GetSelected(); }
 
     void            SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 368f54adba6b..b7cbc165157b 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -179,8 +179,8 @@ public:
     void    TreatAsNumber(sal_Bool bDoSo) { m_bTreatAsNumber = bDoSo; }
 
 public:
-    virtual void SetText( const XubString& rStr );
-    virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
+    virtual void SetText( const OUString& rStr );
+    virtual void SetText( const OUString& rStr, const Selection& rNewSelection );
 
     // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt
     /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern
@@ -244,7 +244,7 @@ protected:
     // any aspect of the current format has changed
     virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
 
-    void ImplSetTextImpl(const XubString& rNew, Selection* pNewSel);
+    void ImplSetTextImpl(const OUString& rNew, Selection* pNewSel);
     void ImplSetValue(double dValue, sal_Bool bForce);
     sal_Bool ImplGetValue(double& dNewVal);
 
diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx
index 4bde111920ae..f06a53c6d24d 100644
--- a/svtools/inc/svtools/ivctrl.hxx
+++ b/svtools/inc/svtools/ivctrl.hxx
@@ -65,7 +65,7 @@ class SvxIconChoiceCtrlEntry
 {
     Image aImage;
 
-    String aText;
+    OUString aText;
     String aQuickHelpText;
     void*  pUserData;
 
@@ -116,8 +116,8 @@ public:
 
     void                    SetImage ( const Image& rImage ) { aImage = rImage; }
     Image                   GetImage () const { return aImage; }
-    void                    SetText ( const String& rText ) { aText = rText; }
-    String                  GetText () const { return aText; }
+    void                    SetText ( const OUString& rText ) { aText = rText; }
+    OUString                GetText () const { return aText; }
     String SVT_DLLPUBLIC    GetDisplayText() const;
     void                    SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
     String                  GetQuickHelpText() const { return aQuickHelpText; }
@@ -155,7 +155,7 @@ enum SvxIconChoiceCtrlColumnAlign
 
 class SvxIconChoiceCtrlColumnInfo
 {
-    String                  aColText;
+    OUString                aColText;
     Image                   aColImage;
     long                    nWidth;
     SvxIconChoiceCtrlColumnAlign    eAlignment;
@@ -167,13 +167,13 @@ public:
                                 nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {}
                             SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& );
 
-    void                    SetText( const String& rText ) { aColText = rText; }
+    void                    SetText( const OUString& rText ) { aColText = rText; }
     void                    SetImage( const Image& rImg ) { aColImage = rImg; }
     void                    SetWidth( long nWd ) { nWidth = nWd; }
     void                    SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; }
     void                    SetSubItem( sal_uInt16 nSub) { nSubItem = nSub; }
 
-    const String&           GetText() const { return aColText; }
+    const OUString&         GetText() const { return aColText; }
     const Image&            GetImage() const { return aColImage; }
     long                    GetWidth() const { return nWidth; }
     SvxIconChoiceCtrlColumnAlign    GetAlignment() const { return eAlignment; }
diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx
index c3a7066fc74e..4ccc566fd74d 100644
--- a/svtools/inc/svtools/svxbox.hxx
+++ b/svtools/inc/svtools/svxbox.hxx
@@ -159,7 +159,7 @@ public:
     sal_uInt16              GetStyle() const             { return nStyle; }
     void                SetStyle( const sal_uInt16 nSt ) { nStyle = nSt; }
 
-    String              GetText() const;
+    OUString            GetText() const;
 
 private:
     SvxEntryLst         aEntryLst;
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index c448c78e3463..14f97f46ccd6 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -799,7 +799,7 @@ public:
     sal_Bool        KeyInput( const KeyEvent& rKEvt );
     void        LoseFocus();
     sal_Bool        EditingCanceled() const { return bCanceled; }
-    String      GetText() const;
+    OUString    GetText() const;
     String      GetSavedValue() const;
     void        StopEditing( sal_Bool bCancel = sal_False );
     void        Hide();