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>

8 files changed, 25 insertions, 25 deletions

diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 53dcf43b3a35..b3cde08b122b 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -102,7 +102,7 @@ public:
     virtual void HideDeleteBtn() = 0;
     virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) = 0;
     //from class ::Window
-    virtual void    SetText( const XubString& rStr ) = 0;
+    virtual void    SetText( const OUString& rStr ) = 0;
 };
 
 class AbstractSdInsertLayerDlg : public VclAbstractDialog  //add for SdInsertLayerDlg
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 71fb02415349..0560040d1ae5 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1605,7 +1605,7 @@ String SdDesignNameDlg::GetDesignName()
 
 IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl)
 {
-    m_aBtnOK.Enable(m_aEdit.GetText().Len() != 0);
+    m_aBtnOK.Enable(!m_aEdit.GetText().isEmpty());
 
     return 0;
 }
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 64dc36ca170e..1dc4e74dcdcb 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2062,7 +2062,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
     // ---
 
     nPos = mpCBRepeat->GetSelectEntryPos();
-    if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (mpCBRepeat->GetText().Len() != 0) )
+    if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) )
     {
         Any aRepeatCount;
         Any aEnd;
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 7f4a51d933a6..8cb3b77e1c2c 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -97,7 +97,7 @@ sal_Bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if(maNewStartCB.GetState() != maNewStartCB.GetSavedValue() ||
         maNewStartNumberCB.GetState() != maNewStartNumberCB.GetSavedValue()||
-        maNewStartNF.GetText() != maNewStartNF.GetSavedValue())
+       maNewStartNF.GetText() != OUString(maNewStartNF.GetSavedValue()))
     {
         mbModified = true;
         sal_Bool bNewStartChecked = STATE_CHECK == maNewStartCB.GetState();
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index c42e17bf067e..e76b6e1283b1 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -114,11 +114,11 @@ void SdAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void SdAbstractTabDialog_Impl::SetText( const XubString& rStr )
+void SdAbstractTabDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String SdAbstractTabDialog_Impl::GetText() const
+OUString SdAbstractTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -150,11 +150,11 @@ void AbstractBulletDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractBulletDialog_Impl::SetText( const XubString& rStr )
+void AbstractBulletDialog_Impl::SetText( const OUString& rStr )
 {
     static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetText( rStr );
 }
-String AbstractBulletDialog_Impl::GetText() const
+OUString AbstractBulletDialog_Impl::GetText() const
 {
     return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetText();
 }
@@ -187,12 +187,12 @@ void SdPresLayoutTemplateDlg_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 
-void SdPresLayoutTemplateDlg_Impl::SetText( const XubString& rStr )
+void SdPresLayoutTemplateDlg_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
 
-String SdPresLayoutTemplateDlg_Impl::GetText() const
+OUString SdPresLayoutTemplateDlg_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -262,7 +262,7 @@ void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEna
 {
     pDlg->SetInputFields(bEnableX, bEnableY);
 }
-void AbstractSdSnapLineDlg_Impl::SetText( const XubString& rStr )
+void AbstractSdSnapLineDlg_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
@@ -344,11 +344,11 @@ const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
 }
-void SdAbstractSfxDialog_Impl::SetText( const XubString& rStr )
+void SdAbstractSfxDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String SdAbstractSfxDialog_Impl::GetText() const
+OUString SdAbstractSfxDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index d1c9ef7726e8..287f7a299a81 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -83,8 +83,8 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
     virtual void                SetInputSet( const SfxItemSet* pInSet );
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 //add for SdCharDlg end
 
@@ -100,8 +100,8 @@ class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
     virtual void                SetInputSet( const SfxItemSet* pInSet );
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 //add for OutlineBulletDlg end
 
@@ -115,8 +115,8 @@ class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
     virtual void                SetInputSet( const SfxItemSet* pInSet );
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 
 // add for AssistentDlg
@@ -153,7 +153,7 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg
     virtual void HideDeleteBtn();
     virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY);
     //from class Window
-    virtual void    SetText( const XubString& rStr );
+    virtual void    SetText( const OUString& rStr );
 };
 
 // add for SdInsertLayerDlg
@@ -216,8 +216,8 @@ class SdAbstractSfxDialog_Impl : public SfxAbstractDialog
 {
     DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog)
     virtual const SfxItemSet*   GetOutputItemSet() const;
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 
 // add for SdVectorizeDlg
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 77960f056cc0..83c6d53a933b 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -444,7 +444,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
     }
 
     // Tabulatorabstand
-    if( aMtrFldTabstop.GetText() != aMtrFldTabstop.GetSavedValue() )
+    if( aMtrFldTabstop.GetText() != OUString(aMtrFldTabstop.GetSavedValue()) )
     {
         sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP );
         SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 0f68a38e283c..ee6305474d9b 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -463,7 +463,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 
         sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() );
 
-        if (nErr || !pOutliner->GetEditEngine().GetText().Len())
+        if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
         {
             ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
                       String(SdResId(STR_READ_DATA_ERROR)));
@@ -611,7 +611,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 
     sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes());
 
-    if (nErr || !pOutliner->GetEditEngine().GetText().Len())
+    if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
     {
         ErrorBox aErrorBox( mpWindow, (WinBits)WB_OK,
                   String(SdResId(STR_READ_DATA_ERROR)));