diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-04 11:57:20 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-05-04 13:54:04 +0200 |
| commit | f7f7621cce0d9b91bec2807ddd0134e8b25957bb (patch) | |
| tree | d8a50cd52ccf07a669df9b67fb3f26b5b384bef9 /sw/source/filter/docx | |
| parent | f18b17ddbd58e64683f7f806e913878f756e7a26 (diff) | |
AutoText: fix dotm support
+ dotm files don't contain additional empty paragraphs
at the end of AutoText entry
+ added test for dotm import
Change-Id: I336145dcf8a5dd69aa9ed82318a0f05a6f62596c
Reviewed-on: https://gerrit.libreoffice.org/37230
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw/source/filter/docx')
| -rw-r--r-- | sw/source/filter/docx/swdocxreader.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 7558b4dfba10..b72253c0b57a 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -139,7 +139,11 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks ) aPam.SetMark(); { SwNodeIndex& rIdx = aPam.GetPoint()->nNode; - rIdx = aStart.GetNode().EndOfSectionIndex() - 2; + rIdx = aStart.GetNode().EndOfSectionIndex() - 1; + // don't add extra empty text node if exist (.dotx but not .dotm) + if( rIdx.GetNode().GetTextNode() && + rIdx.GetNode().GetTextNode()->GetText().isEmpty() ) + rIdx = aStart.GetNode().EndOfSectionIndex() - 2; if( ( nullptr == ( pCNd = rIdx.GetNode().GetContentNode() ) ) ) { ++rIdx; |