summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2013-06-19n#779642: 0 width or height in //v:shape[@style] produces weird resultsCédric Bosdonnat1-2/+9
(cherry picked from commit b7144acb2bfa369fb89146d060dbd8ddd547f4c1) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b (cherry picked from commit 3ad1d411f658b0c2bc8e318aebb999ab75675327)
2013-06-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna1-0/+4
(cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a
2013-05-30bnc#817956 VML import of mso-position-vertical-relative:marginMiklos Vajna1-0/+5
(cherry picked from commit f2720b87093968670e3fb47d24d4952f1631a654) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I86464c44022ef8c8a8037d4228bb2a6409fc77af
2013-05-30bnc#817956 fix VML import of rotationMiklos Vajna1-30/+39
In VML, positive rotation angles are clockwise, we have them as counter-clockwise. This wasn't noticed earlier, as the n751117.docx testcase also had flip:x. (For example, rotation with angle 90 + flip:x is presented as 270 by the UI.) Fix this, and also mirror the angle when flip:x is present. (cherry picked from commit b2c16f6c1b8bd3c96e0549eb3036c820094a795f Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I591ec3369a5bdca53f9684006a459d11e37fbc33
2013-05-30bnc#817956 VML import of v:textpathMiklos Vajna5-0/+78
Word exposes this as Watermark in its UI. (cherry picked from commit 290695c785ef831abb6e78cd3675bc071f05f643) Conflicts: oox/inc/oox/vml/vmlformatting.hxx oox/inc/oox/vml/vmlshape.hxx oox/source/vml/vmlformatting.cxx oox/source/vml/vmlshapecontext.cxx Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-23bnc#820786: Best effort mapping of the OOXML patterns to our hatches.Jan Holesovsky4-8/+91
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-22bnc#819614: Fix runaway lines.Jan Holesovsky1-2/+3
Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07
2013-05-02place ooxml shapes properly to paragraph area (part of bnc#816583)Luboš Luňák1-0/+3
style="position:absolute;left:0" is relative to paragraph area, not paragraph text area (which is different if it's indented). Change-Id: I12a1d2b8a68aa3fa9c65b3d469118b5334f83d7f
2013-04-25n#813291: [PPTX] Axis Labels with percentage.Muthu Subramanian1-1/+5
Added the check only in the Axis Labels import. Maybe this check can be moved to convertNumberFormat() Conflicts: oox/source/drawingml/chart/axisconverter.cxx Change-Id: I40adfa5e79292b45e97f617dbe2b9880af71be07
2013-04-22bnc#793414: Fix the mis-displayed bullet charsuse-3.6-18Felix Zhang1-0/+1
The bullet char is mistakenly set to Level 0 without setting the correct NumberingLevel Change-Id: Ie72abac83f91e9a047578d0e8334d98a358e2aee
2013-04-22bnc#793414: Fixed the left margin of bulletFelix Zhang1-1/+3
Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514
2013-03-30n#810508: Fixes import of Scatternet and Bubble charts.Muthu Subramanian1-2/+2
xVal needs to be imported as double and not as strings.
2013-03-27n#734735: [PPTX] Use number format, if available, for charts.Muthu Subramanian1-0/+3
2013-03-13bnc#798309 inherit group style from parentNoel Power7-12/+22
Change-Id: Ic689a0a17f1d88466feba0cba0d5e96a13ddb99f
2013-03-04Make LO buildable again after the GraphicFilter move.Jan Holesovsky1-1/+1
Conflicts: cui/source/dialogs/SpellDialog.cxx editeng/source/items/frmitems.cxx filter/qa/cppunit/filters-pict-test.cxx sd/source/filter/grf/sdgrffilter.cxx sd/source/ui/app/sddll.cxx svgio/source/svgreader/svgimagenode.cxx svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/source/filter/exportdialog.cxx svx/source/core/graphichelper.cxx svx/source/dialog/compressgraphicdialog.cxx sw/source/ui/shells/grfshex.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/glbltree.cxx test/source/bootstrapfixture.cxx tubes/source/contacts.cxx vcl/Library_vcl.mk vcl/qa/cppunit/graphicfilter/filters-test.cxx vcl/source/filter/FilterConfigCache.cxx vcl/source/filter/graphicfilter.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
2013-02-22Fixed conflict resolution problemsCédric Bosdonnat1-1/+1
Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b
2013-02-21n#779642: Import vertical layout mode from VML elements.Cédric Bosdonnat3-0/+20
(cherry picked from commit 3d46b39491af97ba360fb92182501e6b399f4f56)
2013-01-31n#792778 oox: implement import of v:line inside v:groupMiklos Vajna2-14/+24
The problem was that in ShapeBase::convertAndInsert(), the rectangle calculated for a line was zero, that's why it wasn't imported. Fix this by overriding the get*Rectangle() methods in LineShape, instead of doing so with implConvertAndInsert(). (cherry picked from commit 7877638814de86202d33b5653a0f91d63341e98c) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: Ie4bb2f7964b438cb56e4f5ee7a4ebe9f8f8eb734
2013-01-29use ole obj preview imageRadek Doulik3-1/+7
Change-Id: I7e88ca553fcb8449a337af36554dd1996bc6dd7d
2013-01-21n#793999: PPTX Export - background image fit to slide.Muthu Subramanian1-0/+5
2013-01-21n#794350: [PPTX] Flip gradient fill as well.Muthu Subramanian3-3/+12
2013-01-16fix cell border line properties n#793408Radek Doulik1-0/+1
Change-Id: Id20fa233b7e7eb0f2f01f4c230d1fe3398f2f4ed
2012-12-21this method actually can throw, related fdo#57451Markus Mohrhard2-2/+2
Change-Id: I26b79829029e127eb8b9ab4fbea3e0f02035ee41 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-12-18class vs struct mismatchLuboš Luňák1-1/+1
Apparently this was enough to cause a linking error with oox::vml::TextBox::TextBox on Windows.
2012-12-17n#792778 DOCX import: parse group shapes in oox onlyMiklos Vajna7-51/+142
Previously textframes inside groupshapes were tried to be imported as TextFrames, but then their addition to a GroupShape failed, so the text simply ended up as a normal paragraph. Fix this by importing members of groupshapes as drawinglayer objects, just like how the WW8 import does. Also fix two testcases, which implicitely tested that the groupshape VML element is ignored on import. (cherry picked from commits 7fe05dc95d0c9a584e07483c04b13c071d55293f and d5c934d150cb6cea5f96cbbee4fb5e8312bf027e) Conflicts: oox/source/vml/vmlshape.cxx oox/source/vml/vmltextbox.cxx Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa
2012-12-14fix fdo#58237 import hyperlinks for shapes in xlsx documentsNoel Power3-0/+13
Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
2012-12-13vml import: only apply width-percent attribute if it's != 0Pierre-Eric Pelloux-Prayer1-2/+6
This fixes an issue with a shape defined with these attributes: mso-width-percent:0;mso-height-percent:0 and mso-width-relative:page;mso-height-relative:page; where all points were then located in (0,0) Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09 Reviewed-on: https://gerrit.libreoffice.org/775 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2012-12-13oox: v:textbox's inset attribute should be imported in Hmm, not in EmuMiklos Vajna1-4/+4
Trivial reproducer: http://people.freedesktop.org/~vmiklos/2012/simple-textbox.docx Change-Id: I030f7153326affc5a01e7ede1ddf1164fa500071 (cherry picked from commit 5bc835d48f1e5373b3a31bd166fadfdf19b3588f)
2012-12-11use effect referencesRadek Doulik4-10/+26
Change-Id: Ie0d295cd7db695f777071edcd9b792056ac783ef
2012-12-11Import shadow effect properties for shapes in docx.Eilidh McAdam11-0/+234
Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d Reviewed-on: https://gerrit.libreoffice.org/702 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-12-11Revert "for lnRef idx 0 is valid index into style matrix"Radek Doulik1-4/+4
This reverts commit 1c0af12bf1bc378e3e0c87be9840f41e89783f22. turned out that the standard is most probably missing explanation and that the valid zero index means no line stroke
2012-12-10for lnRef idx 0 is valid index into style matrixRadek Doulik1-4/+4
Change-Id: Idfcaa2539056fdd3712eda4fff1ec2b7cdb3ed30
2012-12-07TextContext::onCharacters: missing rtl:: prefixMiklos Vajna1-1/+1
Change-Id: I8b9b135df739de99afcc79fdb4c56a93189db7b5
2012-12-06bnc#792528: Play it safe for non-Excel documents.Kohei Yoshida1-1/+4
Excel is not the only one that use charts. Let's also store the static label value to maData in case it is used for non-Excel documents. Change-Id: I1faed76e2ff396873039bccb3e1b7dcf27aba8c6
2012-12-06bnc#792528: Import static data series labels from xlsx correctly.Kohei Yoshida1-2/+8
Static data series label is a data series label whose value is a string value rather than a cell reference. Also, when inputting static string label in the UI, we don't have to manually check for quotes; the formula compiler will take care of that later. Change-Id: I1657fc9879a7f652bba84898e308c3a5d5ba87a3
2012-11-22I hate sal_Int32, episode #1326.Luboš Luňák1-4/+4
Change-Id: Ibfda2b553bae1ad040f722dde46a352a313218fc
2012-11-22no matching function for call to 'max(int, long int)'Tor Lillqvist1-1/+1
Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056
2012-11-20export embedded spreadsheet(s), fixes n#780830Radek Doulik4-47/+176
Change-Id: Iee8328a695b554d97f6805b64b98706b9e3d7ab9
2012-11-20limit buSzPct rangeRadek Doulik1-1/+1
Change-Id: I41411301ee131f92b9725208e53133ee0f8a6f82
2012-11-08implement inset attribute of <v:textbox> (part of bnc#773061)Luboš Luňák8-3/+44
Change-Id: I1ec9b5d9fed86c44dc0a412c2323033ea67985c9
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek1-2/+29
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-11-05bnc#785727: Add more safety checks, exact bug mechanism unclearTor Lillqvist1-1/+1
Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d
2012-10-29n#773048: Adjust rotate in relation to fix for n#783433Muthu Subramanian1-1/+1
2012-10-15fix text rotation for txXfrm element, fixes n#783433suse-3.6-0distro/suse/suse-3-6Radek Doulik1-1/+1
Change-Id: I82a14170ce8d58184b1a86f7fc0f9e9d93238c92
2012-10-15better pptx custom shape presets import/exportRadek Doulik9-1/+306
- sometimes we produced unreadable pptx document with custom shape presets - fixes part of n#760997 - before we rely on simple rule that adjustments were named adj1, adj2, ... in case of multiple adjustments and named adj in case there was only one. there are few exceptions though, so now we use exact adjustment names defined in presetShapeDefinitions.xml - TODO: there still might be problem when exporting custom shapes, which didn't originated in pptx import Change-Id: Ic9517a69145a295ba6f680ddc3cc30fc771db3fd
2012-10-15make sure we don't export shapes with negative size (fixes n#760997)Radek Doulik1-0/+5
Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223
2012-10-15write only non NaN chart series values (fixes part of n#760997Radek Doulik1-1/+2
Change-Id: I7c5bc8b9375a325d4ea78f033f577eff44cfd6e9
2012-10-15use master's shape position/size for layout shapes when needed (n#760997)Radek Doulik2-10/+39
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
2012-10-13it seems we still need the ::rtl:: prefix for OUString at some placesAndras Timar1-2/+2
Change-Id: I0c043e2c33ee51d73cf8e00a1032e5953e8c1639
2012-10-13we love you 32bit sal_Int32 as longCaolán McNamara1-1/+1
Change-Id: I006bceae3d05d2c014beae2127ad8a57c9bee353