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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx      |    2 ++
 writerfilter/source/dmapper/GraphicImport.cxx |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 500343105707a9905f5198a4af6ad58fe307b7c2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 4 15:07:12 2013 +0100

    DOCX drawingML shape import: always set Opaque
    
    If behindDoc was 0, we did not set Opaque, so it went into the
    background, fix this.
    
    Change-Id: Id5aa683ffb388b1f4de33dcb19559729db5a4e02

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7fc51c6..6d9837e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1561,6 +1561,8 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx")
     // The relativeFrom attribute was ignored for groupshapes, i.e. these were text::RelOrientation::FRAME.
     CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xShape, "HoriOrientRelation"));
     CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xShape, "VertOrientRelation"));
+    // Make sure the shape is not in the background, as we have behindDoc="0" in the doc.
+    CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xShape, "Opaque")));
 
     // The 3 paragraphs on the rectangles inside the groupshape ended up in the
     // body text, make sure we don't have multiple paragraphs there anymore.
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8962f39..3f7e0cb 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1043,8 +1043,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 
                         m_pImpl->applyMargins(xShapeProps);
                         bool bOpaque = m_pImpl->bOpaque && !m_pImpl->rDomainMapper.IsInHeaderFooter();
-                        if (!bOpaque)
-                            xShapeProps->setPropertyValue("Opaque", uno::makeAny(bOpaque));
+                        xShapeProps->setPropertyValue("Opaque", uno::makeAny(bOpaque));
                         xShapeProps->setPropertyValue("Surround", uno::makeAny(m_pImpl->nWrap));
                     }
                 }