diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-05 20:46:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-06 09:45:47 +0100 |
| commit | 6769538b2e3ff454c4462e64372c50ff9d70df3e (patch) | |
| tree | a094934847b995db8de777d7b71252b762bd4bcb /writerfilter | |
| parent | ac2ee597d39fb45cd4873d4ae345e4dbfa2404eb (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)
(cherry picked from commit c4696e7c0456df8d9466acbae3ea1fa9dcfa73f0)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Id32687c40a17ddb99196635cedfc850182705799
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
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 cdea1b1ce119..a58e139a5c12 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1604,12 +1604,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; |