summaryrefslogtreecommitdiff
path: root/include/oox/drawingml
AgeCommit message (Collapse)Author
2013-11-21DOCX drawingML shape import: fix position when CustomShapeGeometry is setMiklos Vajna
DOCX drawingML shapes had wrong position if they had their CustomShapeGeometry set (e.g. flipped). This wasn't a problem for VML shapes, as there the shape knows its position, and position was always set in oox as well, not in writerfilter. However, in case of WPS shapes, oox created the shape, and previously writerfilter set the position after-the-fact. This leads to incorrect results if CustomShapeGeometry is involved. Fix this by passing the position from writerfilter to oox, and call setPosition() after creation, but before CustomShapeGeometry is set. The other problem was that normally writerfilter learns the position of the shape when relevant token in GraphicImport::lcl_sprm() arrives, but this happens after OOXMLFastContextHandlerShape::sendShape() needs that information. Work around this by accessing the PositionHandler directly. Change-Id: Iced35dc9467ef77c41f1897f124729f686bd045e
2013-11-09fdo#65108 inter-module includes <>Norbert Thiebaud
Change-Id: Ie672de68f6a87713a379e794fa3ad255ad52a71e
2013-10-23fixincludeguards.sh: include/o*Thomas Arnhold
Change-Id: Ibd5d8af00f6582d53231c76e2b04e737b5804497
2013-10-16oox: added methods to lock Smart-Art editionAndres Gomez
Added the possibility of rendering the basic shapes generated for a Smart-Art into a bitmap and replacing them with it in order to not letting to edit the Smart-Art. This possibility is controlled using a configuration parameter located at Options -> Load/Save -> MS Office -> SmartArt to LibreOffice shapes or reverse. Made the "oox" library to depend on the "drawinglayer" and "svx" libraries. Made the "ooxmlexport" C++ unit tests in the "sw" module to depend on the "drawinglayer" and "svx" components. Fixed to set to diagram type a new "oox::drawingml::Shape" representing a Smart-Art in the "getShape" method of the "oox::shape::ShapeContextHandler" class. Added the "keepDiagramCompatibilityInfo" and "renderDiagramToGraphic" protected methods to the "oox::drawingml::Shape" class. "keepDiagramCompatibilityInfo" is now called after an instance of type "FRAMETYPE_DIAGRAM" has added all its children in the "addShape" method and the proper setting is in place. "keepDiagramCompatibilityInfo" substitutes previous similar code in the "createAndInsert" method and also calls "renderDiagramToGraphic". The "renderDiagramToGraphic" renders the basic shapes in a Smart-Art into a PNG image and replaces these basic shapes with a new "GraphicObjectShape" filled with the new PNG image. It also sets the "MoveProtect" and "SizeProtect" properties of the "GraphicObjectShape". Change-Id: Ie4002238ff5fae758a5881b03735bf1f0721ed5b Reviewed-on: https://gerrit.libreoffice.org/6059 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-10n#819614: Lines running off the screens.Muthu Subramanian
Also fixed the test cases.
2013-10-07Fix fdo#70220 Superscript not imported from pptx.Thorsten Behrens
Import works now, though EditEngine still fscks up font scaling - seems for CharEscapementHeight to work, there has to be reference, non-scaled text in the same portion ... Change-Id: I5505ae83bd6b700ebe8c3465beec40a4df2efb78
2013-09-16Related bnc#819614: The diagram is a group.Jan Holesovsky
It is not really desired to import diagrams broken into individual objects; makes trouble with the hieararchy, and also the user wants to see it as a group - can be ungrouped for modifications easily. Change-Id: I0533a69af9e377804bf0e06b2ce873fd0c9bde02
2013-09-11Exorcise some cargo-cultness in oox.Thorsten Behrens
- the inline keyword on class methods that have their body defined right there in the class definition is redundant - the explicit keyword on nullary ctors is pointless, there is no implicit conversion happening anyway with those Change-Id: Ie9f44c7948f932ce3a8af871bf73743112d94d03
2013-09-11oox: Smart-Art DOMs stored in the InteropGrabBagAndres Gomez
The XDocuments representing the DOM documents of a DrawingML diagram (Smart-Art) are now stored as the PropertyValues "OOXData", "OOXLayout", "OOXStyle", "OOXColor" and "OOXDrawing" into the "InteropGraBag" property of the parent SvxGroupShape created from such diagram. Modified the oox::drawingml::dgm::Diagram class to be able to hold the map storing the XDocuments and its names. Added the getDomMap() method to obtain the map directly and the getDomsAsPropertyValues method to get the map as a sequence of Property Values. Modified the methods for importing and loading the Smart-Art into the Diagram so they add automatically the DOM documents to it. Modified the oox::drawingml::Shape class to be able to hold the sequence of PropertyValues storing the XDocuments and its names coming from the oox::drawingml::dgm::Diagram class. Added the getDiagramDoms() and setDiagramDoms() methods. Enhanced the oox::shape::ShapeContextHandler::getShape() method to add the extended drawing document to the oox::drawingml::Shape class. Modified the oox::drawingml::Shape::createAndInsert() method to store the sequence of XDocuments in the "InteropGrabBag" property of the GroupShape service SvxGroupShape implementation representing a Smart-Art. Change-Id: I7d0b9dfbfc9d5299ddd25fab394e5e9a422d1dd1 Reviewed-on: https://gerrit.libreoffice.org/5849 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-08-22oox::drawingml::convertEmuToHmm: fix rounding for negative valuesMiklos Vajna
This commit also moves the floating table DOCX import testcase to the export suite. That test now passes fine, though previously it failed with: - Expected: -199 - Actual : -198 Due to the rounding error. Change-Id: I9bdc9295f68b6bd3e5f5bee868aae15194b30804
2013-07-17n#820077: Import images with duotone filter.Muthu Subramanian
Also, contains implementation for a simple duotone filter.
2013-06-28MSVC build fixesTor Lillqvist
Change-Id: I189fe3635f94fdd6b91bd7930c7abf02e70368aa Reviewed-on: https://gerrit.libreoffice.org/4581 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28Convert all ContextHandler-derived clases over to ContextHandler2Tor Lillqvist
Change-Id: I81f54e3b7d29a0807ec4c2f082ae00fd6e1d6138 Reviewed-on: https://gerrit.libreoffice.org/4580 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28Further MCE workTor Lillqvist
As it is wrong (says Thorsten) to override the methods from XFastContextHandler in ContextHandler2 in its derived classes, mark them with SAL_FINAL to catch that (when compiling with a compiler thaty supports "final"). Do corresponding changes then; change createFastChildContext() methods to onCreateContext() ones instead. Now the unit tests work, and a sample PPTX that uses embedded OLE thingies loads without crash, but unfortunately it looks like crap... Change-Id: Ie30022f37418ba9caf8ce59fe4003b808fa900f3 Reviewed-on: https://gerrit.libreoffice.org/4578 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28More OOXML Markup Compatibility and Extensibility (MCE) supportTor Lillqvist
Change many classes in oox to be based on ContextHandler2 instead of ContextHandler. That supposedly adds MCE support. This is a minimal initial effort. It compiles and links but doesn't work (CppunitTest_chart2_export fails). Follow-up coming... Change-Id: If89117abd48cfead468633fd7fce1ea785f6f420 Reviewed-on: https://gerrit.libreoffice.org/4577 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-21fdo#43641 oox: fix position/size of LineShapes inside lockedCanvasMiklos Vajna
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc
2013-06-06Resolves: #i119547# support the chart legend positon of top&&left...Jian Fang Zhang
just set the Anchor to Alignment_TOP_RIGHT Found by: Shan Zhu Patch by: zhaoshzh Review by: zhangjf (cherry picked from commit 8de6941efffd22214da577ff637b2522e46c7fa5) Conflicts: oox/inc/oox/drawingml/chart/converterbase.hxx oox/source/drawingml/chart/titleconverter.cxx Change-Id: Iad1fe1af8f93e6904759c10a9c9206fd1f1aebbb
2013-06-03Fix issue #i120723#: Table style is lost when import PPTX by AOOZhe Wang
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx * subversion/main/oox/source/drawingml/table/tableproperties.cxx []if the imported table in pptx just have tableStyleId, should fill the tablestyle's content. Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by:Ma Bingbing <jiazema@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 74b1435a4d39eac71e36fb1c387b24af4b353fa0) Conflicts: oox/inc/oox/drawingml/table/tableproperties.hxx oox/source/drawingml/table/tableproperties.cxx Change-Id: I554169522a95343662781c3f169c6485c38a6800
2013-05-23bnc#820786: Best effort mapping of the OOXML patterns to our hatches.Jan Holesovsky
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-23Revert "fdo#46808, Convert chart2::Title service to new style"Stephan Bergmann
This reverts commit d256dbede60533369d1aac64cca34721183f6a8a: For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the direct properties of the old-style css.chart2.Title service into attributes, but left out all the properties inherited by the old-style service from css.style.ParagraphProperties, css.drawing.FillProperties, css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement, whatever that is supposed to be). This needs more thought, to either make available all propertiers as attributes, or none. For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle), for hard-to-debug reasons. Conflicts: chart2/source/model/main/Title.cxx chart2/source/model/main/Title.hxx offapi/com/sun/star/chart2/XTitle2.idl sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7
2013-05-21fdo#46808, Convert chart2::Title service to new styleNoel Grandin
API CHANGE: The chart2::XTitled interface now takes and returns a XTitle2 instead of an XTitle. Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6
2013-04-23execute move of global headersBjoern Michaelsen
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
generated by cgit (git 2.34.1) at 2025-02-11 23:59:40 +0000