| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Change-Id: Ia10e9ad0c5495b8a4887d84781967ffb58a6a7d6
|
|
..in commit a96b6f4708d587ddddd93101e51e52dec4e87b7e
Change-Id: I94ea246df8fabee9b0bda579be7698c964958e16
|
|
There is no need to use different styles for writing the same thing.
It also makes it easier in future to use search & replace.
But of course, there are also some more complicated functions.
Change-Id: I773da20378af0e0d5a27689d3903df7063fb8ac0
|
|
And avoid css::uno::XInitialization protocol.
Change-Id: If4a7987778e2880502bdc7ef2c30792de9377364
|
|
And avoid css::uno::XInitialization protocol.
Change-Id: I14daf6409bf0d651d7b23246ba3855f647b3d1ef
|
|
And avoid css::uno::XInitialization protocol.
|
|
This was forgotten in commit bdeb57c23973f3ef79020847b2fe39f312cf3c0b.
Change-Id: Idd339222e3c464abc2524f78f16c8fe0a02dcd5b
|
|
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
|
|
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
|
|
Shape style attributes contain the default format for the shape in
case that no direct format is specified for it. This is an example
of the attribute we want to preserve with this patch:
<wps:style>
...
<a:fillRef idx="1">
<a:schemeClr val="accent1"/>
</a:fillRef>
...
</wps:style>
The relevant values in these tags are stored at the maShapeStyleRefs
member in the Shape object. The storage happens at
ShapeStyleContext::onCreateContext which is run when the <a:fillRef>
tag is opened. The ShapeStyleRef object contains the idx value and a
Color object which will contain the inner tag <a:schemeClr>.
The Color object has been modified to store the string value of
schemeClr. The storage happens at ColorValueContext::onStartElement
which is run when the tag <a:schemeClr> is opened.
Later, Shape::createAndInsert is called by the ShapeContextHandler to
create the actual XShape, this happens when the tag <wps:wsp> is
closed. createAndInsert puts idx and schemeClr values into the
InteropGrabBag property of the XShape with the name StyleFillRef.
On export time, when the shape data is written at
ShapeExport::WriteCustomShape, we added a call to
DrawingML::WriteShapeStyle. This method will check the existence of
the InteropGrabBag property in the shape, read the StyleFillRef prop
inside it and output the proper XML to the style definition.
DrawingML::WriteShapeStyle also writes some mock tags into the
<wps:style> because we found that they are compulsory. We will
replace them with the proper data in further patches.
The method putPropertyToGrabBag was added to the Shape object for
convenience.
The data files for some /sd/qa/ unit tests were updated to reflect
the new property StyleFillRef inside the InteropGrabBag.
Change-Id: I5ffa5242852461a1a709a8f169d40f0d7a2c9aa3
|
|
Change-Id: I594d854db54a74ddf3f32d4b30b1c4f1aa38d431
|
|
Change-Id: Idcb74c5e911ec2337f1e8743dc4627464f1cfd27
|
|
I almost broke this during refactoring...
Change-Id: If38e73f3b7d66e97bbcbad87447b8aa611ff79d1
|
|
Change-Id: I762e4f09b55d957bdd57e76651417bed11cb1e74
|
|
Change-Id: I2e3315584e66b7a99003512b197062807674f8aa
|
|
Change-Id: Icb124a2f7445ca17f04dc0024dc17cbcc4b0ca6d
|
|
Change-Id: I79e0fa9d0ee35e31912d36ec213acf1a83b3547e
|
