oox/source/drawingml/effectpropertiescontext.cxx | 4 ++++
sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 5 ++---
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 513a21aa6cf350c094289a7976de9e0cc0e7b4d4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 23 22:52:06 2014 +0200
Revert "sw: disable failing checks"
This reverts commit e7646e7e389a6a8c6481bd75127207b5090b126d.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 4995a9d..cc04809 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1097,13 +1097,12 @@ DECLARE_OOXMLEXPORT_TEST(testShapeEffectPreservation,
"shape-effect-preservation
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw",
"dist", "50800");
- /* FIXME why does this fail?
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr",
"val", "ffff00");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr/a:alpha",
- "val", "50000"); */
+ "val", "50000");
}
#endif
commit 861db4c1656956c82bf21489c0068b996bb66cac
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 23 22:51:14 2014 +0200
Monkey see, monkey do?
At least, it makes CppunitTest_sw_ooxmlsdrexport succeed again.
Change-Id: I05b9de5366b0e3d2007311d00991758b6d6f8dba
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx
b/oox/source/drawingml/effectpropertiescontext.cxx
index 458ee59..40f7318 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -82,6 +82,10 @@ ContextHandlerRef EffectPropertiesContext::onCreateContext(
sal_Int32 nElement,
{
mrEffectProperties.msUnsupportedEffectName = "innerShdw";
saveUnsupportedAttribs( rAttribs );
+
+ mrEffectProperties.maShadow.moShadowDist = rAttribs.getInteger(
XML_dist, 0 );
+ mrEffectProperties.maShadow.moShadowDir = rAttribs.getInteger(
XML_dir, 0 );
+ return new ColorContext( *this,
mrEffectProperties.maShadow.moShadowColor );
}
break;
}
commit 8485a276022e05bd34afb2321e72ecfad4589f7e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 23 22:50:09 2014 +0200
Change RGB "FFFF00" -> "ffff00" to keep roundtrip test happy
Change-Id: I14e48d56b6f34be31a1580d448352b925f9aadde
diff --git a/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx
b/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx
index 97787eb..35c7aba 100644
Binary files a/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx and
b/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 8a73e85..4995a9d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1100,7 +1100,7 @@ DECLARE_OOXMLEXPORT_TEST(testShapeEffectPreservation,
"shape-effect-preservation
/* FIXME why does this fail?
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr",
- "val", "FFFF00");
+ "val", "ffff00");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
"wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr/a:alpha",
"val", "50000"); */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
