sw/qa/extras/rtfexport/data/tdf88583.odt |binary
sw/qa/extras/rtfexport/rtfexport.cxx | 7 +++++++
sw/source/filter/ww8/rtfexport.cxx | 9 +++++++++
3 files changed, 16 insertions(+)
New commits:
commit 3e44fcca87fc8e1354d1d735f3a10e388f2f1d0b
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Feb 2 10:27:28 2015 +0100
Related: tdf#88583 RTF export: need to take care of fill attributes when ...
.. building the color table
(cherry picked from commit 87a5cf7db1f070cbc4a674a1c12c805a2c950856)
Change-Id: I8a74640e0d51d76b910394be5210c18d89818edd
Reviewed-on: https://gerrit.libreoffice.org/14392
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/qa/extras/rtfexport/data/tdf88583.odt
b/sw/qa/extras/rtfexport/data/tdf88583.odt
new file mode 100644
index 0000000..307ab1e
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf88583.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 221618d..bbd969d 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -851,6 +851,13 @@ DECLARE_RTFEXPORT_TEST(testFdo82006, "fdo82006.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(280)),
getProperty<sal_Int32>(getParagraph(0), "ParaBottomMargin"));
}
+DECLARE_RTFEXPORT_TEST(testTdf88583, "tdf88583.odt")
+{
+ // This was FillStyle_NONE, as background color was missing from the color
table during export.
+ CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty<drawing::FillStyle>(getParagraph(1), "FillStyle"));
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x00cc00),
getProperty<sal_Int32>(getParagraph(1), "FillColor"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index b0261af..d85903e 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -52,6 +52,7 @@
#if OSL_DEBUG_LEVEL > 1
#include <iostream>
#endif
+#include <svx/xflclit.hxx>
using ::editeng::SvxBorderLine;
using namespace ::comphelper;
@@ -1046,6 +1047,14 @@ void RtfExport::OutColorTable()
}
}
+ // TextFrame or paragraph background solid fill.
+ nMaxItem = rPool.GetItemCount2(XATTR_FILLCOLOR);
+ for (sal_uInt32 i = 0; i < nMaxItem; ++i)
+ {
+ if (const XFillColorItem* pItem = static_cast<const
XFillColorItem*>(rPool.GetItem2(XATTR_FILLCOLOR, i)))
+ InsColor(pItem->GetColorValue());
+ }
+
for (size_t n = 0; n < m_aColTbl.size(); ++n)
{
const Color& rCol = m_aColTbl[ n ];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
