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>

43 files changed, 168 insertions, 168 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3b4e49f6f572..5ecfba5cbc63 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2876,7 +2876,7 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
     (void)pEdit;
 
     // if the Edit control is empty do not change the name
-    if ( aMenuNameEdit.GetText().Equals( String() ) )
+    if ( aMenuNameEdit.GetText() == "" )
     {
         return 0;
     }
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c3e3f4fdeeea..135e9c0c84ba 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -364,7 +364,7 @@ void SpellDialog::UpdateBoxes_Impl()
 
     m_pCheckGrammarCB->Show(rParent.HasGrammarChecking());
     m_pExplainLink->Show(!m_pExplainLink->GetURL().isEmpty());
-    if (m_pExplainFT->GetText().Len() == 0)
+    if (m_pExplainFT->GetText().isEmpty())
     {
         m_pExplainFT->Hide();
         m_pExplainLink->Hide();
@@ -706,7 +706,7 @@ void SpellDialog::Impl_Restore()
     //clear the "ChangeAllList"
     SvxGetChangeAllList()->clear();
     //get a new sentence
-    m_pSentenceED->SetText(rtl::OUString());
+    m_pSentenceED->SetText(OUString());
     m_pSentenceED->ResetModified();
     //Resolves: fdo#39348 refill the dialog with the currently spelled sentence
     SpellContinue_Impl(true);
@@ -959,7 +959,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
         bModified = true;
         m_pSuggestionLB->SetNoSelection();
         m_pSuggestionLB->Disable();
-        String sNewText( m_pSentenceED->GetText() );
+        OUString sNewText( m_pSentenceED->GetText() );
         m_pAutoCorrPB->Enable( sNewText != m_pSentenceED->GetText() );
         SpellUndoAction_Impl* pSpellAction = new SpellUndoAction_Impl(SPELLUNDO_CHANGE_TEXTENGINE, aDialogUndoLink);
         if(!m_pChangeAllPB->IsEnabled())
@@ -1447,7 +1447,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 break;
             }
             //save the current paragraph
-            sal_uInt16 nCurrentLen = GetText().Len();
+            sal_Int32 nCurrentLen = GetText().getLength();
             if(nAction != ACTION_SELECTFIELD)
                 pTextView->GetWindow()->KeyInput(rKeyEvt);
             else
@@ -1485,11 +1485,11 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 else if(pErrorAttr)
                 {
                     //determine the change
-                    sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen;
+                    sal_Int32 nAddedChars = GetText().getLength() - nCurrentLen;
 
                     TextAttrib* pNewError =  pErrorAttr->GetAttr().Clone();
-                    sal_uInt16 nStart = pErrorAttr->GetStart();
-                    sal_uInt16 nEnd = pErrorAttr->GetEnd();
+                    sal_Int32 nStart = pErrorAttr->GetStart();
+                    sal_Int32 nEnd = pErrorAttr->GetEnd();
                     pTextEngine->RemoveAttrib( 0, *pErrorAttr );
                     nStart = nStart - (sal_uInt16)nAddedChars;
                     SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd );
@@ -1772,7 +1772,7 @@ void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPar
 }
 
 //-----------------------------------------------------------------------
-void SentenceEditWindow_Impl::SetText( const String& rStr )
+void SentenceEditWindow_Impl::SetText( const OUString& rStr )
 {
     m_nErrorStart = m_nErrorEnd = 0;
     GetTextEngine()->SetText(rStr);
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index e6b3d0000563..d94a074b655f 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -57,13 +57,13 @@ long SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
 }
 
 //-----------------------------------------------------------------------------
-void SvxClickInfoCtr::SetText( const XubString& rStr )
+void SvxClickInfoCtr::SetText( const OUString& rStr )
 {
     aFixedInfo.SetText(rStr );
 }
 
 //-----------------------------------------------------------------------------
-XubString SvxClickInfoCtr::GetText() const
+OUString SvxClickInfoCtr::GetText() const
 {
     return aFixedInfo.GetText();
 }
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 47e309a16cf7..90c3f4ec8644 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -41,8 +41,8 @@ public:
     SvxClickInfoCtr( Window* pParent, const ResId& rResId );
     ~SvxClickInfoCtr();
 
-    virtual void        SetText( const XubString& rStr );
-    virtual XubString   GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 
     void                SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; }
     const Link&         GetActivateHdl() const { return aActivateLink; }
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 2bf01396e655..0b06b97292e9 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -264,7 +264,7 @@ void SvxShowText::Resize()
 
 // -----------------------------------------------------------------------
 
-void SvxShowText::SetText( const String& rText )
+void SvxShowText::SetText( const OUString& rText )
 {
     Control::SetText( rText );
     Invalidate();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 665643c91376..9d0fc46d0ab0 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -427,7 +427,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
 //------------------------------------------------------------------------
 IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
 {
-    if ((m_cmbSearchText.GetText().Len() != 0) || !m_rbSearchForText.IsChecked())
+    if ((!m_cmbSearchText.GetText().isEmpty()) || !m_rbSearchForText.IsChecked())
         m_pbSearchAgain.Enable();
     else
         m_pbSearchAgain.Disable();
@@ -668,7 +668,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
             if ( WINDOW_EDIT == m_pPreSearchFocus->GetType() )
             {
                 Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus );
-                pEdit->SetSelection( Selection( 0, pEdit->GetText().Len() ) );
+                pEdit->SetSelection( Selection( 0, pEdit->GetText().getLength() ) );
             }
         }
         m_pPreSearchFocus = NULL;
