summaryrefslogtreecommitdiff
path: root/oox/inc
AgeCommit message (Collapse)AuthorFilesLines
2012-07-17dr78: correct include guardDaniel Rentz [dr]2-2/+2
2012-07-02use master's shape position/size for layout shapes when needed (n#760997)Radek Doulik1-3/+3
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-01don't build oox::drawingml::TextListStyle::dump by defaultMiklos Vajna1-1/+1
Change-Id: I24a468dbe208afd2a71dd10e7ed5610d8c259aec
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 Subramanian1-0/+1
SmartArt info was reset, when there was a chart (e.g.) in the same slide.
2012-06-25oox: kill last vml doxygen errorsMiklos Vajna1-22/+22
Change-Id: I955086f0c816d58fe8dfd104fe90367c76ad6568
2012-06-21re-base on ALv2 code.Michael Meeks78-1896/+1194
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21n#758883 oox: anchor vml shapes without anchor info as at-characterMiklos Vajna1-0/+2
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-19rework handling the case of recursive ooxml shapes againLuboš Luňák1-4/+19
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ňák1-2/+4
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-12oox: fix TextFontModel doxygen commentsMiklos Vajna1-5/+5
Change-Id: I0f869af4fd497461fc06897540d3be0a6703f00e
2012-06-11callcatcher: update unused codeCaolán McNamara1-2/+0
Change-Id: Id5f730fc447b11000b266954f9e7f5287bad02f4
2012-06-08handle f suffix (1/65536ths) when reading VML percentagesLuboš Luňák1-2/+3
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-07n#757905 fix VML import of mso-wrap-style:noneMiklos Vajna1-0/+1
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 Power1-0/+1
ensure 'hidden' controls are imported as such.
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-05-23do not insert empty texbodies for empty placeholder shapesRadek Doulik2-0/+2
- 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ňák1-4/+2
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-16Revert selected hunks from various 'unused code' commits.Muthu Subramanian3-0/+12
These functions are required for debugging pptx import problems.
2012-05-08n759212: Text over images.Muthu Subramanian2-2/+2
Default text may not make sense to be copied from the master slide to the slides when there is an image.
2012-05-04Revert "reorganise code a little so ole controls are catered for wrt fdo#49430"Noel Power1-1/+0
This reverts commit 76bab166e21bc3646ae2d3079aae2c5d9ce0d1e5.
2012-05-04reorganise code a little so ole controls are catered for wrt fdo#49430Noel Power1-0/+1
Change-Id: Ifb2c0a97f85884c459b1e7bc4616154c0e4aea2a
2012-05-04oox: fix up doxygen syntax in oox/vml/vmldrawing.hxxMiklos Vajna1-17/+17
Change-Id: Id726f7aa318dbf351cafd62d880b887d1a821431
2012-04-27include oox/token/properties.hxx directly where neededCaolán McNamara1-1/+0
Change-Id: I04e23f69717aadc157169ade40a2407ecdd92a7e
2012-04-27WaE: scary msvc2008 warning about using delete on an incomplete typeCaolán McNamara2-3/+3
Change-Id: I2d83fde2e52576f73cbc0d99053734e5068c1f9c
2012-04-26n758565: Wrong master slide shape being used.Muthu Subramanian2-3/+7
* Changed <ph> idx to OptValue. * Duplicate code removal.
2012-04-25callcatcher: remove freshly unused codeCaolán McNamara1-6/+0
2012-04-23n#757890 oox: implement mso-position-horizontal shape property for textframesMiklos Vajna1-0/+1
2012-04-18oox: fix doxygen syntax to avoid misleading output in vml::ClientDataMiklos Vajna1-29/+29
2012-04-16callcatcher: update listCaolán McNamara1-5/+0
2012-04-16callcatcher: update unused codeCaolán McNamara1-3/+0
2012-04-12oox: fix doxygen syntax to avoid misleading output in ShapeModelMiklos Vajna1-7/+7
2012-04-12unusedcode.easy: remove FilterBase::openSubStorageThomas Arnhold1-12/+0
2012-04-12unusedcode.easy: Remove BinaryFilterBaseThomas Arnhold1-65/+0
2012-04-12unusedcode.easy: remove FilterBase::requestEncryptionDataThomas Arnhold1-5/+0
2012-04-12callcatcher: update unused code listCaolán McNamara1-8/+0
2012-04-11callcatcher: update listCaolán McNamara1-2/+0
2012-04-07callcatcher: update and remove newly unused methodsCaolán McNamara2-10/+0
2012-04-07Some cleaning in oox::dump :Julien Nabet1-7/+0
oox::dump::InputObjectBase oox::dump::Output
2012-04-05remove unused code (oox)Petr Vorel2-39/+0
2012-04-01include guardLuboš Luňák1-0/+5
2012-03-30callcatcher: regenerate unused code listCaolán McNamara4-75/+0
2012-03-29drop extra unused inlines and remains of unconstructable classCaolán McNamara2-12/+0
2012-03-29remove unused code (oox)Petr Vorel4-17/+0
2012-03-29callcatcher: update listCaolán McNamara2-4/+0
2012-03-28remove left-over class stubCaolán McNamara3-720/+0
2012-03-28remove unused code (oox, sc)Petr Vorel3-19/+0