summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-09-27 21:05:13 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-09-27 21:12:30 +0200
commitb3cc2c6d234156e7d5be2c3f2cacd20ab44ce94f (patch)
tree5d7aa2c58e4e8c23f6fa212393499a8520c81498
parent9d31c61103e91ecd4e24d9fb7838f49481ac2f0f (diff)
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
-rw-r--r--sc/source/core/data/postit.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 9eeabbfb49d5..733df671a63b 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -45,6 +45,7 @@
#include "drwlayer.hxx"
#include "userdat.hxx"
#include "detfunc.hxx"
+#include "editutil.hxx"
#include <utility>
@@ -545,11 +546,14 @@ OUString ScPostIt::GetText() const
if( const EditTextObject* pEditObj = GetEditTextObject() )
{
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 )
aBuffer.append( '\n' );
- aBuffer.append( pEditObj->GetText( nPara ) );
+ aBuffer.append(rEngine.GetText(nPara));
}
return aBuffer.makeStringAndClear();
}