@@ -680,7 +680,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
 void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
 {
     sal_Bool bSearchingForText = m_rbSearchForText.IsChecked();
-    m_pbSearchAgain.Enable(bEnable && (!bSearchingForText || (m_cmbSearchText.GetText().Len() != 0)));
+    m_pbSearchAgain.Enable(bEnable && (!bSearchingForText || (!m_cmbSearchText.GetText().isEmpty())));
 
     bEnable = bEnable && bSearchingForText;
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 6e8337723efa..024e140504b3 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -701,9 +701,9 @@ namespace svx
     //-------------------------------------------------------------------------
     IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
     {
-        m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
+        m_aFind.Enable( OUString(m_pPlayground->GetWordInputControl().GetSavedValue()) != m_pPlayground->GetWordInputControl().GetText() );
 
-        bool bSameLen = m_pPlayground->GetWordInputControl().GetText().Len() == m_pPlayground->GetCurrentText().Len();
+        bool bSameLen = m_pPlayground->GetWordInputControl().GetText().getLength() == m_pPlayground->GetCurrentText().Len();
         m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChange, m_bDocumentMode && bSameLen );
         m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChangeAll, m_bDocumentMode && bSameLen );
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 1e538a7eea68..319e68dc36dd 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -193,7 +193,7 @@ String SvxHyperlinkInternetTp::CreateAbsoluteURL() const
     }
 
     // username and password for ftp-url
-    if( aURL.GetProtocol() == INET_PROT_FTP && maEdLogin.GetText().Len()!=0 )
+    if( aURL.GetProtocol() == INET_PROT_FTP && !maEdLogin.GetText().isEmpty() )
         aURL.SetUserAndPass ( maEdLogin.GetText(), maEdPassword.GetText() );
 
     if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
