diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 9cc9b597c9ce..413d04a99cb2 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -11,7 +11,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_external,sw_macros_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sw_macros_test,\ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_macros_test)) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 81a21d003e19..1f97aa0edd1c 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_precompiled_header,swui,sw/inc/pch/precompiled_swui $(eval $(call gb_Library_use_externals,swui,\ boost_headers \ icu_headers \ + libxml2 \ )) $(eval $(call gb_Library_use_custom_headers,swui,\ diff --git a/sw/inc/frameformats.hxx b/sw/inc/frameformats.hxx index bdf0a69905b5..4edb1f98b134 100644 --- a/sw/inc/frameformats.hxx +++ b/sw/inc/frameformats.hxx @@ -28,6 +28,8 @@ #include #include #include +#include +#include class SwFrameFormat; class SwTableFormat; @@ -154,13 +156,12 @@ public: const_iterator begin() const { return GetByPos().begin(); } const_iterator end() const { return GetByPos().end(); } - void dumpAsXml(xmlTextWriterPtr pWriter, const char*) const + void dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) const { - // TODO - //(void)xmlTextWriterStartElement(pWriter, BAD_CAST(pName)); + (void)xmlTextWriterStartElement(pWriter, BAD_CAST(pName)); for (const auto pFormat : GetByPos()) pFormat->dumpAsXml(pWriter); - //(void)xmlTextWriterEndElement(pWriter); + (void)xmlTextWriterEndElement(pWriter); }; virtual size_t GetFormatCount() const override { return m_vContainer.size(); }