summaryrefslogtreecommitdiff
path: root/xmloff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-03Revert "ODF export: don't write invalid "group-name" attribute"cp-4.2-20Andras Timar2-4/+6
This reverts commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7.
2014-12-02prevent invalid ods files with loext:fill-characterMarkus Mohrhard2-4/+5
ODF specifies that extension elements in a document are removed before the validation. With our old implementation of the number format export this could result in two number:text elements following each other. According to the spec a number:text element may not follow another number:text element. The number:text element before loext:fill is actually not that interesting so it makes more sense to make this one an extension element. Possible documents showing issues: fdo45268-1.xlsx fdo49150-1.xlsx and many more Conflicts: xmloff/source/style/xmlnumfe.cxx Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0
2014-12-02ODF export: don't write invalid "group-name" attributeMichael Stahl2-6/+4
Radio buttons are grouped via their "form:name" attribute already. Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6
2014-11-29Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] propertiesCaolán McNamara1-8/+24
regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09 commit 13ef16423e78d3ea825172594f08c47d2f9bfd09 Author: Armin Le Grand <alg@apache.org> Date: Wed Nov 21 13:23:01 2012 +0000 For backward compatibility take mirrorings in setTransformation into account Also found an error in SdrObjCustomShape::TRGetBaseGeometry when MirrorY was used (cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507) Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb (cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23) Reviewed-on: https://gerrit.libreoffice.org/13149 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-08-21fdo#82165: ODF import: clear all shapes when removing header contentMichael Stahl1-2/+11
Shapes anchored to the first or last paragraph survive setString("") so need to be deleted with some ruse. (regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7) Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77 (cherry picked from commit 555c988f3b896e16afc7bdd1bd98e48229599637) Reviewed-on: https://gerrit.libreoffice.org/10895 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-26bnc#885825: Handle ODF import and export of data label border properties.Kohei Yoshida3-0/+33
(cherry picked from commit 6c2c974dd3f0b21a23bc3bc5560487d28bbe0fad) Conflicts: include/xmloff/xmltoken.hxx xmloff/source/chart/PropertyMap.hxx xmloff/source/core/xmltoken.cxx Change-Id: Ic8c7bc873768008537cd52a3fd4b11031b403139
2014-06-29fdo#80009: xmloff: ignore excessive fo:clip valuesMichael Stahl1-0/+7
These cause problems in drawinglayer, and nobody needs a 5km clip. Change-Id: Ic485250413194adbcd0ccf855f12e89e532d7120 (cherry picked from commit 924a28a7b1dc2f89e6940630057557f5f03494df) Reviewed-on: https://gerrit.libreoffice.org/9947 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-29fixes for up-casting to Reference<XInterface>Noel Grandin1-1/+1
Fix regressions introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4) Conflicts: framework/source/uifactory/menubarfactory.cxx Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687 Reviewed-on: https://gerrit.libreoffice.org/9921 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-19fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida2-2/+85
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Conflicts: xmloff/source/chart/SchXMLExport.cxx sd/source/ui/view/sdview3.cxx chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx chart2/source/controller/main/ChartTransferable.cxx chart2/source/controller/main/ChartTransferable.hxx chart2/source/model/main/Axis.cxx chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/tools/AxisHelper.cxx chart2/source/view/main/ChartView.cxx comphelper/source/container/embeddedobjectcontainer.cxx dbaccess/source/ui/browser/dbexchange.cxx dbaccess/source/ui/inc/JoinExchange.hxx dbaccess/source/ui/inc/TableRowExchange.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/querydesign/JoinExchange.cxx dbaccess/source/ui/tabledesign/TableRowExchange.cxx embeddedobj/source/commonembedding/persistence.cxx embeddedobj/source/inc/commonembobj.hxx include/comphelper/embeddedobjectcontainer.hxx include/svtools/embedtransfer.hxx include/svtools/stringtransfer.hxx include/svtools/transfer.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx include/svx/fmview.hxx include/svx/galmisc.hxx include/svx/svdobj.hxx include/svx/svdoole2.hxx include/svx/svdxcgv.hxx include/svx/view3d.hxx include/svx/xmlexchg.hxx include/xmloff/xmlexp.hxx reportdesign/source/ui/dlg/GroupExchange.cxx reportdesign/source/ui/dlg/GroupExchange.hxx reportdesign/source/ui/inc/dlgedclip.hxx reportdesign/source/ui/report/dlgedclip.cxx sc/inc/column.hxx sc/source/ui/app/drwtrans.cxx sc/source/ui/app/lnktrans.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/lnktrans.hxx sc/source/ui/inc/seltrans.hxx sc/source/ui/inc/transobj.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/view/viewfun5.cxx sc/source/ui/view/viewfun7.cxx sd/source/ui/app/sdxfer.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/inc/TabControl.hxx sd/source/ui/inc/View.hxx sd/source/ui/inc/sdtreelb.hxx sd/source/ui/inc/sdxfer.hxx sd/source/ui/view/sdview2.cxx sd/source/ui/view/tabcontr.cxx sfx2/source/doc/objxtor.cxx svtools/source/misc/embedtransfer.cxx svtools/source/misc/stringtransfer.cxx svtools/source/misc/transfer.cxx svtools/source/misc/transfer2.cxx svx/source/engine3d/view3d.cxx svx/source/fmcomp/dbaexchange.cxx svx/source/fmcomp/dbaobjectex.cxx svx/source/fmcomp/xmlexchg.cxx svx/source/form/fmexch.cxx svx/source/form/fmview.cxx svx/source/gallery2/galmisc.cxx svx/source/inc/fmexch.hxx svx/source/svdraw/svdoole2.cxx svx/source/svdraw/svdxcgv.cxx svx/source/tbxctrls/colrctrl.cxx sw/source/core/uibase/dochdl/swdtflvr.cxx sw/source/core/uibase/inc/swdtflvr.hxx sw/source/core/undo/unins.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
2014-06-12fdo#77506: More reliable way to determine label strings.Kohei Yoshida1-10/+28
Not beautiful, but doable. (cherry picked from commit a2a1a59a448420a858724371c4a339f75ebe8c1e) Conflicts: sc/source/ui/unoobj/chart2uno.cxx xmloff/source/chart/SchXMLExport.cxx Change-Id: I6f3b00d620e7d7d19cc05ec4239deeb14d0d5201
2014-06-02various situations where graphic go missing on saveOliver-Rainer Wittmann1-4/+7
Resolves: #i114361# provide and accept changed URL... of embedded graphic file during save (ODF export) (cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Conflicts: sw/inc/ndgrf.hxx Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 Resolves: #i124946# only apply new embedded stream name... for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 Resolves: #i124966# keep picture format information - <GfxLink> instance - also for the reading of preview picture data in order to avoid trouble on save in case that the preview data equals the picture data (cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366) Conflicts: svx/source/svdraw/svdograf.cxx (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d Reviewed-on: https://gerrit.libreoffice.org/9456 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-20Related: cp#1000079, i#123792 correction for comments/annotations on ...Oliver-Rainer Wittmann1-2/+2
... table cell ranges (cherry picked from commit c25523dd3a302d1bd36297a817a869afb3605d1f) Conflicts: sw/inc/IDocumentMarkAccess.hxx sw/inc/doc.hxx sw/source/core/doc/docbm.cxx sw/source/core/undo/undobj.cxx sw/source/ui/shells/textfld.cxx xmloff/source/text/txtfldi.cxx (cherry picked from commit 6af2caab7271e11d9501fd6a597e05194d33fd10) Change-Id: Ic2e12f47e7775ee16f31bedf89d5644b18734d7a
2014-05-20fdo#74524: ODF import: fix unhandled exception in annotation import cp#1000075Michael Stahl1-5/+10
Crash with unhandled UnknownPropertyException when trying to get "Name" property from a PageNumber field. (cherry picked from commit cf26d7614364176742ae0303efb4499a37ae04c8) Change-Id: I501cc138caba034c85630519014b94d783ab8f39
2014-05-11Revert "-Werror=unused-but-set-variable second try"cp-4.2-3Andras Timar1-1/+8
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
2014-05-09Revert "fdo#68663 don't blindly force categories when there are none"Andras Timar1-0/+10
This reverts commit b090cbdf82e0827234caf5969124f6631311ef35. See https://bugs.freedesktop.org/show_bug.cgi?id=72727
2014-05-09fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZLaurent Balland-Poirier1-4/+6
Old versions of OOo and AOO need a fix for Z paths. But AOO 4.0 did not fix it neither. Change-Id: I29af75035c7c059b69fcdc3a1ce27b617a30dbd1 Reviewed-on: https://gerrit.libreoffice.org/9012 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3d2a17fd2e9cde29f12268ddfccc3f5b51455722) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-05-09set graphic properties for error bars during import, fdo#78041Markus Mohrhard1-0/+15
Change-Id: I43138745b074dcacdafa090d97eeb9aa2ccecf78 Reviewed-on: https://gerrit.libreoffice.org/9233 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-04-29123792: complete annotations on text ranges featureOliver-Rainer Wittmann3-96/+69
- rely annotations on text ranges on new annotation marks - support arbitrary text ranges for annotations - fix undo/redo regarding annotations an text ranges - support annotations on overlapping text ranges - fix *.docx import for annotations on overlapping text ranges - fix ODF import of annotations on text ranges cherry-picked from branch ooxml-osba (cherry picked from commit ebd2922ebd3cf2d3899fb80780d38f367197aadf) Conflicts: sw/Library_sw.mk sw/inc/IDocumentMarkAccess.hxx sw/inc/SidebarWin.hxx sw/inc/doc.hxx sw/inc/docufld.hxx sw/inc/hintids.hxx sw/inc/ndhints.hxx sw/inc/txatbase.hxx sw/inc/unobookmark.hxx sw/inc/unofield.hxx sw/inc/unoport.hxx sw/source/core/access/accpara.cxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/docbm.cxx sw/source/core/doc/doccorr.cxx sw/source/core/doc/docdde.cxx sw/source/core/doc/docedt.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/doclay.cxx sw/source/core/doc/tblrwcl.cxx sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/nodes.cxx sw/source/core/docnode/section.cxx sw/source/core/edit/edfld.cxx sw/source/core/fields/docufld.cxx sw/source/core/fields/postithelper.cxx sw/source/core/fields/reffld.cxx sw/source/core/inc/MarkManager.hxx sw/source/core/inc/crossrefbookmark.hxx sw/source/core/text/inftxt.cxx sw/source/core/text/itratr.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/undo/undel.cxx sw/source/core/undo/undobj.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoport.cxx sw/source/core/unocore/unoportenum.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlgrin.cxx sw/source/filter/html/wrthtml.cxx sw/source/filter/writer/writer.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8par.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/dochdl/swdtflvr.cxx sw/source/ui/docvw/PostItMgr.cxx sw/source/ui/docvw/SidebarWin.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/fldui/fldref.cxx sw/source/ui/inc/fldmgr.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textfld.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/navipi.cxx sw/source/ui/wrtsh/wrtsh2.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx xmloff/inc/txtfldi.hxx xmloff/source/text/txtfldi.cxx xmloff/source/text/txtparae.cxx (cherry picked from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4) Conflicts: sw/source/core/access/accpara.cxx sw/source/core/fields/reffld.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/modeltoviewhelper.cxx sw/source/core/txtnode/thints.cxx sw/source/core/unocore/unoportenum.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: Ie4cc467dbb837054c73742262ee20f35c151ff3f
2014-04-16fdo#77027: ODF import: fix wrong version in check for embedded objectsMichael Stahl1-1/+1
SvXMLImport::LO_4x does not mean 4.0+ any more. (regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52) (cherry picked from commit 25a2eab22798373b8197f1e594568207eb7c5039) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a Reviewed-on: https://gerrit.libreoffice.org/9064 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-16ODF import: detect "LibreOfficeDev" in meta:generator tooMichael Stahl1-6/+8
(cherry picked from commit 74d7911abf77643544c58a0d3e5fb956add76c44) xmloff: we used to call it LOdev back in 4.0 so check that too (cherry picked from commit 5d53cabb52648507086a39e06803624949e4a301) Change-Id: Icea3086975dab1afedf111364683e6a7de50ce41 Reviewed-on: https://gerrit.libreoffice.org/9063 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-08accept proper number style condition != as not equal operator, fdo#76777Eike Rathke1-1/+8
ODF 1.2 specifies '!=' as not equal operator in <number:number-style> <style:map> style:condition attribute. So far '<>' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 (cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd) Reviewed-on: https://gerrit.libreoffice.org/8834 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-08fdo#76697: Remove this duplicate and use the UNO constant values instead.Kohei Yoshida1-34/+17
(cherry picked from commit 72b2fafebfc44fa90f08cc198e2fa5fc26154c5b) Conflicts: xmloff/source/style/bordrhdl.cxx This fixes the bug because in XMLBorderHdl::importXML() the value "none" was rejected as invalid because API_LINE_NONE pointlessly had a different value than BorderLineStyle::NONE. Change-Id: Id81aacc6c594ad25d97f6f6dc578ed9ca16549ab Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-03-25fix odf validation errorMarkus Mohrhard1-0/+1
This is the import only change for older release branches. New elements must not be exported into the chart namespace. Change-Id: I295d61224e255dff04ea8564b01a5a438876afc1 Reviewed-on: https://gerrit.libreoffice.org/8579 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-25fdo#75872: ODF import: fix up graphics defaults stroke/fill colorsMichael Stahl2-2/+82
These have changed a few times, notably in LO 4.0 with commit 895890563cb0cc5fa872bdfd06918a46cdda172d and AOO 4.0 with commit c0eb5e7772c848806db8ab461f77f9549c1d8b2b; unfortunately historic OOo and current AOO do not write the values into ODF files, whereas LO 4.x does (probably by accident, since 45d3577bc5726eee44f491fd30a7f11dc428431a by design). Try to set the defaults depending on the generator; since the defaults are not specified by ODF they are implementation defined anyway so this should be OK. Change-Id: I1270d6e0cdeea5cb493724a0998f661a0cf644f1 (cherry picked from commit 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52) Reviewed-on: https://gerrit.libreoffice.org/8563 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-25fix odf validation errors around new chart regression curvesMarkus Mohrhard1-8/+19
Change-Id: If67207abb204b5aca8365737088437b12ac6eaf1 Reviewed-on: https://gerrit.libreoffice.org/8523 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-03-07fdo#75260: Correctly draw double lines for both Writer and Calc.Kohei Yoshida2-20/+27
Fix all sorts of incorrect double line handling in drawinglayer in order to draw thick-thin double line types correctly. Also change handling of border lines in writer tables. There are still some outstanding issues but it's much better than how it was before. Also realized that Word and Excel handle simple thin double lines differently; Word varies widths of all of the lines and the gap whereas Excel only has one fixed size for its double line. For this reason I decided to add a separate double line type (DOUBLE_THIN) to handle Excel's double line. (cherry picked from commit 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc) Conflicts: cui/source/tabpages/border.cxx sc/qa/unit/subsequent_export-test.cxx sc/source/ui/view/tabvwsha.cxx sw/source/core/layout/paintfrm.cxx xmloff/source/style/bordrhdl.cxx Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4 Reviewed-on: https://gerrit.libreoffice.org/8464 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-09fdo#74230: ODF export: write stroke and fill color in graphic defaultsMichael Stahl1-3/+4
The pool defaults for svg:stroke-color and draw:fill-color were changed and while previously (effective, manually overridden) defaults were written into ODF files, this was lost with the change; restore that. (regression from c0eb5e7772c848806db8ab461f77f9549c1d8b2b) Change-Id: Ibcd863260976aa42116175c7f19cb33760af986f (cherry picked from commit 45d3577bc5726eee44f491fd30a7f11dc428431a) Reviewed-on: https://gerrit.libreoffice.org/7929 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-08fdo#73281: Why!?Kohei Yoshida1-1/+1
This restriction makes absolutely no sense. It was likely someone's temporarily hack that was totally forgotten in the past 10 years... Not to mention removing this fixes my bug. Change-Id: I7394cccdc9fe486fda6cdd9b7eaf98fd291895a9 (cherry picked from commit 503b7191737eafa5621dc0aa552092793676c998) Reviewed-on: https://gerrit.libreoffice.org/7942 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-27Resolves: fdo#73814 wrong name for drawing::PointSequenceSequence propertyCaolán McNamara1-4/+2
examining svx/source/unodraw/unoprov.cxx "Geometry" is a indeed a drawing::PolyPolygonBezierCoords for the BezierShapes and a drawing::PointSequenceSequence for the PolyShapes regression since e44335abe006d05f0f915279605a03ef084116d6 because after 223f6b631c1b087754c0f9051fb55f029f2503ce we started getting drawing::PointSequenceSequences in maPath which is the wrong type for the argument to property "PolyPolygonBezier" for those shapes. Which led me to incorrectly assume that the all PolyPolygonBezier properties were named "PolyPolygonBezier" which isn't the case. so reverting the non maPath hunks of e44335abe006d05f0f915279605a03ef084116d6 Change-Id: I013a66778d11a472fc4567e53a9e17e73e2b91ce (cherry picked from commit df2ad69d5df350636c1eb1772b16a2e203a88fa7) Reviewed-on: https://gerrit.libreoffice.org/7685 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-24Resolves: fdo#73355 reconcile legacy path bug detectionCaolán McNamara4-5/+21
reconcile "223f6b631c1b087754c0f9051fb55f029f2503ce Resolves: #i123433# Detect pseudo-vertices at svg import..." with "7a19798c73fd39d8d69ff6364f0696e68cdd1381" Compatibility option for incorrect relative moves after closePath (fdo#47406) and "a2ee8055e9c136923f0244fe289cac6377933c31" Fix fdo#47406 incorrect relative moves after closePath Change-Id: I1221099a40500aeb4165a3350d8ae2df1fd3111b (cherry picked from commit b663316e83ec6b19b8fc33ade38086b22ab04b67) Reviewed-on: https://gerrit.libreoffice.org/7628 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-12-20prepare to accept loext:contextual-spacing, fdo#58112Eike Rathke1-1/+7
Change-Id: I58e151743bf910b8b51f1b453e0bfcb4ed767d9d (cherry picked from commit ef5e7b69440baa9f222d1ec870668d31d08268f0)
2013-12-20added bool bForExport parameter to XMLPropertySetMapper ctorEike Rathke21-63/+84
Set to true for export, false for import. If export true, an XMLPropertyMapEntry with mbImportOnly==true is not added to the mappings. This to be able to have more than one mappings for import (for example a current extension namespace and the future namespace proposed to the ODF-TC, or corrected typos in element or attribute names), but map only to one entry on export, of course. Change-Id: Ia01ea949c88eda2f8a6c10f51c59e35e7abdcaf3 (cherry picked from commit ebc1b2fe50c7ed1002ed8431410b8e2ac6e795b9)
2013-12-20prepared XMLPropertyMapEntry with mbImportOnly flagEike Rathke7-29/+31
Change-Id: Id5a54a591a42c836884af1fd09dc055f2fce6db5 (cherry picked from commit 9dd7ee88bd9835ae2bae36093100fcd651fd3aeb)
2013-12-20reordered member variables for 4 byte alignmentEike Rathke1-2/+2
Change-Id: Iaae7689d1ed3c74e261fcc90fa88b5521468e376 (cherry picked from commit dd902b8e256867b5d5fed06b52995f14d969f67d)
2013-12-19Backport Calc's data stream massive cleanup effort.Kohei Yoshida1-0/+3
Change-Id: Ifbeb7c2d90d87a7cffe9a752f9e8b4910d55fcd9
2013-12-18fdo#72850: ODF export: don't export spurious style:display="false"Michael Stahl2-12/+13
... on style:header-left, style:header-first, style:footer-left, style:footer-first. (regression from d92345561c998f7382cf9ef0fdcd29096f978435) Change-Id: I48c51fcd2b07ae8b0e3ec2c1087a388c6900b366 (cherry picked from commit 8f73c7615ebe60ef71d6e8b49a0f19ddac6f03a0)
2013-12-18fdo#72452: ODF import/export: fix handling of style:page-numberMichael Stahl2-4/+5
Class XMLNumberWithAutoInsteadZeroPropHdl (which appears to be used only for this attribute) needs to be adapted to the change that "PageNumberOffset" value 0 is no longer invalid; use "void" value for invalid instead, which appears more appropriate anyway. Unfortunately the type of style:page-number is positiveInteger so writing 0 would be invalid; write "auto" instead for now. Change-Id: I9621ea201fd928087b863c562607c3d77a3b0269 (cherry picked from commit 22355042a6fc7aecf3caab69b3fa3be1430b697f)
2013-12-14fdo#72697 actually write this only in ODF 1.2 extendedEike Rathke1-11/+27
(cherry picked from commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8) Conflicts: xmloff/source/text/txtflde.cxx Change-Id: I32097cc4b8a67615b0b6d6172cafd0edad7469b6
2013-12-13fdo#72697 accept future <loext:sender-initials>Eike Rathke2-2/+3
... of to-be <text:sender-initials> Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5 (cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
2013-12-10sax, xmloff: fix ODF import/export of text:time/text:time-valueMichael Stahl3-5/+27
The value written for an Impress time field is something like text:time-value="0000-00-00T23:28:07" (in LO 3.5+) or text:time-value="0-00-00T23:28:07" (in OOo 3.3) which contains an invalid all-zero date. Such values are actually rejected by the ODF import since commit ae3e2f170045a1525f67e9f3e9b7e03d94f2b56b. Actually there was no real support to read the RelaxNG type timeOrDateTime before. So fix that by: - adding convertTimeOrDateTime/parseTimeOrDateTime functions to sax::Converter - recognizing and ignoring the 2 invalid all-zero values written by LO 3.5 and historic OOo respectively - writing a bare "time" in text:time-value if the DateTime struct contains zero Date members (Older OOo versions and AOO cannot actually read that, but everything they _can_ read is invalid ODF...) Change-Id: I754076caee74a5163ed3f972af0f23796aa14f9f (cherry picked from commit cc407e50e8a1a74f9d1ed29d444dce9bd2e9167a)
2013-12-09resolved fdo#72537 write <loext:fill-character>Eike Rathke2-2/+3
... instead of <number:fill-character> but read both. Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3 (cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df)
2013-12-09fix equalsAscii conversion. Noticed in fdo#72391Noel Grandin4-36/+35
In commit 363cc397172f2b0a94d9c4dc44fc8d95072795a3 "convert equalsAsciiL calls to startWith calls where possible" I incorrectly converted equalsAsciiL calls to startsWith calls. This commit fixes those places to use the == OUString operator. Change-Id: If76993baf73e3d8fb3bbcf6e8314e59fdc1207b6 Reviewed-on: https://gerrit.libreoffice.org/7008 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-03Support regression curve name in ODF.Tomaž Vajngerl2-0/+2
Change-Id: Ic065d63eee507906febfa15eb6d5ae1e7de58280 Reviewed-on: https://gerrit.libreoffice.org/6874 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-02fdo#71450 fdo#71698: ODF import: fix frame name corner casesMichael Stahl1-2/+10
Trying to set a name that is already in use will throw an exception (and set a different, generated name); if there is actually no name in the file then there's no point trying to set anything. (regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35) Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea (cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071)
2013-11-20avmedia: Implement "block untrusted referer links" featureStephan Bergmann1-1/+3
See f0a9ca24fd4bf79cac908bf0d6fdb8905dc504db "rhbz#887420 Implement 'block untrusted referer links' feature" for details. This adds some further /*TODO?*/ comments, and one known problem (marked /*TODO!*/) is that movies/sounds are not blocked during a slideshow presentation. Change-Id: Ib2d0c7e4f7b02c4bdec0d8a90cee5e7e1bee8325
2013-11-19convert equalsAsciiL calls to startWith calls where possibleNoel Grandin4-39/+35
Simplify code like: aStr.equalsAsciiL( "%", 1 ) to aStr.startsWith( "%" ) Change-Id: Iee0e4e60b0ae6d567fa8f72db5d616fffbec3c00
2013-11-19remove unnecessary use of OUString constructor when assigningNoel Grandin11-57/+56
change code like aStr = OUString("xxxx"); to aStr = "xxxx"; Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
2013-11-15Resolves: fdo#62461 put preferred image firstCaolán McNamara2-43/+52
with fallback after. "Each child element of a frame is a different representation of the same content. The order of content elements reflects the document author's preference for rendering, with the first child element being preferred. That means that consumers should render the first child element that they support. A frame may contain multiple content elements, but shall contain at least one content element." Change-Id: If50062cad58f5b8561ad6bd8dc1a06956d2f444b
2013-11-14SAL_WARN_UNUSED com::sun::star::uno::AnyStephan Bergmann4-7/+0
Change-Id: I9058044d13f696e07667dce706f6c311af6dbea0
2013-11-14rhbz#887420 Implement "block untrusted referer links" featureStephan Bergmann2-1/+10
For now, this checks for a trusted referer (if the BlockUntrustedRefererLinks configuration prop is set) in utl::MediaDescriptor::impl_openStreamWithURL and SvxBrushItem::GetGraphicObject. Checking in additional places will probably be necessary to block /all/ unwanted communication. Also, some places marked /*TODO?*/ currently pass in an empty referer (which is always considered trusted) and will probably need to be adapted. Ideally, Referer URIs would never be empty (and consistently use something like <private:user> for cases where access is explicitly initiated by the user and should never be blocked), but that's a very daunting task, so start small by identifying the places that potentially need blocking and adding appropriate Referer URIs there. Also, Referer information should always be computed as freshly as possible from the context in which an access attempt is made, but, again, always carrying the information from the context all the way to the relevant functions is a very daunting task, so for now store the information upon object instantiation in some cases (SvxBrushItem, SdrGrafObj, ...). The Referer URI (css.document.MediaDescriptor property; SID_REFERER) was already used to track macro execution, and there is one place in SfxApplication::OpenDocExec_Impl where opening of hyperlinks (explicitly clicked by the user) is done that needs the current document's URI as Referer to check execution of macro URIs but needs an empty (or <private:user>, see above) Referer to not block non-macro URIs. Special code has been added there to handle that. Change-Id: Iafbdc07a9fe925d9ee580d4f5778448f18f2ebd9
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 05:58:11 +0000