summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2013-10-31Convert indexOf->startsWith and lastIndexOf->endsWithNoel Grandin1-1/+1
This is both an optimisation and a cleanup. This converts code like aStr.indexOf("XX") == 0 to aStr.startsWith("XX") and converts code like aStr.lastIndexOf("XXX") == aStr.getLength() - 3 to aStr.endsWith("XXX") Note that in general aStr.lastIndexOf("X") == aStr.getLength() - 1 converts to aStr.isEmpty() || aStr.endsWith("X") so I used the surrounding context to determine if aStr could be empty when modifying the code. Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
2013-10-29cppcheck: duplicate break or break which follows a returnJulien Nabet1-1/+0
Change-Id: I0985d28289e31969cb9b048b221abfae1572025d
2013-10-23fixincludeguards.sh: ooxThomas Arnhold27-81/+56
Change-Id: Ibc1fb5c149461d6030749a974c6d37aa11ad0e16
2013-10-23mark as copy and pasteThomas Arnhold2-0/+4
Change-Id: I315e6d2d75ec15655f0c926339b5af0e50a1190f
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist1-1/+1
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22n#839727: Crash fix.Muthu Subramanian1-1/+2
2013-10-22n#839727: Chart missing dataset.Muthu Subramanian1-0/+19
This was because there is no explicit category in the chart - while libreoffice expects it.
2013-10-20wrong comparisonCaolán McNamara1-1/+1
regression since ed338bc212725f422f0def21aafc82f05e350646 Change-Id: Ia5dfe7a551abe244c313d3bdb2b90196fc0c6ba2
2013-10-20drop unnecessary tools/string includesCaolán McNamara4-5/+0
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
2013-10-17oox: special-case single-character a-z token mapping.Michael Meeks1-0/+14
Change-Id: I58a810cc6062d5b42558dd5c0f37426a8a210f40
2013-10-17fdo#54938: Adapt svtools and comphelper module ...Marcos Paulo de Souza3-34/+7
to use cppu::supportsService and other pieces. Change-Id: I16893b3d31a8055acd214ff23d01e63d38fe0826 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-16-Werror,-Wlogical-not-parenthesesStephan Bergmann1-1/+1
"logical not is only applied to the left hand side of this comparison" Change-Id: I015befe47ea9f40f83217b259e07eb01edb7d820
2013-10-16oox: added methods to lock Smart-Art editionAndres Gomez3-22/+154
Added the possibility of rendering the basic shapes generated for a Smart-Art into a bitmap and replacing them with it in order to not letting to edit the Smart-Art. This possibility is controlled using a configuration parameter located at Options -> Load/Save -> MS Office -> SmartArt to LibreOffice shapes or reverse. Made the "oox" library to depend on the "drawinglayer" and "svx" libraries. Made the "ooxmlexport" C++ unit tests in the "sw" module to depend on the "drawinglayer" and "svx" components. Fixed to set to diagram type a new "oox::drawingml::Shape" representing a Smart-Art in the "getShape" method of the "oox::shape::ShapeContextHandler" class. Added the "keepDiagramCompatibilityInfo" and "renderDiagramToGraphic" protected methods to the "oox::drawingml::Shape" class. "keepDiagramCompatibilityInfo" is now called after an instance of type "FRAMETYPE_DIAGRAM" has added all its children in the "addShape" method and the proper setting is in place. "keepDiagramCompatibilityInfo" substitutes previous similar code in the "createAndInsert" method and also calls "renderDiagramToGraphic". The "renderDiagramToGraphic" renders the basic shapes in a Smart-Art into a PNG image and replaces these basic shapes with a new "GraphicObjectShape" filled with the new PNG image. It also sets the "MoveProtect" and "SizeProtect" properties of the "GraphicObjectShape". Change-Id: Ie4002238ff5fae758a5881b03735bf1f0721ed5b Reviewed-on: https://gerrit.libreoffice.org/6059 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-15update pchThomas Arnhold1-0/+3
Change-Id: I475bee35ca5d24903d85e7f2427fab0e47d8db4d
2013-10-12Fix for Corruption of chart due to Data Lables in Writer, Impress and CalcRohit Deshmukh1-23/+57
Chart file gets corrupted, if we save file in Libreoffice and open in MS office. MS Office gives error, file is Corrupt. Following charts get fixed 1. Radar chart 2. Area chart without data labels 3. Line chart 4. Bubble chart Area chart with data label file gets courrputed after roundtrip in Libreoffice. Change-Id: Ib03ad49aae268b53aa18bdc21c723e2a7777eb45
2013-10-11-Werror,-Wunused-variableStephan Bergmann2-3/+4
Change-Id: I7f4f232475339d524eed7ba578e22b53991bd123
2013-10-11CID#1103719 leak on default: pathCaolán McNamara1-4/+4
Change-Id: I74a17da384499fb18f13d5caa04c356dfee71eff
2013-10-10Partially revert alpha handling.Muthu Subramanian1-2/+0
Spec talks about x% while documents seem to contain x*1000
2013-10-10n#812793: clrChange applying for EMFsMuthu Subramanian2-15/+27
Also fixed alpha clrChanges.
2013-10-10n#819614: Lines running off the screens.Muthu Subramanian2-4/+3
Also fixed the test cases.
2013-10-07fix build: use rAttribs :)Thomas Arnhold1-2/+2
Change-Id: I383bd331090603aa9a159e41ef26be8d8e1c5ff3
2013-10-07Fix fdo#70220 Superscript not imported from pptx.Thorsten Behrens2-24/+22
Import works now, though EditEngine still fscks up font scaling - seems for CharEscapementHeight to work, there has to be reference, non-scaled text in the same portion ... Change-Id: I5505ae83bd6b700ebe8c3465beec40a4df2efb78
2013-10-02-Werror,-Wunused-variableStephan Bergmann1-1/+1
Change-Id: Ic0801e224750cccee3d91c742fcb67cb0472124f
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-14/+0
Change-Id: I41ec28c39c395b8eb2eaf72f91440f3ae2c3aa99
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-1/+0
Change-Id: I7422272a7103bacd36c5d7234b6eb76477f5a2b9
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-14/+0
Change-Id: Id941d9a9f5fc020e2e5bd11b419461f60b9b4626
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-2/+0
Change-Id: I6c028561f0aa2eb4b1a14ed5646f1c10541512d1
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-15/+0
Change-Id: I4e0f9b935171b65b20a40c4dec8d769d202cf4b8
2013-10-02-Werror,-Wunused-const-variableStephan Bergmann1-1/+0
Change-Id: Ia8f7c1bbf18bbe3dbd84df5a05c450361b7c8578
2013-10-01convert remnants of String to OUString to OOX moduleNoel Grandin1-4/+4
Change-Id: I55a620063a1021830802c5bc41b425fd134b449f
2013-09-27oox: fix off-by-one error in SimpleShape::implConvertAndInsert()Miklos Vajna1-1/+1
Change-Id: I52741c344fc04b82db650927e4223dc325afabdf
2013-09-26fdo#69636 VML import: handle mso-layout-flow-alt shape prop for sw framesMiklos Vajna2-0/+24
Writer core doesn't support this, and this has been a problem for table cells as well. There the workaround we're using for quite a while is to do the rotation at a text portion level instead, which results in reasonable layout for simple cases. Do the same here. One additional complexity is that the API between oox and writerfilter is a single UNO shape, we get this property in oox, and we have to handle it in writerfilter, when the text frame is already attached to some text. Kill this problem by adding a FrameInteropGrabBag for sw text frames: it's useful anyway, and then we can pass around this property inside the grab bag. Change-Id: Idb5ec83b5cbdde8f29d15b2cebfad24226bb6507
2013-09-26typo fixes in commentsAndras Timar2-2/+2
Change-Id: Iaadec33715f8e0e0c6595c5e684606905274fdab
2013-09-23Show errorsJulien Nabet1-4/+4
Change-Id: Iff3b8e523f5d326586115c4ff61835c15b8b7f01
2013-09-20fdo#40594 Fix for chart missing issue in Writer (for docx)Vinaya Mandke2-6/+50
1. Enabled parsing of chart in writer module. 2. While parsing chart is read as ole2shape. Then converted into TextEmbedded object for chart. 3. While exporting postponed chart writing after rpr tag. 4. Generated unique id for each chart. 5. Corrected content type of chart in export. Change-Id: I6a1ca0c34e03e17cc3dd8a183580132ea7af5c48 Reviewed-on: https://gerrit.libreoffice.org/5976 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-16Related bnc#819614: Set the position and name immediately.Jan Holesovsky2-9/+3
Change-Id: I4c1046040f52e261004df95125b53e42dc8fca4b
2013-09-16Related bnc#819614: The diagram is a group.Jan Holesovsky2-9/+2
It is not really desired to import diagrams broken into individual objects; makes trouble with the hieararchy, and also the user wants to see it as a group - can be ungrouped for modifications easily. Change-Id: I0533a69af9e377804bf0e06b2ce873fd0c9bde02
2013-09-15Save should encrypt OOXML document if it was loaded encrypted.Tomaž Vajngerl5-67/+30
Currently Agile encryption is not supported, so all documents loaded with "agile" encryption will be encrypted with "standard" encryption when they are saved afterwards. Change-Id: Id0477f43c00ed70032ca6b3390eebb1105d5ffa7
2013-09-13Avoid crash when a comment contains data, but no textKatarina Behrens1-1/+5
calling back() on empty vector results in undef behaviour Crash originally reported here: http://lists.freedesktop.org/archives/libreoffice/2013-September/055827.html Change-Id: Ibefdc7e2495fc31d748c16fedd3cee5eb957bfa2
2013-09-11n#834720: Labels wrongly interpreted as dates.Muthu Subramanian1-3/+1
If the numFormat is available we should probably use that.
2013-09-11oox: Smart-Art DOMs stored in the InteropGrabBagAndres Gomez4-39/+123
The XDocuments representing the DOM documents of a DrawingML diagram (Smart-Art) are now stored as the PropertyValues "OOXData", "OOXLayout", "OOXStyle", "OOXColor" and "OOXDrawing" into the "InteropGraBag" property of the parent SvxGroupShape created from such diagram. Modified the oox::drawingml::dgm::Diagram class to be able to hold the map storing the XDocuments and its names. Added the getDomMap() method to obtain the map directly and the getDomsAsPropertyValues method to get the map as a sequence of Property Values. Modified the methods for importing and loading the Smart-Art into the Diagram so they add automatically the DOM documents to it. Modified the oox::drawingml::Shape class to be able to hold the sequence of PropertyValues storing the XDocuments and its names coming from the oox::drawingml::dgm::Diagram class. Added the getDiagramDoms() and setDiagramDoms() methods. Enhanced the oox::shape::ShapeContextHandler::getShape() method to add the extended drawing document to the oox::drawingml::Shape class. Modified the oox::drawingml::Shape::createAndInsert() method to store the sequence of XDocuments in the "InteropGrabBag" property of the GroupShape service SvxGroupShape implementation representing a Smart-Art. Change-Id: I7d0b9dfbfc9d5299ddd25fab394e5e9a422d1dd1 Reviewed-on: https://gerrit.libreoffice.org/5849 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-09n#834722: Chart shown flipped.Muthu Subramanian1-1/+2
Auto and manual axis positioning seems to cause a problem. Needs to be tested with more charts.
2013-09-07s/wiki.services.openoffice.org/wiki.openoffice.org/gAndras Timar1-1/+1
Change-Id: I059fbee385a109069c70f3869021c8e2ee48fee1
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle char spacingMiklos Vajna2-0/+20
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle insetMiklos Vajna1-0/+9
Change-Id: If8b064ca9a52bb02ff41f07e00142702a29df818
2013-09-06bnc#779642 VML import: import result of sdt fieldsMiklos Vajna1-0/+5
We can't have e.g. placeholder fields on drawinglayer rectangles, but at least the result of the field is now imported. Change-Id: I135f205c4231645f11f824495993c4dbea4135ed
2013-09-06CID#1078768: pass big parameter by referenceMarkus Mohrhard1-1/+1
Change-Id: I423e6e0b3a7c16461765b5086f729cce028c4b6e
2013-09-05update pchThomas Arnhold1-3/+19
Change-Id: I6d5e8d3fd69189935a3338fee19b60022f70a7eb
2013-09-05CID#1078784 and CID#1078785 fix memory leaksMarkus Mohrhard1-5/+5
Change-Id: I5a878bfb0a6947616b1d0bfaad2541bb46903676
2013-09-05bnc#779642 VML import: fix TextHorizontalAdjust when layout-flow is verticalMiklos Vajna1-0/+11
The shape had no special properties about hori/vert text adjustment, so it should be hori left / vert top. Then it has vertical layout-flow, so vert should be top and hori should be right (vert was center). Change-Id: Ia89d8587b6a822ead45198dc5d1ba23907cc3567