@@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
     // disable login-editfields if checked
     if ( maCbAnonymous.IsChecked() )
     {
-        if ( maEdLogin.GetText().ToLowerAscii().SearchAscii ( sAnonymous ) == 0 )
+        if ( maEdLogin.GetText().toAsciiLowerCase().indexOf ( sAnonymous ) == 0 )
         {
             maStrOldUser = aEmptyStr;
             maStrOldPassword = aEmptyStr;
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 3134196fa3db..1899ed9c895b 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -159,7 +159,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const
     // subject for EMail-url
     if( aURL.GetProtocol() == INET_PROT_MAILTO )
     {
-        if ( maEdSubject.GetText() != aEmptyStr )
+        if ( maEdSubject.GetText() != OUString(aEmptyStr) )
         {
             String aQuery = rtl::OUString("subject=");
             aQuery.Append( maEdSubject.GetText() );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 4d9c80863282..54495d50e50a 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -643,7 +643,7 @@ short SfxInsertFloatingFrameDialog::Execute()
     if ( bOK && ( nRet = Dialog::Execute() ) == RET_OK )
     {
         ::rtl::OUString aURL;
-        if ( m_pEDURL->GetText().Len() )
+        if ( !m_pEDURL->GetText().isEmpty() )
         {
             // URL can be a valid and absolute URL or a system file name
             INetURLObject aObj;
@@ -684,13 +684,13 @@ short SfxInsertFloatingFrameDialog::Execute()
 
                 long lMarginWidth;
                 if ( !m_pCBMarginWidthDefault->IsChecked() )
-                    lMarginWidth = (long) m_pNMMarginWidth->GetText().ToInt32();
+                    lMarginWidth = (long) m_pNMMarginWidth->GetText().toInt32();
                 else
                     lMarginWidth = SIZE_NOT_SET;
 
                 long lMarginHeight;
                 if ( !m_pCBMarginHeightDefault->IsChecked() )
-                    lMarginHeight = (long) m_pNMMarginHeight->GetText().ToInt32();
+                    lMarginHeight = (long) m_pNMMarginHeight->GetText().toInt32();
                 else
                     lMarginHeight = SIZE_NOT_SET;
 
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 11c05b4a5b16..9c7ce0cfb4ff 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -64,7 +64,7 @@ PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl()
 
 void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect )
 {
-    if (GetText().Len() == 0)
+    if (GetText().isEmpty())
     {
         Push( PUSH_TEXTCOLOR );
         SetTextColor( Color( COL_GRAY ) );
@@ -174,8 +174,8 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl()
 IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
 {
     bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() &&
-            m_aPasswdToOpenED.GetText().Len() == 0 &&
-            m_aPasswdToModifyED.GetText().Len() == 0;
+            m_aPasswdToOpenED.GetText().isEmpty() &&
+            m_aPasswdToModifyED.GetText().isEmpty();
     if (bInvalidState)
     {
         ErrorBox aErrorBox( m_pParent, WB_OK,
@@ -243,18 +243,18 @@ PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
 String PasswordToOpenModifyDialog::GetPasswordToOpen() const
 {
     const bool bPasswdOk =
-            m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 &&
+            !m_pImpl->m_aPasswdToOpenED.GetText().isEmpty() &&
             m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText();
-    return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String();
+    return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : OUString();
 }
 
 
 String PasswordToOpenModifyDialog::GetPasswordToModify() const
 {
     const bool bPasswdOk =
-            m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 &&
+            !m_pImpl->m_aPasswdToModifyED.GetText().isEmpty() &&
             m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText();
-    return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String();
+    return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : OUString();
 }
 
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index e94cbedc54be..8480b2398aae 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -113,16 +113,16 @@ ReplaceEdit::~ReplaceEdit()
 void ReplaceEdit::Modify()
 {
     if (m_pBtn)
-        m_pBtn->Enable( GetText().Len() > 0 );
+        m_pBtn->Enable( !GetText().isEmpty() );
 }
 
-void ReplaceEdit::SetText( const XubString& rStr )
+void ReplaceEdit::SetText( const OUString& rStr )
 {
     Edit::SetText( rStr );
     Modify();
 }
 
-void ReplaceEdit::SetText( const XubString& rStr, const Selection& rNewSelection )
+void ReplaceEdit::SetText( const OUString& rStr, const Selection& rNewSelection )
 {
     Edit::SetText( rStr, rNewSelection );
     Modify();
@@ -324,7 +324,7 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl()
 
 void SvxThesaurusDialog::LookUp( const String &rText )
 {
-    if (rText != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same
+    if (OUString(rText) != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same
         m_pWordCB->SetText( rText );
     LookUp_Impl();
 }
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8664374846e9..09005d39a502 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -216,11 +216,11 @@ void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void CuiAbstractTabDialog_Impl::SetText( const XubString& rStr )
+void CuiAbstractTabDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String CuiAbstractTabDialog_Impl::GetText() const
+OUString CuiAbstractTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -231,12 +231,12 @@ const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 
-void CuiAbstractSfxDialog_Impl::SetText( const XubString& rStr )
+void CuiAbstractSfxDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
 
-String CuiAbstractSfxDialog_Impl::GetText() const
+OUString CuiAbstractSfxDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -643,11 +643,11 @@ void AbstractSvxTransformTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractSvxTransformTabDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxTransformTabDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String AbstractSvxTransformTabDialog_Impl::GetText() const
+OUString AbstractSvxTransformTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -682,11 +682,11 @@ void AbstractSvxCaptionDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractSvxCaptionDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxCaptionDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String AbstractSvxCaptionDialog_Impl::GetText() const
+OUString AbstractSvxCaptionDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
@@ -737,7 +737,7 @@ void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
 {
     pDlg->SetHelpId( aHelpId );
 }
-void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
@@ -907,16 +907,16 @@ void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
      pDlg->SetInputSet( pInSet );
 }
 //From class Window.
-void AbstractSvxAreaTabDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxAreaTabDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
-String AbstractSvxAreaTabDialog_Impl::GetText() const
+OUString AbstractSvxAreaTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
 
-void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxPostItDialog_Impl::SetText( const OUString& rStr )
 {
     pDlg->SetText( rStr );
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 080d8b760460..dd4c37a4802e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -115,8 +115,8 @@ class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
     virtual const SfxItemSet*   GetOutputItemSet() const;
 
         //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const ;
+    virtual void          SetText( const OUString& rStr );
+    virtual OUString      GetText() const ;
 };
 
 class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
@@ -128,8 +128,8 @@ class CuiAbstractTabDialog_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;
 };
 
 //for SvxDistributeDialog begin
@@ -346,8 +346,8 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
     virtual void                SetInputSet( const SfxItemSet* pInSet );
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
 {
@@ -358,8 +358,8 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
     virtual void                SetInputSet( const SfxItemSet* pInSet );
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
+    virtual void        SetText( const OUString& rStr );
+    virtual OUString    GetText() const;
 };
 
 //for FmInputRecordNoDialog end
@@ -391,7 +391,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
     virtual void    SetEditHelpId(const rtl::OString&) ;
     //from class Window
     virtual void    SetHelpId( const rtl::OString& ) ;
-    virtual void    SetText( const XubString& rStr ) ;
+    virtual void    SetText( const OUString& rStr ) ;
 private:
     Link aCheckNameHdl;
     DECL_LINK(CheckNameHdl, void *);
@@ -506,8 +506,8 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
     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 SvxAreaTabDialog end
 
@@ -542,7 +542,7 @@ class SvxPostItDialog;
 class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
 {
     DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
-    virtual void                SetText( const XubString& rStr );  //From class Window
+    virtual void                SetText( const OUString& rStr );  //From class Window
     virtual const SfxItemSet*   GetOutputItemSet() const;
     virtual void                SetPrevHdl( const Link& rLink ) ;
     virtual void                SetNextHdl( const Link& rLink ) ;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b7b4ef066724..10ce9b28b3fa 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -81,7 +81,7 @@ public:
     void            SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
 
     void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
-    void            SetText( const String& rStr );
+    void            SetText( const OUString& rStr );
 
     bool            MarkNextError( bool bIgnoreCurrentError );
     void            ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index d9db58c24a3a..27b0d0f7d50b 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -44,7 +44,7 @@ public:
                     ~SvxShowText();
 
     void            SetFont( const Font& rFont );
-    void            SetText( const String& rText );
+    void            SetText( const OUString& rText );
     void            SetCentered(bool bCenter) { mbCenter = bCenter; }
 
     virtual void    Resize();
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index f8353ef17713..5ab74b046251 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -58,8 +58,8 @@ public:
 
 class AlternativesExtraData
 {
-    String  sText;
-    bool    bHeader;
+    OUString  sText;
+    bool      bHeader;
 
 public:
     AlternativesExtraData() : bHeader( false ) {}
@@ -70,7 +70,7 @@ public:
         }
 
     bool  IsHeader() const          { return bHeader; }
-    const String& GetText() const   { return sText; }
+    const OUString& GetText() const   { return sText; }
 };
 
 class ThesaurusAlternativesCtrl
@@ -118,8 +118,8 @@ public:
 
     // Edit
     virtual void        Modify();
-    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 );
 };
 
 class SvxThesaurusDialog : public SvxStandardDialog
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 98b550069b38..d38b872ab27d 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -96,7 +96,7 @@ namespace svx
     void ODocumentLinkDialog::validate( )
     {
 
-        m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) );
+        m_aOK.Enable( ( !m_aName.GetText().isEmpty()) && ( !m_aURL.GetText().isEmpty() ) );
     }
 
     //------------------------------------------------------------------
@@ -179,7 +179,7 @@ namespace svx
         if (0 != aFileDlg.Execute())
             return 0L;
 
-        if (0 == m_aName.GetText().Len())
+        if (m_aName.GetText().isEmpty())
         {   // default the name to the base of the chosen URL
             INetURLObject aParser;
 
@@ -188,7 +188,7 @@ namespace svx
 
             m_aName.SetText(aParser.getBase(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET));
 
-            m_aName.SetSelection(Selection(0,m_aName.GetText().Len()));
+            m_aName.SetSelection(Selection(0,m_aName.GetText().getLength()));
             m_aName.GrabFocus();
         }
         else
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e511a3f9302b..1ce2e89c4281 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -385,7 +385,7 @@ void SvxFontSubstTabPage::CheckEnable()
         sEntry += aFont2CB.GetText();
 
         // because of OS/2 optimization error (Bug #56267) a bit more intricate:
-        if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
+        if (aFont1CB.GetText().isEmpty() || aFont2CB.GetText().isEmpty())
             bApply = sal_False;
         else if(aFont1CB.GetText() == aFont2CB.GetText())
             bApply = sal_False;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9855c8a31fb5..e8d3f4850ae0 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
 
 IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
 {
-    if ( aNameEdit.GetText().Len() )
+    if ( !aNameEdit.GetText().isEmpty() )
         aOKBtn.Enable();
     else
         aOKBtn.Disable();
@@ -552,7 +552,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
         if(!bFirstSelect)
         {
             SvTreeListEntry* pEntry = pBox->FirstSelected();
-            String sTmpShort(pBox->GetEntryText(pEntry, 0));
+            OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
             // without this the curser is always at the beginning of a word, if the text
             // is set over the ModifyHdl, although you're editing there at the moment
             if(aWordED.GetText() != sTmpShort)
@@ -761,7 +761,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
         sal_Bool bIsChange =
                 CDE_EQUAL != cmpDicEntry_Impl(aWordED.GetText(), aWordText)
              || CDE_EQUAL != cmpDicEntry_Impl(aReplaceED.GetText(), aReplaceText);
-        if (aWordED.GetText().Len()  &&  bIsChange)
+        if (!aWordED.GetText().isEmpty()  &&  bIsChange)
             bEnableNewReplace = sal_True;
     }
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b7f6ec496db..9bbfab856e90 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -350,7 +350,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
 
     const SfxUInt16Item* pUInt16Item =
         PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
-    sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32();
+    sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().toInt32();
     if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
     {
         bModified = sal_True;
@@ -1480,7 +1480,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
 
     // Configured date acceptance patterns, for example Y-M-D;M-D or empty for
     // locale default.
-    if (aDatePatternsED.GetText() != aDatePatternsED.GetSavedValue())
+    if (aDatePatternsED.GetText() != OUString(aDatePatternsED.GetSavedValue()))
         pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( aDatePatternsED.GetText());
 
     SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5a1438b2073d..21278cf8b4d0 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -483,7 +483,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl()
 
     // modified?
     for (unsigned i = 0; i != vFields.size(); ++i)
-        if (vFields[i]->aEdit.GetSavedValue() != vFields[i]->aEdit.GetText())
+        if (OUString(vFields[i]->aEdit.GetSavedValue()) != vFields[i]->aEdit.GetText())
             return true;
     return false;
 }
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 999303046d8c..49a57fcba5dd 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -111,19 +111,19 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
 sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
 {
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
-    if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
+    if(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText())
         rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
-    if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
+    if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText())
         rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
-    if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
+    if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText())
         rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
-    if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
+    if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText())
         rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
-    if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
+    if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText())
         rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
-    if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
+    if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText())
         rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
-    if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
+    if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText())
         rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
 
     if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 240cb876684a..37a4c63d0e7f 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -414,49 +414,49 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
             bModified = sal_True;
         }
 
-        if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText())
+        if(OUString(aHttpProxyED.GetSavedValue()) != aHttpProxyED.GetText())
         {
             xPropertySet->setPropertyValue( aHttpProxyPN,
                 makeAny(rtl::OUString(aHttpProxyED.GetText())));
             bModified = sal_True;
         }
 
-        if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() )
+        if ( OUString(aHttpPortED.GetSavedValue()) != aHttpPortED.GetText() )
         {
             xPropertySet->setPropertyValue( aHttpPortPN,
-                makeAny(aHttpPortED.GetText().ToInt32()));
+                makeAny(aHttpPortED.GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if(aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText())
+        if(OUString(aHttpsProxyED.GetSavedValue()) != aHttpsProxyED.GetText())
         {
             xPropertySet->setPropertyValue( aHttpsProxyPN,
                 makeAny(rtl::OUString(aHttpsProxyED.GetText())));
             bModified = sal_True;
         }
 
-        if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() )
+        if ( OUString(aHttpsPortED.GetSavedValue()) != aHttpsPortED.GetText() )
         {
             xPropertySet->setPropertyValue( aHttpsPortPN,
-                makeAny(aHttpsPortED.GetText().ToInt32()));
+                makeAny(aHttpsPortED.GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if(aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText())
+        if(OUString(aFtpProxyED.GetSavedValue()) != aFtpProxyED.GetText())
         {
             xPropertySet->setPropertyValue( aFtpProxyPN,
                 makeAny( rtl::OUString(aFtpProxyED.GetText())));
             bModified = sal_True;
         }
 
-        if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() )
+        if ( OUString(aFtpPortED.GetSavedValue()) != aFtpPortED.GetText() )
         {
             xPropertySet->setPropertyValue( aFtpPortPN,
-                makeAny(aFtpPortED.GetText().ToInt32()));
+                makeAny(aFtpPortED.GetText().toInt32()));
             bModified = sal_True;
         }
 
-        if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() )
+        if ( OUString(aNoProxyForED.GetSavedValue()) != aNoProxyForED.GetText() )
         {
             xPropertySet->setPropertyValue( aNoProxyDescPN,
                 makeAny( rtl::OUString(aNoProxyForED.GetText())));
@@ -1386,7 +1386,7 @@ SfxTabPage*  SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
 sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bMailModified = sal_False;
-    if(!pImpl->aMailConfig.bROProgram && aMailerURLED.GetSavedValue() != aMailerURLED.GetText())
+    if(!pImpl->aMailConfig.bROProgram && OUString(aMailerURLED.GetSavedValue()) != aMailerURLED.GetText())
     {
         pImpl->aMailConfig.sProgram = aMailerURLED.GetText();
         bMailModified = sal_True;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index e5c43f79cf11..48e120fe7159 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -176,7 +176,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
     boost::shared_ptr< comphelper::ConfigurationChanges > batch(
         comphelper::ConfigurationChanges::create());
 
-    if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() )
+    if ( aUndoEdit.GetText() != OUString(aUndoEdit.GetSavedValue()) )
         officecfg::Office::Common::Undo::Steps::set(
             aUndoEdit.GetValue(), batch);
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index d818d9199aa0..394ece1bd0eb 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -310,7 +310,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
         bModified |= sal_True;
     }
 
