[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa sw/source
Vasily Melenchuk
Vasily.Melenchuk at cib.de
Tue Sep 12 08:35:01 UTC 2017
sw/qa/extras/ooxmlexport/data/tdf103090.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 22 +++++++++++++++++++
sw/source/filter/ww8/docxattributeoutput.cxx | 30 ++++++++++-----------------
sw/source/filter/ww8/docxattributeoutput.hxx | 6 ++---
sw/source/filter/ww8/wrtw8nds.cxx | 3 +-
5 files changed, 39 insertions(+), 22 deletions(-)
New commits:
commit 68da8658dd29b7b4016f69982a81ab4b8bb3ca18
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date: Tue Sep 5 21:30:06 2017 +0300
tdf#103090 replace spaces by underscore in bookmark names for DOCX.
Bookmarks containing spaces are incorrectly interpreted by MS Word,
so spaces are replaced in bookmark names and bookmark references
in fields.
Change-Id: I4e23c6b8740b54e94a1ec7e3385cffbe3ba01709
Reviewed-on: https://gerrit.libreoffice.org/41954
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf103090.odt b/sw/qa/extras/ooxmlexport/data/tdf103090.odt
new file mode 100644
index 000000000000..d264f255abb7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103090.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 62af2714b9d7..4f2f878a249c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1202,6 +1202,28 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104162, "tdf104162.docx")
CPPUNIT_ASSERT(xTextFields->hasElements());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf103090, "tdf103090.odt")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ if (!pXmlDoc)
+ return;
+
+ // Get bookmark name
+ OUString bookmarkName = getXPath(pXmlDoc, "/w:document/w:body/w:p/w:bookmarkStart", "name");
+
+ // Ensure that name has no spaces
+ CPPUNIT_ASSERT(bookmarkName.indexOf(" ") < 0);
+
+ // Get PAGEREF field
+ OUString fieldName = getXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText");
+
+ // Ensure that PAGEREF field refers exactly our bookmark
+ OUString expectedFieldName(" PAGEREF ");
+ expectedFieldName += bookmarkName;
+ expectedFieldName += " \\h ";
+ CPPUNIT_ASSERT_EQUAL(expectedFieldName, fieldName);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index af9d6fd49d04..d37e9989a0e0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1361,14 +1361,13 @@ void DocxAttributeOutput::EndRun()
void DocxAttributeOutput::DoWriteBookmarks()
{
// Write the start bookmarks
- for ( std::vector< OString >::const_iterator it = m_rBookmarksStart.begin(), end = m_rBookmarksStart.end();
- it != end; ++it )
+ for ( const auto & it : m_rBookmarksStart )
{
- const OString& rName = *it;
+ OString rName = OUStringToOString( BookmarkToWord( it ), RTL_TEXTENCODING_UTF8 ).getStr();
// Output the bookmark
const sal_Int32 nId = m_nNextBookmarkId++;
- m_rOpenedBookmarksIds[rName] = nId;
+ m_rOpenedBookmarksIds[it] = nId;
m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart,
FSNS( XML_w, XML_id ), OString::number( nId ).getStr( ),
FSNS( XML_w, XML_name ), rName.getStr(),
@@ -1378,20 +1377,17 @@ void DocxAttributeOutput::DoWriteBookmarks()
m_rBookmarksStart.clear();
// export the end bookmarks
- for ( std::vector< OString >::const_iterator it = m_rBookmarksEnd.begin(), end = m_rBookmarksEnd.end();
- it != end; ++it )
+ for ( const auto & it : m_rBookmarksEnd )
{
- const OString& rName = *it;
-
// Get the id of the bookmark
- std::map< OString, sal_Int32 >::iterator pPos = m_rOpenedBookmarksIds.find( rName );
- if ( pPos != m_rOpenedBookmarksIds.end( ) )
+ auto pPos = m_rOpenedBookmarksIds.find(it);
+ if ( pPos != m_rOpenedBookmarksIds.end() )
{
const sal_Int32 nId = ( *pPos ).second;
m_pSerializer->singleElementNS( XML_w, XML_bookmarkEnd,
- FSNS( XML_w, XML_id ), OString::number( nId ).getStr( ),
+ FSNS( XML_w, XML_id ), OString::number( nId ).getStr(),
FSEND );
- m_rOpenedBookmarksIds.erase( rName );
+ m_rOpenedBookmarksIds.erase( it );
}
}
m_rBookmarksEnd.clear();
@@ -6779,17 +6775,15 @@ void DocxAttributeOutput::WriteFormData_Impl( const ::sw::mark::IFieldmark& rFie
void DocxAttributeOutput::WriteBookmarks_Impl( std::vector< OUString >& rStarts,
std::vector< OUString >& rEnds )
{
- for ( std::vector< OUString >::const_iterator it = rStarts.begin(), end = rStarts.end(); it != end; ++it )
+ for ( const auto & it : rStarts )
{
- OString rName = OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr( );
- m_rBookmarksStart.push_back( rName );
+ m_rBookmarksStart.push_back( it );
}
rStarts.clear();
- for ( std::vector< OUString >::const_iterator it = rEnds.begin(), end = rEnds.end(); it != end; ++it )
+ for ( const auto & it : rEnds )
{
- OString rName = OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr( );
- m_rBookmarksEnd.push_back( rName );
+ m_rBookmarksEnd.push_back( it );
}
rEnds.clear();
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 701bfc6b5881..fd4143081c0f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -770,15 +770,15 @@ private:
sal_Int32 m_nNextAnnotationMarkId;
/// Bookmarks to output
- std::vector<OString> m_rBookmarksStart;
- std::vector<OString> m_rBookmarksEnd;
+ std::vector<OUString> m_rBookmarksStart;
+ std::vector<OUString> m_rBookmarksEnd;
/// Annotation marks to output
std::vector<OString> m_rAnnotationMarksStart;
std::vector<OString> m_rAnnotationMarksEnd;
/// Maps of the bookmarks ids
- std::map<OString, sal_Int32> m_rOpenedBookmarksIds;
+ std::map<OUString, sal_Int32> m_rOpenedBookmarksIds;
/// Name of the last opened bookmark.
OString m_sLastOpenedBookmark;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d2e5524d79fa..6792fea1ef79 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1127,7 +1127,8 @@ bool WW8AttributeOutput::EndURL(bool const)
OUString BookmarkToWord(const OUString &rBookmark)
{
- OUString sRet(INetURLObject::encode(rBookmark,
+ OUString sRet(INetURLObject::encode(
+ rBookmark.replace(' ', '_'), // Spaces are prohibited in bookmark name
INetURLObject::PART_REL_SEGMENT_EXTRA,
INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_ASCII_US));
return TruncateBookmark(sRet);
More information about the Libreoffice-commits
mailing list