summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2012-11-26this method actually can throw, related fdo#57451Markus Mohrhard2-2/+2
Change-Id: I26b79829029e127eb8b9ab4fbea3e0f02035ee41 Signed-off-by: Noel Power <noel.power@suse.com> Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-10-04fix for fdo#55565 regression, failure to export vertical text in shapeNoel Power1-0/+21
Change-Id: If3d6413b1fb9e02dc26f930634f84712d7d08ca3 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-10-03misc comment import/export fixesNoel Power1-1/+27
Cherry pick the rest of the commit ... a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added support for shadow element with attributes, shadow color, shadow obscured ) b) use proper fillcolor attribute c) detect whether note/comment is shown on import d) export state of note ( shown/hidden ) text position still not perfect, we still are missing some attributes to control that. Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea Conflicts: oox/source/export/vmlexport.cxx sc/source/filter/xcl97/xcl97rec.cxx
2012-10-02fdo#46278 - misc comment import/export fixesNoel Power1-1/+2
detect whether note/comment is shown on import export state of note ( shown/hidden ) parts of Change-Id: I59b446175217479ce7960287aa540df8c6b2b1e Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-09-24Revert "fdo#54609, fdo#45366: Exception while importing xlsx."Fridrich Štrba1-15/+7
We fixed the root cause of this exception. This reverts commit 3ad52a6453ff612409123db29dc74a9071789aab. Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-09-20fdo#54609, fdo#45366: Exception while importing xlsx.Muthu Subramanian1-7/+15
* Handle any exception thrown during document properties import. This is not so critical so as to stop the import. We anyways check for hasElements(). * Also lclGetRelatedStreams might throw IllegalArgumentException Change-Id: I5206ff1ab07f2853e6a20aebea3f892460b881ad Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-09-11fdo#53113 various docx shape export fixesMiklos Vajna3-8/+88
- docx export: initial shape text support - vml export: handle custom segment types - docx: export fillBlip shape property Change-Id: I8453d76cfb91386c8beaedc874e09a291234babb Reviewed-on: https://gerrit.libreoffice.org/411 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2012-08-21n760019: removing problematic code that disrupts numbering levelFelix Zhang1-6/+0
Change-Id: Idb997e672e4f997ad324bdb5d49ab7dae4a9e9e9
2012-08-09n#759210: Certain smartart drawings weren't imported.Muthu Subramanian3-33/+45
SmartArt info was reset, when there was a chart (e.g.) in the same slide. This also fixes fdo#50907. (cherry picked from commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f) Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-09Bogus warning C4701: potentially uninitialized local variableStephan Bergmann1-1/+1
Change-Id: I51caaca911f71788940260bd63d3854526d7473f (cherry picked from commit 6aff9717426db96f41ab04cd96da2b5d074625e1) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-08-09n#774167: Crash fix.Muthu Subramanian1-1/+2
(cherry picked from commit 36233b158b5de6c474f06c8c8772f0012b191baa) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-08-01fdo#45724 improve WW8 textbox exportMiklos Vajna1-0/+3
If there is no default value, but there is a current one, export that instead. Change-Id: I01af5cfa641b061b0aeb959e579bca66340781e9
2012-08-01fdo#45724 fix WW8 export of textbox default background colorMiklos Vajna2-5/+8
regression from 5609c512cd4d2899300b432d88d93cff05a05c87 Change-Id: I5f3ce73943b2805b7de1ae41699e605af9086b15
2012-07-31rhbz#842552 always create text contentDavid Tardon1-1/+2
The following line in oox::drawingml::table::TableCell::pushToXCell suggests that it is assumed that the cell always contains text: Reference< text::XText > xText( rxCell, UNO_QUERY_THROW ); So TableCell should always hold a valid TextBody too. Change-Id: Ic2db7b535c98dd5f2b18941846709a781df4585c
2012-06-27add import of axis color for data bars from xlsxMarkus Mohrhard1-0/+1
Change-Id: I2a15f8787afceaea1cb8e1c2902c05367d3e5b15
2012-06-22n#758883 oox: anchor vml shapes without anchor info as at-characterMiklos Vajna3-4/+19
w10:wrap was originally arrived to writerfilter::dmapper::WrapHandler::lcl_attribute(), but writerfilter::dmapper::DomainMapper_Impl::PushShapeContext() was called already and set the anchor type. Fix this, then we can set a a suitable anchor type in lcl_SetAnchorType() based on the type model. Change-Id: Ib411450b10f29f814bc13d81eaec434971b2e52a
2012-06-22oox: mso-wrap-style is about wrapping mode for text in shapesMiklos Vajna1-3/+24
This commit partially reverts 9e8957de203bb9abb208516ad32aee9527feb67b (as it interpreted mso-wrap-style as the wrap type of the textbox itself, not the wrap type of the contained text) and also extends the effect of commit 0016757efef898205452a586ba5927e5d11fdabe to the SimpleShape class as well. Conflicts: oox/source/vml/vmlshape.cxx Change-Id: If2bded6ad94f2866e8ea398ff0f2792e8c8e86b0
2012-06-19rework handling the case of recursive ooxml shapes againLuboš Luňák3-12/+50
Another attempt, whoever has written this apparently didn't consider the possibility of recursion at all, and this still feels a bit hackish. Writerfilter keeps just one oox::shape::ShapeContextHandler object during the entire time of parsing the document, because e.g. <v:shapetype> needs to be reachable even across VML block (see sw testcases for bnc#705956). This however presents a problem when VML contains <w:txbxContent> which contains another VML, as this code previously just took whatever has been read and returned it to writerfilter, and it broke with recursion. So now try to mark recursion entry and returns the right shape. Related to 36c12c246d886b2d96d7a2d4d0c250db9d925c74 and the previous commits it reverted. Change-Id: I949a6b52ec7540aa59b047c7b6e908b10fb3bdc1
2012-06-19oox: fix all vmlshapecontainer doxygen errorsMiklos Vajna1-5/+5
Change-Id: Ieccd1f5e89c550095cd83a3f11939eec210f789e
2012-06-19Revert "rework getting shape for the .docx import filter"Luboš Luňák3-10/+12
Stupid containers with shared_ptr. Trying to remove the object from it gets it deleted because it's owned by the shared_ptr and there's no sensible way to wrestle it out of it. This will need to be redone somehow. This reverts commit 04d600d4be7c50db4b3b505039eb8bc96856f593.
2012-06-14fix reading two smartart shapes in one documentLuboš Luňák1-1/+2
Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7 (cherry picked from commit e5fdaa259157c062b5481226e54e6a02bfbeca0d)
2012-06-12fix missing ole and form control(s) on xlsx importNoel Power1-2/+1
chang the visibility of aMceState in order to access that member to filter out reading and parsing of ./xl/ctrlProps/ctrlProp[N].xml fragments for 'controls' & 'oleObjects' elements nested withing 'mc:AlternateContent' elements Change-Id: I6892db7e3302b9977f0fdaabbe3ac1444315e011
2012-06-08handle f suffix (1/65536ths) when reading VML percentagesLuboš Luňák2-2/+6
Not all percentage attributes actually use this, but better be safe and no point in checking only the allowed ones use them. Change-Id: I851f9b19ea85201d70d5e6b2e219bbcd88ae3dea
2012-06-08n#757905 fix VML import of mso-wrap-style:noneMiklos Vajna4-0/+6
There were two problems here: 1) SimpleShape::implConvertAndInsert() did not set the anchor type 2) DomainMapper_Impl::PushShapeContext() tried to overwrite it Change-Id: I2c32016c4bb15c891cf287d8208e10817c6291e6 (cherry picked from commit 9e8957de203bb9abb208516ad32aee9527feb67b)
2012-06-07import vmlshape 'hidden' style attribute and apply to controls bnc#757609Noel Power3-2/+12
ensure 'hidden' controls are imported as such.
2012-06-06TextParagraphProperties::pushToPropSet: limit effect of failed numrule importMiklos Vajna1-9/+16
Fixes missing paragraph properties in Writer when importing SmartArt. Change-Id: I0091d7156b30b7ef99e550d7252a60676c23046e
2012-06-05oox: move ShapeDrawingFragmentHandler to its own fileMiklos Vajna4-48/+130
Change-Id: I12b057555e00f3623c45c831f4042747f140ff92
2012-06-05oox: import prerendered smartart into writerMiklos Vajna3-3/+131
Change-Id: I1c76c1bb2098c42727ae4e605e20746d0bb09463
2012-06-04remove anchor to cell shape (re)position hackNoel Power1-1/+0
this change manaully reverts c07e9299bb2c8d5477669568b12708bd2ff12684 & 4908c16a73b397f83c327789f113658c1ea4d904 Change-Id: Ia8656631f84709430c8e94e8d9dfa961e81d5746
2012-06-04fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin1-1/+2
Update calls to factories to use new ::create methods Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
2012-06-02targeted string re-workNorbert Thiebaud2-15/+15
Change-Id: I910a508722a309d7916377a7e2df2093070809ad
2012-06-01targetted string cleanupMichael Meeks5-31/+28
Change-Id: Iaf77bb427d62d7f3be00a96cba4dfb25a01934ac
2012-06-01Related: fdo#46361 fix VML import of v:rect's fillcolorMiklos Vajna2-0/+10
Change-Id: I530e07bb89f231b10c9e6da2eb4e6b698ee9654a
2012-06-01targeted string re-workNorbert Thiebaud1-55/+55
Change-Id: I96ce39a3982d7d638283c18a5913c1df13979b1f
2012-05-31n#764005 VML import of absolutely positioned pictures should not be opaqueMiklos Vajna2-0/+2
Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
2012-05-31nuke unused typedefTakeshi Abe1-2/+0
Change-Id: I8848d0e687c3b19be1a8bc1f41c2a0c94e13bbbf
2012-05-30oox: initial smartart text is imported into Writer, take twoMiklos Vajna2-0/+28
The original commit (8c6fb76c2cc24c336a28702b5f7f31cb5964129a) broke the sw_subsequent_ooxmltok test, as it threated getDiagramShapeContext() a const method, but that's not true. Check mxDiagramShapeContext directly instead. Change-Id: Idd730787be41cc11e6c1fc962da60f05e024ee84
2012-05-29Revert "oox: initial smartart text is imported into Writer"Luboš Luňák2-28/+0
This causes a test failure with sw's n747461.docx , since one shape is apparently not loaded. In this patch, it seems the "if (Element == DGM_TOKEN(relIds))" part is the problem. Reverting the whole change until this is fixed. This reverts commit 8c6fb76c2cc24c336a28702b5f7f31cb5964129a.
2012-05-29oox: initial smartart text is imported into WriterMiklos Vajna2-0/+28
2012-05-28hack the same meaning for o:hr handling like MSO usesLuboš Luňák1-0/+9
This doesn't in fact change much in LO, since ShapeType::getAbsRectangle() uses 0 as the reference size, 100% is still actually 0. Change-Id: I81690d710402224c8477c90ad14672b593aacc24
2012-05-28Y, height are in Y coordinatesLuboš Luňák1-3/+3
Change-Id: If75567533b5e00417f749bd8e957a317dda02804
2012-05-24sc: fix bogus -I$(WORKDIR)/other_moduleMichael Stahl1-0/+1
2012-05-24oox: remove duplicate custom makefile from writerfilter10Michael Stahl1-126/+0
2012-05-24oox: generate vmlexport-shape-types into CustomTarget dirMichael Stahl2-8/+8
2012-05-24oox: add some bling so we can see what takes so longMichael Stahl1-0/+3
2012-05-24oox: move generated stuff to custom targetMichael Stahl4-42/+64
2012-05-24oox: this rule needs a commandMichael Stahl1-0/+1
Make doesn't consider targets that depend on this outdated when there is no command to update it.
2012-05-24oox: can't see why we need these depsMichael Stahl1-10/+0
2012-05-24oox; there is no oox_source packageMichael Stahl1-2/+1
2012-05-23do not insert empty texbodies for empty placeholder shapesRadek Doulik5-3/+21
- the original problem can be reproduced by creating new empty presentation in powerpoint. after it is loaded in impress, it was completely blank, without placeholder shape texts (Click to add title, Click to add text) Change-Id: I541554e273372ad09cca2fb91e27a17eb1f3a00e
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 21:08:56 +0000