-    if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() )
+    if ( aAutoSaveEdit.GetText() != OUString(aAutoSaveEdit.GetSavedValue()) )
     {
         rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
                                  (sal_uInt16)aAutoSaveEdit.GetValue() ) );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48bd0c7de2b5..b64619feacd1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1095,7 +1095,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
     if(!bFirstSelect || !bHasSelectionText)
     {
         SvTreeListEntry* pEntry = pBox->FirstSelected();
-        String sTmpShort(pBox->GetEntryText(pEntry, 0));
+        OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
         // if the text is set via ModifyHdl, the cursor is always at the beginning
         // of a word, although you're editing here
         sal_Bool bSameContent = 0 == pCompareClass->compareString( sTmpShort, aShortED.GetText() );
@@ -1197,7 +1197,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
     {
         SvTreeListEntry* _pNewEntry = aReplaceTLB.FirstSelected();
         String sEntry(aShortED.GetText());
-        if(sEntry.Len() && ( aReplaceED.GetText().Len() ||
+        if(sEntry.Len() && ( !aReplaceED.GetText().isEmpty() ||
                 ( bHasSelectionText && bSWriter ) ))
         {
             NewEntry(aShortED.GetText(), aReplaceED.GetText());
@@ -1630,7 +1630,7 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
 IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
 {
     if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED )
-        && aAbbrevED.GetText().Len())
+        && !aAbbrevED.GetText().isEmpty())
     {
         aAbbrevLB.InsertEntry(aAbbrevED.GetText());
         ModifyHdl(&aAbbrevED);
@@ -1641,7 +1641,7 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
         ModifyHdl(&aAbbrevED);
     }
     else if((pBtn == &aNewDoublePB || pBtn == (PushButton*)&aDoubleCapsED )
-            && aDoubleCapsED.GetText().Len())
+            && !aDoubleCapsED.GetText().isEmpty())
     {
         aDoubleCapsLB.InsertEntry(aDoubleCapsED.GetText());
         ModifyHdl(&aDoubleCapsED);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 1151fb5dcdde..afad498a15fc 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -763,7 +763,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
     SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, sal_False);
     const SfxItemSet& rOldSet = GetItemSet();
 
-    sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue());
+    sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != OUString(m_pGraphTransMF->GetSavedValue()));
     if ( pOld )
     {
         const SvxBrushItem& rOldItem    = (const SvxBrushItem&)*pOld;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 2bd6766faa64..960eaa3481e6 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -602,8 +602,8 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         if( !mbUseMarginItem )
         {
             // #106224# all edits empty: do nothing
-            if( m_pLeftMF->GetText().Len() || m_pRightMF->GetText().Len() ||
-                m_pTopMF->GetText().Len() || m_pBottomMF->GetText().Len() )
+            if( !m_pLeftMF->GetText().isEmpty() || !m_pRightMF->GetText().isEmpty() ||
+                !m_pTopMF->GetText().isEmpty() || !m_pBottomMF->GetText().isEmpty() )
             {
                 if ( ((mbHorEnabled || mbVerEnabled || (nSWMode & SW_BORDER_MODE_TABLE)) &&
                         (m_pLeftMF->IsModified()||m_pRightMF->IsModified()||
@@ -617,10 +617,10 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
                                                         rCoreAttrs, SID_ATTR_BORDER_INNER );
                     if (
                         !pOldBoxItem ||
-                        m_pLeftMF->GetText() != m_pLeftMF->GetSavedValue() ||
-                        m_pRightMF->GetText() != m_pRightMF->GetSavedValue() ||
-                        m_pTopMF->GetText() != m_pTopMF->GetSavedValue() ||
-                        m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() ||
+                        m_pLeftMF->GetText() != OUString(m_pLeftMF->GetSavedValue()) ||
+                        m_pRightMF->GetText() != OUString(m_pRightMF->GetSavedValue()) ||
+                        m_pTopMF->GetText() != OUString(m_pTopMF->GetSavedValue()) ||
+                        m_pBottomMF->GetText() != OUString(m_pBottomMF->GetSavedValue()) ||
                         nMinValue == m_pLeftMF->GetValue() ||
                         nMinValue == m_pRightMF->GetValue() ||
                         nMinValue == m_pTopMF->GetValue() ||
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 9d444d45a3a2..9c35affa4f1f 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -483,7 +483,7 @@ namespace
             aSize.Height() =
                 ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), SFX_FUNIT_TWIP );
         }
-        else if ( _pFontSizeLB->GetText().Len() )
+        else if ( !_pFontSizeLB->GetText().isEmpty() )
             aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) );
         else
             aSize.Height() = 200;   // default 10pt
@@ -1021,7 +1021,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
     // FontSize
     long nSize = static_cast<long>(pSizeBox->GetValue());
 
-    if ( !pSizeBox->GetText().Len() )   // GetValue() returns the min-value
+    if ( pSizeBox->GetText().isEmpty() )   // GetValue() returns the min-value
         nSize = 0;
     long nSavedSize = pSizeBox->GetSavedValue().ToInt32();
     bool bRel = true;
@@ -3223,7 +3223,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
 
     // Scale Width
     nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
-    if ( m_pScaleWidthMF->GetText() != m_pScaleWidthMF->GetSavedValue() )
+    if ( m_pScaleWidthMF->GetText() != OUString(m_pScaleWidthMF->GetSavedValue()) )
     {
         rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
         bModified = sal_True;
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f1d088d2ec39..1b2eb4779d87 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -324,49 +324,49 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
     sal_Bool     bModified = sal_False;
     sal_Int32    nValue;
 
-    if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() )
+    if( aMtrFldHorz1.GetText() != OUString(aMtrFldHorz1.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHorz1, eUnit );
         rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHorz2.GetText() != aMtrFldHorz2.GetSavedValue() )
+    if( aMtrFldHorz2.GetText() != OUString(aMtrFldHorz2.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHorz2, eUnit );
         rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldVert1.GetText() != aMtrFldVert1.GetSavedValue() )
+    if( aMtrFldVert1.GetText() != OUString(aMtrFldVert1.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldVert1, eUnit );
         rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldVert2.GetText() != aMtrFldVert2.GetSavedValue() )
+    if( aMtrFldVert2.GetText() != OUString(aMtrFldVert2.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldVert2, eUnit );
         rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine1.GetText() != aMtrFldLine1.GetSavedValue() )
+    if( aMtrFldLine1.GetText() != OUString(aMtrFldLine1.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldLine1, eUnit );
         rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine2.GetText() != aMtrFldLine2.GetSavedValue() )
+    if( aMtrFldLine2.GetText() != OUString(aMtrFldLine2.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldLine2, eUnit );
         rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldLine3.GetText() != aMtrFldLine3.GetSavedValue() )
+    if( aMtrFldLine3.GetText() != OUString(aMtrFldLine3.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldLine3, eUnit );
         rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1d3694b22a65..bbe07837e139 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -237,8 +237,8 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
 {
     const SfxItemPool& rPool = *rSet.GetPool();
     sal_Bool bModified = sal_False;
-    if( aWidthMF.GetSavedValue() != aWidthMF.GetText() ||
-        aHeightMF.GetSavedValue() != aHeightMF.GetText() )
+    if( OUString(aWidthMF.GetSavedValue()) != aWidthMF.GetText() ||
+        OUString(aHeightMF.GetSavedValue()) != aHeightMF.GetText() )
     {
         sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE );
         FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -256,9 +256,9 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
             aSz = (const SvxSizeItem&)GetItemSet().Get( nW );
 
         Size aTmpSz( aSz.GetSize() );
-        if( aWidthMF.GetText() != aWidthMF.GetSavedValue() )
+        if( aWidthMF.GetText() != OUString(aWidthMF.GetSavedValue()) )
             aTmpSz.Width() = lcl_GetValue( aWidthMF, eUnit );
-        if( aHeightMF.GetText() != aHeightMF.GetSavedValue() )
+        if( aHeightMF.GetText() != OUString(aHeightMF.GetSavedValue()) )
             aTmpSz.Height() = lcl_GetValue( aHeightMF, eUnit );
         aSz.SetSize( aTmpSz );
         aWidthMF.SaveValue();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 215ba1b75820..edf5eda7159d 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -438,35 +438,35 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
     sal_Int32    nValue;
     TriState eState;
 
-    if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() )
+    if( aMtrFldLineDist.GetText() != OUString(aMtrFldLineDist.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldLineDist, eUnit );
         rAttrs.Put( SdrMeasureLineDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelplineOverhang.GetText() != aMtrFldHelplineOverhang.GetSavedValue() )
+    if( aMtrFldHelplineOverhang.GetText() != OUString(aMtrFldHelplineOverhang.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHelplineOverhang, eUnit );
         rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelplineDist.GetText() != aMtrFldHelplineDist.GetSavedValue() )
+    if( aMtrFldHelplineDist.GetText() != OUString(aMtrFldHelplineDist.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHelplineDist, eUnit );
         rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelpline1Len.GetText() != aMtrFldHelpline1Len.GetSavedValue() )
+    if( aMtrFldHelpline1Len.GetText() != OUString(aMtrFldHelpline1Len.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHelpline1Len, eUnit );
         rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) );
         bModified = sal_True;
     }
 
-    if( aMtrFldHelpline2Len.GetText() != aMtrFldHelpline2Len.GetSavedValue() )
+    if( aMtrFldHelpline2Len.GetText() != OUString(aMtrFldHelpline2Len.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldHelpline2Len, eUnit );
         rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) );
