summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
2014-03-31coverity#1194923 Missing break in switchCaolán McNamara
and coverity#1194924 Change-Id: I1225745b22d27918ff3efe3ad8f0a7d69ed2f015
2014-03-30enable smoothed property export for line charts, fdo#74619Markus Mohrhard
Change-Id: I1b9796411a6f688f2bc7c53212fb4245c55ab3e1
2014-03-30adapt smooth import to OOXML and not to MSO 2007Markus Mohrhard
Change-Id: Id1dc62a89e2858f81dc9b6eb8a5f3d9996ba85ec
2014-03-30export smooth property correctly to OOXML, fdo#74619Markus Mohrhard
MSO 2007 and later have different behavior for the default value. Be explicit and always export the element. Change-Id: Ic8cad67db8c882d3642a6662bf710be2088335b7
2014-03-29coverity#1194942 Uninitialized scalar fieldCaolán McNamara
Change-Id: I21733cb3fc0dd32a39826b0eaa7b2064d50a9c90
2014-03-28coverity#1130428 Dereference null return valueCaolán McNamara
Change-Id: I557aeb40b4209e2f77383143a8c2665bffea110c
2014-03-28Use setProperty instead of << operatorMuthu Subramanian
Change-Id: I2c553a41de430c200445d8c8e8300af13d0eaea0
2014-03-28n#870234: Import gradfill for text colors.Muthu Subramanian
Uses the first color from the gradfill list. (Which is better than plain black!) Change-Id: I4c1c0c4b031f3681c95b75b3c0683eb4de95bffb
2014-03-27write (no)wrap of text only for custom shapes to .pptx (fdo#71961)Luboš Luňák
Apparently checking the TextWordWrap property in DrawingML::WriteText() gives false by default for objects that do not have it set, which happens to be everything except for custom shapes, which seem to be the only ones to actually obey it. So all normal text would be exported as nowrap to .pptx and read back as custom shape that has non-wrapping text. I tried to make the property return true (which is what it should be in practice), but that appears to be an exercise in futility, or I'm not mad enough to follow the complicated property sets and whatnot. So just write it out only for custom shapes. UNO purists, if any, are welcome to change the dynamic_cast to something UNO-better if they manage without an ambiguous base class error. Change-Id: I3ed906285fde88d902ac9c801986a82a7515638b
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27Cleanup a bit.Muthu Subramanian
Change-Id: I90e15389a76c34d6b7a93cf8b059029795ef8891
2014-03-27n#862510: anchorCtr controls the anchoring as well.Muthu Subramanian
Change-Id: Ib244d89a9f7d400b3891d477314cd5f0193552e0
2014-03-27n#862510: Fix text rotation.Muthu Subramanian
Fix breaks document in n#783433 - the one there is damaged - resaving it using mso 2010 should fix the problem there. Change-Id: Ib2ee7ab20489d716dc189ac6810d705763a16476
2014-03-26support negative overlapMarkus Mohrhard
Change-Id: I1ec67a8697148d650f56650c6320964ac39dfedf
2014-03-25coverity#735446 Logically dead codeCaolán McNamara
Change-Id: I6615145e2529193cbe72f4e5d326832a5b8864d0
2014-03-24fdo#76222 oox: add support for MSO 2007 SP2 encrypted documentsTomaž Vajngerl
Change-Id: I8fa586d49437ff5422fc3daa4c81439146e598a0
2014-03-23oox: cast to avoid compile errorTomaž Vajngerl
Change-Id: I1ef4f4917f2b97d44c9b39f36fd17b0be6995a4e
2014-03-23oox: add Digest class which uses NSS or OpenSSL for digest calc.Tomaž Vajngerl
Document encryption and decryption uses either NSS or OpenSSL to calculate digest. Digest class hides the implementation details between the two implementations. Previously, functions sha1 and sha512 were used for this, but were less generic. Change-Id: I60119e2ab9c5c1f4a2b02bc417c3c89c53a63fda
2014-03-23fdo#75955 use SHA1 from openssl/nss instead of rtl_digest_sha1Tomaž Vajngerl
Change-Id: I92186b2ed8426d59e31080cfb629beb02cd01c41
2014-03-23fdo#76356 : Docx file contianing chart in footer/header gets corrupted.sushil_shinde
- Docx file with chart in footer/header or .bin file referred in chart was getting corrupted. - Embedded file for footer.xml was not grabbaged. - .bin embedded files were not grab baged. - Added grab bag support for both case. - Added UT to check .bin files are grab baged properly. Reviewed on: https://gerrit.libreoffice.org/8674 Change-Id: I221e3867798fc2a3a42f6385d687e80b80a3678f
2014-03-22coverity#1038295 Unchecked dynamic_castCaolán McNamara
Change-Id: I80488cc2c5edfaf5e3eb11bed1684d230549a663
2014-03-22oox: no need to dump these hereMiklos Vajna
writeAppProperties() already uses this data as necessary. Change-Id: I5eea399ae2cfa37dc3a7c80114f5265fb4a0c648
2014-03-21First check if this is the one we search for, then extract.Jan Holesovsky
Change-Id: Ie98dc14b743983e68f126ed4b7a7f00b637957d3
2014-03-21DOCX export of paragraph count in app.xmlMiklos Vajna
Change-Id: Ie2fd4af3340c48c915eada74760cb414848f8a8b
2014-03-21oox: don't fill CharInteropGrabBag if the property doesn't existTomaž Vajngerl
Change-Id: Ic7d543a8155cfe5ec39d34c8cd7133f14f8f3cc9
2014-03-20ooxml: preserve checkbox sdt controlJacobo Aragunde Pérez
Checkbox controls in docx are implemented with a sdt block containing the property w:14:checkbox, which has several child elements. To implement the preservation of the field, we had to add several tags to the ooxml model file. Notice they belong to namespace w14, that's why we had to add a redundant definitions of CT_STRING, ST_STRING and their actions. Then, we just used the existing mechanisms on the importer and the exporter. Finally, added a unit test. TODO: the checkbox is preserved on export but it cannot be modified. We should import it like we do for combo and date boxes. Change-Id: I40f29b48ec24719c48482b9c8cff10176d1b188d
2014-03-19fdo76201:File Corruption - Issue related with prstGeom for Hexagon shape.Sourav
There are two issues that are handled in this fix. 1)File created in MSO2K10 on RT gets corrupted.The root cause is found in CustomShapeProperties::pushToPropSet 2)File created in MSO2K7 on RT gets corrupted.There is an issue in shape import <a:gd> values for any shape (ex. circular arrow, hexagon etc).LO cannot import right <a:gd> values for any shape which is created in MSO-2007.Due to missing values of <a:gd> tag, after roundtrip the file gets corrupted.To avoid corruption a check introduced:- if(aAdjustments.size() == nLength) after http://opengrok.libreoffice.org/xref/core/oox/source/export/drawingml.cxx#1784 that will verify the number of <a:gd> tags associated with the shape during import and the number of <a:gd> tags during export.If there is a mismatch <a:gd> willnot be written.Changes made in DrawingML::WritePresetShape. I have written 2 test cases for the same. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8657 Change-Id: Ibb1e2dc1c098b7399c06d7b4f59fac4e80887062
2014-03-19fdo#74401 VML groupshape import: only handle v:rect as TextShapeMiklos Vajna
Regression from commit 75934fc178ed90b56d77eb1efebed5bdac8427b6 (VML import: handle shape with text inside groupshape as TextShape, 2014-01-17), the problem was that TextShape is also a kind of rectangle, so that shouldn't be used for all shape with text in groupshapes, just for v:rect elements. This fix gives the required text wrapping for the referenced bugdoc without turning the rest of the shapes into rectangles. Change-Id: I6e343c65a869e335b641728adbc7984ee85377b5
2014-03-19convert OUString::match to OUString::endsWithNoel Grandin
Convert code like: rTxt.match( "---", rTxt.getLength()-3 ) to: rTxt.endsWith( "---" ) Change-Id: Iada74c5e714f7234f25b326526843a36255d5599
2014-03-18fdo#76249 DOCX export DML Drawing as lockedCanvas if it's inside DMLTextFrameVinaya Mandke
The Locked Canvas is imported correctly, but while exporting the drawing is exported inside a textbox. However a locked Canvas has to be exported inside a text-box for the RT file to work in MS Word 2010. As dml drawing elements are not allowed in the dml textboxes. Export as Locked Canvas iff the drawing was originally a Locked Canvas and is now inside a DML Text Frame. As otherwise the Locked Canvas is exported correctly as a DMLDrawing. Reviewed on: https://gerrit.libreoffice.org/8618 Change-Id: Ifa350d8922a22c4e480411530aa4d953bd3ed2ac
2014-03-18Use osl::Mutex member, not baseStephan Bergmann
Change-Id: I7104a6fdd31a23750929dccb59fd89e96cadf89c
2014-03-18oox: fix DOCX strict import of SmartArtMiklos Vajna
Change-Id: Ied8283e17ec4379f218dc60912e1c41ca28a8ac9
2014-03-17oox: try to fix incremental buildMiklos Vajna
The problem was that the input of the generated vmlexport-shape-types.cxx got changed, but it was only built when building from scratch. Fix this by depending on the makefile as well. Change-Id: Ia2d7f059aae2f5819bb8a1329fefa74c56660607
2014-03-17FDO#76013 : If original file has image whose link is broken RT gets corrupted.umeshkadam
- The original file contains an image which has invalid link. - since the link is invalid the import throws an exception while loading the image & the link is lost. - while exporting the system used to write an empty image for an unhandled graphic type, which is incorrect and the RT file would result in corrupt. - Fixed this issue and added UT. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8549 Change-Id: If884f154d1fba921280d63930e7fccb979ea5608
2014-03-17oox: prefer passing OUString by referenceNoel Grandin
Change-Id: Iace276878e7ae668bba5bb6e36af1e5d5d72d6cb
2014-03-15fdo#76016 Changed oox/CustomTarget_generated.mkVinaya Mandke
oox/source/export/presetShapeDefinitions.xml had multiple entries for "upDownArrow" instead of an entry for "upArrow". Whereas drawingml/customshapes/presetShapeDefinitions.xml has correct entries. Changed CustomTarget_generated.mk to use drawingml/customshapes/presetShapeDefinitions.xml instead of oox/source/export/presetShapeDefinitions.xml. Also deleted the latter to avoid duplication. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8540 Change-Id: Ic46496af7fb79edf0780b04731a882d914e89a24
2014-03-14n#862510: Ignore baseline attributes with zero.Muthu Subramanian
Change-Id: I1adc46e62c82c23645ccad0e11d5a7cb07114539
2014-03-12MSO writes broken files, fdo#74929Markus Mohrhard
Change-Id: Iec545fc2a7ec61f6d4678398f22878c9f31a450d
2014-03-12fdo#74111 3D Rotation is wrong after Round trip for pie chartPriyankaGaikwad
3D Rotation is lost after Round trip for pie chart. XML Difference: Original: <c:rotX val="40"/> <c:rotY val="30"/> Round Trip: <c:rotX val="310"/> <c:rotY val="0"/> Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I60132fef071e0573b17c35f509f3a74bd4ffcc66
2014-03-12fdo#75975 crash while saving the DOCX file containing chartsRavindra Vidhate
1. Open DOCX file containing Charts 2. Save this file into DOCX format. 3. LO crashed while saving/exporting to DOCX format. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I14d4f2c214ce3513b4bd14831771d72498e4486d
2014-03-11-Werror,-Wunused-variableStephan Bergmann
Change-Id: I87354690ac880ffb78bc8a6c20efe02f3eaa0779
2014-03-11oox: add missing break statementsTomaž Vajngerl
Change-Id: I032442e0e1c583228d6837dbf290f31d01a91b45
2014-03-11oox: change w14 CharGrabBag so it is recognised by exportTomaž Vajngerl
Change-Id: I7b6f4e5ff9d6e1161b3d05c594498d7f0cb7d8a3
2014-03-11"overflow" is one wordTor Lillqvist
Change-Id: Ib36c2c5d55f86aff27081a0da554f6e8a81474ee
2014-03-11fdo#35324: Text and picture water are not imported and not preserved in RT.Ravindra Vidhate
Problem : Open docx file which has Text/Picture as water mark. 1. The text is not imported properly also picture water mark is also considered as shape. 2. It writes the watermarks in Document.xml, while it should write in only Header.xml. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8457 Change-Id: Ic988858da25a4cba3ae16e614d920e2e16053a5f
2014-03-10unused oox::core::Relations::getRelationsFromTypeMiklos Vajna
Change-Id: I42e0ebd92d804c34cda42a05b91f45970a22fbe2
2014-03-10WaE: unused variable 'aPropertyName' [loplugin:unusedvariablecheck]Tor Lillqvist
Change-Id: I8c95ca06e2a688811310d62470c4173d30d20c91
2014-03-10oox: handle all w14 text effects at groupshape importTomaž Vajngerl
When dealing with groupshapes, the responsibility to process the w14 text effects elements is in oox. This commit adds the code to handle all elements and its children elements and attributes and puts the values into a CharInteropGrabBag. Change-Id: Iafb8759bd60e0ee831296dc2d9159f4311ad5403
2014-03-10oox: GrabBagStack: add method isStackEmptyTomaž Vajngerl
Change-Id: Iec563762e7be7fb6e2d5501fe5efeb88093793cb
2014-03-10fix OOXML strict chart importMarkus Mohrhard
Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f