Age | Commit message (Collapse) | Author | Files | Lines |
|
DrawingML: The useBgFill attribute specifies that the shape fill
should be set to that of the slide background.
Reviewed-on: https://gerrit.libreoffice.org/23039
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit f3d1ac75c4b7fa63022e54a9cbff46ba99535076)
Change-Id: I8b568e730f00326d51e7b604579f4ff990b26f8a
|
|
The spec says in theory a % suffix could be also supported, but let's
wait till that is seen in a real-world document.
Change-Id: Ie026915e38dcb03c99085a1740075364b00e1c8d
(cherry picked from commit bb646c1472d3b77066b01128baf1c9cafdb40233)
|
|
Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812
(cherry picked from commit 99ab23d26010120e7e6344cb2b26e192890ec5c3)
Reviewed-on: https://gerrit.libreoffice.org/21489
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 436b1615b271bae46a43530c2dab3a80b4e46419)
|
|
Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit b3d50feaa87b670baf68288974005ac26ad31736.
It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.
(cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
Reviewed-on: https://gerrit.libreoffice.org/20921
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e18c062be49042945644db438608a6e58c7dc98a)
|
|
(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4)
Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498
Reviewed-on: https://gerrit.libreoffice.org/21342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit c5f4c528123d6c65b489ac18ab7892bc92866b09)
|
|
Change-Id: I74f4c4507bbe6abe7618ca41764715b3b5c68b5b
(cherry picked from commit 20d8267ac702ec6e910481c14eb46c6431a40fe9)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 23e6789dfc7c5a7cd0693fad573540519784bd91)
|
|
This is a combination of 4 commits.
Omitted are 2246f478e2505388ab253d08a1d86b897251223b and
7340872a3450e38a7f820945585a9ee60b2a9d41 that replace the Calc code with
calling the new SvNumberFormatter functions.
introduce SvNumberFormatter::FillKeywordTableForExcel()
... to conflate the places that do this on their own.
(cherry picked from commit b55548043e969a6aa4c211217cfc3fb85d50d2da)
use proper case "General" keyword
... Excel doesn't seem to care though.
(cherry picked from commit ea1db935b085507f11d05f8606a680d521db4838)
introduce SvNumberFormatter::GetFormatStringForExcel()
Taking implementation from sc/source/filter/excel/xestyle.cxx
GetNumberFormatCode(), slightly modified to ensure valid conversion and
force en-US locale data. Also don't unnecessarily convert if format is
for system locale and system locale is en-US.
(cherry picked from commit 2011b5412c4daa47bc5624a2efc996960e19c2a9)
Resolves: tdf#96072 export Chart format codes in Excel notation
As for the change in chart2/qa/extras/chart2export.cxx
Chart2ExportTest::testAxisNumberFormatXLSX() unit test: also Excel
writes string parts of format codes quoted, including minus sign in
negative subformat.
(cherry picked from commit 509cfa40691cf544519872a63335cff4a4d94006)
3697a808d8fee2417f0b0e03dba2b94ceea133dd
9223eaa655132b4106a35c94cb0005559d7575b1
201bb012df818129cbc65de0eee8eca59e57d829
Change-Id: Idde2173780e0515ad982b4be46fc4df23a7577ad
Reviewed-on: https://gerrit.libreoffice.org/20249
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 446a3a06098ef75c034ae00e6671255973e7e5a0)
|
|
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516:
DOCX import: fix context stack when importing header/footer, 2014-03-05),
though that just made an existing Writer layout problem visible.
RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those
import pictures as sw graphics, not draw ones.
<w10:wrap type="through"/> is normally mapped to our page wrap (as it uses
"through" in the "not only wrap around, but also in the holes of the shape, if
it has any" context, not in our "text should go through it, so no wrapping"
one), but for some reason in this case (most probably due to the extreme large
negative margins) Word handles the situation as our through, i.e. the text
should not go to the second page, as it would normally happen with a "Word
through" wrapping.
Work around the strange situation by ignoring the wrapping request for extreme
top margin values.
(cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd)
Conflicts:
oox/source/vml/vmlshape.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
Reviewed-on: https://gerrit.libreoffice.org/20212
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d66df3d35030bf725fa7e3d78420344ddd44478c)
|
|
1) Write endParaRPr so that PowerPoint display them properly.
2) Original design forbid properites with default value to be exprted, now fixed.
3) Automatic colors are written as white or black based on
whether background is dark.
Note that tdf#77881,tdf#80520,tdf#89525 depend on this.
Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf
Reviewed-on: https://gerrit.libreoffice.org/17472
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/19862
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 0b5e3885bc706ed02acac1c682c90171700b0cac)
|
|
ODF export in xmloff does the same
Reviewed-on: https://gerrit.libreoffice.org/20051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 11b7a2c89b8e155bf1da79107878f066847b46eb)
Change-Id: I78ddbef3ac96f10f334c45a467dafb95bb9e3453
Reviewed-on: https://gerrit.libreoffice.org/20066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 7cb41280ca4eb9e33c9ef06ea296bf91ba5a83ee)
|
|
The missing convertMm100ToTwip() calls mispositioned the line shapes
inside the groupshape in case of using drawingML inside DOCX files.
(cherry picked from commit 11129d89b152db54c86bb2bda58c24b8abb6c5a8)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I0c9d652de43d779f9073a8bfe22866ce4f31d0fa
Reviewed-on: https://gerrit.libreoffice.org/19946
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ca8cdb9afc886f3013a7c1d8707d4c5bef70a1c5)
|
|
Regression from commit 866a4436d3cfac1ff42d7996250bf96fb703aeaa (oox:
handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04),
the problem was that code in ShapeContextHandler::endFastElement()
assumed that all the XShape implementation it may see provides a TextBox
UNO property (which is specific to Writer) of type bool, but this is not
true.
Fix the problem by assuming false in case it has an other type.
Testcase can be a simple "does it load" one, as in the meantime
exceptions such as trying to read a bool from an uno::Any make the DOCX
XFilter::filter() implementation return false, unlike in the originally
reported LibreOffice 4.4 version that just silently discarded the
remaining content of the document.
Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f
(cherry picked from commit 4cae3689d4d78fabe6529c9df03c438b1e9d1611)
Reviewed-on: https://gerrit.libreoffice.org/19905
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 2c43db1ecfd9621f4eb6775a4f682d00987692f4)
|
|
Change-Id: Ib3a1ccda738091466d5e2866823f64b254ed5bab
(cherry picked from commit 6e3c36255b9a17095745aba2489b347bccf42423)
Reviewed-on: https://gerrit.libreoffice.org/19740
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit c34958475373397bd0c29f81c12ae918646d28fb)
|
|
The fix is twofold:
1.Get URL property from the underlying text field, not from the
text run -- put text field properties into rXPropSet (that's
what GETA macro later queries), not into rRun
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/
afaics for no good reason
2. Retrieve string content from URL field early, so that the test
for empty text content doesn't fire
Reviewed-on: https://gerrit.libreoffice.org/18031
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Conflicts:
sd/qa/unit/export-tests.cxx
Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e17187c323428b7edea425278ea33bca77db12b5)
|
|
So that large images are written only once to the ZIP container when
they are exported using both markups. This affects drawinglayer images,
the Writer ones are handled directly in sw and were already
deduplicated.
(cherry picked from commit b484e9814c66d8d51cea974390963a6944bc9d73)
Conflicts:
oox/source/export/drawingml.cxx
Change-Id: Iff7c769329b42939833056b727b070f6a60da5e3
Reviewed-on: https://gerrit.libreoffice.org/18491
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Commit ef2668bad976f1fbb70759887cafd35ea7833655 (PPTX import: fix
missing document metadata, 2014-08-28) implemented metadata import for
the PPTX filter, but in case the metadata stream is not an existing one,
then OHierarchyHolder_Impl::GetListPathFromString() invoked by
OStorage::openStreamElementByHierarchicalName() throws.
The bugdoc is generated by a 3rd-party tool that always starts the
stream path with a slash, and MSO seems to just ignore that: so let's do
the same to be able to open the document.
Change-Id: I6c0715adeb19b9055669f6a45055415dd2c44e28
(cherry picked from commit 46cf9bb76b29f2bfa6639d9aaf4f26dee365bc0c)
Reviewed-on: https://gerrit.libreoffice.org/18368
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Replace bullet char before write out font description
since it may be altered if bullet font has been changed
(i.e. StarSymbol to WingDings ).
Change-Id: I0461cc0a5e4628b36177602bba7ed7f74a0751eb
Reviewed-on: https://gerrit.libreoffice.org/17376
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/18318
Reviewed-by: Mark Hung <marklh9@gmail.com>
|
|
Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9
Reviewed-on: https://gerrit.libreoffice.org/18226
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb)
Reviewed-on: https://gerrit.libreoffice.org/18270
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f
(cherry picked from commit c874bf3f7bd6bbe31416506d9b4213bcbbbac4fa)
Reviewed-on: https://gerrit.libreoffice.org/18225
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
This is a combination of 12 commits from master branch:
tdf#92256: ODF save/load syntax for string reference
Related tdf#92256: map CONV_OOO to listbox item no.1
tdf#92256: Introducing CONV_A1_XL_A1 address pseudoconvention
tdf#92256: OOXML save/load syntax for string reference
add unhandled case in switch
that comment is not correct anymore
don't generate invalid XLSX files
tdf#92256: Handle case when string ref syntax is unknown
tdf#92256: Make OOXML filter CONV_A1_XL_A1 aware too
tdf#92256: Make sure ref syntax of Excel docs gets saved
tdf#92256: Save ref syntax when different from native one
tdf#92256: Don't force CalcA1 syntax on all !Microsoft xlsx docs
Change-Id: I226d5644ce729f1311aefc9a8998b3a75633c334
Reviewed-on: https://gerrit.libreoffice.org/17837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
If the shape is rotated 90 degrees clockwise and the text is further
rotated 270 degrees clockwise that means we shouldn't do anything with
the text and the result will be correct.
Also: cid#1315264 incorrect expression
(cherry picked from commit dbfed66eebde65f5844a0f1a2cfe548ad4eda962 and
1c09657c5c25cf941588610eeab653217399f9b5)
Change-Id: I7c65319258136288520bd24fa2bf8e3c598b0878
Reviewed-on: https://gerrit.libreoffice.org/17807
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
(regression from ccfc02f7691848284403d339ee17054169fbff1d)
Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea
(cherry picked from commit f18ca153aac53408284062309db513ab73f7dd2c)
Reviewed-on: https://gerrit.libreoffice.org/17144
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
cherry picked from commits 976add10b35e482251ed4c75957baeb6811e6e2c and
091fe76b6329b4bb974987554369cbfadd8f2401
Change-Id: I017049a8f3578ad4c2a1f549be1c683f98c20318
Reviewed-on: https://gerrit.libreoffice.org/16692
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
digging into the crash on export of kde216114-1.odt
reveals various horrors
Change-Id: I0d24fe303d561a00a08098b306d10fd8273af928
(cherry picked from commit b04e1e79e64cb7bb3106fd08a019c27b09bdd5c6)
|
|
Change-Id: I78478de91473681fd8d836293dabe7b790dda516
(cherry picked from commit 80fbd731d8b8b101a10466a4d16d4867e9de968b)
|
|
the enhanced-path contains decimal points so the
last element is a double not an integer
Change-Id: I90be76a2d4cb90ee7a904aa72fe65770c675fc53
(cherry picked from commit aeb52a855d55475ff2e74f5308ae580dce3e069f)
|
|
Change-Id: I8b39a210490759e9f548c195e516a26b94a8b3cb
(cherry picked from commit 113adfe37326f132de2ab1c6220dfd95fec4c6ba)
|
|
Change-Id: I17ea45f2b1dd46a7f1c0f3ce8c680bef9ec533fa
Reviewed-on: https://gerrit.libreoffice.org/16249
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 7dee641f675e7f472f5bec39cb92a1422fd1ffee)
|
|
Change-Id: I0386b4a768a9ac51cb86ac1c3edb17c41caf821a
Reviewed-on: https://gerrit.libreoffice.org/15993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit a819691ecc32586e800566d74ac22b474430d685)
|
|
Change-Id: I777c6734a7f63240e9021152ecff0a86f530ff8f
Reviewed-on: https://gerrit.libreoffice.org/15951
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 62031cd02d1fbb27c2e5bc9eee2a8dd7c7c9e295)
|
|
Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237
Reviewed-on: https://gerrit.libreoffice.org/15923
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 1a4eeac14b618714bb8be9755f508ee63ac4a422)
|
|
Change-Id: I610d8099f057a2a34a1f9573d8ac16b5b8da9fc7
Reviewed-on: https://gerrit.libreoffice.org/15918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 481c185e327cb83ffcb29657d5a354eae2c4a5f3)
|
|
Revert "Resolves: #i124703# adapt coordinate range from ms relative..."
This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467.
The reverted commit did not fix anything in LibreOffice in the
first place. The document referenced in #i124703# is as good
without the patch as with it. But it caused a regression.
Conflicts:
oox/source/drawingml/customshapeproperties.cxx
Change-Id: I65eb114423039e9c9c684cc55009275fd06caacd
Reviewed-on: https://gerrit.libreoffice.org/15875
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit da0a44b415f630ce39617b8c8f0c366177a7705e)
|
|
ambiguous symbol
Change-Id: Ie3eea266b6a1bf6ca65edaf6a2f22e543a128646
|
|
Change-Id: I27b27b4f6ca4b443ebbfb0898cef7481b47658f9
|
|
Change-Id: I61892eeeb3d90e50f23cb1dbaf303aabaa1225fa
|
|
Previously, the merged cells were not getting saved. Also it
was leading to corruption if saved as pptx.
While on opening the round-trip file of odf extension which has
merged cells, merged cell properties not used to persist.
In the current implementation XMergeableCell class was not having
any property to identify the parent cell of a merged cell.
This CL includes:
- Fixed the above scenario for export of file
- Now, the odf file with table merged cells persists its property
- MS doesn't complain for any corruption after export an odf file
as pptx
TODO: Writing a UT seems to be tricky for this change.
Need to analyze and will raise the UT in separate CL.
Change-Id: I32f9daf77312a0ef3f291f36aef372671554c56d
Reviewed-on: https://gerrit.libreoffice.org/15282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ie53422eb4684bc3d720c8922d4764b807df4c8f3
|
|
Change-Id: Iae58d107d8df1c543a165086fb2b7c288e7121dd
Reviewed-on: https://gerrit.libreoffice.org/15775
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Due the variables above this error, I think this needs to be the .Height, not .Width
Change-Id: If796cd1950f59d0e1a6005c1c1185066c688ef55
Reviewed-on: https://gerrit.libreoffice.org/15748
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5.
Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc
Reviewed-on: https://gerrit.libreoffice.org/15737
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
|
|
Problem Description
If the attribute hidden is set and then after exporting it to .xlsx, the shape does not remain hidden.
XML Difference
Original :
<xdr:cNvPr id="2" name="Rectangle 1" hidden="1"/>
Roundtrip :
<xdr:cNvPr id="0" name="CustomShape 1"></xdr:cNvPr>
Change-Id: I2e87a484ea984b56415891fd157995cb49453f76
Reviewed-on: https://gerrit.libreoffice.org/15662
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Iec293ec3541b87b16f5a8097d51b878166814670
|
|
Change-Id: Ic1cb9b32fe252706cd607abb2ae1fd5a00999901
|
|
Change-Id: I604acb0b7f0bf8b726ace07c2fa9919c0f0b6aa6
|
|
Change-Id: I7af0db5381737c7d28a491e4aca673d9cc4b1e19
|
|
Change-Id: Ia0e23faf43fd266b8314f807b77423e9a3e15797
|
|
Change-Id: Id6de1425c03be8552d1dd2597001bf0632292e90
|
|
Change-Id: Iad76b7263526da4e50ef3c0b6933a8833f567790
|
|
Change-Id: Ide1a30307711e3857d83b691c95d984439359005
|