diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-26 17:28:27 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-26 18:06:40 +0100 |
| commit | 5de52551a963b932cc23c2ea75f709fa1924520b (patch) | |
| tree | 380b547231a507a83a58cd7f271c46bd38b3c57f /sw/source | |
| parent | 3a934d928e455eca38f124072c20a624a64aa225 (diff) | |
fdo#61507 export of RTF_TITLE may need RTF_UPR and RTF_UD
Change-Id: I3b8fe209a96e5119541e09cb5dbda8a2c6926b40
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 15 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index a2512059b46d..34073be45e87 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -395,7 +395,7 @@ void RtfExport::WriteInfo() } if (xDocProps.is()) { - OutUnicode(OOO_STRING_SVTOOLS_RTF_TITLE, xDocProps->getTitle()); + OutUnicode(OOO_STRING_SVTOOLS_RTF_TITLE, xDocProps->getTitle(), true); OutUnicode(OOO_STRING_SVTOOLS_RTF_SUBJECT, xDocProps->getSubject()); OutUnicode(OOO_STRING_SVTOOLS_RTF_KEYWORDS, @@ -801,13 +801,18 @@ SvStream& RtfExport::OutLong( long nVal ) return m_pWriter->OutLong( Strm(), nVal ); } -void RtfExport::OutUnicode(const sal_Char *pToken, const String &rContent) +void RtfExport::OutUnicode(const sal_Char *pToken, const String &rContent, bool bUpr) { if (rContent.Len()) { - Strm() << '{' << pToken << ' '; - Strm() << msfilter::rtfutil::OutString( rContent, eCurrentEncoding ).getStr(); - Strm() << '}'; + if (!bUpr) + { + Strm() << '{' << pToken << ' '; + Strm() << msfilter::rtfutil::OutString( rContent, eCurrentEncoding ).getStr(); + Strm() << '}'; + } + else + Strm() << msfilter::rtfutil::OutStringUpr(pToken, rContent, eCurrentEncoding).getStr(); } } diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 6cd33ce4d3e5..8fc8e26c8886 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -155,7 +155,7 @@ public: SvStream& Strm(); SvStream& OutULong( sal_uLong nVal ); SvStream& OutLong( long nVal ); - void OutUnicode(const sal_Char *pToken, const String &rContent); + void OutUnicode(const sal_Char *pToken, const String &rContent, bool bUpr = false); void OutDateTime(const sal_Char* pStr, const util::DateTime& rDT ); void OutPageDescription( const SwPageDesc& rPgDsc, bool bWriteReset, bool bCheckForFirstPage ); |