summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-09-02 00:33:01 +0800
committerCaolán McNamara <caolanm@redhat.com>2015-09-03 11:10:02 +0000
commit85c62a36a907bc5ff31627349a80baa51efbd443 (patch)
tree7bf753483affd7013b19f09e33edf7e7e2d5904c
parentdb9f846abfc683c622375191edb6ae9bf348f6e7 (diff)
Fix tdf#93781 Impress copy wrong style name to clipboard when
style name contains Chinese character. Encode style name in multibyte sring (ex,Chinese) properly with RTFOutFuncs::Out_String(). Change-Id: Ibdd1010e28c711d7829643b60b32637ebce58bdb Reviewed-on: https://gerrit.libreoffice.org/18247 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--editeng/source/editeng/impedit4.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index fcc47af2161c..ba50da1367a1 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -515,7 +515,8 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
rOutput.WriteUInt32AsString( nNumber );
// Name of the template ...
- rOutput.WriteCharPtr( " " ).WriteCharPtr( OUStringToOString(pStyle->GetName(), eDestEnc).getStr() );
+ rOutput.WriteCharPtr( " " );
+ RTFOutFuncs::Out_String( rOutput, pStyle->GetName(), eDestEnc );
rOutput.WriteCharPtr( ";}" );
nStyle++;
}