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>

20 files changed, 52 insertions, 53 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();
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 718eb6768b5a..fa081b743ad0 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -98,7 +98,7 @@ namespace svt
             case KEY_RIGHT:
             {
                 Selection aSel = rBox.GetSelection();
-                return !aSel && aSel.Max() == rBox.GetText().Len();
+                return !aSel && aSel.Max() == rBox.GetText().getLength();
             }
             case KEY_HOME:
             case KEY_LEFT:
@@ -129,7 +129,7 @@ namespace svt
     //------------------------------------------------------------------
     sal_Bool ComboBoxCellController::IsModified() const
     {
-        return GetComboBox().GetSavedValue() != GetComboBox().GetText();
+        return OUString(GetComboBox().GetSavedValue()) != GetComboBox().GetText();
     }
 
     //------------------------------------------------------------------
@@ -488,7 +488,7 @@ namespace svt
             case KEY_RIGHT:
             {
                 Selection aSel = GetSpinWindow().GetSelection();
-                bResult = !aSel && aSel.Max() == GetSpinWindow().GetText().Len();
+                bResult = !aSel && aSel.Max() == GetSpinWindow().GetText().getLength();
             }   break;
             case KEY_HOME:
             case KEY_LEFT:
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index aa7783b803fc..0f2177aad7b3 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -126,7 +126,7 @@ void ODocumentInfoPreview::fill(
 void ODocumentInfoPreview::insertEntry(
     rtl::OUString const & title, rtl::OUString const & value)
 {
-    if (m_pEditWin.GetText().Len() != 0) {
+    if (!m_pEditWin.GetText().isEmpty()) {
         m_pEditWin.InsertText(rtl::OUString("\n\n"));
     }
     rtl::OUString caption(title + rtl::OUString(":\n"));
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index eddb6022534e..a8e3b14e39a5 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -268,7 +268,7 @@ void SvInplaceEdit2::CallCallBackHdl_Impl()
     }
 }
 
-String SvInplaceEdit2::GetText() const
+OUString SvInplaceEdit2::GetText() const
 {
     return pEdit->GetText();
 }
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 0de2f577074f..1365975a15bb 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -79,7 +79,7 @@ FileControl::~FileControl()
 
 // -----------------------------------------------------------------------
 
-void FileControl::SetText( const XubString& rStr )
+void FileControl::SetText( const OUString& rStr )
 {
     maEdit.SetText( rStr );
     if ( mnFlags & FILECTRL_RESIZEBUTTONBYPATHLEN )
@@ -88,7 +88,7 @@ void FileControl::SetText( const XubString& rStr )
 
 // -----------------------------------------------------------------------
 
-XubString FileControl::GetText() const
+OUString FileControl::GetText() const
 {
     return maEdit.GetText();
 }
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 181bc7166dc6..b8b67748b315 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -368,7 +368,7 @@ FormattedField::~FormattedField()
 }
 
 //------------------------------------------------------------------------------
-void FormattedField::SetText(const XubString& rStr)
+void FormattedField::SetText(const OUString& rStr)
 {
     DBG_CHKTHIS(FormattedField, NULL);
 
@@ -377,7 +377,7 @@ void FormattedField::SetText(const XubString& rStr)
 }
 
 //------------------------------------------------------------------------------
-void FormattedField::SetText( const XubString& rStr, const Selection& rNewSelection )
+void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelection )
 {
     DBG_CHKTHIS(FormattedField, NULL);
 
@@ -397,7 +397,7 @@ void FormattedField::SetTextFormatted(const OUString& rStr)
 
     m_sCurrentTextValue = rStr;
 
-    String sFormatted;
+    OUString sFormatted;
     double dNumber = 0.0;
     // IsNumberFormat changes the format key parameter
     sal_uInt32 nTempFormatKey = static_cast< sal_uInt32 >( m_nFormatKey );
@@ -419,8 +419,8 @@ void FormattedField::SetTextFormatted(const OUString& rStr)
     Selection aSel(GetSelection());
     Selection aNewSel(aSel);
     aNewSel.Justify();
-    sal_uInt16 nNewLen = sFormatted.Len();
-    sal_uInt16 nCurrentLen = GetText().Len();
+    sal_Int32 nNewLen = sFormatted.getLength();
+    sal_Int32 nCurrentLen = GetText().getLength();
     if ((nNewLen > nCurrentLen) && (aNewSel.Max() == nCurrentLen))
     {   // the new text is longer and the cursor was behind the last char (of the old text)
         if (aNewSel.Min() == 0)
@@ -514,7 +514,7 @@ void FormattedField::Modify()
 }
 
 //------------------------------------------------------------------------------
-void FormattedField::ImplSetTextImpl(const XubString& rNew, Selection* pNewSel)
+void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel)
 {
     DBG_CHKTHIS(FormattedField, NULL);
 
@@ -533,8 +533,8 @@ void FormattedField::ImplSetTextImpl(const XubString& rNew, Selection* pNewSel)
         Selection aSel(GetSelection());
         aSel.Justify();
 
-        sal_uInt16 nNewLen = rNew.Len();
-        sal_uInt16 nCurrentLen = GetText().Len();
+        sal_Int32 nNewLen = rNew.getLength();
+        sal_Int32 nCurrentLen = GetText().getLength();
 
         if ((nNewLen > nCurrentLen) && (aSel.Max() == nCurrentLen))
         {   // new new text is longer and the cursor is behind the last char
@@ -782,7 +782,7 @@ void FormattedField::FormatChanged( FORMAT_CHANGE_TYPE _nWhat )
 void FormattedField::Commit()
 {
     // remember the old text
-    String sOld( GetText() );
+    OUString sOld( GetText() );
 
     // do the reformat
     ReFormat();
@@ -799,7 +799,7 @@ void FormattedField::Commit()
 //------------------------------------------------------------------------------
 void FormattedField::ReFormat()
 {
-    if (!IsEmptyFieldEnabled() || GetText().Len())
+    if (!IsEmptyFieldEnabled() || !GetText().isEmpty())
     {
         if (TreatingAsNumber())
         {
@@ -856,7 +856,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt)
     if (rNEvt.GetType() == EVENT_LOSEFOCUS)
     {
         // Sonderbehandlung fuer leere Texte
-        if (GetText().Len() == 0)
+        if (GetText().isEmpty())
         {
             if (!IsEmptyFieldEnabled())
             {
@@ -925,7 +925,7 @@ void FormattedField::EnableEmptyField(sal_Bool bEnable)
         return;
 
     m_bEnableEmptyField = bEnable;
-    if (!m_bEnableEmptyField && GetText().Len()==0)
+    if (!m_bEnableEmptyField && GetText().isEmpty())
         ImplSetValue(m_dCurrentValue, sal_True);
 }
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 6c0ce2a16bf5..37736054fa1e 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -907,7 +907,7 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
     }
 
     KeyCode aCode( rKey.GetCode() );
-    if ( aCode == KEY_RETURN && GetText().Len() )
+    if ( aCode == KEY_RETURN && !GetText().isEmpty() )
     {
         // wait for completion of matching thread
         ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
@@ -943,7 +943,7 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
         ClearModifyFlag();
         return bHandled;
     }
-    else if ( aCode == KEY_RETURN && !GetText().Len() && GetOpenHdl().IsSet() )
+    else if ( aCode == KEY_RETURN && GetText().isEmpty() && GetOpenHdl().IsSet() )
     {
         // for file dialog
         bAutoCompleteMode = sal_False;
@@ -1000,7 +1000,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt )
             Selection aSelection( GetSelection() );
             sal_uInt16 nLen = (sal_uInt16)aSelection.Min();
             GetSubEdit()->KeyInput( rEvent );
-            SetSelection( Selection( nLen, GetText().Len() ) );
+            SetSelection( Selection( nLen, GetText().getLength() ) );
             return sal_True;
         }
 
@@ -1008,7 +1008,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt )
         {
             // set the selection so a key stroke will overwrite
             // the placeholder rather than edit it
-            SetSelection( Selection( 0, GetText().Len() ) );
+            SetSelection( Selection( 0, GetText().getLength() ) );
         }
     }
 
@@ -1039,7 +1039,7 @@ long SvtURLBox::Notify( NotifyEvent &rEvt )
     }
     else if ( EVENT_LOSEFOCUS == rEvt.GetType() )
     {
-        if( !GetText().Len() )
+        if( GetText().isEmpty() )
             ClearModifyFlag();
         if ( pCtx.is() )
         {
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 4438779af611..046cf5f0a271 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2356,7 +2356,7 @@ sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId )
         mpEdit->SetControlForeground( aForegroundColor );
         mpEdit->SetControlBackground( aBackgroundColor );
         mpEdit->GrabFocus();
-        mpEdit->SetSelection( Selection( 0, mpEdit->GetText().Len() ) );
+        mpEdit->SetSelection( Selection( 0, mpEdit->GetText().getLength() ) );
         mpEdit->Show();
         return sal_True;
     }
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 3d85f3e1e4df..b42d81b52b42 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -1175,7 +1175,7 @@ void AssignmentPersistentData::Commit()
     // -------------------------------------------------------------------
     IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox)
     {
-        if (_pBox->GetSavedValue() != _pBox->GetText())
+        if (OUString(_pBox->GetSavedValue()) != _pBox->GetText())
         {
             if (_pBox == &m_aDatasource)
                 resetTables();
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 9ffc5f086428..38775201b5ae 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -227,14 +227,13 @@ namespace svt
     //---------------------------------------------------------------------
     void OWizardMachine::implUpdateTitle()
     {
-        String sCompleteTitle(m_pImpl->sTitleBase);
+        OUString sCompleteTitle(m_pImpl->sTitleBase);
 
         // append the page title
         TabPage* pCurrentPage = GetPage(getCurrentState());
-        if ( pCurrentPage && pCurrentPage->GetText().Len() )
+        if ( pCurrentPage && !pCurrentPage->GetText().isEmpty() )
         {
-            sCompleteTitle += rtl::OUString(" - ");
-            sCompleteTitle += pCurrentPage->GetText();
+            sCompleteTitle += (" - " + pCurrentPage->GetText());
         }
 
         SetText(sCompleteTitle);
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 64853117fe48..af68d0515a40 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -42,7 +42,7 @@ MultiLineEditSyntaxHighlight::~MultiLineEditSyntaxHighlight()
 {
 }
 
-void MultiLineEditSyntaxHighlight::SetText(const String& rNewText)
+void MultiLineEditSyntaxHighlight::SetText(const OUString& rNewText)
 {
     MultiLineEdit::SetText(rNewText);
     UpdateData();
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 91885b23562f..49edf88dd409 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1246,7 +1246,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet)
     }
     else
     {
-        if (pField->GetText().Len())    // empty wird erst mal standardmaessig als void nach draussen gereicht
+        if (!pField->GetText().isEmpty())    // empty wird erst mal standardmaessig als void nach draussen gereicht
             aReturn <<= pField->GetValue();
     }