sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- sw/source/filter/ww8/docxattributeoutput.hxx | 2 +- sw/source/filter/ww8/docxexport.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit ac9f7c8d1abffe882093f93ea70dc5e31d28a7a2 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue May 13 10:19:25 2014 +0200 DocxAttributeOutput: ClearGraphicCache() -> ClearRelIdCache() Because rel ids are used not only for graphics. Change-Id: I9d0fd7196a1b8e0494d850197cb50fc8098eff82 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c84d2e6..2d30749 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3567,7 +3567,7 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj ) } } -void DocxAttributeOutput::ClearGraphicCache() +void DocxAttributeOutput::ClearRelIdCache() { m_aRelIdCache.clear(); } diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 81305ba..c5dac2d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -358,7 +358,7 @@ public: void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); void WriteAnnotationMarks_Impl( std::vector< OUString >& rStarts, std::vector< OUString >& rEnds ); - void ClearGraphicCache(); + void ClearRelIdCache(); private: /// Initialize the structures where we are going to collect some of the paragraph properties. diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f8500e4..28db5ec 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -713,7 +713,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* //When the stream changes the cache which is maintained for the graphics in case of alternate content is not cleared. //So clearing the alternate content graphic cache. - m_pAttrOutput->ClearGraphicCache(); + m_pAttrOutput->ClearRelIdCache(); // switch the serializer back m_pAttrOutput->SetSerializer( m_pDocumentFS ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits