diff options
author | hb <hbrinkm@openoffice.org> | 2010-03-19 11:41:08 +0100 |
---|---|---|
committer | hb <hbrinkm@openoffice.org> | 2010-03-19 11:41:08 +0100 |
commit | 281ba7bdd44fc6fccacdec5fca877229e9be54d7 (patch) | |
tree | 6c94692645df5f0dc56c452b0ee11b7ee54faa30 | |
parent | 2670e195169501bfc687d5a3f65544142c7a3b92 (diff) |
sw321bf01: #i109284# moved changes form hb33issues01
-rw-r--r-- | sw/source/filter/rtf/wrtrtf.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sw/source/filter/rtf/wrtrtf.cxx b/sw/source/filter/rtf/wrtrtf.cxx index 5d9a0deda7d1..34fe44eae053 100644 --- a/sw/source/filter/rtf/wrtrtf.cxx +++ b/sw/source/filter/rtf/wrtrtf.cxx @@ -85,6 +85,7 @@ const sal_Char SwRTFWriter::sNewLine = '\012'; const sal_Char __FAR_DATA SwRTFWriter::sNewLine[] = "\015\012"; #endif +static ::rtl::OUString aEmpty; SV_DECL_VARARR( RTFColorTbl, Color, 5, 8 ) @@ -1299,8 +1300,16 @@ void SwRTFWriter::OutBookmarks( xub_StrLen nCntntPos) Strm() << '}'; } OutComment( *this, OOO_STRING_SVTOOLS_RTF_BKMKEND ) << ' '; - RTFOutFuncs::Out_String( Strm(), pAsBookmark->GetName(), + + { + ::rtl::OUString & rBookmarkName = aEmpty; + + if (pAsBookmark) + rBookmarkName = pAsBookmark->GetName(); + + RTFOutFuncs::Out_String( Strm(), rBookmarkName, eDefaultEncoding, bWriteHelpFmt ) << '}'; + } if(++nBkmkTabPos >= pMarkAccess->getMarksCount()) nBkmkTabPos = -1; |