[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source

[Stephan Bergmann]

 editeng/source/editeng/editundo.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41a4548baf490c8f12e36aa24f1ad943e760400
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 9 12:11:15 2015 +0100

    EditUndoRemoveChars::GetStr must return a reference
    
    ...as ImpEditEngine::ImpRemoveChars (editeng/source/editeng/impedit2.cxx) calls
    
      pCurUndo->GetStr() += aStr;
    
    Regression introduced with d5e11f5ffb741aabe7e43be78ef764a1f3cafd8e "convert
    editeng/source/editeng/editundo.hxx from String to OUString."
    
    Change-Id: Iab3dd3b861bca715a90e89e3a63a6f298657367d
    (cherry picked from commit e31205f3ec1f941ab5a188bfde6329edf2acc55b)
    Reviewed-on: https://gerrit.libreoffice.org/19858
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index a31261a..9d6451a 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -126,7 +126,7 @@ public:
     EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr);
 
     const EPaM&     GetEPaM() { return aEPaM; }
-    OUString        GetStr() const { return aText; }
+    OUString &      GetStr() { return aText; }
 
     virtual void    Undo() SAL_OVERRIDE;
     virtual void    Redo() SAL_OVERRIDE;