diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-05 20:46:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-05 21:05:45 +0100 |
| commit | c4696e7c0456df8d9466acbae3ea1fa9dcfa73f0 (patch) | |
| tree | 972cfa73c2830443ee280842433674abc9b9bd94 /writerfilter | |
| parent | cf8f6fe1f9d65eedbc6f4d65ce0fa88831830966 (diff) | |
RTF import: fix import of \line symbol
"Required line break" was eaten by the newly added code in text() to
ignore \'0a. (regression from f593a2e4179b05ae1019372cde612cb242d1d27f)
Change-Id: Id32687c40a17ddb99196635cedfc850182705799
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 607d9553ef96..325ff4f6eb8c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1605,12 +1605,16 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) checkUnicode(); setNeedSect(); RTFSkipDestination aSkip(*this); - sal_uInt8 cCh = 0; + if (RTF_LINE == nKeyword) + { // very special handling since text() will eat lone '\n' + singleChar('\n'); + return 0; + } // Trivial symbols + sal_uInt8 cCh = 0; switch (nKeyword) { - case RTF_LINE: cCh = '\n'; break; case RTF_TAB: cCh = '\t'; break; case RTF_BACKSLASH: cCh = '\\'; break; case RTF_LBRACE: cCh = '{'; break; |