@@ -480,7 +480,7 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
         bModified = sal_True;
     }
 
-    if( aMtrFldDecimalPlaces.GetText() != aMtrFldDecimalPlaces.GetSavedValue() )
+    if( aMtrFldDecimalPlaces.GetText() != OUString(aMtrFldDecimalPlaces.GetSavedValue()) )
     {
         nValue = static_cast<sal_Int32>(aMtrFldDecimalPlaces.GetValue());
         rAttrs.Put(
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4dad881a70d3..09ea455a1a0d 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1348,7 +1348,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, PushButton*, pIB)
                         SetCategory(nCatLbSelPos );
 
                     FillFormatListBox_Impl( aEntryList );
-                    if(m_pEdComment->GetText()!=m_pLbCategory->GetEntry(1))
+                    if(m_pEdComment->GetText()!=OUString(m_pLbCategory->GetEntry(1)))
                     {
                         pNumFmtShell->SetComment4Entry(nFmtLbSelPos,
                                                     m_pEdComment->GetText());
@@ -1459,12 +1459,12 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
 {
     sal_uInt32 nCurKey = NUMKEY_UNDEFINED;
 
-    if ( m_pEdFormat->GetText().Len() == 0 )
+    if ( m_pEdFormat->GetText().isEmpty() )
     {
         m_pIbAdd->Enable(sal_False );
         m_pIbRemove->Enable(sal_False );
         m_pIbInfo->Enable(sal_False );
-        m_pFtComment->SetText(String());
+        m_pFtComment->SetText(OUString());
     }
     else
     {
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 50b6a5746657..daaf17ea2b2f 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -685,13 +685,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     nWhich = GetWhich( SID_ATTR_ULSPACE );
     SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
 
-    if ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() )
+    if ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) )
     {
         aMargin.SetLeft( (sal_uInt16)GetCoreValue( aLeftMarginEdit, eUnit ) );
         bModified |= sal_True;
     }
 
-    if ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() )
+    if ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) )
     {
         aMargin.SetRight( (sal_uInt16)GetCoreValue( aRightMarginEdit, eUnit ) );
         bModified |= sal_True;
@@ -710,13 +710,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 
     sal_Bool bMod = sal_False;
 
-    if ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() )
+    if ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) )
     {
         aTopMargin.SetUpper( (sal_uInt16)GetCoreValue( aTopMarginEdit, eUnit ) );
         bMod |= sal_True;
     }
 
