summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2012-06-20oox: mso-wrap-style is about wrapping mode for text in shapesMiklos Vajna1-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
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-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-19oox: fix all vmlshapecontainer doxygen errorsMiklos Vajna1-5/+5
Change-Id: Ieccd1f5e89c550095cd83a3f11939eec210f789e
2012-06-18oox: last vmlshape doxygen mistakesMiklos Vajna1-7/+7
Change-Id: I1d74aad0280662cd06dcc633072402ba13199898
2012-06-14fix reading two smartart shapes in one documentLuboš Luňák1-1/+2
Change-Id: If693eea8deceec7eebd45ab04de020223dc7f6a7
2012-06-12oox: fix TextFontModel doxygen commentsMiklos Vajna1-5/+5
Change-Id: I0f869af4fd497461fc06897540d3be0a6703f00e
2012-06-11callcatcher: update unused codeCaolán McNamara2-12/+0
Change-Id: Id5f730fc447b11000b266954f9e7f5287bad02f4
2012-06-11attempt to anchor vml shapes properly as they should beLuboš Luňák1-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
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-07shapes with position:static (default) should be anchored inlineLuboš Luňák1-0/+4
Visible with incorrect alignment of the image in the footer in the doc from bnc#764745. Change-Id: Ibea9f38f7404981a9a846c23a09f8244c6020797
2012-06-07n#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
2012-06-06import vmlshape 'hidden' style attribute and apply to controls bnc#757609Noel Power3-2/+12
ensure 'hidden' controls are imported as such.
2012-06-06fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin1-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.
2012-06-05fix 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-05TextParagraphProperties::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::drawingml::TextParagraph: OSL_TRACE -> SAL_INFOMiklos Vajna1-2/+2
Change-Id: I79af1d624c420dff87751691ff8aa484fd3de2b6
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
2012-05-22rework getting shape for the .docx import filterLuboš Luňák3-12/+10
This makes both sw/qa/extras/ooxmltok/data/n705956-{1|2}.docx testcases work at the same time. As far as I understand it, the .docx filter calls into oox and at the end if gets the shape, while the shape is removed from the ShapeContainer. In the case of recursion caused by <w:pict><v:shape><w:txbxContent><w:pict><v:shape>, clearing the whole list is wrong. Also, the OSL_ENSURE seems to suggest that there should not be more than one shape inserted by each read. So simply consider maShapes to be a stack when importing .docx . Change-Id: I7263aeaf74c8d31a05e64c56b880cbc6b00d7dd6
2012-05-20more on correct import of data bars from Excel2010Markus Mohrhard1-0/+1
http://msdn.microsoft.com/en-us/library/documentformat.openxml.office2010.excel.databar.aspx Change-Id: I6d76cd888b723718e5a2beedfb5223fb6c0d0ba2
2012-05-20correctly import data bar information from Excel2010Markus Mohrhard1-0/+3
Change-Id: I7545dfd849f2cc9924a6bb7f6d1ca9d97c3cf079
2012-05-20add namespace for extensions from Excel2010Markus Mohrhard3-2/+11
Change-Id: I45144a08729b00c1e46784b430af7bc15244dfe7
2012-05-17n#760029: Floor borders were missing from 3D Charts.Muthu Subramanian1-3/+3
Looks like there should always be a floor border for the 3D charts.
2012-05-16Crash fix.Muthu Subramanian1-1/+1
2012-05-16Revert selected hunks from various 'unused code' commits.Muthu Subramanian6-1/+55
These functions are required for debugging pptx import problems.
2012-05-14removed unused static rtl::OUStringTakeshi Abe2-2/+0
Change-Id: I5a097beaaeb30214ed6071bba1297e551291922b
2012-05-08oox: strict aliasing warning:Michael Stahl1-2/+13
/oox/source/dump/dumperbase.cxx:345:69: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 20:02:47 +0000