summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
2014-02-25remove unused code oox::core::Decrypt::aes128cbcNoel Grandin
Change-Id: I12478278de8b719c51b87c335abd5c440a56bd36
2014-02-25Resolves: #i118640# force early destruction of last FragmentHandler...Armin Le Grand
to not let it use an already destroyed RelationsMap instance (cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4) Conflicts: oox/source/core/xmlfilterbase.cxx Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
2014-02-25fix OOXML validation errorMarkus Mohrhard
Change-Id: Ia27f9615b063393a0733e061df7dd1666283badb
2014-02-24implicitboolconversion: warn about implicit conversion of call args to boolStephan Bergmann
...to be able to find problems like 6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f "sal_Bool arg of SetUseImagesInMenus was abused to squeeze '2' through it" earlier when converting occurrences of sal_Bool to bool. Restricting this check to function call arguments avoids too much noise while hopefully still catching all the relevant problems. (This check partially overlaps the pointertobool check, so implicit conversions from pointers to bool call arguments will now generate two loplugin warnings, but that's harmless.) Change-Id: I0b03b1d1615aaf8bc18e7a84c56fff3ef9903508
2014-02-24OOXML chart import: ignore rot values outside the valid rangeAndras Timar
Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef
2014-02-23drawingML import: remove some unneeded memberZolnai Tamás
Change-Id: Iea975665b9225e535dcc4fbdcd666d7c7bff8ef3
2014-02-23oox: add some more missing w14 tokensTomaž Vajngerl
Change-Id: Ied80a30419ac809c0cb20f8c29427ff0945f5904
2014-02-23prevent invalid OOXML chart files, related #i82905#Markus Mohrhard
Change-Id: I27166772c6eefb4e49eb4c097683a1c6aea4476a
2014-02-23prevent invalid OOXML chart files, related #i75121#Markus Mohrhard
Change-Id: I8e34fd2941ce98a30d27861db2c6a625ff873aa6
2014-02-23don't write axId for dougnught chart, related fdo#63114Markus Mohrhard
Change-Id: I75168888ff8da6f18089311a99135c124c7a7e72
2014-02-23Remove unneccessary commentsAlexander Wilms
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-22we only support simple labels in the InternalDataProvider, bnc#864396Markus Mohrhard
Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63
2014-02-21drawingML import: paragraph spacing inside group shapeZolnai Tamás
unotext: a conversion was missing during the corresponding SvxLineSpacingItem was filled with "ParaLineSpacing" UNO property. Change-Id: I02559ed7e8b46150a88eed2bf20afdf084aec47b
2014-02-21vcl: sal_Bool -> boolStephan Bergmann
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
2014-02-21drawingML import: run fonts inside group shapeZolnai Tamás
Change-Id: Ib54fe868c11c0c22b85d8821fa7274c80918362c
2014-02-21drawingML export: gradient fill defined by imported themeZolnai Tamás
Plus avoid writing out empty <a:gradFill></a:gradFill>. Change-Id: I50fa92b2cc30eedfe28a8c6af697d43d98a3aee8
2014-02-20Added word 2010 - w14 namespace and w14 elementsTomaž Vajngerl
Change-Id: I8098cc4bd49c3480bd45875a541d8273b9c7f287
2014-02-20Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxxTobias Lippert
Added vcl/settings.hxx to all cxx files which require it. This helps to speed up compilation after changes to the settings. Conflicts: sc/source/ui/dbgui/pvlaydlg.cxx Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4 Reviewed-on: https://gerrit.libreoffice.org/7933 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-18drawingML import: fix position of cildren in shape groupsZolnai Tamás
Translate component of parent shapes' transformation have to be applied to children when there is no explicit child transformation. Note. Export also use this concept. Change-Id: I51bd3325fb53ee250402326ee361c8f07038ed07
2014-02-18DOCX drawingML import: handle paragraph top marginMiklos Vajna
Change-Id: I4a69647af5b068c35bea0a5f9665a5e68eb76293
2014-02-18prevent invalid OOXML files with trendlines, related #i88825#Markus Mohrhard
Change-Id: I503b24233060400cf4bbb40701bec0a3e101512a
2014-02-18fix indentationMarkus Mohrhard
Change-Id: I36be2de793d3d32433530bf71632cb73a676bb9a
2014-02-17comphelper: sal_Bool -> boolStephan Bergmann
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
2014-02-17prevent invalid ooxml files during notes export, related #i83060#Markus Mohrhard
Change-Id: I151c14cd75477445465e0221271f9bf17385af9f
2014-02-16drawingML export: make WritePolyPolygon robusterZolnai Tamás
Make sure a:cubicBezTo conatins three a:pt elements. escherex: It seems a cubic bezier curve last point has a POLY_NORMAL flag and not POLY_CONTROL. Change-Id: Id6dc2160c7ae171a720e4a1aa9161cef2b3b9413
2014-02-15fdo#74137: Fix for courruption of Pie chart after roundtrip.Rohit Deshmukh
Problem: - Pie chart with data labels files gets corrupt because of label position is bestFit in original file. - But after round trip, data labels position gets changes to top, left and right. For some data labels postion value is missing. Implementaion: - In LO, while converting data label from model, the position gets changed. So we are ignoring this hack for Pie chart. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: Ic51845cd6f39bc905439eea8971e878607d25dac
2014-02-14drawingML import: fix inheritance of character heightMiklos Vajna
The problem was that in case a shape had multiple (e.g. two) paragraphs, and in case the first paragraph had an explicit character height, but not the second, then the cursor carried over the explicit character height to the second paragraph, but it shouldn't, as that leads to incorrect character height in the second paragraph. Fix this by remembering the default character height and using that in case nothing is set explicitly. Change-Id: I66e06d5cf192739fb254f7280c74617171d9ee6a
2014-02-14FDO#74774 : issue with number of child nodes of tag CubicBezierTo.umeshkadam
Issue : - Number of child nodes required by cubicBexTo should be 3 of type "pt". While exporting, sometimes the child nodes are less than 3. The sequence of writing these tags was getting messed up. Implementation : - corrected the logic for writing the sequence of cubicBexTo tag. Change-Id: Ic26db72b2c516276c2e6452a21b4106d6a0a1a80 Reviewed-on: https://gerrit.libreoffice.org/7990 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-13Fix win buildZolnai Tamás
Use namespace to avoid ambiguity. Change-Id: Iaef6869b12839edbb94695aa5e3d877863e9b669
2014-02-13drawingML export: hatching of shapesZolnai Tamás
Change-Id: I7111d4064d033e27659c7b45650d596df22c593f
2014-02-13drawingML import: improve mapping of some filling pattern to hatchingZolnai Tamás
For a better visual match. Change-Id: I6f8a2f4b500c4ea04ef92572984a2bac597d85be
2014-02-13fdo#74110 : Issue with <a:prstGeom prst="rect"> tag in document.xmlumeshkadam
Issue: - While exporting the system used to write adjustment values for preset shape type "rect" in document.xml with the shape guide name(adjustment name) being empty. - This is not accepted by MS Office. Hence the file was resulting as corrupt. Implementation: - The preset shapes are being picked up from GetOOXMLPresetGeometry(), which refers pCustomShapeTypeTranslationTable[] array for the mapping. - Most of the shape types have been commented in the pCustomShapeTypeTranslationTable[] array therefore the GetOOXMLPresetGeometry() defaults the shapetype as rect, whereas the adjustment values are being picked up for the actual shape type(s). - Uncommenting the commented shape type translations( for instance textInflateTop) in pCustomShapeTypeTranslationTable will eventually write prst="textInflateTop" under the tag prstGeom which is invalid. - It should probably go under prstTxWrap. - In order to avoid the corruption, thought of adding a check before writing the adjustment values. If the shape type is "rect"( which is defaulted and does not have adjustment values defined in presetShapeDefinitions.xml) then avoid writing the adjustment values under this tag. Conflicts: oox/source/export/drawingml.cxx sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7765 Change-Id: I6511e9a3ee0c01962d6e82997705a484161086ef
2014-02-12oox: warning C4101: 'rEx' : unreferenced local variableMichael Stahl
Change-Id: I79722b33a0c193a8bb0c0dd357787ee213909051
2014-02-12drawingML import: wrong namespace for 'pic'Zolnai Tamás
Change-Id: I97311b737c7cb706ddff95d1b1b8fe61241f055d
2014-02-12loplugin:implicitboolconversionAndrzej Hunt
Presumably we need to specifically check whether Element is a PPT pic token here too? Change-Id: Id5c90099c8762042f9a2a886631faa72737704fb
2014-02-12coverity#1103671 Unchecked dynamic_castCaolán McNamara
Change-Id: I7a0e483550b0f7bbe91f20acde5a09ca43eb02c2
2014-02-12drawingML import: picture with scheme colorZolnai Tamás
Theme fragment must be loaded for pictures too. Change-Id: If4c412926319df2beaecfc120065bd011fc3eb57
2014-02-12drawingML export\import: cropping of shape's fill textureZolnai Tamás
In Writer shapes had no cropping property so far. With this commit this is introduced as a FillProperty and has the same type as the cropping used for pictures (Picture context menu > Picture > Crop). Layout and UI will be an other step. On the UI it would be placed on the Shape context menu -> Area, when Bitmap is selected as fill type. Note: In case of picture/graphic, cropping property is imported from and exported to a:srcRect instead of a:fillRect. Change-Id: Idc1ed2d40cb20b6992e94f14e7e4d853e1f55d02
2014-02-12Add tokens for 'table cell' redlines (future patch)Adam Co
This patch adds 2 tokens for future patche's use of table cell redline preservation. Change-Id: Ic0ec4122eeaf66c6f0ebff9251fbc38596877541 Reviewed-on: https://gerrit.libreoffice.org/7869 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12fdo#72520 : Preserving external data path in chart import.sushil_shinde
- Preserved external data path for chart in newly added property for external data. Change-Id: I3c49093c9e71cd126c097500b3951a345e81039e Reviewed-on: https://gerrit.libreoffice.org/7214 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-12nasty merge errorMarkus Mohrhard
Change-Id: I5afaf03c5aee417ea40cea65b2ac51dde7c35918
2014-02-12fdo#74111 3D Rotation is wrong after Round trip for bar chartPriyankaGaikwad
3D Rotation is lost after Round trip for bar chart. XML Difference: Original: <c:rotX val="30"/> <c:rotY val="50"/> Round Trip: <c:rotX val="42"/> <c:rotY val="42"/> Implementation: The RightAngledAxes should set first then the RotationVertical and RotationHorizontal because the RightAngledAxes is needed while setting Rotation. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I64f3b6e56f8515bf6c3d935c59dfaf1d440dba31
2014-02-12fdo#74115 Fix for DOCX BitmapFill for Chart WallVinaya Mandke
Fixed import and export for chart wall Bitmap Fill in DOCX Added UT for the same. Conflicts: oox/source/export/chartexport.cxx Change-Id: Id066b0e4c2007fcdfdbbfa67b40307463bf0cfe7
2014-02-12small stylistic changesMarkus Mohrhard
Change-Id: I31cbdc8e09474252205edb837bfd1a8a7299b52b
2014-02-12fdo#74115 Fix for DOCX GradientFill for Chart WallVinaya Mandke
Fixed import and export for chart wall Gradient Fill in DOCX Added UT for the same. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: Ie6caa2b238aeb70f7225145da8c5c78003e73002
2014-02-12prevent invalid OOXML chart filesMarkus Mohrhard
Change-Id: I2ccf988a26e5c69f4f14547cfea7cb4fb574b317
2014-02-12until we support custUnit make sure that all files are validMarkus Mohrhard
Change-Id: I759a4cc97e2a2adf71322d2aa18fdb11873a538e
2014-02-11fdo#74112 Added properties to store chart display unit information in import.sushil_shinde
- added display unit properties. - added axis display unit converter class. Change-Id: Iaa1f9a175b1109c8da7321a1567a04fb981568d1 Reviewed-on: https://gerrit.libreoffice.org/7720 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-11fdo#74112 Write Chart Displayunits information back to XML.sushil_shinde
During export access properties stored during import and write back those. Currently we just support basic chart display unit information such as builtinunit, there are more properties ex. custUnit, dispUnitsLbl, extLst. which are pending. Conflicts: chart2/qa/extras/chart2export.cxx Change-Id: I87e0a8322fc0b0c3df2b8053b7f29fffea611040 Reviewed-on: https://gerrit.libreoffice.org/7722 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-11ooxml: Preserve color transformations for shape theme colorsJacobo Aragunde Pérez
Colors can have modifiers like in the following example: <a:schemeClr val="accent6"> <a:lumMod val="40000"/> <a:lumOff val="60000"/> </a:schemeClr> In the case of RGB colors, the transformations are merged within the RGB color itself on import, so there's no need to preserve the original transformations, but that's necessary in the case of scheme colors. Slightly modified an existing unit test to check this feature too. Change-Id: I3a03a56f2b633f283c392e54842b326bd4df316b