mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#100830 drawingML import: handle <a:alphaModFix>

Browse Source 
Fill transparency on the UI. Regression from commit
57450afb76 (DOCX import: declare wps as a
supported feature, 2013-12-03), as the VML import handled this.

Change-Id: I654b51d51448d25d400979a4a62189b86126ac01
Reviewed-on: https://gerrit.libreoffice.org/29517
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-10-04 09:24:42 +02:00
parent be014c218d
commit ecfcee8b05
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/oox/drawingml/fillproperties.hxx
View File

@@ -121,6 +121,7 @@ struct BlipFillProperties
Color maDuotoneColors[2]; /// Duotone Colors Color maDuotoneColors[2]; /// Duotone Colors
ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core. ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core.
OptValue<sal_Int32> moAlphaModFix; ///< Alpha Modulate Fixed Effect.
/** Overwrites all members that are explicitly set in rSourceProps. */ /** Overwrites all members that are explicitly set in rSourceProps. */
void assignUsed( const BlipFillProperties& rSourceProps ); void assignUsed( const BlipFillProperties& rSourceProps );

4
oox/source/drawingml/fillproperties.cxx
View File

@@ -205,6 +205,7 @@ void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
maDuotoneColors[0].assignIfUsed( rSourceProps.maDuotoneColors[0] ); maDuotoneColors[0].assignIfUsed( rSourceProps.maDuotoneColors[0] );
maDuotoneColors[1].assignIfUsed( rSourceProps.maDuotoneColors[1] ); maDuotoneColors[1].assignIfUsed( rSourceProps.maDuotoneColors[1] );
maEffect.assignUsed( rSourceProps.maEffect ); maEffect.assignUsed( rSourceProps.maEffect );
moAlphaModFix.assignIfUsed(rSourceProps.moAlphaModFix);
} }
void FillProperties::assignUsed( const FillProperties& rSourceProps ) void FillProperties::assignUsed( const FillProperties& rSourceProps )
@@ -652,6 +653,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
} }
} }
} }
if (maBlipProps.moAlphaModFix.has())
rPropMap.setProperty(ShapeProperty::FillTransparency, static_cast<sal_Int16>(maBlipProps.moAlphaModFix.get() / PER_PERCENT));
} }
break; break;

3
oox/source/drawingml/fillpropertiesgroupcontext.cxx
View File

@@ -190,6 +190,9 @@ ContextHandlerRef BlipContext::onCreateContext(
mrBlipProps.moBrightness = rAttribs.getInteger( XML_bright ); mrBlipProps.moBrightness = rAttribs.getInteger( XML_bright );
mrBlipProps.moContrast = rAttribs.getInteger( XML_contrast ); mrBlipProps.moContrast = rAttribs.getInteger( XML_contrast );
break; break;
case A_TOKEN( alphaModFix ):
mrBlipProps.moAlphaModFix = rAttribs.getInteger(XML_amt);
break;
} }
return nullptr; return nullptr;
} }

BIN
sw/qa/extras/ooxmlimport/data/tdf100830.docx Normal file
View File

Binary file not shown.

6
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -3294,6 +3294,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf99140, "tdf99140.docx")
CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::LEFT_AND_WIDTH, getProperty<sal_Int16>(xTableProperties, "HoriOrient")); CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::LEFT_AND_WIDTH, getProperty<sal_Int16>(xTableProperties, "HoriOrient"));
} }
DECLARE_OOXMLIMPORT_TEST(testTdf100830, "tdf100830.docx")
{
// FillTransparence wasn't imported, this was 0.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(50), getProperty<sal_Int16>(getShape(1), "FillTransparence"));
}
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */