diff options
| author | László Németh <nemeth@numbertext.org> | 2018-09-21 12:38:48 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-09-22 15:47:11 +0200 |
| commit | bdade7e3fc33c1832c6f6a472443fca8238738d2 (patch) | |
| tree | 5126a7c8afa18f61cf320556402d91e63f9cf31d /writerfilter/source | |
| parent | b56ad4cbe0aa67b92211cf31d70eca0b35c62666 (diff) | |
tdf#105444 DOCX import: don't put extra paragraphs in comments
on Win32, waiting only for \r\n instead of \n in RemoveLastParagraph().
Change-Id: I8921a6a72e8397ed04edb9f339ba3f0bf5bbb98b
Reviewed-on: https://gerrit.libreoffice.org/60865
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8767256faa76..6359fdf0982a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -436,7 +436,9 @@ void DomainMapper_Impl::RemoveLastParagraph( ) xCursor->goLeft( 1, true ); // If this is a text on a shape, possibly the text has the trailing // newline removed already. - if (xCursor->getString() == SAL_NEWLINE_STRING) + if (xCursor->getString() == SAL_NEWLINE_STRING || + // tdf#105444 comments need an exception, if SAL_NEWLINE_STRING defined as "\r\n" + (sizeof(SAL_NEWLINE_STRING)-1 == 2 && xCursor->getString() == "\n")) { uno::Reference<beans::XPropertySet> xDocProps(GetTextDocument(), uno::UNO_QUERY); const OUString aRecordChanges("RecordChanges"); |