-    if ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() )
+    if ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) )
     {
         aTopMargin.SetLower( (sal_uInt16)GetCoreValue( aBottomMarginEdit, eUnit ) );
         bMod |= sal_True;
@@ -900,18 +900,18 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
 
     if ( nPos == SVX_PAGE_MIRROR )
     {
-        if ( aLeftMarginLbl.GetText() != aInsideText )
+        if ( aLeftMarginLbl.GetText() != OUString(aInsideText) )
             aLeftMarginLbl.SetText( aInsideText );
 
-        if ( aRightMarginLbl.GetText() != aOutsideText )
+        if ( aRightMarginLbl.GetText() != OUString(aOutsideText) )
             aRightMarginLbl.SetText( aOutsideText );
     }
     else
     {
-        if ( aLeftMarginLbl.GetText() != aLeftText )
+        if ( aLeftMarginLbl.GetText() != OUString(aLeftText) )
             aLeftMarginLbl.SetText( aLeftText );
 
-        if ( aRightMarginLbl.GetText() != aRightText )
+        if ( aRightMarginLbl.GetText() != OUString(aRightText) )
             aRightMarginLbl.SetText( aRightText );
     }
     UpdateExample_Impl( true );
@@ -1630,7 +1630,7 @@ bool SvxPageDescPage::IsPrinterRangeOverflow(
     long nValue = static_cast<long>(rField.GetValue());
     if ( bCheck &&
          (  nValue < nFirstMargin || nValue > nLastMargin ) &&
-         rField.GetText() != rField.GetSavedValue() )
+         rField.GetText() != OUString(rField.GetSavedValue()) )
     {
         rField.SetValue( nValue < nFirstMargin ? nFirstMargin : nLastMargin );
          bRet = true;
@@ -1664,19 +1664,19 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear )
 bool SvxPageDescPage::IsMarginOutOfRange()
 {
     bool bRet = ( ( ( !( pImpl->m_nPos & MARGIN_LEFT ) &&
-                      ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() ) ) &&
+                      ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) ) ) &&
                     ( aLeftMarginEdit.GetValue() < nFirstLeftMargin ||
                       aLeftMarginEdit.GetValue() > nLastLeftMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_RIGHT ) &&
