Age | Commit message (Collapse) | Author |
|
Change-Id: Ic27b230cc9dce366f281ff720ded5873e94f6191
|
|
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: Ic9903fd887f2c3fab2630ebeb20df39392177c8d
|
|
Change-Id: Ic46fa46c200b94e2e6c5a073ba89b9aae5c14542
|
|
Change-Id: I9f5564100aa64ff4940dd93a81ff5a8d8edc7a07
|
|
Change-Id: I8eac2f5ff08968a885a8e413bf4db38092036957
|
|
Change-Id: Ieee10f9acb67453ac6c3d893d29330e19d96bdef
|
|
Using scaling is sufficient.
Change-Id: If976bec3940772432d814a77681170d7c99306d2
|
|
This will be used when generating line patterns.
Change-Id: I2fa0298bd3e34df1cb304d9be41e471835484d83
|
|
Change-Id: Iaf23a9962c9dd748247cb986ffabb1a5ba173c09
|
|
Change-Id: I187511dbf85ecdfe0c5d05c6f77cf4ac93363051
|
|
Change-Id: I4838514bc85636df1b3f0558ce1796431bfe19f3
|
|
Change-Id: Iad2d494bf7dd9f1f69e4e863aeaa514bf76c7c76
|
|
Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
|
|
Change-Id: I4ddad27d1e5a4de9885956b80db37f1e2f80a96e
|
|
Change-Id: I1250581d69423030bd0a93a1529458b8d424ce3e
Reviewed-on: https://gerrit.libreoffice.org/7329
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
note that the autodetect HC option is somewhat broken anyway:
it resets the icon theme hard, so there are not simple roundtrips
enableing/disabling it for that, but those havent been there before
either.
Change-Id: Ia35a41717224dfb7437054bb885c61d7e0b189d7
|
|
the sidebar widget-layout enabled panels could use frame::XDispatch::dispatch
to send their commands directly rather than mapping back to SIDS and Executing
those, which would allow removing piles of weird-ass stuff
Change-Id: Ibbff56d4fb96820d3bdbf4b1cb582d25337fe48b
|
|
* Translated some more German comments
* Some typos corrected
* Removed useless comment decoration
Change-Id: I40176e23983193e5087f48cf7d7b8e5eb339d6c6
Reviewed-on: https://gerrit.libreoffice.org/7463
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
This is in preparation for more conversion of SvStream::operator<< calls
to use more explicit method names.
This converts the subclasses that have their own convenience overloads
of operator<< to use normal methods.
Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80
|
|
- Adding external data path relationship for chart[n].xml
for docx files.
- Added Unit Test.
Change-Id: If48ed21237433ddf6659454dda95d720aabdb300
|
|
(cherry picked from commit 71d322a8ce0f5f5cbfd66fd689ff10b3490c1ee4)
Conflicts:
include/xmloff/xmlexp.hxx
xmloff/source/core/xmlexp.cxx
xmloff/source/text/txtparae.cxx
xmloff/source/text/txtparai.cxx
Change-Id: Ie8291c93c86815cab68482b35a5e88a3bd9b731e
|
|
Change-Id: I5ec11ce8a64bc50faf7305ae74f058a0114d095a
|
|
- added new property entry to store xlsx external data for chart.
Change-Id: I3695865ad7e888359d1048e9bc380cba26108636
Reviewed-on: https://gerrit.libreoffice.org/7212
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I489126d291f9420aa1692d4b1f187f72dfd92a62
|
|
Change-Id: Ie0e66ac6c76eabb80340d4c11b60dd7890c6a378
|
|
It puts the function into binary in cases we don't want it for mobile platforms.
We want to generate this list later anyway.
Change-Id: I59be18b7b394254d845f5b2de02684c774510174
|
|
Change-Id: Ibfcd2954b20def05d2a7db36f5ccc0b570305441
|
|
Change-Id: I31bce794c95062abfa1171c13cf565498688b5f3
|
|
Change-Id: I603198b9fd2c6fea1c9ec7de09b23c61fe9d603c
|
|
|
|
|
|
|
|
Change-Id: I2ca8abb284e8441a49c6e96a10cf76b5680e48e2
|
|
Extract that class to its own source file.
Change-Id: Idc192354b88d4489db22f6f6e9b7f5178f4030e4
|
|
Change-Id: I42127c096aa4310e3c8b6c9b6487b4de63e7ac9a
|
|
Change-Id: Ic6488ac278cac2d1d7e240abff545f9ea0b8eafe
|
|
Change-Id: I89c35503d22797c5d5117e298f04e953de03044a
|
|
...there was a handful of Hide(true) calls, which would happen to actually mean
Show(false, SHOW_NOPARENTUPDATE)
but I assume those were typos rather than genuine requests for
SHOW_NOPARENTUPDATE.
Change-Id: I20310d58437bb556f95965885f82784f855b517d
|
|
Change-Id: Id10a0d7e0d635a6829966dc5ce0110dc715d7c6c
|
|
Change-Id: I49621bc3887baf8fcee17559818193325b83f27d
|
|
Change-Id: I32b458390130e9ed83af0831069329ac8f672d67
|
|
Change-Id: I55bb0baa8e83948c470ade2fc6fabccb69dea91d
|
|
Change-Id: Ie62a6c1197594102bc68e246ae6059a9442ce314
|
|
Change-Id: I3c0804d35c5ff7a00ec7169d0ab387f4b63d65d3
|
|
we can use -1 as the failure return code as return value is always checked and
isolated from the rest of the code.
Change-Id: I87a743de82d681a7e4eabc61a576c4e50f1279a8
|
|
Currently we change shape type to textframe if a shape contains
text. Due to this shape information is not preserved when file
is saved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7372
Change-Id: I7af3ce29f857d6fa2ceab0350937d91638361e7c
|
|
Change-Id: I39a854910299ab2e7c64beabda381bb9f0bd2891
|
|
Grab-bagged the "editas" attribute of v:group and added UT for
the same
Please verify this fix on MS Office 2007 as it renders the mc:Fallback VML part
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7335
Change-Id: I4e4456997621089967514009005ee775b71d6d69
|