diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-09-02 00:33:01 +0800 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 11:11:44 +0000 |
| commit | 9761e8b7eb2f4efedfff67a6574540d4ea2e9c5a (patch) | |
| tree | 9038157cd76c45f0f49c611a52bbfb329cf3b8ac | |
| parent | ab49ad6e45a777253abc02f1feabfdb93a44e72f (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>
(cherry picked from commit 85c62a36a907bc5ff31627349a80baa51efbd443)
Reviewed-on: https://gerrit.libreoffice.org/18296
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 0c26682d49f4..ecc12147b25a 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++; } |