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>

7 files changed, 17 insertions, 17 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index b5a561d0f85a..08c80509179d 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -185,8 +185,8 @@ public:
     sal_Bool    ReplaceBadChars();
 
     void        UpdateText();
-    void        SetText(const String& rBuffer);
-    String&     GetText() { return (aText); }
+    void        SetText(const OUString& rBuffer);
+    OUString    GetText() { return (OUString(aText)); }
     void        SetFormat(SmFormat& rFormat);
     const SmFormat&  GetFormat() { return (aFormat); }
 
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index be7b52d8c397..b24f9ec54bcd 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -97,8 +97,8 @@ public:
     SfxItemPool *   GetEditEngineItemPool();
 
     // Window
-    virtual void        SetText(const XubString &rText);
-    virtual String      GetText() const;
+    virtual void        SetText(const OUString &rText);
+    virtual OUString    GetText() const;
     virtual void        GetFocus();
     virtual void        LoseFocus();
 
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index ae72f525adea..8f44185a65eb 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -532,7 +532,7 @@ void Test::testBinomInBinHor()
     aCursor.InsertText("d");
 
     sExpected.AppendAscii(" { { binom a b + c } + d } ");
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Binom Node in BinHor Node", sExpected, xDocShRef->GetText());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Binom Node in BinHor Node", sExpected, String(xDocShRef->GetText()));
 
     delete pTree;
 }
@@ -563,7 +563,7 @@ void Test::testBinVerInUnary()
     aCursor.InsertText("2");
 
     sExpected.AppendAscii(" - { 1 over 2 } ");
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Binary Vertical in Unary Operator", sExpected, xDocShRef->GetText());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Binary Vertical in Unary Operator", sExpected, String(xDocShRef->GetText()));
 
     delete pTree;
 }
@@ -641,7 +641,7 @@ void Test::testUnaryInMixedNumberAsNumerator()
     aCursor.InsertText("4");
 
     sExpected.AppendAscii(" { 2 { - 1 over 2 } + 4 } ");
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unary in mixed number as Numerator", sExpected, xDocShRef->GetText());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Unary in mixed number as Numerator", sExpected, String(xDocShRef->GetText()));
 
     delete pTree;
 }
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index c0cc81f4203c..53b9b075ac1a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2044,7 +2044,7 @@ void SmSymDefineDialog::UpdateButtons()
                     && aTmpSymbolName.equals(pOrigSymbol->GetName())
                     && aFonts.GetSelectEntry().EqualsIgnoreCaseAscii(
                             pOrigSymbol->GetFace().GetName())
-                    && aStyles.GetText().EqualsIgnoreCaseAscii(
+                    && aStyles.GetText().equalsIgnoreAsciiCase(
                             GetFontStyles().GetStyleName(pOrigSymbol->GetFace()))
                     && aCharsetDisplay.GetSelectCharacter() == pOrigSymbol->GetCharacter();
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 632ce0ea76be..d62d5acec7c8 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -151,11 +151,11 @@ const String SmDocShell::GetComment() const
 }
 
 
-void SmDocShell::SetText(const String& rBuffer)
+void SmDocShell::SetText(const OUString& rBuffer)
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetText" );
 
-    if (rBuffer != aText)
+    if (rBuffer != OUString(aText))
     {
         bool bIsEnabled = IsEnableSetModified();
         if( bIsEnabled )
@@ -911,7 +911,7 @@ void SmDocShell::UpdateText()
 
     if (pEditEngine && pEditEngine->IsModified())
     {
-        String aEngTxt( pEditEngine->GetText( LINEEND_LF ) );
+        OUString aEngTxt( pEditEngine->GetText( LINEEND_LF ) );
         if (GetText() != aEngTxt)
             SetText( aEngTxt );
     }
@@ -1164,7 +1164,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
         case SID_TEXT:
         {
             const SfxStringItem& rItem = (const SfxStringItem&)rReq.GetArgs()->Get(SID_TEXT);
-            if (GetText() != rItem.GetValue())
+            if (GetText() != OUString(rItem.GetValue()))
                 SetText(rItem.GetValue());
         }
         break;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index b6d83e0f6e9f..4e4172349e13 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -598,7 +598,7 @@ void SmEditWindow::InitScrollBars()
 }
 
 
-String SmEditWindow::GetText() const
+OUString SmEditWindow::GetText() const
 {
     String aText;
     EditEngine *pEditEngine = const_cast< SmEditWindow* >(this)->GetEditEngine();
@@ -609,7 +609,7 @@ String SmEditWindow::GetText() const
 }
 
 
-void SmEditWindow::SetText(const XubString& rText)
+void SmEditWindow::SetText(const OUString& rText)
 {
     EditEngine *pEditEngine = GetEditEngine();
     OSL_ENSURE( pEditEngine, "EditEngine missing" );
@@ -686,7 +686,7 @@ bool SmEditWindow::IsAllSelected() const
         sal_Int32 nParaCnt = pEditEngine->GetParagraphCount();
         if (!(nParaCnt - 1))
         {
-            sal_uInt16 nTextLen = pEditEngine->GetText( LINEEND_LF ).Len();
+            sal_Int32 nTextLen = pEditEngine->GetText( LINEEND_LF ).getLength();
             bRes = !eSelection.nStartPos && (eSelection.nEndPos == nTextLen - 1);
         }
         else
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e006c1ccb016..306d92a26716 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -684,7 +684,7 @@ void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
 {
     const SfxStringItem *pItem = PTR_CAST(SfxStringItem, pState);
 
-    if ((pItem != NULL) && (rEdit.GetText() != pItem->GetValue()))
+    if ((pItem != NULL) && (rEdit.GetText() != OUString(pItem->GetValue())))
         rEdit.SetText(pItem->GetValue());
     SfxControllerItem::StateChanged (nSID, eState, pState);
 }
@@ -1778,7 +1778,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
 
         case SID_GETEDITTEXT:
             if (pWin)
-                if (pWin->GetText ().Len ()) GetDoc()->SetText( pWin->GetText() );
+                if (!pWin->GetText().isEmpty()) GetDoc()->SetText( pWin->GetText() );
             break;
 
         case SID_ATTR_ZOOM: