summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)Author
2013-06-03Don't merge this fileXisco Fauli
Change-Id: I5efca8bf4969252198e06ac3309064e8d69c0e55
2013-06-03Fix issue #i120723#: Table style is lost when import PPTX by AOOZhe Wang
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx * subversion/main/oox/source/drawingml/table/tableproperties.cxx []if the imported table in pptx just have tableStyleId, should fill the tablestyle's content. Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by:Ma Bingbing <jiazema@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 74b1435a4d39eac71e36fb1c387b24af4b353fa0) Conflicts: oox/inc/oox/drawingml/table/tableproperties.hxx oox/source/drawingml/table/tableproperties.cxx Change-Id: I554169522a95343662781c3f169c6485c38a6800
2013-05-31In ShapeExport, use general com.sun.star.comp.oox.xls.ExcelFilterStephan Bergmann
...instead of its export-only part com.sun.star.comp.oox.ExcelFilterExport (for which even a new-style service com.sun.star.oox.ExcelFilterExport has been introduced recently, but all of this should probably go away again; that this filter is used explicitly is probably a rare enough scenario to not warrant a dedicated new-style service). The modified code in ShapeExport::WriteOLE2Shape is triggered e.g. with a Presetation, insert a Spreadsheet as an OLE Object, and save as "Office Open XML Presentation (.pptx)." Change-Id: Id2645972caaec5265eed645c9c6e2c308a4d079d
2013-05-31Resolves: #i119631# Teardrop shape cannot be shown correctly in pptxZhe Wang
* subversion/main/filter/inc/filter/msfilter/escherex.hxx * subversion/main/filter/source/msfilter/escherex.cxx []check whether one shape is default shape of ppt by shape type * subversion/main/svx/inc/svx/msdffdef.hxx * subversion/main/oox/source/drawingml/customshapegeometry.cxx * subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx []add definition and declaration for tear drop * subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx []the content of tear drop shape which incudes "path, adjust value, handle" Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by: Zong Dongjun <zongdongjun@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com> (cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6) Conflicts: filter/inc/filter/msfilter/escherex.hxx oox/source/drawingml/customshapegeometry.cxx svx/inc/svx/msdffdef.hxx Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0
2013-05-30Make use of IsStarSymbol()Thomas Arnhold
Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c Reviewed-on: https://gerrit.libreoffice.org/4077 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-05-30Fix tinderbox failures due to missing includeFridrich Štrba
Change-Id: Ied4c829bbe3038e483524669a85a0a7eaa055eb9
2013-05-30Fix crash with fdo60063-1.docxFridrich Štrba
Compared to the original version, this one tries hard not to produce empty keywords. Change-Id: I11d036c2d54cde2d3c311a77c115011246f38d0a Reviewed-on: https://gerrit.libreoffice.org/4091 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-29bnc#817956 VML import of mso-position-vertical-relative:marginMiklos Vajna
Change-Id: I86464c44022ef8c8a8037d4228bb2a6409fc77af
2013-05-29bnc#817956 fix VML import of rotationMiklos Vajna
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. Change-Id: I591ec3369a5bdca53f9684006a459d11e37fbc33
2013-05-29bnc#817956 VML import of v:textpathMiklos Vajna
Word exposes this as Watermark in its UI. Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-27be case-insensitive for open/starsymbol comparisonThomas Arnhold
Change-Id: I7a342c809a723f5f9c03271c6145d9c367cea6de Reviewed-on: https://gerrit.libreoffice.org/4015 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-05-27x86 register vs memory accuracy double pitaCaolán McNamara
with x86 gcc-4.1.2-54.el5 the sd import test fails while x86-64 passes. Tracked it down eventually to this double equality test failing on x86. Apparently excess precision in registers compared with memory. Change-Id: I61b43b2f0e9c9aded570448a1c5a7c9dbad8986e
2013-05-27respect element order in OOXML chart export, related fdo#63114Markus Mohrhard
Change-Id: I591a63c38ab18b03a2f86428defbdac0cb96a1c0
2013-05-24WaE: implicit conversion of NULL constant to nullptr_tTor Lillqvist
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
2013-05-23bnc#820786: Best effort mapping of the OOXML patterns to our hatches.Jan Holesovsky
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-23Revert "fdo#46808, Convert chart2::Title service to new style"Stephan Bergmann
This reverts commit d256dbede60533369d1aac64cca34721183f6a8a: For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the direct properties of the old-style css.chart2.Title service into attributes, but left out all the properties inherited by the old-style service from css.style.ParagraphProperties, css.drawing.FillProperties, css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement, whatever that is supposed to be). This needs more thought, to either make available all propertiers as attributes, or none. For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle), for hard-to-debug reasons. Conflicts: chart2/source/model/main/Title.cxx chart2/source/model/main/Title.hxx offapi/com/sun/star/chart2/XTitle2.idl sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7
2013-05-22Use the new type-checking Reference constructor to reduce code noiseNoel Grandin
Also create a Clang compiler plugin to detect such cases. Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752 Reviewed-on: https://gerrit.libreoffice.org/4001 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2013-05-21fdo#46808, Convert oox::PowerPointExport service to new styleNoel Grandin
The service already existed, it just needed an IDL file Change-Id: I1404f4f60abafd489ddfb7294affcc7ff33885ce
2013-05-21fdo#46808, Convert oox.ExcelFilterExport service to new styleNoel Grandin
Service already existed, just needed an IDL file Change-Id: I397296e5ad7b32febb63e74f8ee9a0db53ba5a81
2013-05-21fdo#46808, Remove unnecessary XMultiServiceFactory memberNoel Grandin
.. and associated methods Change-Id: Iec01b4615decc1616e405166088d7d1d844ac0ae
2013-05-21fdo#46808, Convert chart2::Title service to new styleNoel Grandin
API CHANGE: The chart2::XTitled interface now takes and returns a XTitle2 instead of an XTitle. Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6
2013-05-21fdo#46808, Convert various chart2:*Scaling services to new styleNoel Grandin
Change-Id: I93294be4c822160e609ae6aab552edd64478e34b
2013-05-19WaE on mac osx buildNorbert Thiebaud
Change-Id: Ief28d2563b66754d00fdc09d6d68ea3a73aff22a
2013-05-16bnc#819614: Fix runaway lines.Jan Holesovsky
Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07
2013-05-16Fix length check - it would be out of bounds.Jan Holesovsky
Change-Id: I5430fed06ea1a81a68ddfaafa595d7d5b0167f3b
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist
2013-05-15Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.Thorsten Behrens
Just don't assume the DSP_TOKEN( spTree ) was seen in input. Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
2013-05-14detect whether a bezier shape is open or closedLuboš Luňák
For open shapes e.g. fill does not work. Part of bnc#780044. Change-Id: Id0ce50e94ae86c0398f06b2a67e3fd13d487ae7a
2013-05-14remove non-sensical /*static*/ commentsLuboš Luňák
They are presumably meant to say the functions are class-static, but at the function definition it's pretty confusing (looks like file-static). Change-Id: I28c69244c9eb7aa3f20f07d8784f3704dc6a57bf
2013-05-13-Werror=maybe-uninitializedStephan Bergmann
Change-Id: I320e08d7d83727a93e0644db80943bc2bb896222
2013-05-13fdo#46808, Convert some chart2 services to new styleNoel Grandin
The services already existed, they just needed IDL files Change-Id: Ia7bdae932c5fb4b47d23afd2bb0756ecc9cbf6f7
2013-05-13fdo#46808 Convert chart2::FormattedString service to new styleNoel Grandin
API CHANGE: dropped the following services from the new unified interface because the current service does not implement them. service ::com::sun::star::style::CharacterProperties; [optional] service ::com::sun::star::style::CharacterPropertiesAsian; [optional] service ::com::sun::star::style::CharacterPropertiesComplex; Change-Id: I7cb6a5d4e998975b1272f4f4da03feea30cd30b6
2013-05-11Resolves: #i119889# .pptx table vertical text directionJürgen Schmidt
Set property to cell object if the cell has vertical property. And fix in svx module by setting cell's vertical property. Patch By: companycy Found By: Shan Zu Review By: jsc (cherry picked from commit bb8bf7bde59c22776199e791b8cfcbf07992de8e) Conflicts: oox/source/drawingml/table/tablecell.cxx Change-Id: I58bb1548617c4c1e231280a405d6071ea8813039
2013-05-10Resolves: #i122208# introduce rtl::CStringHash and rtl::CStringEqualHerbert Dürr
unify the various c-string compares and hashes. (cherry picked from commit b7e3470a154538a92f0a21b14e726d75723f4a92) Conflicts: oox/inc/oox/export/shapes.hxx oox/source/export/shapes.cxx sal/inc/rtl/string.hxx sdext/source/minimizer/pppoptimizertoken.cxx svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx vcl/source/glyphs/gcach_ftyp.cxx writerfilter/source/resourcemodel/TagLogger.cxx xmloff/source/draw/EnhancedCustomShapeToken.cxx Change-Id: Ib742744077bfb4d38a462d88b44bdef45601b4ae
2013-05-09fix userform data aware control importNoel Power
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c
2013-05-08oox: fix dependencies in CustomTargetMichael Stahl
This breaks on incremental build after files have been renamed like in 38f5717b1d488b866d55a603eea1260c6203fd69, hope Windows tinderboxes are happy now. Change-Id: I292508c242f7e6da1db3693cf54ba11876ac8997
2013-05-07oox: remove Package_generated and Package_tokensMichael Stahl
Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8
2013-05-06data label export does not work with bar chartsMarkus Mohrhard
Excel just removes the chart during import. Additionally we should work on only exporting the data label information for points that really contain data labels. Change-Id: I80aef8effe27c729feb69c25c319ca129dc961a5
2013-05-06remove unnecessary explicit namespacesMarkus Mohrhard
Change-Id: Idb6bf5704a3b569ae4ae19d35526f19528ab63a6
2013-05-06map full transparent solid fill to no fill, fdo#64224Markus Mohrhard
Change-Id: I9ec33b347647bfcd6c1411c4db7af51ca597dc8e
2013-05-06let us be explicit about default valuesMarkus Mohrhard
Different MSO versions behave differently in respect to the default values. 2007 is not compliant to OOXML and is what our export filter expects, 2010+ are compliant to OOXML and therefore our charts look awful. Change-Id: If301d878a1603ed9835884cfbb9ed9c902526ba0
2013-05-05another validation error in chart OOXML exportMarkus Mohrhard
Change-Id: I2edd5cb877fdf66926483c866382480f7ae3d36f
2013-05-05respect element order in OOXML chart export, fdo#59857Markus Mohrhard
The chart part of the document passes validation now. Change-Id: I52c946c0ad399038e5f9ffff08a117f2693c55b5
2013-05-05respect element order in OOXML chart export, related fdo#59857Markus Mohrhard
Change-Id: Iecb47635cb8c854ec6c12a12f895972fcf099009
2013-05-05respect element order in OOXML export, related fdo#59857Markus Mohrhard
Change-Id: I00bb173010419a47ee30c9d6ae1173bb1ea0e370
2013-05-05overlap is only valid for the 2D bar chart, related fdo#59857Markus Mohrhard
Change-Id: Ie17ef54a2b2f2058cef97dacd9110a3065f76f68
2013-05-05respect element order in OOXML chart export, related fdo#59857Markus Mohrhard
Change-Id: Icd40ad5a1a428d6ae0d012b1896a9dd713a4e79b
2013-05-05respect order of elements in OOXML chart export, related fdo#59857Markus Mohrhard
Change-Id: I541e04d2f4a3b272894ceb67b4bd970e235b96a2
2013-05-02place ooxml shapes properly to paragraph area (part of bnc#816583)Luboš Luňák
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-05-02fdo#60549 - pptx export presentation as well as draw shape objects.Michael Meeks
Change-Id: Ibe6e0b9fa55bab7a7d02e55560c1db4c8ed84132