summaryrefslogtreecommitdiff
path: root/include/oox
AgeCommit message (Collapse)Author
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-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-08fix OOXML validation error, related fdo#42698Markus Mohrhard
Missing percentage sign in type. The values of XML_d and XML_sp seem insane. Change-Id: If6762ed70d3536c0eeea3ee687991dad60f5e71e
2014-03-08remove whitespacesMarkus Mohrhard
Change-Id: I7937b154d0417876634711224ed5678eefa2654d
2014-03-07ooxml: make GrabBagStack ready for reuse and move it to ooxTomaž Vajngerl
Change-Id: Ia7d52a003138a275860d3462382e636747343488
2014-03-06n#821567: Fix TextFrame background import for sw.Muthu Subramanian
TextFrame in sw unfortunately doesn't seem to support nametable!
2014-03-06n#821567: Import PPTX background images with table-name.Muthu Subramanian
Seems like using the URL directly causes ODP export to ignore the background image. Probaby ODP Export requires updation as well?
2014-03-06fix OOXML strict importMarkus Mohrhard
fix the problem introduced by 6536826f2f4c747582d60ed40b0418c6a67a9829 Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e
2014-03-05Revert "remove unused code oox::core::Relations::getRelationsFromType"Caolán McNamara
we need it again now This reverts commit 77c45eb25eb462bacdf7d658d6cb485f755beaa5. Change-Id: I3e171d95e4f50c8e26824da2f6e6817d3b597d4d
2014-03-05fdo#74792 [DOCX] Grab-bag rels and images for SmartArtVinaya Mandke
Added support to grab-bag rels and associated Images for data[i].xml, and drawing[i].xml. Added UT for the same Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8362 Change-Id: I545825f67214f14037ab72b77764a07d575b8b5b
2014-03-05remove unused code oox::core::Relations::getRelationsFromTypeNoel Grandin
Change-Id: I242ddcc1e352fbf92206a21d93e16c42a0e5ef8e
2014-03-05remove unused code oox::core::XmlFilterBase::getFragmentPathFromFirstTypeNoel Grandin
Change-Id: I75094f95001dab18436100375a8ec6564e8d0f8f
2014-03-04in the old design all lists needed to be the same size, fdo75200Markus Mohrhard
We did not crash in the invalid memory access because the lists were continuous in memory and we would just pick the next id. However it crashed when trying to map some of the ids to non existant strings. This commit also removes the need for the earlier fix for this bug that just hit the problem behind some checks much later in the call chain. Change-Id: Ic6658987815c4e84ed2449934c310e30dcd0ed4c
2014-03-04remove the inheritance to std::map in PropertyMapMarkus Mohrhard
Change-Id: Iaaf5b7ab47ffa151cd7c8ea376763d02c883f377
2014-03-03fdo#74826: File corruption-Issue related to Series idx & order val.YogeshBharate
Problem Description: - If the document contains more than one charts together. ex.Bar & Line chart - In that case, LO writes idx & order val equal to 0, instead of 1 for second chart series. - After roundtrip, the document get corrupted. Implementation: - Added varible to take the series count in case of multiple chart. Note: - Some of the UT's are failing when --enable-dbgutil is enabled. Change-Id: I40606b4d69026939fa19ae534dd7b2bb36ec97fc
2014-03-03remove unused code oox::AttributeConversion::decodeDoubleNoel Grandin
Change-Id: I057ebcf125e068653570dabb59a8b7f4494e96db
2014-03-01Remove visual noise from includeAlexander Wilms
Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01support OOXML strict documents in CalcMarkus Mohrhard
Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d
2014-03-01handle OOXML strict namespacesMarkus Mohrhard
Change-Id: I198862388426161e3f054a5f128639c59f3c9d24
2014-02-28DOCX import: handle font theme references in group shape textMiklos Vajna
Change-Id: I1d5b86ad17b2c4a0945f483c94ac6abf410cf1d6
2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26fix OOXML validation error for text shapes, related fdo#31551Markus Mohrhard
blipFill and other fill elements are not allowed to appear together. See EG_FillProperties in the OOXML spec. See fdo31551-2.ods Change-Id: If5869ab9dc69815938c1f4c6fb180b0c1652ddcc
2014-02-26use const reference for OUStringMarkus Mohrhard
Change-Id: I66b5f144da7951f36e32a840b8ed70f38539f105
2014-02-25remove unused code oox::core::Decrypt::aes128cbcNoel Grandin
Change-Id: I12478278de8b719c51b87c335abd5c440a56bd36
2014-02-23drawingML import: reduce code duplicationZolnai Tamás
Change-Id: I7730fb047a10f270498bbf6f1a89dde034514121
2014-02-23drawingML import: remove some unneeded memberZolnai Tamás
Change-Id: Iea975665b9225e535dcc4fbdcd666d7c7bff8ef3
2014-02-21drawingML import: run fonts inside group shapeZolnai Tamás
Change-Id: Ib54fe868c11c0c22b85d8821fa7274c80918362c
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-13drawingML export: hatching of shapesZolnai Tamás
Change-Id: I7111d4064d033e27659c7b45650d596df22c593f
2014-02-12oox: fix GetTextVerticalAdjust visibilityMichael Stahl
Change-Id: Iaab33ab752a67e2acd374e0c08045c3e9da22ce7
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-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-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-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-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-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
2014-02-08drawingML export/import: text frames with vertical alignmentZolnai Tamás
Change-Id: I469da0a8234dd2979facfed3d66907aad1a138ab
2014-02-05drawingML import: paragraph adjustment inside group shapeZolnai Tamás
Change-Id: I875cb1f12c9f81d329d7fe9cd3aa32a4cd818573
2014-02-05ooxml: preserve gradient shape fillJacobo Aragunde Pérez
LibreOffice is unable to properly import the custom gradient fills defined in ooxml documents. To prevent data loss, we save the original gradient fill definition in the shape interopgrabbag and we write it back to the document on export. In case the user has changed the fill properties of a shape, the original fill will be discarded in favor of the new fill. We have added a new ooxmlexport unit test to test this feature. We have also added some missing transformations to the methods getColorTransformationName and getColorTransformationToken in Color class, and refactored some code in class DrawingML to the method WriteColor( OUString, Sequence ). Change-Id: Ie71f89eaa20313561aa9180ea33b76f3fb5e5df6
2014-01-30drawingML: complete the fix of nAlpha param in DrawingMLJacobo Aragunde Pérez
Change-Id: I1aec870ee52180d1b1b96762f69fab94370acbde
2014-01-30drawingML: fix transparency of shape solid fillJacobo Aragunde Pérez
The empty value for transparency in drawingML is 100% and not 0. Change-Id: I5f34f03b9b72cc20e92e32f9c9bc1bdfae73ff55
2014-01-30drawingML export: transparency of solid filled shapeZolnai Tamás
Change-Id: I97968dd5f5233e17870bdfdf2864ae8ce9179080
2014-01-28ooxml: Small code refactorJacobo Aragunde Pérez
* Use PUT_PROPS macro in all cases. * Added putPropertyToGrabBag( OUString, Any ) to avoid the explicit creation of a PropertyValue object every time. Change-Id: If098dd3a94d1843c4c5dbc3a507b05754d9d59c7
2014-01-28ooxml: Preserve shape style and theme attributes for lineJacobo Aragunde Pérez
Line style and color can be defined by the shape style attributes or can be directly assigned by the user (and even using a theme color in the case of color attribute). This patch aims to preserve the relevant attributes of this feature after a roundtrip. For style attributes (wps:style/a:lnRef), they are kept and preserved in the "StyleLnRef" property of the shape InteropGrabBag. To be able to access to some of them, the methods getLineStyle, getLineJoint and getLineWidth were added to LineProperties object. For the line theme color (a:ln/a:solidFill/a:schemeClr), the original line color and the theme color name are preserved in the properties "OriginalLnSolidFillClr" and "SpPrLnSolidFillSchemeClr"of the Shape InteropGrabBag. On export time, we must check if the user has changed any properties of the shape line, this is done comparing the new shape attributes with the original values coming from the style and theme definitions. In case some of the attributes is different, the new attribute must be saved overwriting the old one. The data files for some /sd/qa/ unit tests were updated to reflect the new properties inside the Shape InteropGrabBag. Besides, an existing unit test in ooxmlexport was modified to include checks for the preservation of line style, line theme color and custom line style that override the style attributes. Change-Id: Iabb0cef9e3cc433676c201bc296fb7b373839a3f
2014-01-28ooxml: Preserve color transformations in shape style definitionsJacobo Aragunde Pérez
Color tags like <a:schemeClr> can have children tags that modify the specified color. These modifications were applied on import time in the Color object, but they were not preserved. We added a member to Color object to preserve the unaltered list of transformations. The method getTransformations() returns that member, and the methods getColorTransformationName and getColorTransformationToken were added to transform the tokens into strings that can be added to an InteropGrabBag and viceversa. The transformations are added to the Shape InteropGrabBag in the method Shape::createAndInsert, and they are written back on export time at DrawingML::WriteStyleProperties. The data files for some /sd/qa/ unit tests were updated to reflect the new properties inside the Shape InteropGrabBag. Change-Id: Ieb164268c3b79f2d9b7ed3a4954b5de3b7a5811c
2014-01-24fdo#69616: Fix for VML part missing for group.Rohit Deshmukh
Cause: - In altenrate content, Fallback contains only group tag. Implementation: - Added export logic in Vml export. - Added unit test case for vml group. Change-Id: Ia1c9834950528dc892caea1cb675a7f42165d9ba Reviewed-on: https://gerrit.libreoffice.org/7276 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-23drawingML export: fix position of shape in case rotation is 180 degreesMiklos Vajna
This is the other case when position shouldn't be adjusted. Change-Id: I9265bf1c762fd519e3a12e97d767b5d213644e6d
2014-01-18ooxml: Preserve shape theme attribute for solid fillJacobo Aragunde Pérez
Users can select the fill color for a shape among the theme-defined colors. This results in the following XML: <wps:spPr> ... <a:solidFill> <a:schemeClr val="accent2"/> </a:solidFill> ... </wps:spPr> Now we store both the original fill color and the name of the theme-defined color, if it exists, on the import phase. They are put into the InteropGrabBag of the shape with the names OriginalSolidFillClr and SpPrSolidFillSchemeClr. Additionally, we needed to to store the decoded theme color inside StyleFillRef. On the export phase we have to take into account several combinations of factors: * If the final color for the shape fill is different from the original color, we must ignore any theme attributes and write the new color. * If the fill color is unchanged and some theme color exists, we must write the theme color. * If the fill color is unchanged and no theme color exists, we must check if the original color matches the style-defined color. If it does, we must not write any <a:solidFill> tag. * Otherwise we must write the <a:solidFill> tag with the RGB color. The method putPropertiesToGrabBag was added to the Shape object for convenience. The data files for some /sd/qa/ unit tests were updated to reflect the new properties inside the Shape InteropGrabBag. Change-Id: If0915c5442872a8acab0a8a081f60c89c97277bd
generated by cgit (git 2.34.1) at 2025-02-11 09:27:27 +0000