diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-07-09 08:46:42 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-07-09 09:23:21 +0200 |
| commit | 75d0b1ecd914ee06f51621983671da70d0e183fa (patch) | |
| tree | 2cadd3ebb4540cef80c39087970e44e8c6437dcd /sw | |
| parent | db9e64c2a499c1c3da9d3c1b4e123af04f937933 (diff) | |
Do not downcast opened bookmarks, neither (and just in case)
Change-Id: I603940c64a1580a73c4f5c59b403caecd0ac75a5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 5b022d85f8c2..9a17f98eb637 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1295,7 +1295,7 @@ void DocxAttributeOutput::DoWriteBookmarks() const OString& rName = *it; // Output the bookmark - sal_uInt16 nId = m_nNextBookmarkId++; + const sal_Int32 nId = m_nNextBookmarkId++; m_rOpenedBookmarksIds[rName] = nId; m_pSerializer->singleElementNS( XML_w, XML_bookmarkStart, FSNS( XML_w, XML_id ), OString::number( nId ).getStr( ), @@ -1312,7 +1312,7 @@ void DocxAttributeOutput::DoWriteBookmarks() const OString& rName = *it; // Get the id of the bookmark - std::map< OString, sal_uInt16 >::iterator pPos = m_rOpenedBookmarksIds.find( rName ); + std::map< OString, sal_Int32 >::iterator pPos = m_rOpenedBookmarksIds.find( rName ); if ( pPos != m_rOpenedBookmarksIds.end( ) ) { const sal_Int32 nId = ( *pPos ).second; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index c0cf834a2008..6c2a63cf1b85 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -776,7 +776,7 @@ private: std::vector<OString> m_rAnnotationMarksEnd; /// Maps of the bookmarks ids - std::map<OString, sal_uInt16> m_rOpenedBookmarksIds; + std::map<OString, sal_Int32> m_rOpenedBookmarksIds; /// Name of the last opened bookmark. OString m_sLastOpenedBookmark; |