summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
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-27Resolves: #i121162# ImageScaleMode constants should be in UPPERCASEAriel Constenla-Haile
(cherry picked from commit 734b532fb77d2d5be7eb7becb6720dbd7b3d8978) Conflicts: offapi/com/sun/star/awt/ImageScaleMode.idl oox/source/ole/axcontrol.cxx reportdesign/source/filter/xml/xmlHelper.cxx wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java Change-Id: Ib5fa7b82edddb809129a4e5619a20ca7a7b2e38a
2013-06-27n#820504: start a new subpath with m and t in VML path decodingCédric Bosdonnat
Change-Id: I7bac4b111ede5e815d2ed121c18f4cfe1ad0950e (cherry picked from commit 8d6eb11d6965ee93e72513f5e01b67f598edf6c3)
2013-06-27Forgot to remove one case where nParamCount is set to twice the valueCédric Bosdonnat
Change-Id: I3649364a889b7ef6ce7ac4316a1621b6328170eb (cherry picked from commit 7f7a1294e2d0da30a58d897558a18a13dbc5e690)
2013-06-27n#820504: VML path import fixes: get back missing pointsCédric Bosdonnat
nParamsCount was set to the double of the expected value, but the code handling the command only took the first set of parameters. Removing this 2* in nParamsCount. (cherry picked from commit 442ad6eef9d6e1588e4985e97ec3eafd6289f9ae) Conflicts: oox/source/vml/vmlformatting.cxx Change-Id: I2a4bb07fc9167e056a52c7adfbee9e1ef8e2636c
2013-06-27n#820504: Some imported VML paths are closed, try to detect theCédric Bosdonnat
(cherry picked from commit 08db0b22bdce0f779e4af01a209aef1be29e9907) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: Idefd0277a85bd7b2b727f59cc4e568869b4932a1
2013-06-26forgotten tweak for spinbuttonNoel Power
see origin f1ecd5ff46a217ee9f4323a08f03e59a53ef551e, f9d08dd5c9af8f8128371540e & follow up 0a686a9bb54b5c1b3a45810e2601a098c0272c33 Change-Id: I1a10de6984f7ed78efdf6f32bfca14b433b24405
2013-06-26handle v:shape having coordsize with 0 (part of bnc#780044)Luboš Luňák
There's a document which has coordsize="6094,0" path="m444,424r6094,e" , where the 0 is somewhat questionable (and the spec doesn't seem to say anything about it), but given it's a horizontal line, vertical coordinate space size shouldn't matter, so treat it as 1, making the space visible and avoiding division by 0 in our code. Change-Id: I53725cd73a699b8e6d3c96e8fc39c276d082bc0c
2013-06-26tweak ppt ole import for libreoffice codebaseNoel Power
a) make sure backcolor is skipped when libreoffice backcolor is default. Libreoffice default is 0 ( but if we write that out mso reads it as black ) b) don't take the label default backcolor in exchange for the libreoffice default. Libreoffice default backcolor for label is white, mso's default is rather different ( and never seems to be used ) c) re-enable compObj export ( seemed this was disabled unintentionally except for buttons ) Change-Id: Ie68267809cee2e92bd06e88e698f17a10eeeb6ad
2013-06-24Fix typo in Emacs mode lineTor Lillqvist
Change-Id: I882a24a665a721420c8ec99288f399abf4fdbca1
2013-06-21fdo#43641 oox: fix position/size of LineShapes inside lockedCanvasMiklos Vajna
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc
2013-06-21bnc#593612: font size: override para prop with run propFelix Zhang
Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8
2013-06-20fdo#43641 oox: initial import of lc:lockedCanvasMiklos Vajna
If that canvas contains a single shape, the result looks OK. If it contains a groupshape, we also import something, but then the position / size is still to be improved. Change-Id: Ic4e4c08016a05a5e3acb005c3a642981ba4fb16d
2013-06-20fdo#43641 oox: add support for the lockedCanvas namespaceMiklos Vajna
The plan is that once these are here, the writerfilter ooxml tokenizer can refer to them. And then the writerfilter will call back to oox to do the real drawingml import. Change-Id: Ibc0d9838f3db717004a3bc8b80a408a39c8f0886
2013-06-18fix ppc buildDavid Tardon
char is a type distinct from both unsigned char and signed char. Change-Id: Ia9de35ef42101ce818880b810c44547f1c1a417a
2013-06-17fdo#43460 oox: use isEmpty()Jelle van der Waa
Change-Id: If291a72d87001932c605755d628cecc088d50275 Reviewed-on: https://gerrit.libreoffice.org/4324 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-15fix fdo#63053 ampersand in document title causes corrupt docxabdulmajeed ahmed
FILESAVE, FILEOPEN: ampersand in document title causes corrupt docx when saving; truncates title when loading
2013-06-15Remove redundant toplevel constStephan Bergmann
...that might be the reason the Raspbian-ARM tb broke. Change-Id: I1c238f0bd70dd2237c66b479aa5eb79010f477ce
2013-06-15Related: fdo#58819 VML import: shape types not starting with a hashmark are OKMiklos Vajna
Change-Id: I2a04aeedd6899eb2717b070fa61a21991bc7be8a
2013-06-15fdo#58819 VML export of ESCHER_Prop_fillOpacityMiklos Vajna
Change-Id: Ic50be88b484e5bfba60c5bd8dafb7e6da0b33c9e
2013-06-15fdo#58819 VML export of ESCHER_Prop_gtextFontMiklos Vajna
Change-Id: Id0404405b41d5137e726670a959d5e314eb8f2ec
2013-06-15fdo#58819 VML export of ESCHER_Prop_fNoLineDrawDashMiklos Vajna
With this, the bugdoc is (correctly) no longer stroked. Change-Id: Iaf00e17f2535ece2be09dc8ec0d383f2218a6050
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-13Resolves: #i119579# position & direction of bracket incorrect in Arabic localeZhe Wang
* subversion/main/oox/source/drawingml/textparagraphpropertiescontext.cxx []WritingMode2 is used to numerous explicit writing directions, so use WritingMode2 to instead WritingMode. Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmai.com> Found by: Wang Lifeng <phoenix.wanglf@gmail.com> Review by: Wang Zhe <kingwisemmx@gmai.com>(cherry picked from commit 4545d293b1cf5009b075cdc82d43916909b77347) Change-Id: Ic621ce6107bdc0b83c511f055175ae7b629f1503
2013-06-13fdo#58819 VML export of ESCHER_Prop_RotationMiklos Vajna
Change-Id: I3deb8f914cabd58a284bef825092a6980b1f6310
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 initial VML export of ESCHER_Prop_gtextUNICODEMiklos Vajna
Change-Id: I67b5dc102fc264d0a643620bbdc5796bdaa46d82
2013-06-13Introduce O[U]String::toUInt32Stephan Bergmann
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39 "Handle oveflow in O(U)String::toInt() functions" reduces values in the range (SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied on getting a correct (unsigned) value for the whole input range ["0" .. "FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3 "Revert overflow checks in O[U]String::toInt{32,64} again"). Audited all uses of toInt32/64 with non-decimal radix. (There is still a TODO comment in oox/source/helper/attributelist.cxx, and stoc/source/typeconv/convert.cxx will still need some love and test code.) Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
2013-06-13Revert "bnc#819614: Fix runaway lines."Jan Holesovsky
This reverts commit 5fe65c0c5e5a8d815d9d15ef192e7652726662e6. Unfortunately this causes a regression elsewhere. This also disables the unit test for this bug - will re-enable when I find a fix that both fixes this, and does not regress other stuff :-) Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125
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-12Fix Excel still complains about exported MorphData controlsNoel Power
seems that writing property values that same as file defaults can cause problems ( this behaviour doesn't seem to be consistent but... ) Fix up some instances of properties that I've seen make Excel complain Change-Id: Iacf6789906f07dc35aa5dbe3e7b62f4d2090e20a
2013-06-12n#779642: 0 width or height in //v:shape[@style] produces weird resultsCédric Bosdonnat
Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b
2013-06-11squash some excel fileformat warnings ( and protected mode opening )Noel Power
some attributes should not be exported for some controls, their very presence triggers the dreaded nag dialog ( promising doom & death if you open the file ) Change-Id: I974ac94f75ee95ab54ca19bd5cd31952a66b20e5
2013-06-11honour mbAutoClose in BinaryXOutputStreamNoel Power
presumably this mbAutoClose usages got clobbered mistakenly in some merging operation Change-Id: I7116827269cdbb555753f6678528c83ab804de46
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-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a
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-04Document seemingly dead QuickDiagrammingImport, QuickDiagrammingLayoutStephan Bergmann
Change-Id: I9662671d8dbce87993ba67cf8e4fd993ad1eb27a
2013-06-03Revert "fdo#46808, Convert oox::PowerPointExport service to new style"Stephan Bergmann
This reverts commit 02021163dbbcc8904da0b2138c8b53684dcc8ab4. The filter appears to be split in two (com.sun.star.comp.oox.ppt.PowerPointImport implementation oox::ppt::PowerPointImport from include/oox/ppt/pptimport.hxx for im-/export, for export calling com.sun.star.comp.Impress.oox.PowerPointExport implementation PowerPointExport from sd/source/filter/eppt/epptooxml.hxx) for no good reason, so the com.sun.star.oox.PowerPointExport new-style service is supporting a hack that should rather be cleaned up. Conflicts: offapi/UnoApi_offapi.mk Change-Id: I875192a68a8e3458dbfd74b4981a6a2e86ce44d7
2013-06-03Fixing crash with dereferencing front() and back() of an empty vectorFridrich Štrba
Change-Id: If7204614aa7a650f4a2804fc63dd3301ece2281e
2013-06-03Don't merge this fileXisco Fauli
Change-Id: I5efca8bf4969252198e06ac3309064e8d69c0e55
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-31In ShapeExport, use general com.sun.star.comp.oox.xls.ExcelFilterStephan Bergmann
...instead of its export-only part com.sun.star.comp.oox.ExcelFilterExport (for which even a new-style service com.sun.star.oox.ExcelFilterExport has been introduced recently, but all of this should probably go away again; that this filter is used explicitly is probably a rare enough scenario to not warrant a dedicated new-style service). The modified code in ShapeExport::WriteOLE2Shape is triggered e.g. with a Presetation, insert a Spreadsheet as an OLE Object, and save as "Office Open XML Presentation (.pptx)." Change-Id: Id2645972caaec5265eed645c9c6e2c308a4d079d
2013-05-31Resolves: #i119631# Teardrop shape cannot be shown correctly in pptxZhe Wang
* subversion/main/filter/inc/filter/msfilter/escherex.hxx * subversion/main/filter/source/msfilter/escherex.cxx []check whether one shape is default shape of ppt by shape type * subversion/main/svx/inc/svx/msdffdef.hxx * subversion/main/oox/source/drawingml/customshapegeometry.cxx * subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx []add definition and declaration for tear drop * subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx []the content of tear drop shape which incudes "path, adjust value, handle" Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by: Zong Dongjun <zongdongjun@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com> (cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6) Conflicts: filter/inc/filter/msfilter/escherex.hxx oox/source/drawingml/customshapegeometry.cxx svx/inc/svx/msdffdef.hxx Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0
generated by cgit (git 2.34.1) at 2024-08-13 18:06:13 +0000