[Libreoffice-commits] core.git: starmath/source

[Thomas Arnhold]

 starmath/source/mathmlimport.cxx |    2 +-
 starmath/source/mathmlimport.hxx |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8c1d8ab99ca593189b25e6d8e56ed65c2482b09d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Sep 4 22:40:08 2013 +0200

    fdo#68956: fix string conversion
    
    Added the SetText method to make it absolutely clear.
    
    Regression from 150c9f8bbcffacc687a5603e2a589d2a3816dccb
    
    Change-Id: I4e9935fd13fca8f9cfdfda65c980d08b1e85b459
    Reviewed-on: https://gerrit.libreoffice.org/5819
    Reviewed-by: Marcos Souza <marcos.souza.org at gmail.com>
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index c10bf97..59aadee 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1192,7 +1192,7 @@ void SmXMLAnnotationContext_Impl::StartElement(const uno::Reference<
 void SmXMLAnnotationContext_Impl::Characters(const OUString &rChars)
 {
     if (bIsStarMath)
-        GetSmImport().GetText() + rChars;
+        GetSmImport().SetText( GetSmImport().GetText() + rChars );
 }
 
 ////////////////////////////////////////////////////////////
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 17b0260..d730395 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -255,8 +255,9 @@ public:
         return result;
     }
 
-    sal_Bool GetSuccess()           { return bSuccess; }
-    OUString &GetText()             { return aText; }
+    sal_Bool GetSuccess()              { return bSuccess; }
+    OUString GetText()                 { return aText; }
+    void SetText(const OUString &rStr) { aText = rStr; }
 
     virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);
     virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);