summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2017-06-21tdf#89064 Fix import of pages with comments and notesPaul Trojahn1-2/+2
importSlide removes the shapes on the page. It was used to import the comments and authors, which resulted in an empty notes page. Change-Id: I7d68085b482e5497d46e92328c413c87440714a0 Reviewed-on: https://gerrit.libreoffice.org/38648 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c2da33ead8b093b12ebb9a0ea9c06d156c41a3e6) Reviewed-on: https://gerrit.libreoffice.org/39043 Reviewed-by: Paul Trojahn <paul.trojahn@gmail.com>
2017-06-18coverity#1412145 Result is not floating pointCaolán McNamara1-1/+1
Change-Id: Ia2b4c4f14f5a59dd5d24c0d0749922e0d190f53a Reviewed-on: https://gerrit.libreoffice.org/38635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/38919
2017-06-16VML: EMU to Points conversionSzymon Kłos1-3/+1
Change-Id: Icd2dbd6e894975615268dc4aa52d1d53bf9c0bca Reviewed-on: https://gerrit.libreoffice.org/38581 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 15957e14408e7b525c71914739faa63bd827117d) Reviewed-on: https://gerrit.libreoffice.org/38879 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-06-16Watermark: VML export/import font sizeSzymon Kłos3-2/+19
Change-Id: I11409dfc621018a761c70a640938e18ae679d3f5 Reviewed-on: https://gerrit.libreoffice.org/38254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f6f52c526cda640dd7595abd45727cb615c2b167) Reviewed-on: https://gerrit.libreoffice.org/38872 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-06-08Related: tdf#108269 DOCM filter: reuse oox code for VBA data preservationMiklos Vajna2-8/+15
Which means the DOCM-specific code to roundtrip VBA things (project, data) can be removed. The oox part has to be extended a bit, as at least for this DOCM bugdoc there is an XML relation of the binary data, while existing shared code assumed the full VBA project is just a single OLE blob. Reviewed-on: https://gerrit.libreoffice.org/38504 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 0129c2cd9dd95355412b194c595f4b986403ba1e) Conflicts: writerfilter/source/ooxml/OOXMLDocumentImpl.hxx Change-Id: I4085e4dba24475e6fd555e5f34fe7ad0f305c57d Reviewed-on: https://gerrit.libreoffice.org/38545 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-07Related: tdf#108269 oox: ignore case when checking .docm extensionMiklos Vajna1-2/+11
Also check for ".docm", not "docm" as a suffix. Change-Id: Ib9d3474cfe3139ee1ea51210a5606cd52243fee5 Reviewed-on: https://gerrit.libreoffice.org/38430 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1c768b975827c74e58944b8b12ab254891389edc) Reviewed-on: https://gerrit.libreoffice.org/38459 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-06-06Related: tdf#108269 oox: allow recovering broken DOCM filesMiklos Vajna1-7/+12
The content type inside an OOXML file differs for DOCX and DOCM. These must be in sync with the file extension, otherwise MSO refuses to open the file. We used to always write the DOCX content-type even for files which had the DOCM extension. Allow users to recover those broken files by detecting a "has docm extension but docx content-type" file as docm, so re-saving it will produce output that's accepted by MSO as well. (cherry picked from commit 97fa7024ce608b7908aca369e8c643a5de9ebf78) Change-Id: I7d60c6f6c1d0421e95b3dc9e8fff617f101919f5 Reviewed-on: https://gerrit.libreoffice.org/38356 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-04Watermark: VML font-family import for textpathSzymon Kłos2-0/+23
Handle style attribute to get font-family: <v:textpath style="font-family:&quot;DejaVu Sans Light&quot;;font-size:1pt" .../> Change-Id: I5fe530aecccc57e103b413ef494502f666f1005a Reviewed-on: https://gerrit.libreoffice.org/38039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 46edac18b76d8e9cc74aed8a9712ca3bdadd0972) Reviewed-on: https://gerrit.libreoffice.org/38384 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-06-04Watermark: docx interoperabilitySzymon Kłos2-3/+12
Before patch: Document created in MS Word: <v:shapetype id="_x0000_t136" o:spt="136" ...> <v:shape type="#_x0000_t136" ...> Imported to LO and exported: <v:shapetype id="shapetype_136" o:spt="136" ...> <v:shape type="shapetype_136" ...> Then again imported to MS Word and exported: <v:shapetype id="shapetype_136" o:spid="_x0000_m1026" o:spt="100" ...> <v:shape type="#shapetype_136" ...> In this moment LO after import had shape in the navigator but it wasn't visible. Patch: * vmshapecontext.cxx is changed to read ShapeType from id instead of o:spt when o:spid is present. * vmlexport.cxx added o:spid for Word to identify inserted watermark * edfxol.cxx changed name of shape to "PowerPlusWaterMarkObject" for Word * tests Change-Id: I25322628838a98c45cbeed64144d04977b2ea9ba Reviewed-on: https://gerrit.libreoffice.org/37969 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 271094ad8f9e334d17176744b90b35e80528bcb2) Reviewed-on: https://gerrit.libreoffice.org/38381 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-06-01tdf#108269 sw: add separate DOCM filterMiklos Vajna1-2/+4
This way at export time we can preserve the correct content-type, which isn't the same for DOCX and DOCM. (cherry picked from commit 697173f6fdfae581022cfdb5ec5171c5a3be58f0) Change-Id: I08fa734c72fab7400bd327a07a760839556dbf6f Reviewed-on: https://gerrit.libreoffice.org/38308 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-01tdf#104219 Don't export color information when color is automaticBartosz Kosiorek2-12/+19
In LibreOffice and MS Office, there are two types of colors: - Automatic (which is taken from settings) and Fixed (which is set by RGB value). OOXML is setting automatic color by default, by not providing any RGB color. To preserve automatic color we need to not export RGB color during OOXML export. Change-Id: I8895230c4fffc9d8741f3eff37e64c4823d71da8 Reviewed-on: https://gerrit.libreoffice.org/37970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 8129ad7b22dceeb2fef13741aa509c2229cf03de) Reviewed-on: https://gerrit.libreoffice.org/38285 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-05-16loplugin:unusedfields improve write-only analysisNoel Grandin1-2/+0
by whitelisting a couple of methods we know only write to their parameters Change-Id: Id7aef9c03c23d10c27707b21eb9a0db4a6c2757c Reviewed-on: https://gerrit.libreoffice.org/37647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-15Correct URI for HDPHOTO, tdf#107197 follow-upEike Rathke1-1/+1
Fallout from commit b08e9f08072ec2f632dd8bbbc8d0b5ca2de8b532 Date: Tue May 9 14:22:52 2017 +0530 Change-Id: I146481525f7ed17cc3f66440563079f0148ffb80
2017-05-14tdf#107197 Replace relationship URIFakabbir Amin4-22/+52
Hard coded relationship URI in sd/source/, sw/source/filter and oox/source/export/ directory has been replaced with method calls. Change-Id: Ie1b9542325fa4143bddea2582aa5e946094e457d Reviewed-on: https://gerrit.libreoffice.org/37433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-05-12remove unused uno::Reference varsNoel Grandin4-8/+0
found by temporarily marking Reference as SAL_WARN_UNUSED. Change-Id: I18809b62654467f890016adcc92576980ced393b Reviewed-on: https://gerrit.libreoffice.org/37511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-09cleanup osl/diagnose.h includesJochen Nitschke20-20/+0
with command > git grep -l osl/diagnose.h *.cxx | xargs grep -L -w 'OSL_\w*' | xargs sed -i '/#include *\(<\|\"\)osl\/diagnose.h\(>\|\"\).*/d' headers need more work Change-Id: I906519ebbd47a04703b4fa5943b2f7abea7a97ab Reviewed-on: https://gerrit.libreoffice.org/37350 Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-05-09remove unnecessary empty OUString fields and varsNoel Grandin1-18/+14
Change-Id: I940120087a0bc6b1b0abc30a3e7727ce22b7d9a7 Reviewed-on: https://gerrit.libreoffice.org/37394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-09loplugin:constantparamNoel Grandin1-2/+1
Change-Id: Ia9500b25602c14aadf49fe373682ae9d87a0a1a2 Reviewed-on: https://gerrit.libreoffice.org/37390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-08remove unused boolJochen Nitschke1-5/+0
japanese candlesticks has no function since initial commit a41687b62b0a6f2b79e44311ddf74c52e844ee36 New files from xlsx-shared-oox-chart-export-part1.diff bool is unused since last loplugin:unusedparams in oox commit 4cc0b82103e0b1d28a3ada59974aac0e7da18083 Change-Id: I30d51ecdeea851ebe1538e33ed1a0b32e131aa80 Reviewed-on: https://gerrit.libreoffice.org/37351 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-07revert OSL_ASSERT changesChris Sherlock6-19/+18
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
2017-05-07tdf#43157: convert oox module away from OSL_ASSERT to assertChris Sherlock6-18/+19
Change-Id: Ia7b62b94190537236135548f7d1d22ea3dc360f2
2017-05-04tdf#106520 xlsx: black square where image should beThomas Beck1-3/+3
Reversed order of Transforms. Duotone will now be applied after a ColorChange due to the ColorChange Transform not being able to distinguish the colors properly anymore after Duotone had been applied. This seems to better match what MSO is doing there. Change-Id: I6ca66cc411c3e2a3d009325f0f1641c560949a54 Reviewed-on: https://gerrit.libreoffice.org/36263 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-05-04cleanup includesJochen Nitschke5-22/+10
Change-Id: I9615a1da8224b0112acf5b811f7de566945c02c9 Reviewed-on: https://gerrit.libreoffice.org/37185 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-02loplugin:checkunusedparams in ooxNoel Grandin18-49/+23
Change-Id: I95bce82654bd0da7ed76ebd22b107b870ed15a1f Reviewed-on: https://gerrit.libreoffice.org/37144 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-29replace oox internal hashing code with new comphelper codeMarkus Mohrhard3-143/+20
Change-Id: I0e9363f6aa6f9d1011bc917645122408f9728ca2 Reviewed-on: https://gerrit.libreoffice.org/36794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-04-28loplugin:salunicodeliteral: ooxStephan Bergmann1-1/+1
Change-Id: I392f52f0371befc92cb5ddd51ec68bce07b689cf
2017-04-28clang-tidy readability-simplify-boolean-exprNoel Grandin1-3/+1
Change-Id: Iea7ab64683f0b29794d50d774cc482b54a00e70a Reviewed-on: https://gerrit.libreoffice.org/36450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-27tdf#107020: Reintroduce uses of I32S, I64SStephan Bergmann3-114/+114
...that had been removed with 4b788a12380518e31a9064d5839f4880d3f36874 "There should be no need to distinguish between I32S and I64S" (which this commit effectively reverts). I had erroneously assumed that the arguments to I32S and I64S would only be of (signed) integer types, and that it would be irrelevant that they are truncated to sal_Int32 resp. sal_Int64. However, at least oox/source/export/drawingml.cxx called I32S with double values (for which there is an OUString::number overload too), so the resulting strings could be rather different. Change-Id: Ib3887269fad0764740bc9ed3be91f67696a23b55 Reviewed-on: https://gerrit.libreoffice.org/37040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-25errinf.hxx moved out of tools and into vcl moduleChris Sherlock1-1/+1
ErrorInfo has a hard depency on VCL, yet is in the tools package. It is more appropriate to have it reside in the VCL module. Change-Id: Ica54a46c3a7f86cf0331ed7245234bea69c05650 Reviewed-on: https://gerrit.libreoffice.org/36839 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2017-04-25tools: svstream.hxx needs only errcode.hxx & not errinf.hxxChris Sherlock2-0/+2
Change-Id: Ia28e35ae5af4f601e9a586a3deffbcd61702b0ca Reviewed-on: https://gerrit.libreoffice.org/36896 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2017-04-24clang-tidy readability-simplify-boolean-expr in oox..salNoel Grandin1-4/+1
Change-Id: I1e14e5b15d2dd9e35477f8189cbecf0b443b9381 Reviewed-on: https://gerrit.libreoffice.org/36875 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-24Indentation fixesMiklos Vajna1-1/+1
No functional changes intended. Change-Id: Ibc23de9cb33428765b8b0c85a221a2014ad4d7bd
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky4-4/+0
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-04-21remove unnecessary explicit linefeeds from end of SAL and OSL log callsNoel Grandin2-4/+4
Change-Id: I3fa363c8e76e6cfb297f4ec346e3f031c09d6fbf Reviewed-on: https://gerrit.libreoffice.org/36727 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-16cppcheck: arrayIndexThenCheckJulien Nabet1-1/+1
Change-Id: Ie3ca646fae94ff5a06a29fc2823a1cacafc3deb1 Reviewed-on: https://gerrit.libreoffice.org/36575 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-04-16first stab at replacing hard coded relationships with calls to a methodMarkus Mohrhard3-0/+35
Change-Id: I4d1fd6ac3d32180972d82c67a81adf4953e3a82d Reviewed-on: https://gerrit.libreoffice.org/32409 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-04-15tdf#100926: PPTX import of table with rotated textTamás Zolnai1-0/+5
Change-Id: I05a8e979ac11b179e15784023032a56edc5b569b
2017-04-13convert AX_FONTDATA to o3tl::typed_flagsNoel Grandin2-18/+27
Change-Id: If51119fbdde4b1d923b794d126fdae99ca238f81 Reviewed-on: https://gerrit.libreoffice.org/36463 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-13Removed duplicated includesAndrea Gelmini1-4/+0
No automatic tools. Manual checked and tested. Change-Id: Ife260fa4e1d786cf81f2917a901664cc54943754 Reviewed-on: https://gerrit.libreoffice.org/36371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-12enum spelling: throught -> throughJustin Luth1-1/+1
git grep -l "[ _\.]THROUGHT" | xargs sed -i 's/THROUGHT/THROUGH/g' git grep -l -i "[ _\.]THROUGHT" | xargs sed -i 's/throught/through/g' In ENUMs: THROUGHT = THROUGH (preserved as valid alternate spelling) In ooxmlexport8 - unit test confirms THROUGH = THROUGHT Change-Id: Iae0fef9a8adcb96761989f38903a24ffb1b91e77 Reviewed-on: https://gerrit.libreoffice.org/35998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-04-12convert AX_FONTDATA constants to scoped enumNoel Grandin2-11/+13
Change-Id: I0de365c8f654973f483d09fc9170f40bda7cbd9e Reviewed-on: https://gerrit.libreoffice.org/36457 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-12no need to use OUStringToOString in SAL_INFONoel Grandin1-3/+2
Change-Id: I707e0d72aba89b7e644def6f4c251e14f6599ad2 Reviewed-on: https://gerrit.libreoffice.org/36451 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-10loplugin:inlinefields in oox::vml::VMLExportNoel Grandin1-6/+3
Change-Id: Ia6880212503b2945953ca4c3d62d3ddb1d159c7b Reviewed-on: https://gerrit.libreoffice.org/36351 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-06Improved loplugin:redundantcast, static_cast on arithmetic types: ooxStephan Bergmann2-7/+7
Change-Id: I5febd0b28bc3e8beca1034ca151406af1e2034d9
2017-04-06loplugin:singlevalfieldsNoel Grandin3-22/+24
Change-Id: Ia681765aa1da5c80a3dbe91b7376af841a9c9ec1 Reviewed-on: https://gerrit.libreoffice.org/36145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-06loplugin:redundantcast find cstyle double castsNoel Grandin1-1/+1
Change-Id: I5507be190dac781e5cdb545a60acf3d50056c9f8 Reviewed-on: https://gerrit.libreoffice.org/36187 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-05add a clearDocumentHandler for null document handler caseCaolán McNamara2-1/+8
Change-Id: I661a2fd5381013056c69b379792560aed7121214
2017-04-05loplugin:constantparam part2Noel Grandin5-31/+23
Change-Id: I7ec4c946be52a6b56aee908426f95ecacc7b0746 Reviewed-on: https://gerrit.libreoffice.org/36072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-04oox: -Werror=formatMichael Stahl1-2/+2
Change-Id: I9036335c812992946e3164e517cbe7296b98759b
2017-03-31use actual UNO enums in ooxNoel Grandin8-21/+20
Change-Id: I7fbb3619287acde0c397ff9b4015271ec785cc46 Reviewed-on: https://gerrit.libreoffice.org/35958 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 00:58:05 +0000