-                      ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() ) ) &&
+                      ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) ) ) &&
                     ( aRightMarginEdit.GetValue() < nFirstRightMargin ||
                       aRightMarginEdit.GetValue() > nLastRightMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_TOP ) &&
-                      ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() ) ) &&
+                      ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) ) ) &&
                     ( aTopMarginEdit.GetValue() < nFirstTopMargin ||
                       aTopMarginEdit.GetValue() > nLastTopMargin ) ) ||
                   ( ( !( pImpl->m_nPos & MARGIN_BOTTOM ) &&
-                      ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() ) ) &&
+                      ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) ) ) &&
                     ( aBottomMarginEdit.GetValue() < nFirstBottomMargin ||
                       aBottomMarginEdit.GetValue() > nLastBottomMargin ) ) );
     return bRet;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 91a376cf4e85..6f992318f2de 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -802,7 +802,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
             aLineDistAtMetricBox.SetMin(0);
 
 
-            if ( !aLineDistAtMetricBox.GetText().Len() )
+            if ( aLineDistAtMetricBox.GetText().isEmpty() )
                 aLineDistAtMetricBox.SetValue(
                     aLineDistAtMetricBox.Normalize( 1 ) );
             aLineDistAtPercentBox.Hide();
@@ -816,7 +816,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
             pActLineDistFld = &aLineDistAtMetricBox;
             aLineDistAtMetricBox.SetMin(0);
 
-            if ( !aLineDistAtMetricBox.GetText().Len() )
+            if ( aLineDistAtMetricBox.GetText().isEmpty() )
                 aLineDistAtMetricBox.SetValue(
                     aLineDistAtMetricBox.Normalize( 10 ), FUNIT_TWIP );
             aLineDistAtPercentBox.Hide();
@@ -829,7 +829,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
             aLineDistAtMetricBox.Hide();
             pActLineDistFld = &aLineDistAtPercentBox;
 
-            if ( !aLineDistAtPercentBox.GetText().Len() )
+            if ( aLineDistAtPercentBox.GetText().isEmpty() )
                 aLineDistAtPercentBox.SetValue(
                     aLineDistAtPercentBox.Normalize( 100 ), FUNIT_TWIP );
             aLineDistAtMetricBox.Hide();
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index ef6d44b9a5fc..dc5431959274 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -536,7 +536,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
     // If no RadioButton was clicked, we need to put anyway
     bCheck |= sal_True;
     // Set the selection into the position Edit
