summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2012-07-05remove forgotten debug printfDavid Tardon1-1/+0
Change-Id: Iff5a53735d78a2afcf90299a5f28a47f1376e393
2012-07-04n#768027: Slide notesMaster and notes import.Muthu Subramanian3-5/+51
2012-07-03ditch String::CreateFromAsciiCaolán McNamara1-1/+1
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
2012-07-02use master's shape position/size for layout shapes when needed (n#760997)Radek Doulik2-10/+39
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
2012-07-02Remove unused definesThomas Arnhold1-2/+0
Some of them were commented out for documentation purpose. Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
2012-07-02targetted improvement of UNO API includes / usageMichael Meeks1-4/+1
2012-07-01don't build oox::drawingml::TextListStyle::dump by defaultMiklos Vajna2-2/+2
Change-Id: I24a468dbe208afd2a71dd10e7ed5610d8c259aec
2012-06-27Remove commented out code (includes)Thomas Arnhold2-2/+0
Change-Id: I0a11d09544c10d78a2036a5c3c94132b17fbfbe8
2012-06-27add import of axis color for data bars from xlsxMarkus Mohrhard1-0/+1
Change-Id: I2a15f8787afceaea1cb8e1c2902c05367d3e5b15
2012-06-26re-base on ALv2 code.Michael Meeks1-33/+14
2012-06-26oox: fix remaining vba doxygen errorsMiklos Vajna3-27/+27
Change-Id: Ic7816065fd5fda640ce85ab25514df76be098b12
2012-06-25n#759210: Certain smartart drawings weren't imported.Muthu Subramanian3-35/+46
SmartArt info was reset, when there was a chart (e.g.) in the same slide.
2012-06-25merge 3 copy and paste efforts back together as bestFitOpenSymbolToMSFontCaolán McNamara1-50/+8
Change-Id: Ia830af58a1e2b80e85b2748b4acceb0bfc340afc
2012-06-25TODO: get rid of this in another incompatible build with SW projectCaolán McNamara1-1/+2
Change-Id: Ic3fb0c8eb37317d55bcdc6abc7ff9843ba11fac6
2012-06-25oox: kill last vml doxygen errorsMiklos Vajna1-22/+22
Change-Id: I955086f0c816d58fe8dfd104fe90367c76ad6568
2012-06-24Fix consecutive breakJulien Nabet1-1/+0
Change-Id: Ifd5dddee6950bcc08dc48c17293e794bf5aeb48e
2012-06-22.pptx files don't need executable bitsMichael Stahl1-0/+0
Change-Id: I90069f562c61359f9b226b147fe99807ecb3ad8a
2012-06-22re-base on ALv2 code.Michael Meeks4-91/+55
Change-Id: I8018d9b5fa01d1720c0392dc5fdc4a0656f25a35
2012-06-21re-base on ALv2 code.Michael Meeks135-3249/+2034
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21n#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-21re-base on ALv2 code.Michael Meeks7-27/+120
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-06-21make sure we don't export shapes with negative size (fixes n#760997)Radek Doulik1-0/+5
Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223
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