summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2013-09-18Avoid 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 (cherry picked from commit 3750deae3e2d8fcf8bcf795fe327e1da370a2c4d) Reviewed-on: https://gerrit.libreoffice.org/5974 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-09-09bnc#779642 VML import: groupshape-related fixesMiklos Vajna3-0/+45
1) fix TextHorizontalAdjust when layout-flow is vertical 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). 2) import result of sdt fields We can't have e.g. placeholder fields on drawinglayer rectangles, but at least the result of the field is now imported. 3) handle drawinglayer rectangle inset 4) handle drawinglayer rectangle char spacing (cherry picked from commits b10afb26296e33c77e94a6eda3f2c36c4d34c2aa, 3847de4b724f4f435bb68bceef9a5e187c3f363c, 870a2394a87c77740daf41e1aa81b130113f8e00 and 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7) Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a Reviewed-on: https://gerrit.libreoffice.org/5847 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06n#779642: 0 width or height in //v:shape[@style] produces weird resultsCédric Bosdonnat1-2/+9
(cherry picked from commit 3d5fb88cc0aa8ee6be6cec5ce0255f1412368519) Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-08-05bnc#593612: workaround for grpFillFelix Zhang1-3/+2
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-07-15API change: oslDateTime signed yearLionel Elie Mamane1-1/+1
to match the rest of our date-related data structures, which were recently switched to signed year. Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41 Reviewed-on: https://gerrit.libreoffice.org/4735 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl1-1/+3
Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c) i#108348: fix TimeZone -> Timezone in struct names (cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu> Signed-off-by: Michael Meeks <michael.meeks@suse.com> Conflicts: forms/source/xforms/convert.cxx offapi/type_reference/offapi.rdb reportdesign/source/core/sdr/RptObject.cxx sc/source/filter/oox/unitconverter.cxx
2013-07-05fixup nanosecond precisionLionel Elie Mamane1-1/+1
oox/source/docprop/docprophandler.cxx: DateTime used to take centiseconds, now it is nanoseconds. basic/source/runtime/methods.cxx: This was broken before... Time used to take centiseconds, so the nanoseconds should have been *divided* by 10^7 for conversion. Now Time takes straight nanoseconds, so no conversion necessary. Change-Id: Ia33b811d56fe5ad5e7e844b3e1c1c25ece0b5396 Reviewed-on: https://gerrit.libreoffice.org/4734 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-04bnc#820504 VML import: don't anchor shapes TO_PAGEMiklos Vajna1-12/+2
In theory, this is a problem because Word formats only support AT_CHAR and AS_CHAR, so importing something as AT_PAGE is buggy. In practice, this also leads to unvisible shapes, since f0d001a378c64ea457e722266e60c96522c72e9b. Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237 (cherry picked from commit f5b7acac624f07fa95835b6054b8d295901bb1dd) Reviewed-on: https://gerrit.libreoffice.org/4716 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-02fdo#46361 oox: fixes for the VML import of groupshape textboxesMiklos Vajna4-10/+80
(cherry picked from commits b1f78c44c1acc246f06a963383232c9bf649a06b, f24e4c74d7d6a7d95090c6fa6a584fed7787706c, 6bf79576aeca243db553ed3b5eade492dc35337b, 5a737fca37cd5a5f90aa03a30688d447677d3b8a, ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433 and 2a2105b002c482e6536d5c3046c9e7783c0cdca3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ie7ce4fb5c32ff4b3c1f3d7ee92d8358ae67fc6c1 Reviewed-on: https://gerrit.libreoffice.org/4675 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28n#820504: start a new subpath with m and t in VML path decodingCédric Bosdonnat1-1/+11
Change-Id: I7bac4b111ede5e815d2ed121c18f4cfe1ad0950e (cherry picked from commit 8d6eb11d6965ee93e72513f5e01b67f598edf6c3) (cherry picked from commit ff28c7b26b097a3213766cf2ba6f36a4b77b185f) Reviewed-on: https://gerrit.libreoffice.org/4587 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28Forgot to remove one case where nParamCount is set to twice the valueCédric Bosdonnat1-1/+1
Change-Id: I3649364a889b7ef6ce7ac4316a1621b6328170eb (cherry picked from commit 7f7a1294e2d0da30a58d897558a18a13dbc5e690) (cherry picked from commit 696b9b1ce2b7ffa60ba80d6cfaef8a61711fd28f) Reviewed-on: https://gerrit.libreoffice.org/4586 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28n#820504: VML path import fixes: get back missing pointsCédric Bosdonnat2-11/+11
nParamsCount was set to the double of the expected value, but the code handling the command only took the first set of parameters. Removing this 2* in nParamsCount. (cherry picked from commit 442ad6eef9d6e1588e4985e97ec3eafd6289f9ae) (cherry picked from commit 10cd569334971949b82bbccfd7a29334e374cc47) Conflicts: oox/source/vml/vmlformatting.cxx Change-Id: I2a4bb07fc9167e056a52c7adfbee9e1ef8e2636c Reviewed-on: https://gerrit.libreoffice.org/4585 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28n#820504: Some imported VML paths are closed, try to detect theCédric Bosdonnat1-1/+8
(cherry picked from commit 08db0b22bdce0f779e4af01a209aef1be29e9907) (cherry picked from commit b516a9b69119b25df8f973b6318f2ae1c7e601df) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: Idefd0277a85bd7b2b727f59cc4e568869b4932a1 Reviewed-on: https://gerrit.libreoffice.org/4584 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#43641 oox: fix position/size of LineShapes inside lockedCanvasMiklos Vajna3-1/+25
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc (cherry picked from commit 6ada1ddecd98a616114cb36651c0f0f48c6dd3c3) Reviewed-on: https://gerrit.libreoffice.org/4423 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#43641 oox: initial import of lc:lockedCanvasMiklos Vajna5-1/+145
If that canvas contains a single shape, the result looks OK. If it contains a groupshape, we also import something, but then the position / size is still to be improved. Change-Id: Ic4e4c08016a05a5e3acb005c3a642981ba4fb16d (cherry picked from commit a9966b272151fa66c4a7c74bcb2505ef2ea94a6e) Reviewed-on: https://gerrit.libreoffice.org/4422 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#43641 oox: add support for the lockedCanvas namespaceMiklos Vajna2-0/+2
The plan is that once these are here, the writerfilter ooxml tokenizer can refer to them. And then the writerfilter will call back to oox to do the real drawingml import. Change-Id: Ibc0d9838f3db717004a3bc8b80a408a39c8f0886 (cherry picked from commit 32b93c5c4f0663eefd1e1979875f8af659c463df) Reviewed-on: https://gerrit.libreoffice.org/4420 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-15Revert "enc foo", totally not supposed to be pushedCaolán McNamara1-295/+20
This reverts commit 56a3a2b253552826a6b5cc13500df739d3875974.
2013-06-14enc fooCaolán McNamara1-20/+295
Change-Id: Idae2ae3f04f36504d5c15f980c251461b383064e
2013-06-13Revert "bnc#819614: Fix runaway lines."Jan Holesovsky1-3/+2
This reverts commit 5fe65c0c5e5a8d815d9d15ef192e7652726662e6. Unfortunately this causes a regression elsewhere. This also disables the unit test for this bug - will re-enable when I find a fix that both fixes this, and does not regress other stuff :-) Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125
2013-06-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna1-0/+4
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a (cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
2013-06-06Don't merge this fileXisco Fauli1-83/+0
Change-Id: I5efca8bf4969252198e06ac3309064e8d69c0e55 (cherry picked from commit 355329a3cdbd8e4f2b7c6032ba0538a9a2a13d86)
2013-06-06Fix issue #i120723#: Table style is lost when import PPTX by AOOZhe Wang2-2/+227
* 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 (cherry picked from commit f39f7ba614749d99362a2059919521eee6bdb6fc)
2013-06-03Fixing crash with dereferencing front() and back() of an empty vectorFridrich Štrba1-1/+2
Change-Id: If7204614aa7a650f4a2804fc63dd3301ece2281e (cherry picked from commit f5d6e7af69f6b8972bd97d1d8e2a6d9ec5a6294a)
2013-05-30bnc#817956 VML import of mso-position-vertical-relative:marginMiklos Vajna1-0/+4
Change-Id: I86464c44022ef8c8a8037d4228bb2a6409fc77af (cherry picked from commit f2720b87093968670e3fb47d24d4952f1631a654)
2013-05-30bnc#817956 fix VML import of rotationMiklos Vajna1-2/+10
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 (cherry picked from commit b2c16f6c1b8bd3c96e0549eb3036c820094a795f)
2013-05-30bnc#817956 VML import of v:textpathMiklos Vajna3-0/+60
Word exposes this as Watermark in its UI. Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81 (cherry picked from commit 290695c785ef831abb6e78cd3675bc071f05f643)
2013-05-30Fix tinderbox failures due to missing includeFridrich Štrba1-0/+1
Change-Id: Ied4c829bbe3038e483524669a85a0a7eaa055eb9 (cherry picked from commit 319ac1fded32875416c668b51e6566ecacd1c0e1)
2013-05-30Fix crash with fdo60063-1.docxFridrich Štrba1-28/+12
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> (cherry picked from commit b2f97d77237cde249b4c40acc8ad3f7f8755e768)
2013-05-27x86 register vs memory accuracy double pitaCaolán McNamara1-2/+4
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 (cherry picked from commit 34c2e8845804921c027ed66884fdf7c31f75fd87)
2013-05-27respect element order in OOXML chart export, related fdo#63114Markus Mohrhard1-3/+3
Change-Id: I591a63c38ab18b03a2f86428defbdac0cb96a1c0 (cherry picked from commit 54fbbc20b8397a8362f5a0878744c3a082464713)
2013-05-23bnc#820786: Best effort mapping of the OOXML patterns to our hatches.Jan Holesovsky3-8/+90
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-23Revert "fdo#46808, Convert chart2::Title service to new style"Stephan Bergmann2-6/+7
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 (cherry picked from commit f30399c540f01f16f097b86ff518251324d558d7) Conflicts: sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7
2013-05-21fdo#46808, Convert chart2::Title service to new styleNoel Grandin2-7/+6
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 Grandin1-5/+8
Change-Id: I93294be4c822160e609ae6aab552edd64478e34b
2013-05-19WaE on mac osx buildNorbert Thiebaud1-1/+1
Change-Id: Ief28d2563b66754d00fdc09d6d68ea3a73aff22a
2013-05-16bnc#819614: Fix runaway lines.Jan Holesovsky1-2/+3
Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07
2013-05-16Fix length check - it would be out of bounds.Jan Holesovsky1-2/+1
Change-Id: I5430fed06ea1a81a68ddfaafa595d7d5b0167f3b
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-05-15Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.Thorsten Behrens1-2/+5
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ňák1-2/+13
For open shapes e.g. fill does not work. Part of bnc#780044. Change-Id: Id0ce50e94ae86c0398f06b2a67e3fd13d487ae7a
2013-05-14remove non-sensical /*static*/ commentsLuboš Luňák11-23/+23
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 Bergmann2-3/+3
Change-Id: I320e08d7d83727a93e0644db80943bc2bb896222
2013-05-13fdo#46808, Convert some chart2 services to new styleNoel Grandin1-9/+11
The services already existed, they just needed IDL files Change-Id: Ia7bdae932c5fb4b47d23afd2bb0756ecc9cbf6f7
2013-05-13fdo#46808 Convert chart2::FormattedString service to new styleNoel Grandin1-3/+3
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 Schmidt1-0/+6
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ürr1-18/+2
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 Power1-0/+1
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c
2013-05-08oox: fix dependencies in CustomTargetMichael Stahl1-5/+3
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 Stahl5-40/+1
Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8
2013-05-06data label export does not work with bar chartsMarkus Mohrhard1-1/+1
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 10:17:13 +0000