[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sd/qa sw/qa
Jacobo Aragunde Pérez
jaragunde at igalia.com
Sat Jan 18 06:46:53 PST 2014
include/oox/drawingml/color.hxx | 7
include/oox/drawingml/shape.hxx | 5
include/oox/export/drawingml.hxx | 2
oox/source/drawingml/colorchoicecontext.cxx | 5
oox/source/drawingml/shape.cxx | 74 +
oox/source/export/drawingml.cxx | 105 ++
oox/source/export/shapes.cxx | 4
sd/qa/unit/data/xml/fdo47434_0.xml | 44
sd/qa/unit/data/xml/fdo71434_0.xml | 4
sd/qa/unit/data/xml/n593612_0.xml | 5
sd/qa/unit/data/xml/n762695_0.xml | 20
sd/qa/unit/data/xml/n762695_1.xml | 20
sd/qa/unit/data/xml/n819614_0.xml | 448 +++++++--
sd/qa/unit/data/xml/n820786_0.xml | 540 ++++++++++--
sw/qa/extras/ooxmlexport/data/shape-theme-preservation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 48 +
16 files changed, 1153 insertions(+), 178 deletions(-)
New commits:
commit d185daec6814ff3179ce7ef4242952505f98fa19
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date: Thu Jan 16 17:26:33 2014 +0100
ooxml: unit test for shape theme attributes preservation
This tests checks that the shape style attribute for fill color is
preserved, that the theme attibute for shape fill is preserved too
and that the interaction between them and direct assignment of some
color works properly.
Change-Id: Ia934c46731ed38be14ed851e083d0ed6fc151b01
diff --git a/sw/qa/extras/ooxmlexport/data/shape-theme-preservation.docx b/sw/qa/extras/ooxmlexport/data/shape-theme-preservation.docx
new file mode 100644
index 0000000..8fdbd06
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/shape-theme-preservation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f093b5d..fe92247 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2469,6 +2469,54 @@ DECLARE_OOXMLEXPORT_TEST(testMsoSpt180, "mso-spt180.docx")
CPPUNIT_ASSERT_EQUAL(OUString("ooxml-borderCallout1"), aType);
}
+DECLARE_OOXMLEXPORT_TEST(testShapeThemePreservation, "shape-theme-preservation.docx")
+{
+ xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+ if (!pXmlDocument)
+ return;
+
+ // check shape style has been preserved
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef",
+ "idx", "1");
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef/a:schemeClr",
+ "val", "accent1");
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef",
+ "idx", "1");
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef/a:schemeClr",
+ "val", "accent1");
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[5]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef",
+ "idx", "1");
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[5]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef/a:schemeClr",
+ "val", "accent1");
+
+ // check shape style hasn't been overwritten
+ assertXPath(pXmlDocument,
+ "/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:solidFill",
+ 0);
+
+ // check direct theme assignments have been preserved
+ assertXPath(pXmlDocument,
+ "/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:solidFill/a:schemeClr",
+ "val", "accent6");
+
+ // check direct color assignments have been preserved
+ OUString sFillColor = getXPath(pXmlDocument,
+ "/w:document/w:body/w:p[5]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:solidFill/a:srgbClr",
+ "val");
+ CPPUNIT_ASSERT_EQUAL(sFillColor.toInt32(16), sal_Int32(0x00b050));
+
+ // check colors are properly applied to shapes on import
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty<sal_Int32>(getShape(1), "FillColor"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0xf79646), getProperty<sal_Int32>(getShape(2), "FillColor"));
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00b050), getProperty<sal_Int32>(getShape(3), "FillColor"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit bc0a9076aa43a0782bcf81e55d3f84f6af0f68e8
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date: Thu Jan 16 10:27:46 2014 +0100
ooxml: Preserve shape theme attribute for solid fill
Users can select the fill color for a shape among the theme-defined
colors. This results in the following XML:
<wps:spPr>
...
<a:solidFill>
<a:schemeClr val="accent2"/>
</a:solidFill>
...
</wps:spPr>
Now we store both the original fill color and the name of the
theme-defined color, if it exists, on the import phase. They are put
into the InteropGrabBag of the shape with the names
OriginalSolidFillClr and SpPrSolidFillSchemeClr. Additionally, we
needed to to store the decoded theme color inside StyleFillRef.
On the export phase we have to take into account several combinations
of factors:
* If the final color for the shape fill is different from the
original color, we must ignore any theme attributes and write the
new color.
* If the fill color is unchanged and some theme color exists, we must
write the theme color.
* If the fill color is unchanged and no theme color exists, we must
check if the original color matches the style-defined color. If it
does, we must not write any <a:solidFill> tag.
* Otherwise we must write the <a:solidFill> tag with the RGB color.
The method putPropertiesToGrabBag was added to the Shape object for
convenience.
The data files for some /sd/qa/ unit tests were updated to reflect
the new properties inside the Shape InteropGrabBag.
Change-Id: If0915c5442872a8acab0a8a081f60c89c97277bd
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 01cc1e9..c1618ba6 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -219,6 +219,8 @@ protected:
void putPropertyToGrabBag(
const ::com::sun::star::beans::PropertyValue& pProperty );
+ void putPropertiesToGrabBag(
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
std::vector< ShapePtr > maChildren; // only used for group shapes
com::sun::star::awt::Size maChSize; // only used for group shapes
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 2de1ba0..65ae6f3 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -118,6 +118,7 @@ public:
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( sal_uInt32 nColor );
+ void WriteSolidFill( OUString sSchemeName );
void WriteSolidFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteGradientFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString sURLPropName, sal_Int32 nXmlNamespace );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 09d74bf..c9889db 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -568,11 +568,13 @@ Reference< XShape > Shape::createAndInsert(
OUString sColorScheme = pFillRef->maPhClr.getSchemeName();
if( !sColorScheme.isEmpty() )
{
- Sequence< PropertyValue > aProperties(2);
+ Sequence< PropertyValue > aProperties(3);
aProperties[0].Name = "SchemeClr";
aProperties[0].Value = Any( sColorScheme );
aProperties[1].Name = "Idx";
aProperties[1].Value = Any( pFillRef->mnThemedIdx );
+ aProperties[2].Name = "Color";
+ aProperties[2].Value = Any( nFillPhClr );
PropertyValue pStyleFillRef;
pStyleFillRef.Name = "StyleFillRef";
@@ -764,6 +766,18 @@ Reference< XShape > Shape::createAndInsert(
mxShape->setPosition(awt::Point(aShapeRectHmm.X, aShapeRectHmm.Y));
mxShape->setSize(awt::Size(aShapeRectHmm.Width, aShapeRectHmm.Height));
}
+
+ Sequence< PropertyValue > aProperties( 1 );
+ aProperties[0].Name = "OriginalSolidFillClr";
+ aProperties[0].Value = aShapeProps[PROP_FillColor];
+ OUString sColorFillScheme = aFillProperties.maFillColor.getSchemeName();
+ if( !aFillProperties.maFillColor.isPlaceHolder() && !sColorFillScheme.isEmpty() )
+ {
+ aProperties.realloc( 2 );
+ aProperties[1].Name = "SpPrSolidFillSchemeClr";
+ aProperties[1].Value = Any( sColorFillScheme );
+ }
+ putPropertiesToGrabBag( aProperties );
}
// These can have a custom geometry, so position should be set here,
@@ -1070,6 +1084,33 @@ void Shape::putPropertyToGrabBag( const PropertyValue& pProperty )
}
}
+void Shape::putPropertiesToGrabBag( const Sequence< PropertyValue >& aProperties )
+{
+ Reference< XPropertySet > xSet( mxShape, UNO_QUERY );
+ Reference< XPropertySetInfo > xSetInfo( xSet->getPropertySetInfo() );
+ const OUString& aGrabBagPropName = OUString( UNO_NAME_MISC_OBJ_INTEROPGRABBAG );
+ if( mxShape.is() && xSet.is() && xSetInfo.is() && xSetInfo->hasPropertyByName( aGrabBagPropName ) )
+ {
+ // get existing grab bag
+ Sequence< PropertyValue > aGrabBag;
+ xSet->getPropertyValue( aGrabBagPropName ) >>= aGrabBag;
+ sal_Int32 length = aGrabBag.getLength();
+
+ // update grab bag size to contain the new items
+ aGrabBag.realloc( length + aProperties.getLength() );
+
+ // put the new items
+ for( sal_Int32 i=0; i < aProperties.getLength(); ++i )
+ {
+ aGrabBag[length + i].Name = aProperties[i].Name;
+ aGrabBag[length + i].Value = aProperties[i].Value;
+ }
+
+ // put it back to the shape
+ xSet->setPropertyValue( aGrabBagPropName, Any( aGrabBag ) );
+ }
+}
+
// ============================================================================
} }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index e98a326..ebcfb16 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -174,10 +174,65 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor )
mpFS->endElementNS( XML_a, XML_solidFill );
}
+void DrawingML::WriteSolidFill( OUString sSchemeName )
+{
+ mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
+ mpFS->singleElementNS( XML_a, XML_schemeClr, XML_val,
+ OUStringToOString( sSchemeName, RTL_TEXTENCODING_ASCII_US ).getStr(),
+ FSEND );
+ mpFS->endElementNS( XML_a, XML_solidFill );
+}
+
void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet )
{
- if ( GetProperty( rXPropSet, "FillColor" ) )
- WriteSolidFill( *((sal_uInt32*) mAny.getValue()) & 0xffffff );
+ // get fill color
+ sal_uInt32 nFillColor;
+ if ( !GetProperty( rXPropSet, "FillColor" ) )
+ return;
+ mAny >>= nFillColor;
+
+ // get InteropGrabBag and search the relevant attributes
+ OUString sColorFillScheme;
+ sal_uInt32 nOriginalColor;
+ Sequence< PropertyValue > aStyleProperties;
+ if ( GetProperty( rXPropSet, "InteropGrabBag" ) )
+ {
+ Sequence< PropertyValue > aGrabBag;
+ mAny >>= aGrabBag;
+ for( sal_Int32 i=0; i < aGrabBag.getLength(); ++i )
+ if( aGrabBag[i].Name == "SpPrSolidFillSchemeClr" )
+ aGrabBag[i].Value >>= sColorFillScheme;
+ else if( aGrabBag[i].Name == "OriginalSolidFillClr" )
+ aGrabBag[i].Value >>= nOriginalColor;
+ else if( aGrabBag[i].Name == "StyleFillRef" )
+ aGrabBag[i].Value >>= aStyleProperties;
+ }
+
+ // write XML
+ if ( nFillColor != nOriginalColor )
+ // the user has set a different color for the shape
+ WriteSolidFill( nFillColor & 0xffffff );
+ else if ( !sColorFillScheme.isEmpty() )
+ // the shape had a scheme color and the user didn't change it
+ WriteSolidFill( sColorFillScheme );
+ else if ( aStyleProperties.hasElements() )
+ {
+ sal_uInt32 nThemeColor;
+ for( sal_Int32 i=0; i < aStyleProperties.getLength(); ++i )
+ if( aStyleProperties[i].Name == "Color" )
+ {
+ aStyleProperties[i].Value >>= nThemeColor;
+ break;
+ }
+ if ( nFillColor != nThemeColor )
+ // the shape contains a theme but it wasn't being used
+ WriteSolidFill( nFillColor & 0xffffff );
+ // in case the shape used the style color and the user didn't change it,
+ // we must not write a <a: solidFill> tag.
+ }
+ else
+ // the shape had a custom color and the user didn't change it
+ WriteSolidFill( nFillColor & 0xffffff );
}
void DrawingML::WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor )
diff --git a/sd/qa/unit/data/xml/fdo47434_0.xml b/sd/qa/unit/data/xml/fdo47434_0.xml
index 21b0a29..f091b2a 100644
--- a/sd/qa/unit/data/xml/fdo47434_0.xml
+++ b/sd/qa/unit/data/xml/fdo47434_0.xml
@@ -24,10 +24,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="5210557" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -92,10 +94,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="5210557" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -160,10 +164,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="5210557" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -228,10 +234,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="5210557" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
diff --git a/sd/qa/unit/data/xml/fdo71434_0.xml b/sd/qa/unit/data/xml/fdo71434_0.xml
index 1605ba5..46efeb1 100644
--- a/sd/qa/unit/data/xml/fdo71434_0.xml
+++ b/sd/qa/unit/data/xml/fdo71434_0.xml
@@ -6,6 +6,8 @@
<Line2 column1="0.000000" column2="19046.000000" column3="-75.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
</XShape>
</XShapes>
diff --git a/sd/qa/unit/data/xml/n593612_0.xml b/sd/qa/unit/data/xml/n593612_0.xml
index c4501c4..aa5d1f7 100644
--- a/sd/qa/unit/data/xml/n593612_0.xml
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -13,7 +13,10 @@
<Line2 column1="0.000000" column2="15193.000000" column3="1324.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="3968147" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml
index 1d1e35f..7b61b2e9 100644
--- a/sd/qa/unit/data/xml/n762695_0.xml
+++ b/sd/qa/unit/data/xml/n762695_0.xml
@@ -14,10 +14,13 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="12834459" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="accent3" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="5210557" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -107,7 +110,9 @@
<Line2 column1="-1004.091629" column2="1026.011940" column3="7175.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues>
@@ -185,7 +190,9 @@
<Line2 column1="1003.384523" column2="1026.011940" column3="6171.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues>
diff --git a/sd/qa/unit/data/xml/n762695_1.xml b/sd/qa/unit/data/xml/n762695_1.xml
index fb24ba08..2cc28c2 100644
--- a/sd/qa/unit/data/xml/n762695_1.xml
+++ b/sd/qa/unit/data/xml/n762695_1.xml
@@ -13,7 +13,9 @@
<Line2 column1="0.000000" column2="7620.000000" column3="7197.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -100,7 +102,9 @@
<Line2 column1="0.000000" column2="9529.000000" column3="4229.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -187,7 +191,9 @@
<Line2 column1="0.000000" column2="1274.000000" column3="5715.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues>
@@ -341,7 +347,9 @@
<Line2 column1="0.000000" column2="1274.000000" column3="6125.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues>
@@ -495,7 +503,9 @@
<Line2 column1="0.000000" column2="2672.000000" column3="6125.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues>
diff --git a/sd/qa/unit/data/xml/n819614_0.xml b/sd/qa/unit/data/xml/n819614_0.xml
index 6a834be..8157412 100644
--- a/sd/qa/unit/data/xml/n819614_0.xml
+++ b/sd/qa/unit/data/xml/n819614_0.xml
@@ -38,7 +38,9 @@
<Line2 column1="0.000000" column2="254.000000" column3="3496.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -98,7 +100,9 @@
<Line2 column1="0.000000" column2="2072.000000" column3="5702.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -158,7 +162,9 @@
<Line2 column1="0.000000" column2="811.000000" column3="5702.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -218,7 +224,9 @@
<Line2 column1="0.000000" column2="834.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -282,7 +290,9 @@
<Line2 column1="0.000000" column2="4509.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -342,7 +352,9 @@
<Line2 column1="0.000000" column2="3165.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -402,7 +414,9 @@
<Line2 column1="0.000000" column2="7483.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -462,7 +476,9 @@
<Line2 column1="0.000000" column2="5903.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -522,7 +538,9 @@
<Line2 column1="0.000000" column2="630.000000" column3="7078.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -582,7 +600,9 @@
<Line2 column1="0.000000" column2="741.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -642,7 +662,9 @@
<Line2 column1="0.000000" column2="903.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -706,7 +728,9 @@
<Line2 column1="0.000000" column2="3272.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -766,7 +790,9 @@
<Line2 column1="0.000000" column2="1992.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -826,7 +852,9 @@
<Line2 column1="0.000000" column2="713.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -886,7 +914,9 @@
<Line2 column1="0.000000" column2="903.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -950,7 +980,9 @@
<Line2 column1="0.000000" column2="1989.000000" column3="13817.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1010,7 +1042,9 @@
<Line2 column1="0.000000" column2="737.000000" column3="13817.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1070,7 +1104,9 @@
<Line2 column1="0.000000" column2="7377.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1130,7 +1166,9 @@
<Line2 column1="0.000000" column2="5851.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1190,7 +1228,9 @@
<Line2 column1="0.000000" column2="12373.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1250,7 +1290,9 @@
<Line2 column1="0.000000" column2="11250.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1310,7 +1352,9 @@
<Line2 column1="0.000000" column2="3177.000000" column3="7232.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1370,7 +1414,9 @@
<Line2 column1="0.000000" column2="1949.000000" column3="7232.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1430,7 +1476,9 @@
<Line2 column1="0.000000" column2="728.000000" column3="7232.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1490,7 +1538,9 @@
<Line2 column1="0.000000" column2="777.000000" column3="5771.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1550,7 +1600,9 @@
<Line2 column1="0.000000" column2="903.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1614,7 +1666,9 @@
<Line2 column1="0.000000" column2="7085.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1674,7 +1728,9 @@
<Line2 column1="0.000000" column2="5830.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1734,7 +1790,9 @@
<Line2 column1="0.000000" column2="4551.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1794,7 +1852,9 @@
<Line2 column1="0.000000" column2="3272.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1854,7 +1914,9 @@
<Line2 column1="0.000000" column2="1992.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1914,7 +1976,9 @@
<Line2 column1="0.000000" column2="713.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -1974,7 +2038,9 @@
<Line2 column1="0.000000" column2="906.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2038,7 +2104,9 @@
<Line2 column1="0.000000" column2="11224.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2098,7 +2166,9 @@
<Line2 column1="0.000000" column2="9916.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2158,7 +2228,9 @@
<Line2 column1="0.000000" column2="8608.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2218,7 +2290,9 @@
<Line2 column1="0.000000" column2="781.000000" column3="12333.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2278,7 +2352,9 @@
<Line2 column1="0.000000" column2="5992.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2338,7 +2414,9 @@
<Line2 column1="0.000000" column2="4684.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2398,7 +2476,9 @@
<Line2 column1="0.000000" column2="3376.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2458,7 +2538,9 @@
<Line2 column1="0.000000" column2="2068.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2518,7 +2600,9 @@
<Line2 column1="0.000000" column2="12490.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2578,7 +2662,9 @@
<Line2 column1="0.000000" column2="713.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2638,7 +2724,9 @@
<Line2 column1="0.000000" column2="906.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2702,7 +2790,9 @@
<Line2 column1="0.000000" column2="10863.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2762,7 +2852,9 @@
<Line2 column1="0.000000" column2="1817.000000" column3="13615.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2822,7 +2914,9 @@
<Line2 column1="0.000000" column2="657.000000" column3="13615.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2882,7 +2976,9 @@
<Line2 column1="0.000000" column2="7275.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -2942,7 +3038,9 @@
<Line2 column1="0.000000" column2="6012.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3002,7 +3100,9 @@
<Line2 column1="0.000000" column2="4731.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3062,7 +3162,9 @@
<Line2 column1="0.000000" column2="3475.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3122,7 +3224,9 @@
<Line2 column1="0.000000" column2="2049.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3182,7 +3286,9 @@
<Line2 column1="0.000000" column2="12187.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3242,7 +3348,9 @@
<Line2 column1="0.000000" column2="710.000000" column3="5774.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3302,7 +3410,9 @@
<Line2 column1="0.000000" column2="906.000000" column3="3623.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3366,7 +3476,9 @@
<Line2 column1="0.000000" column2="1079.000000" column3="2544.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3431,7 +3543,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4529.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3496,7 +3610,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="5919.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3561,7 +3677,10 @@
<Line2 column1="0.000000" column2="1223.000000" column3="17350.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="14539203" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="bg2" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3626,7 +3745,9 @@
<Line2 column1="0.000000" column2="1269.000000" column3="7189.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3691,7 +3812,9 @@
<Line2 column1="0.000000" column2="1157.000000" column3="8671.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3756,7 +3879,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="9939.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3821,7 +3946,9 @@
<Line2 column1="0.000000" column2="1152.000000" column3="11210.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3886,7 +4013,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="12483.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -3951,7 +4080,9 @@
<Line2 column1="0.000000" column2="1037.000000" column3="13753.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4016,7 +4147,9 @@
<Line2 column1="0.000000" column2="1063.000000" column3="14901.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4081,7 +4214,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="16071.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4146,7 +4281,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4529.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4211,7 +4348,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="5921.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4276,7 +4415,9 @@
<Line2 column1="0.000000" column2="1149.000000" column3="17689.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4341,7 +4482,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="7277.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4406,7 +4549,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="8585.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4471,7 +4616,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="9893.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4536,7 +4683,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="11200.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4601,7 +4750,9 @@
<Line2 column1="0.000000" column2="1211.000000" column3="12508.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4666,7 +4817,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="13816.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4731,7 +4884,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="15124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4796,7 +4951,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="16432.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4861,7 +5018,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4529.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4926,7 +5085,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="5921.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -4991,7 +5152,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="7201.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5056,7 +5219,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="8480.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5121,7 +5286,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="9759.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5186,7 +5353,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="11039.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5251,7 +5420,9 @@
<Line2 column1="0.000000" column2="1101.000000" column3="12309.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5316,7 +5487,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4526.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5381,7 +5554,9 @@
<Line2 column1="0.000000" column2="1366.000000" column3="5866.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5446,7 +5621,9 @@
<Line2 column1="0.000000" column2="1088.000000" column3="7416.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5511,7 +5688,9 @@
<Line2 column1="0.000000" column2="1008.000000" column3="8677.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5576,7 +5755,10 @@
<Line2 column1="0.000000" column2="925.000000" column3="9946.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="14539203" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="bg2" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5641,7 +5823,9 @@
<Line2 column1="0.000000" column2="1034.000000" column3="16505.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5706,7 +5890,10 @@
<Line2 column1="0.000000" column2="912.000000" column3="17689.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="14539203" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="bg2" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5771,7 +5958,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="10999.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5836,7 +6025,9 @@
<Line2 column1="0.000000" column2="1338.000000" column3="12479.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5901,7 +6092,9 @@
<Line2 column1="0.000000" column2="1184.000000" column3="13962.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -5966,7 +6159,9 @@
<Line2 column1="0.000000" column2="1144.000000" column3="15233.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6031,7 +6226,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4526.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6096,7 +6293,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="5918.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6161,7 +6360,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="7198.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6226,7 +6427,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="8477.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6291,7 +6494,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4526.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6356,7 +6561,9 @@
<Line2 column1="0.000000" column2="1131.000000" column3="5947.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6421,7 +6628,9 @@
<Line2 column1="0.000000" column2="969.000000" column3="7223.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6486,7 +6695,9 @@
<Line2 column1="0.000000" column2="1231.000000" column3="11059.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6551,7 +6762,10 @@
<Line2 column1="0.000000" column2="1422.000000" column3="12543.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" value="14539203" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="SpPrSolidFillSchemeClr" value="bg2" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6616,7 +6830,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="8371.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6681,7 +6897,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="9715.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6746,7 +6964,9 @@
<Line2 column1="0.000000" column2="1245.000000" column3="4457.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6811,7 +7031,9 @@
<Line2 column1="0.000000" column2="1132.000000" column3="5947.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6876,7 +7098,9 @@
<Line2 column1="0.000000" column2="1101.000000" column3="7224.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -6941,7 +7165,9 @@
<Line2 column1="0.000000" column2="983.000000" column3="3341.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
diff --git a/sd/qa/unit/data/xml/n820786_0.xml b/sd/qa/unit/data/xml/n820786_0.xml
index 335b615..81d667b 100644
--- a/sd/qa/unit/data/xml/n820786_0.xml
+++ b/sd/qa/unit/data/xml/n820786_0.xml
@@ -13,7 +13,9 @@
<Line2 column1="1371.000000" column2="0.000000" column3="6036.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -80,7 +82,9 @@
<Line2 column1="0.000000" column2="-1058.000000" column3="12758.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -165,7 +169,9 @@
<Line2 column1="0.000000" column2="-1058.000000" column3="12758.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
- <InteropGrabBag/>
+ <InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
+ </InteropGrabBag>
<CustomShapeGeometry>
<PropertyValue name="AdjustmentValues">
<AdjustmentValues/>
@@ -259,10 +265,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -331,10 +339,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -403,10 +413,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -475,10 +487,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -547,10 +561,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -619,10 +635,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -691,10 +709,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -763,10 +783,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -835,10 +857,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -907,10 +931,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -979,10 +1005,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1051,10 +1079,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1123,10 +1153,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1195,10 +1227,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1267,10 +1301,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1339,10 +1375,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1411,10 +1449,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1483,10 +1523,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1555,10 +1597,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1627,10 +1671,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1699,10 +1745,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1771,10 +1819,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1843,10 +1893,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1915,10 +1967,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -1987,10 +2041,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2059,10 +2115,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2131,10 +2189,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2203,10 +2263,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2275,10 +2337,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2347,10 +2411,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2419,10 +2485,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2491,10 +2559,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2563,10 +2633,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2635,10 +2707,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2707,10 +2781,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2779,10 +2855,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2851,10 +2929,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2923,10 +3003,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -2995,10 +3077,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -3067,10 +3151,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -3139,10 +3225,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
</InteropGrabBag>
@@ -3211,10 +3299,12 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
<InteropGrabBag>
+ <PropertyValue name="OriginalSolidFillClr" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="StyleFillRef">
<StyleFillRef>
<PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
<PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+ <PropertyValue name="Color" value="52377" handle="0" propertyState="DIRECT_VALUE"/>
</StyleFillRef>
</PropertyValue>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list