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

Michael Stahl mstahl at redhat.com
Sun Jun 16 03:29:30 PDT 2013


 sw/source/core/text/pormulti.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5c5ec048fa88886370d2e1455b2c23700aeac66
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Jun 16 11:25:40 2013 +0100

    fdo#64925 - fix crash on paste of Arabic text on windows.
    
    Change-Id: I4c1c5416d6ce486f257f499c39e269d1f1619add

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 3443d69..05bf26f 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1830,7 +1830,7 @@ sal_Bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     const OUString* pOldTxt = &(rInf.GetTxt());
     const SwTwips nOldPaintOfst = rInf.GetPaintOfst();
 
-    XubString aMultiStr( rInf.GetTxt(), 0, nMultiLen + rInf.GetIdx() );
+    OUString const aMultiStr( rInf.GetTxt().copy(0, nMultiLen + rInf.GetIdx()) );
     rInf.SetTxt( aMultiStr );
     SwTxtFormatInfo aInf( rInf, rMulti.GetRoot(), nActWidth );
     // Do we allow break cuts? The FirstMulti-Flag is evaluated during


More information about the Libreoffice-commits mailing list