Kaydet (Commit) 6dd693bf authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Andras Timar

don't try to create OUString from editeng directly, tdf#94542

editeng uses special control characters (apparently 0x01) that need to
be translated by editeng to the real characters. Let EditEngine handle
the conversion from editeng string to OUString.

Change-Id: If5014e1ada7f1df933a084b17bb307035ce01cc6
Reviewed-on: https://gerrit.libreoffice.org/19065Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit e108b24c)
üst 8fb177b8
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "drwlayer.hxx" #include "drwlayer.hxx"
#include "userdat.hxx" #include "userdat.hxx"
#include "detfunc.hxx" #include "detfunc.hxx"
#include "editutil.hxx"
#include <utility> #include <utility>
...@@ -545,11 +546,14 @@ OUString ScPostIt::GetText() const ...@@ -545,11 +546,14 @@ OUString ScPostIt::GetText() const
if( const EditTextObject* pEditObj = GetEditTextObject() ) if( const EditTextObject* pEditObj = GetEditTextObject() )
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
for( sal_Int32 nPara = 0, nParaCount = pEditObj->GetParagraphCount(); nPara < nParaCount; ++nPara ) ScNoteEditEngine& rEngine = mrDoc.GetNoteEngine();
rEngine.SetText(*pEditObj);
sal_Int32 nParaCount = rEngine.GetParagraphCount();
for( sal_Int32 nPara = 0; nPara < nParaCount; ++nPara )
{ {
if( nPara > 0 ) if( nPara > 0 )
aBuffer.append( '\n' ); aBuffer.append( '\n' );
aBuffer.append( pEditObj->GetText( nPara ) ); aBuffer.append(rEngine.GetText(nPara));
} }
return aBuffer.makeStringAndClear(); return aBuffer.makeStringAndClear();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment