summaryrefslogtreecommitdiffstats
path: root/oox
Commit message (Collapse)AuthorAgeFilesLines
* Remove commented out code (includes)Thomas Arnhold2012-06-272-2/+0
| | | | Change-Id: I0a11d09544c10d78a2036a5c3c94132b17fbfbe8
* add import of axis color for data bars from xlsxMarkus Mohrhard2012-06-271-0/+1
| | | | Change-Id: I2a15f8787afceaea1cb8e1c2902c05367d3e5b15
* re-base on ALv2 code.Michael Meeks2012-06-261-33/+14
|
* oox: fix remaining vba doxygen errorsMiklos Vajna2012-06-263-27/+27
| | | | Change-Id: Ic7816065fd5fda640ce85ab25514df76be098b12
* n#759210: Certain smartart drawings weren't imported.Muthu Subramanian2012-06-253-35/+46
| | | | | SmartArt info was reset, when there was a chart (e.g.) in the same slide.
* merge 3 copy and paste efforts back together as bestFitOpenSymbolToMSFontCaolán McNamara2012-06-251-50/+8
| | | | Change-Id: Ia830af58a1e2b80e85b2748b4acceb0bfc340afc
* TODO: get rid of this in another incompatible build with SW projectCaolán McNamara2012-06-251-1/+2
| | | | Change-Id: Ic3fb0c8eb37317d55bcdc6abc7ff9843ba11fac6
* oox: kill last vml doxygen errorsMiklos Vajna2012-06-251-22/+22
| | | | Change-Id: I955086f0c816d58fe8dfd104fe90367c76ad6568
* Fix consecutive breakJulien Nabet2012-06-241-1/+0
| | | | Change-Id: Ifd5dddee6950bcc08dc48c17293e794bf5aeb48e
* .pptx files don't need executable bitsMichael Stahl2012-06-221-0/+0
| | | | Change-Id: I90069f562c61359f9b226b147fe99807ecb3ad8a
* re-base on ALv2 code.Michael Meeks2012-06-224-91/+55
| | | | Change-Id: I8018d9b5fa01d1720c0392dc5fdc4a0656f25a35
* re-base on ALv2 code.Michael Meeks2012-06-21135-3249/+2034
| | | | Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
* n#758883 oox: anchor vml shapes without anchor info as at-characterMiklos Vajna2012-06-213-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
* re-base on ALv2 code.Michael Meeks2012-06-217-27/+120
| | | | Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
* make sure we don't export shapes with negative size (fixes n#760997)Radek Doulik2012-06-211-0/+5
| | | | Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223
* oox: mso-wrap-style is about wrapping mode for text in shapesMiklos Vajna2012-06-201-15/+23
| | | | | | | | | | 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. Change-Id: If2bded6ad94f2866e8ea398ff0f2792e8c8e86b0
* rework handling the case of recursive ooxml shapes againLuboš Luňák2012-06-193-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
* Revert "rework getting shape for the .docx import filter"Luboš Luňák2012-06-193-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.
* oox: fix all vmlshapecontainer doxygen errorsMiklos Vajna2012-06-191-5/+5
| | | | Change-Id: Ieccd1f5e89c550095cd83a3f11939eec210f789e
* oox: last vmlshape doxygen mistakesMiklos Vajna2012-06-181-7/+7
| | | | Change-Id: I1d74aad0280662cd06dcc633072402ba13199898
* fix reading two smartart shapes in one documentLuboš Luňák2012-06-141-1/+2
| | | | Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
* oox: fix TextFontModel doxygen commentsMiklos Vajna2012-06-121-5/+5
| | | | Change-Id: I0f869af4fd497461fc06897540d3be0a6703f00e
* callcatcher: update unused codeCaolán McNamara2012-06-112-12/+0
| | | | Change-Id: Id5f730fc447b11000b266954f9e7f5287bad02f4
* attempt to anchor vml shapes properly as they should beLuboš Luňák2012-06-111-3/+12
| | | | | | | | | | | | | | | | | | This is a mess. Shapes from oox/vml are added to Writer by calling SwXDrawPage::add(), which forces the shapes to be AT_PAGE, because the pDoc->GetCurrentLayout() there is NULL. After that writerfilter in DomainMapper_Impl::PushShapeContext() tries to do further tricks with the anchoring. Such as the fix for bnc#764005 (0a412cc13edf0904524ee2cf1e38ccc36b713065) that broke inline shapes because of the AT_PAGE above. So try to set the proper anchoring already in oox, although I'm not entirely sure I got it right. Ideally writerfilter should not touch it, but when I simply removed it another testcase breaks, so hopefully this all can be cleaned up somewhen later when we have enough testcases for all the possibilities. Change-Id: I7dd95d87bd027ce0f129f76b3377f3d1445c34d1
* handle f suffix (1/65536ths) when reading VML percentagesLuboš Luňák2012-06-082-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
* shapes with position:static (default) should be anchored inlineLuboš Luňák2012-06-071-0/+4
| | | | | | | Visible with incorrect alignment of the image in the footer in the doc from bnc#764745. Change-Id: Ibea9f38f7404981a9a846c23a09f8244c6020797
* n#757905 fix VML import of mso-wrap-style:noneMiklos Vajna2012-06-074-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
* import vmlshape 'hidden' style attribute and apply to controls bnc#757609Noel Power2012-06-063-2/+12
| | | | ensure 'hidden' controls are imported as such.
* fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin2012-06-061-7/+5
| | | | | | | Update calls to factories to use new SimpleFileAccess::create method Change-Id: Ie5b0696fe2228a9033b19969245a53c21a61aa14 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
* fix missing ole and form control(s) on xlsx importNoel Power2012-06-051-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
* TextParagraphProperties::pushToPropSet: limit effect of failed numrule importMiklos Vajna2012-06-051-9/+16
| | | | | | Fixes missing paragraph properties in Writer when importing SmartArt. Change-Id: I0091d7156b30b7ef99e550d7252a60676c23046e
* oox::drawingml::TextParagraph: OSL_TRACE -> SAL_INFOMiklos Vajna2012-06-051-2/+2
| | | | Change-Id: I79af1d624c420dff87751691ff8aa484fd3de2b6
* oox: move ShapeDrawingFragmentHandler to its own fileMiklos Vajna2012-06-054-48/+130
| | | | Change-Id: I12b057555e00f3623c45c831f4042747f140ff92
* oox: import prerendered smartart into writerMiklos Vajna2012-06-053-3/+131
| | | | Change-Id: I1c76c1bb2098c42727ae4e605e20746d0bb09463
* remove anchor to cell shape (re)position hackNoel Power2012-06-041-1/+0
| | | | | | this change manaully reverts c07e9299bb2c8d5477669568b12708bd2ff12684 & 4908c16a73b397f83c327789f113658c1ea4d904 Change-Id: Ia8656631f84709430c8e94e8d9dfa961e81d5746
* fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin2012-06-041-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.
* targeted string re-workNorbert Thiebaud2012-06-022-15/+15
| | | | Change-Id: I910a508722a309d7916377a7e2df2093070809ad
* targetted string cleanupMichael Meeks2012-06-015-31/+28
| | | | Change-Id: Iaf77bb427d62d7f3be00a96cba4dfb25a01934ac
* Related: fdo#46361 fix VML import of v:rect's fillcolorMiklos Vajna2012-06-012-0/+10
| | | | Change-Id: I530e07bb89f231b10c9e6da2eb4e6b698ee9654a
* targeted string re-workNorbert Thiebaud2012-06-011-55/+55
| | | | Change-Id: I96ce39a3982d7d638283c18a5913c1df13979b1f
* n#764005 VML import of absolutely positioned pictures should not be opaqueMiklos Vajna2012-05-312-0/+2
| | | | Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
* nuke unused typedefTakeshi Abe2012-05-311-2/+0
| | | | Change-Id: I8848d0e687c3b19be1a8bc1f41c2a0c94e13bbbf
* oox: initial smartart text is imported into Writer, take twoMiklos Vajna2012-05-302-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
* Revert "oox: initial smartart text is imported into Writer"Luboš Luňák2012-05-292-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.
* oox: initial smartart text is imported into WriterMiklos Vajna2012-05-292-0/+28
|
* hack the same meaning for o:hr handling like MSO usesLuboš Luňák2012-05-281-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
* Y, height are in Y coordinatesLuboš Luňák2012-05-281-3/+3
| | | | Change-Id: If75567533b5e00417f749bd8e957a317dda02804
* sc: fix bogus -I$(WORKDIR)/other_moduleMichael Stahl2012-05-241-0/+1
|
* oox: remove duplicate custom makefile from writerfilter10Michael Stahl2012-05-241-126/+0
|
* oox: generate vmlexport-shape-types into CustomTarget dirMichael Stahl2012-05-242-8/+8
|
generated by cgit (git 2.34.1) at 2024-08-12 22:37:27 +0000