-    aTabBox.SetSelection(Selection(0, aTabBox.GetText().Len()));
+    aTabBox.SetSelection(Selection(0, aTabBox.GetText().getLength()));
     return 0;
 }
 
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 32e0448fc2ba..7eb291109b2d 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -343,25 +343,25 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
     sal_Int32    nValue;
     TriState eState;
 
-    if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() )
+    if( aMtrFldLeft.GetText() != OUString(aMtrFldLeft.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldLeft, eUnit );
         rAttrs.Put( SdrTextLeftDistItem( nValue ) );
     }
 
-    if( aMtrFldRight.GetText() != aMtrFldRight.GetSavedValue() )
+    if( aMtrFldRight.GetText() != OUString(aMtrFldRight.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldRight, eUnit );
         rAttrs.Put( SdrTextRightDistItem( nValue ) );
     }
 
-    if( aMtrFldTop.GetText() != aMtrFldTop.GetSavedValue() )
+    if( aMtrFldTop.GetText() != OUString(aMtrFldTop.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldTop, eUnit );
         rAttrs.Put( SdrTextUpperDistItem( nValue ) );
     }
 
-    if( aMtrFldBottom.GetText() != aMtrFldBottom.GetSavedValue() )
+    if( aMtrFldBottom.GetText() != OUString(aMtrFldBottom.GetSavedValue()) )
     {
         nValue = GetCoreValue( aMtrFldBottom, eUnit );
         rAttrs.Put( SdrTextLowerDistItem( nValue ) );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 87b410fff68c..08d15d630016 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1165,7 +1165,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
             else
             {
                 // condition != Disabled ?
-                if( aNumFldStepCount.GetText().Len() > 0 )
+                if( !aNumFldStepCount.GetText().isEmpty() )
                 {
                     nValue = (sal_uInt16) aNumFldStepCount.GetValue();
                     if( nValue != (sal_uInt16) aNumFldStepCount.GetSavedValue().ToInt32() )
@@ -2234,7 +2234,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
     {
         if( aTsbStepCount.GetState() == STATE_NOCHECK )
         {
-            if( aNumFldStepCount.GetText().Len() == 0 )
+            if( aNumFldStepCount.GetText().isEmpty() )
                 aNumFldStepCount.SetText(rtl::OUString("64"));
 
             aNumFldStepCount.Enable();
@@ -2247,7 +2247,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
     if( aTsbStepCount.GetState() != STATE_CHECK )
     {
         // condition != Disabled ?
-        if( aNumFldStepCount.GetText().Len() > 0 )
+        if( !aNumFldStepCount.GetText().isEmpty() )
             nValue = (sal_uInt16) aNumFldStepCount.GetValue();
     }
     rXFSet.Put( XGradientStepCountItem( nValue ) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 896899728b9b..25c394fdb9c6 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -513,7 +513,7 @@ long SvxColorTabPage::CheckChanges_Impl()
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         Color aColor = pColorList->GetColor( nPos )->GetColor();
-        String aString = aLbColor.GetSelectEntry();
+        OUString aString = aLbColor.GetSelectEntry();
 
         // aNewColor, because COL_USER != COL_something, even if RGB values are the same
         // Color aNewColor( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 07d7267c3fc9..9fb4d89b3a75 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -230,8 +230,8 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 long SvxHatchTabPage::CheckChanges_Impl()
 {
-    if( aMtrDistance.GetText()           != aMtrDistance.GetSavedValue() ||
-        aMtrAngle.GetText()              != aMtrAngle.GetSavedValue() ||
+    if( aMtrDistance.GetText()           != OUString(aMtrDistance.GetSavedValue()) ||
+        aMtrAngle.GetText()              != OUString(aMtrAngle.GetSavedValue()) ||
         aLbLineType.GetSelectEntryPos()  != aLbLineType.GetSavedValue()  ||
         aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
         aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8e65d47ff9ae..fbd083b4c759 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -753,7 +753,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
     }
     // Line width
     // GetSavedValue() returns String!
-    if( aMtrLineWidth.GetText() != aMtrLineWidth.GetSavedValue() )
+    if( aMtrLineWidth.GetText() != OUString(aMtrLineWidth.GetSavedValue()) )
     {
         XLineWidthItem aItem( GetCoreValue( aMtrLineWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH );
@@ -764,7 +764,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line start
-    if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
+    if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
     {
         XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -775,7 +775,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line end
-    if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
+    if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
     {
         XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
@@ -868,7 +868,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
     }
 
     // Width line start
-    if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
+    if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
     {
         XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -879,7 +879,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         }
     }
     // Width line end
-    if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
+    if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
     {
         XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
         pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4718ec5d13c8..6108aaaa5606 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -222,13 +222,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
     // is here used to NOT lose changes
     //XDashStyle eXDS;
 
-    if( aNumFldNumber1.GetText()     != aNumFldNumber1.GetSavedValue() ||
-        aMtrLength1.GetText()        != aMtrLength1.GetSavedValue() ||
+    if( aNumFldNumber1.GetText()     != OUString(aNumFldNumber1.GetSavedValue()) ||
+        aMtrLength1.GetText()        != OUString(aMtrLength1.GetSavedValue()) ||
         aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() ||
-        aNumFldNumber2.GetText()     != aNumFldNumber2.GetSavedValue() ||
-        aMtrLength2.GetText()        != aMtrLength2.GetSavedValue() ||
+        aNumFldNumber2.GetText()     != OUString(aNumFldNumber2.GetSavedValue()) ||
+        aMtrLength2.GetText()        != OUString(aMtrLength2.GetSavedValue()) ||
         aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
-        aMtrDistance.GetText()       != aMtrDistance.GetSavedValue() )
+        aMtrDistance.GetText()       != OUString(aMtrDistance.GetSavedValue()) )
     {
         ResMgr& rMgr = CUI_MGR();
         Image aWarningBoxImage = WarningBox::GetStandardImage();