[Libreoffice-commits] core.git: sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/ww8export/ww8export.cxx |    3 +++
 sw/source/filter/ww8/ww8graf.cxx     |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 15819181772d95963d16c1c2eaa9e51af81f7f68
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Mon Jan 14 17:16:42 2019 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Jan 21 18:45:11 2019 +0100

    tdf#101826 ww8import: add XATTR_* to textbox attr set
    
    Somewhat magically, just adding XATTR to the FlySet makes
    background colors/gradients/images appear. This has been
    broken since XATTR was introduced in LO 4.3.
    
    Change-Id: I84554045f49618a5eb927edfebdf641c5a93b673
    Reviewed-on: https://gerrit.libreoffice.org/66310
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 48461ff527a6..0a22a05fa3ea 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1303,6 +1303,9 @@ DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, "tdf76349_textboxMargins.doc
 {
     // textboxes without borders were losing their spacing items in round-tripping
     CPPUNIT_ASSERT( 0 < parseDump("/root/page/body/txt/anchored/fly/infos/prtBounds", "left").toInt32() );
+
+    uno::Reference<drawing::XShape> xShape = getShape(1);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Textbox background color", Color(0xD8, 0xD8, 0xD8), getProperty<Color>(xShape, "BackColor"));
 }
 
 DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 25235fa64bb0..a0f0769c922b 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1149,7 +1149,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                 if( pFlyFormat && pRecord )
                 {
                     SfxItemSet aFlySet( m_rDoc.GetAttrPool(),
-                        svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
+                        svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END>{} );
 
                     tools::Rectangle aInnerDist(   pRecord->nDxTextLeft,
                                              pRecord->nDyTextTop,
@@ -2552,7 +2552,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     // when in a header or footer word appears to treat all elements as wrap through
 
     // determine wrapping mode
-    SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
+    SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END>{});
     Reader::ResetFrameFormatAttrs(aFlySet); // tdf#122425: Explicitly remove borders and spacing
     css::text::WrapTextMode eSurround = css::text::WrapTextMode_PARALLEL;
     bool bContour = false;