summaryrefslogtreecommitdiff
path: root/include/oox
AgeCommit message (Collapse)Author
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-10-01convert remnants of String to OUString to OOX moduleNoel Grandin
Change-Id: I55a620063a1021830802c5bc41b425fd134b449f
2013-09-26fdo#69636 VML import: handle mso-layout-flow-alt shape prop for sw framesMiklos Vajna
Writer core doesn't support this, and this has been a problem for table cells as well. There the workaround we're using for quite a while is to do the rotation at a text portion level instead, which results in reasonable layout for simple cases. Do the same here. One additional complexity is that the API between oox and writerfilter is a single UNO shape, we get this property in oox, and we have to handle it in writerfilter, when the text frame is already attached to some text. Kill this problem by adding a FrameInteropGrabBag for sw text frames: it's useful anyway, and then we can pass around this property inside the grab bag. Change-Id: Idb5ec83b5cbdde8f29d15b2cebfad24226bb6507
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-15Save should encrypt OOXML document if it was loaded encrypted.Tomaž Vajngerl
Currently Agile encryption is not supported, so all documents loaded with "agile" encryption will be encrypted with "standard" encryption when they are saved afterwards. Change-Id: Id0477f43c00ed70032ca6b3390eebb1105d5ffa7
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-09-06bnc#779642 VML import: handle drawinglayer rectangle char spacingMiklos Vajna
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
2013-09-05CID#1079343 mContext.cipher is not initialized...Caolán McNamara
use protected to indicate that this is not callable directly, but only by another ctor which will do the initialization. Not sure if coverity will grok that, but if it doesn't then it can be submitted as a false positive Change-Id: I8e97c0b441dc407a005913e2b10f0fb48f45672b
2013-08-24Convert vector block* to const array block*.Tomaž Vajngerl
Looks like my compiler eats a lot of things thrown at him but others don't. Change-Id: If1d080a545e6c2a17e19b389eeb1714aa0569644
2013-08-24fdo#35422 Support to open encrypted Office 2010 and 2013 formatsTomaž Vajngerl
Additionally encryption and decryption has been refactored. 2 engines have been added: AgileEngine and Standard2007Engine, which contain core functions for encryption and decryption. Standard2007Engine refers to encryption and decryption as used in Office 2007 and AgileEngine refers to encryption and decryption as used in Office 2010 and 2013. AgileEngine does not yet support encryption. Change-Id: Ica1d4d5a109fb204012b92a0c39325fe0b99b793
2013-08-22fdo#67737 : fix for flip not being imported & rendered correctlyRi GangHu
Signed-off-by: Adam Co <rattles2013@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/5272 Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I5c8440edad0381e33b64f64bb54aa8f1bc304007
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-08-21finish deprecation of O(U)String::valueOf()Luboš Luňák
Compiler plugin to replace with matching number(), boolean() or OUString ctor, ran it, few manual tweaks, mark as really deprecated. Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-16VML import of mso-wrap-distance-{left,right,top,bottom}Miklos Vajna
Change-Id: Ib16be0bf83120ed7aeb01f29634d51421fc351c8
2013-08-15Move OOXML decryption to DocumentCrypt.Tomaž Vajngerl
OOXML decryption was implemented in filterdetect. With this the decryption was moved to a common place where it shares functions and constants with encryption. Change-Id: Id334daf7c2eb1e18735d6a500132f6bb61bb3ba0
2013-08-14fdo#59524 Encryption for MS Office 2007 Spreadsheet documentsTomaž Vajngerl
This enables saving of MS 2007 spreadsheet documents with a password. The encryption used is the same as used in Office 2007 (however different than in Office 2010 and 2013 which use "agile" encryption). Change-Id: I3539e811d95b6f9178246ab269d13bb385a48bd2
2013-07-17n#820077: Import images with duotone filter.Muthu Subramanian
Also, contains implementation for a simple duotone filter.
2013-07-09n#819822: XLSX Chart import with internal data table.Muthu Subramanian
When the import with xlsx ranges fail - try with internal data table.
2013-07-03Support for trendlines in charts when exporting in OOXML format.Tomaž Vajngerl
Trendline support at exporting in OOXML was missing. Add support for exporting regression type and properties and additionally line properties. The only missing are working dashed / dotted lines which are currently kind of "broken" for all lines. Change-Id: Ib7574e58febeb70f2a488db3546b74807c14df14
2013-07-02more SAL_OVERRIDEMiklos Vajna
Change-Id: I7b3e908a0ce00f0d844803fdf628d3d757de92bd
2013-07-02fdo#46361 oox: handle w:jc for groupshape textboxesMiklos Vajna
Change-Id: I21391d9a9f5b5173b599006287b33fdaab3c0c75
2013-07-02fdo#46361 oox: VML import of v-text-anchor for drawinglayer shapesMiklos Vajna
Change-Id: Ib73d17fd8c9325f7f062d4a15b655e36b84bd351
2013-07-02fdo#46361 oox: handle multiple w:p for groupshape textboxesMiklos Vajna
One testcase had to be adjusted, as it seems previously we stripped all newlines at the end (I consider that as a bug), and now we only strip the last one (so the resulting number of paragraphs on the shape and in the source document equal). Change-Id: Ic22b96c2992b53c72e2609e2286622173b86065c
2013-06-30robustify some headersThomas Arnhold
Change-Id: Id1998b240025973f43691e83cebce17449b060ba
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-28Also LockedCanvasContext needs to be a ContextHandler2 now thenTor Lillqvist
Change-Id: Idcc55370efbcd85f9f7142803e4cb61f3742e7fc Reviewed-on: https://gerrit.libreoffice.org/4579 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-24fix hair & fine cell border export ( followon fix fdo#56960 )Noel Power
1) align excel binary and oox import filter border thickness values 2) use new fine-dash border style 3) detect & determine hair vrs fine borderline on export Change-Id: Ieb024bc6f4bfc87c525082c7b9a1f3c444f5c5ca
2013-06-24convert the right number of elementsDavid Tardon
Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
2013-06-21fdo#43641 oox: fix position/size of LineShapes inside lockedCanvasMiklos Vajna
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc
2013-06-15Remove redundant toplevel constStephan Bergmann
...that might be the reason the Raspbian-ARM tb broke. Change-Id: I1c238f0bd70dd2237c66b479aa5eb79010f477ce
2013-06-15fdo#58819 DOCX VML export: fix shape size for rotated shapesMiklos Vajna
The problem is that we wrote the size of the shape itself, while VML wants the bounding box here. The WW8 export ignores the rectangle given in EscherEx::Commit(), uses SdrObject::GetSnapRect() instead and later refines the position by using the point got in WW8AttributeOutput::OutputFlyFrame_Impl(), see PlcDrawObj::WritePlc(). Do the same in the VML export, i.e. ignore the Rectangle we get in VMLExport::Commit() and use SdrObject::GetSnapRect() + the point given in DocxAttributeOutput::OutputFlyFrame_Impl() instead. Change-Id: I5adbdf205792c87f92c1ddf1cf674f87e11eb54e
2013-06-13fdo#58819 VML export of mso-position-*Miklos Vajna
mso-position-horizontal, mso-position-horizontal-relative, mso-position-vertical and mso-position-vertical-relative With this, the watermark in the bugdoc is almost in place, if you ignore the missing rotation. Change-Id: I8d3d834089e734654fcbbb0fb6166b4d7e01f80f
2013-06-13fdo#58819 VML export: handle objects anchored in the header / footerMiklos Vajna
Previously such shapes landed in the middle of section properties. Change-Id: I7993eaa721e2b53d8adb1cbdee40992bbeb11416
2013-06-12typo correction AX_SELCTION_xxx -> AX_SELECTION_xxxNoel Power
petty correct of AX_SELCTION_xxx -> AX_SELECTION_xxx but it was irritating me Change-Id: Iae7a0151a63502aa89f04ae54fe7348548ffd32c
2013-06-11fix build error, reinstate WriteOCXExcelKludgeStream to export ole controlNoel Power
new ole export used WriteOCXExcelKludgeStream but that function dissapeared when msocximex was stripped of ocx control import ( now we use the new filters in oox ) When that stuff was moved WriteOCXExcelKludgeStream was #ifdef'ed out Change-Id: I370983efa5e8c4ba2b210dfb7535ea211d13a8c1
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-04fix for fdo#53042 fix ole object macro bindings ( for xlsm )Noel Power
A number of fixes needed here a) make sure convert properties of control model is done before inserting control model into formcontainer, need to do that to ensure that GenerateVBAEvents is set ( so the fake VBA event generation can be triggered ) b) remove the IsAlieanExcel check in servuno.cxx ( it's too strict and additionally seems there is confusion over the media type to check ) c) split the vba import so that we can ensure the VBA mode is set (if we have modules to import ) before sheets are imported and defer further processing ( actual assigning of the modules and associated objects ) until later Change-Id: I8fdbe788b400d7e41d4cc4b51b15f692bd7b0ecc
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-29bnc#817956 VML import of v:textpathMiklos Vajna
Word exposes this as Watermark in its UI. Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-25provide complete types of FragmentHandler and RecordInfo before they are usedHerbert Dürr
(cherry picked from commit c73bc9587bdcf6a5d3add454fe3383fc9d2c1e65) Conflicts: oox/inc/oox/core/recordparser.hxx Change-Id: I6deecaabe32d4b071a83ce4687f83543354ddac2
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, Remove unnecessary XMultiServiceFactory memberNoel Grandin
.. and associated methods Change-Id: Iec01b4615decc1616e405166088d7d1d844ac0ae
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-05-09fix userform data aware control importNoel Power
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c