summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2015-12-22tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid OOXMLZolnai Tamás1-3/+6
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. Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
2015-12-22loplugin:unusedfields in oox,packageNoel Grandin13-34/+3
Change-Id: I8f8c3ff9ded455a09f3df81c501da17cca0b2310
2015-12-21loplugin:unusedmethodsNoel Grandin2-48/+0
Change-Id: Ifafdaf6da0225f244853a0042a6458643b570623
2015-12-20Bin leftover commented-out debugging call to dump_pset()Tor Lillqvist1-1/+0
Most likely wouldn't have compiled anyway if un-commented-out as I see no dump_pset here. Change-Id: I45a998251fb241a534d8f8ee9e57c2f4cba7df5c
2015-12-20oox: fix indentation of ShapeExport::WriteOLE2ShapeMichael Stahl1-134/+133
Change-Id: I9057cd9d574d545929a9f43f40f49164179a6dcc
2015-12-20oox: save ProgId on import, and use it in ShapeExport::WriteOLE2Shape()Michael Stahl3-6/+63
Uses the same approach as DOCX import to preserve the ProgID; it would be much better if the MediaType of the stream were preserved instead and the other things derived from that, but this here was rather quick to do... This makes the round-tripping of OOXML OLEs in PPTX work again, which was broken by an earlier commit. Change-Id: Ic7d0362f0c14bf0e522185713666bcd58db2cf64
2015-12-20move saveInteropProperties from writerfilter to ooxMichael Stahl1-0/+40
Change-Id: I4f9769ad496198d2d002775dee4ee0a2f08d6f3b
2015-12-20oox: stop pointlessly loading embedded objects to check if it's a chartMichael Stahl1-4/+12
This fixes SdExportTest::testBnc822341 again, because the conversion TryToConvertToOOo() in OleEmbeddedObject no longer breaks it. Change-Id: Ib968722af426123afa08865290e5a4e762f19070
2015-12-20oox: replace incomplete implementation of ShapeExport::WriteOLE2Shape()Michael Stahl1-84/+38
... with oox::GetOLEObjectStream(), and add the "progId" attribute while at it. Not sure what the "name" attribute is good for, it appears more like a unique name than some kind of type classification? This makes SdExportTest::testBnc822341 fail temporarily, and also breaks roundtripping of OOXML OLEs in PPTX files. Change-Id: I20043b2a414cf5a28eaa24adaf2ddeb737986250
2015-12-20factor out oox::GetOLEObjectStream() without sw dependenciesMichael Stahl1-0/+225
Change-Id: I32fa4b6b6d755b613b46b32d3b5961976335c76e
2015-12-15loplugin:findoncontainerNoel Grandin1-2/+1
Change-Id: Ie32abd917bf86ab0c44be80a00e5f35354bc3cdc
2015-12-14don't be creative and use a simple lookup tableDavid Tardon1-2/+21
The original code breaks at least in optimized build on Fedora x86, because there nBits for 256 is computed as 9, not 8. Change-Id: Ib157c415bc9e231bf7fd544349810e6bc83c8fcc
2015-12-11No need for a separate <vcl/graph.h>Tor Lillqvist1-1/+0
Change-Id: I962544005b5d408f7c044a02eefe09b87d8a81fe
2015-12-04Prefer STL container to manual reallocMiklos Vajna1-30/+12
Change-Id: Id586934c8ff635b1ec2b645b0956cc60960f6078
2015-11-30oox: better warning message on unhandled element in docprophandlerMiklos Vajna1-1/+1
Change-Id: I7ddd5290134ae3cc3b9f7427055537e79919b480
2015-11-30export date and time fields in impressRosemary1-2/+36
only those fields that are currently implemented in editeng/source/items/flditem.cxx and also match with those in the specification are exported Change-Id: I542cb0f827e161005e55452b5b6961dc642cd4e7 Reviewed-on: https://gerrit.libreoffice.org/20062 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2015-11-27Resolves: tdf#96072 export Chart format codes in Excel notationEike Rathke1-8/+21
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. Change-Id: I201bb012df818129cbc65de0eee8eca59e57d829
2015-11-24loplugin:unusedfields in include/oox/Noel Grandin1-5/+4
Change-Id: Ie7a53f3ecc05d1d4f6f71aa8165315f9155c60dc
2015-11-24tdf#78902 VML import: workaround for extreme top marginMiklos Vajna1-9/+18
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. Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
2015-11-23loplugin:unusedfields in oox,package,reportdesignNoel Grandin3-7/+2
Change-Id: I83d03dcc76b5f0d54ebb0513ae972acb0db8eef1
2015-11-20loplugin:sallogareasStephan Bergmann1-1/+1
Change-Id: Ib1f06cb5f925535858bc14aab6f59ad7fd2a3a8d
2015-11-19tdf#92527 construct default Segments sequence, when there is noneAndras Timar1-1/+14
Change-Id: I78ddbef3ac96f10f334c45a467dafb95bb9e3453 Reviewed-on: https://gerrit.libreoffice.org/20051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-11-19tdf#90904 Sorry, mixed Characters and CharactersWithSpaces at a first timealexey.chemichev1-2/+8
Without this patch Windows Explorer shows different "Character count" for the same text saved with MSW an LO. Now both stats are explicitly exported this way: NonWhitespaceCharacterCount -> XML_Characters CharacterCount -> XML_CharactersWithSpaces Change-Id: I0a3b827629e88ab5e09aa8440e5f19e7fba2d831 Reviewed-on: https://gerrit.libreoffice.org/20058 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-11-19use comphelper::containerToSequenceNoel Grandin4-35/+13
in chart2, we remove a local equivalent of the method Change-Id: I25129a3d1ea1dd724eb9cd38a57be37a78b3d100
2015-11-18tdf#90904 DOCX export metadata for "Pages", "Word count", "Character count"alexey.chemichev1-5/+25
/oox/source/core/xmlfilterbase.cxx: writeAppProperties modified. Stats are extracted from DocumentProperties->DocumentStatistics. No stat counter found for the lines of text Change-Id: Ibc2e848a97776f65f0bfd4a880e5279e9c507dd0 Reviewed-on: https://gerrit.libreoffice.org/20046 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-18pptx: import/export of honeycomb slide transitionTomaž Vajngerl2-0/+5
Change-Id: I3edb77d5b046691e64d600d61dcd44e892c31301
2015-11-18remove unused typedefs and inline use-once typedefsNoel Grandin1-1/+1
and improve the script a little Change-Id: I2792ea4dd5df3a50736fbe209225c3f16fb86b84 Reviewed-on: https://gerrit.libreoffice.org/20033 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-15Fast PCH generator and optimized PCH filesAshod Nakashian1-357/+175
Ported update_pch.sh to Python with improved performance and features. The new script is invoked from the same update_pch.sh which calls it for each library in parallel, although it can be invoked directly. The ported script (update_pch) updates all PCH files in ~15 seconds where the old script took ~4500 seconds. In addition, the new script supports 3-tiered headers (system, module, and local) and is very flexible to support other improvement. It has a per-library optimal configuration settings that can be updated using another new scripts (update_pch_autotune.sh) which finds optimal per-PCH settings. PCH files have been generated using the new scripts which builds significantly faster (2-3x, depending on module and configuration) and the intermediate binaries are noticably smaller (by several GBs). The new script stamps each generated PCH file with the command that generated it to make it trivial for users to update them, and also adds the command to invoke another script (update_pch_bisect) that helps find missing headers or conflicting headers that may break the build after updating the PCH. Finally update_pch has built-in unit-tests for makefile parsing and other core functionality. Change-Id: Ib933b50e50374d7e2e7e3e95ba8799b0cc8a27fa Reviewed-on: https://gerrit.libreoffice.org/19965 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-15use initialiser for Sequence<OUString>Noel Grandin3-6/+3
using variations of: git grep -lP 'Sequence.*OUString.*\(\s*1\s*\)' | xargs perl -0777 -pi -e "s/Sequence<OUString> (\w+)\(1\)\; \s*OUString\* pArray.*; .*\[0\]\s*=\s*(\S+)\;/Sequence<OUString> \1 { \2 };/g" Change-Id: I03c64334ff30ee14dce0d17b67f5122a3893bbe3 Reviewed-on: https://gerrit.libreoffice.org/19971 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-15use initialiser syntax for Sequence<OUString>Noel Grandin1-2/+1
replaced using the script: git grep -lP 'Sequence.*OUString.*\(1\)' | xargs perl -0777 -pi -e "s/Sequence< OUString > (\w+)\(1\); .*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g" Change-Id: I23688a91562051a8eed11fc2a85599545c285c34 Reviewed-on: https://gerrit.libreoffice.org/19967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-13slideshow: add "glitter" slide transitionTomaž Vajngerl2-0/+5
Change-Id: Ie89b64c4399cd0092eee579660c9fe85f8ca8e73
2015-11-12Namespace cleanup and disambiguationAshod Nakashian1-1/+1
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739 Reviewed-on: https://gerrit.libreoffice.org/19900 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-11tdf#85232 WPG import: fix handling of line shapesMiklos Vajna1-2/+11
The missing convertMm100ToTwip() calls mispositioned the line shapes inside the groupshape in case of using drawingML inside DOCX files. Change-Id: I0c9d652de43d779f9073a8bfe22866ce4f31d0fa
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann100-514/+514
Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
2015-11-09Clean up Sequence constructionStephan Bergmann1-66/+44
...to avoid silly errors like the one fixed with 37039fde1187c2e71bdde6e7fafd23c6ae8a871e "Missing comma." Change-Id: Iab4d25f44fd8867ee1ef5e15c209ada5c6ebb0c8 Reviewed-on: https://gerrit.libreoffice.org/19871 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2015-11-09Missing commaStephan Bergmann1-1/+1
Change-Id: Ia2497902771b78130b6263885bdb3362d1e6c76c
2015-11-09loplugin:passstuffbyrefStephan Bergmann1-1/+1
Change-Id: Ibcab688c042e32a81b936573503c4a9066244161
2015-11-09pptx: "fall" transition, which needed p15 namespaceTomaž Vajngerl8-0/+34
Added p15 namespace which is present in MSO 2013+ documents. It adds a "prstTrans" element with a string "prst" attribute which is a name of the transition to be performed. This was added to support "fall" transition which translates to "fallOver" preset transition. Change-Id: I429bb106a12c1b99cce756502508e917720daef3
2015-11-09pptx: import "Vortex" and "Ripple" transition + testTomaž Vajngerl2-0/+10
Change-Id: I29d71e9c07c4964275c13772cdb6042624550acb
2015-11-09new loplugin: oncevarNoel Grandin3-54/+15
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f Reviewed-on: https://gerrit.libreoffice.org/19815 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-08loplugin:stringconstantStephan Bergmann1-1/+1
Change-Id: I33876585b5a406231954013051bc7f61045226b0
2015-11-08oox: check for namespace in MCE is flawed, use a namespace listTomaž Vajngerl1-7/+13
In "AlternateContent" nodes we have to check if we support the namespace which is provided in "Requires" attribute of "Choice". Currently we tried to resolve the namespace with a call to the xml filter, however this doesn't work as the filter is already gone. In writerfilter we also have to handle a similar situation but there we just compare it to a list of predefined namespace alias ("wps" and "wpg"). This commit adds a list of supported namespace aliases to fragmenthandler2 instead of the namespace checking to support the "p14" namespace alias correctly. Change-Id: I25c430b97336c9e140bb5641a76a60895734b91f
2015-11-08add p14 namespace to xmlfilterbaseTomaž Vajngerl1-2/+4
Change-Id: I34d253e9f5bdfff14f1940544ae5bbb019bf506b
2015-11-08pptx: import outside/insde turning cube transitionTomaž Vajngerl2-0/+16
Change-Id: I12f668aca158a8c868ecaeb37f6724852308a515
2015-11-08oox: define p14 namespace in strict, define P14_TOKENTomaž Vajngerl3-1/+6
Change-Id: I9c92b9a637f43fd425cd0741e480b72ee5cff919
2015-11-08oox: p14 namespace (MSO 2010) + tokens for slide transitionsTomaž Vajngerl2-0/+23
Change-Id: I72d1901ceb2e43e459efb197cb72bd701c7d8f63
2015-11-08pptx: import/export of "cut through black" transitionTomaž Vajngerl1-3/+1
"Cut through black" is not supported in ppt so we detectit only in pptx specific export code. This needed some changes in the pptx code for exporting transitions. Change-Id: Ibc7361311017b3ffadd289db4e8ae233e1101ea8
2015-11-08pptx: fix export of newsflash transitionTomaž Vajngerl1-3/+2
Change-Id: I0e34e1b8860b9142d3171246d41bb528e710d10c
2015-11-06loplugin:stringconstant: elide explicit ctor usage (manually due to macros)Stephan Bergmann2-5/+5
Change-Id: Ic8c87b17d0c2c1b18b01a44ababee0daccf1fb28
2015-11-06loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)Stephan Bergmann3-10/+10
Change-Id: Ia944d081842753fcf82f77bda82defe1d5566b37