Commit Graph

1383 Commits

Author SHA1 Message Date
426077fbea fdo#77027: add some comments to prevent such oversights
Change-Id: I381c9738bba3e422e01324fa0c781c857db3d360
2014-04-16 12:47:43 +02:00
25a2eab227 fdo#77027: ODF import: fix wrong version in check for embedded objects
SvXMLImport::LO_4x does not mean 4.0+ any more.

(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)

Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
2014-04-16 00:33:22 +02:00
8a81f542a6 xmloff: sal_Bool->bool
Change-Id: I873c80baec8e70e3e8f642644563b92137571a30
2014-04-15 09:02:31 +02:00
b8239ac2f9 typo: noone -> no one 2014-04-14 12:32:54 +02:00
9c51f5b806 Clean up function declarations and some unused functions
Change-Id: I2ca50a15209503020047975ac848df98b74089af
2014-04-09 12:04:12 +02:00
0586bdc748 coverity#704111: Unchecked return value
Change-Id: Ida3a1b2804f655b39378f79e10872dcac4e70cf1
2014-04-06 13:11:30 -05:00
d14f701bba glTF ODF export: use mimetype to decide about file type
Change-Id: Ib1837bdc7468fb19f55a38f6875e026eea8d3b24
2014-04-04 19:06:12 +02:00
8416261a8b Use stored mime type for stream creation
Change-Id: Iecc50f7964fa63ae028e2fb21d022de1f060c7a7
2014-04-04 19:06:11 +02:00
f470f3c72e Introduce a new media shape property to handle mime type
Default mime-type for all media objects:
"application/vnd.sun.star.media"
The problem of missing mime-type detection
still exists. For now only glTF model has
a concrete type.

Change-Id: I4dca26c1c47a564579bbed926bffa3aa5eda6c04
2014-04-04 19:06:11 +02:00
e341ea3863 ODF import of glTF 3D models
Change-Id: I42f7bc63c1f75592ab628407b40d40536e58f18c
2014-04-02 12:15:51 +02:00
f388519b2c ODF export of glTF 3D models
Change-Id: Iea06ea7359b859144df338e1e22675e05bf4a2d7
2014-04-02 12:15:50 +02:00
362d4f0cd4 Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."

Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
2014-04-01 19:22:54 +02:00
0f912872b6 xmloff: sal_Bool->bool
Change-Id: Id3d8f4f4ef32280a131907ffa32eb2ad5d6ea2e1
2014-03-31 12:39:03 +02:00
0e8ab0fa29 xmloff: sal_Bool->bool
Change-Id: Ib4a73215187923dccd72fc7793ffd4bcbef24ab9
2014-03-31 12:39:02 +02:00
6ac6fb820f xmloff: sal_Bool->bool
Change-Id: I64c33ae4c157e270acac9a1f820d3e6272ba0bea
2014-03-31 12:39:02 +02:00
ba6cfaaa6b xmloff: sal_Bool->bool
Change-Id: Idc7b0ef2591e65e82903d55af68434acbeca0e55
2014-03-31 12:37:25 +02:00
c98a7eec7f xmloff: sal_Bool->bool
Change-Id: I1c97da5b7bbac348150399afbf386613433e5551
2014-03-31 12:37:25 +02:00
ddb07081da xmloff: sal_Bool->bool
Change-Id: I1deb10cb1581137ab92e73367e63339822a9a094
2014-03-31 12:36:54 +02:00
ee1de94276 typo: persistance -> persistence 2014-03-29 19:16:18 +01:00
6e61ecd096 Merge back branch alg_writerframes to trunk
(cherry picked from commit b635b4fa4e42053d30ab639643d2236a20243f62)

Conflicts:
	comphelper/inc/comphelper/TypeGeneration.hxx
	comphelper/source/property/TypeGeneration.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/tabarea.cxx
	cui/source/tabpages/tabarea.hrc
	cui/source/tabpages/tabarea.src
	cui/source/tabpages/tparea.cxx
	drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	drawinglayer/source/texture/texture.cxx
	editeng/inc/editeng/unotext.hxx
	editeng/source/items/frmitems.cxx
	include/drawinglayer/texture/texture.hxx
	include/editeng/brushitem.hxx
	include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
	include/svx/svxids.hrc
	include/xmloff/xmltypes.hxx
	reportdesign/source/ui/misc/UITools.cxx
	sc/source/ui/drawfunc/drawsh.cxx
	sfx2/source/dialog/tabdlg.cxx
	svl/source/undo/undo.cxx
	svx/inc/svx/unoshprp.hxx
	sw/Library_sw.mk
	sw/inc/doc.hxx
	sw/inc/format.hxx
	sw/inc/frmfmt.hxx
	sw/inc/swatrset.hxx
	sw/inc/unomap.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/access/accpara.cxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/swatrset.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfly.cxx
	sw/source/core/doc/notxtfrm.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/porfld.cxx
	sw/source/core/text/txtfly.cxx
	sw/source/core/txtnode/fntcache.cxx
	sw/source/core/uibase/app/docst.cxx
	sw/source/core/uibase/app/docstyle.cxx
	sw/source/core/uibase/shells/drawdlg.cxx
	sw/source/core/uibase/shells/frmsh.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/fmtui/tmpdlg.src
	sw/source/ui/frmdlg/frmdlg.cxx
	sw/source/ui/frmdlg/frmpage.src
	sw/source/ui/inc/frmsh.hxx
	xmloff/source/text/txtprhdl.cxx
	xmloff/source/text/txtprmap.cxx

Change-Id: Id3ffaa83bb5594d287f1ac8f2c1c9cf55c70946d
2014-03-28 14:31:08 +01:00
70cc2b191b First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
2014-03-26 16:39:26 +01:00
5fb78604c1 Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
2014-03-26 11:54:55 +01:00
cd8c774030 Simplify by choosing shape kind in SvXMLElementExport constructor
Change-Id: I6d8e1e3c78675b6096f354cace3ff060801cad9e
2014-03-25 09:08:14 +01:00
b45270bbfe coverity#705095 Unchecked dynamic_cast
Change-Id: Ia8291acbba50c492568b11e1eb852e7b84885633
2014-03-21 11:13:55 +00:00
c6e316f520 Resolves: #i124452# correct svg:viewBox for EnhancedCustomShape...
geometry import when no width and no height are given

(cherry picked from commit 4e04ad3623f2ab4693dcd50a9934fc836e190a6f)

Conflicts:
	xmloff/source/draw/ximpcustomshape.cxx

Change-Id: I2589fd28dcbdf767d324f84e0a2342370ad6f061
2014-03-20 14:40:31 +00:00
92cb21ebed fdo#75872: ODF import: fix up graphics defaults stroke/fill colors
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
2014-03-12 23:55:29 +01:00
f8c8d61313 coverity#736008 Dereference after null check
Change-Id: I87977322458b6f22816bdfefb44795609c8159a4
2014-03-10 11:36:30 +00:00
7211162081 Clean up uses of rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength
Change-Id: Ie37614dac882bfe05f8ce595ae6b20326dce872e
2014-03-01 19:28:14 +01:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
e23ea87cb3 Remove visual noise from xmloff
Change-Id: I205d4e555f5b88654a90007eb7ac05bc7b00a904
Reviewed-on: https://gerrit.libreoffice.org/8346
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-26 04:32:34 -06:00
d5c59404be Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I773524536c0ed7bc34eb08cd35cfc77e83f722ba
2014-02-26 17:21:20 +09:00
4da81e4a0b xmloff: import style:rel-width/height for drawinglayer shapes
In case the underlying UNO object supports that, which is the case for
Writer. Export was already working before.

Change-Id: I4676c8349ebe1959da004d6e1a024a342da45049
2014-02-25 12:11:41 +01:00
b7259532d8 Remove unnecessary bool2any
Change-Id: Ie2caee1d5a7912011d76172539c2f8f37eaee5cf
2014-02-24 08:08:00 +01:00
f65b691d98 coverity#708702 Uninitialized scalar field
Change-Id: I89bab63349a5d89df0683eb36c3e69b6370e2ed1
2014-02-21 12:40:35 +00:00
94c87ec911 coverity#708704 Uninitialized scalar field
Change-Id: I135988584eb00e891bbc6410f3cf80f955f046ec
2014-02-21 12:40:35 +00:00
25f5b28f27 coverity#708705 Uninitialized scalar field
Change-Id: If48058d1f5cfb1c91c996f2921381b9c74aca04e
2014-02-21 12:40:35 +00:00
04a8c9eef4 coverity#708707 Uninitialized scalar field
Change-Id: I36432d090334440b596dfcc56339f10cb0b96426
2014-02-21 12:40:34 +00:00
b81e528803 coverity#708708 Uninitialized scalar field
Change-Id: I1b0f4ed24dd6c1281f2170e5b1199435ce1409f5
2014-02-21 12:40:34 +00:00
05f742d28b comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
2014-02-17 17:55:19 +01:00
a519296007 Resolves: #i42894# added support for <presentation:animations>...
at import and creation

(cherry picked from commit 0f11a9d487744af6c50e9f1d547c22cd4bdeab48)

Conflicts:
	sd/source/core/EffectMigration.cxx
	sd/source/ui/dlg/animobjs.cxx
	sd/source/ui/unoidl/unoobj.cxx

Change-Id: Ib498bf718d40501cbab71a700342343df68a6ee9
2014-02-17 10:53:36 +00:00
8b34d05cb1 sal_Bool->bool
Change-Id: Iab0165ef642dfee5bd315fc1f42f4bad8e86aa47
2014-02-14 14:15:15 +02:00
f44024d1a0 sal_Bool->bool
Change-Id: Iadc9f9ef444fe36d58304c2d6219021173385118
2014-02-14 14:15:15 +02:00
17bb5abb6e Resolves: #i123879 dr3d rotation angle is degree in ODF1.2...
but radiant in AOO core

(cherry picked from commit 23b2b0b395537f4b5d0226f9ebb19dc38029ee55)

Conflicts:
	xmloff/source/draw/xexptran.cxx

Change-Id: I66cd482b2b237ca008c31b7738f9ea21502f3d45
2014-02-13 14:56:16 +00:00
746028f5c5 cid#705343 missing break in switch
Change-Id: I0fe11a71223c15937917a1a06a9078e856f0f67f
2014-02-12 08:59:08 +02:00
742d398731 cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: I34446102091ef8be72d5aec603740db531fdd14b
2014-02-09 10:01:00 +01:00
45d3577bc5 fdo#74230: ODF export: write stroke and fill color in graphic defaults
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
2014-02-07 18:56:39 +01:00
258e6f93e8 Resolves: #i124143# for draw:frame containing multiple draw:image...
and draw:glue-point it is necessary to move the GluePoints from the last
draw:image where they were automatically imported to the surviving one if these
are different

(cherry picked from commit c011af1087411a9bacd29cd479c807e698b2e92c)

Conflicts:
	xmloff/inc/xmloff/xmlictxt.hxx
	xmloff/source/core/xmlmultiimagehelper.cxx
	xmloff/source/draw/ximpshap.cxx
	xmloff/source/draw/ximpshap.hxx

Change-Id: I8f6c875767e9cbfee74838742401356df002b051
2014-02-05 11:36:35 +00:00
fa189d7447 bool improvements
Change-Id: I238ab0ebe54cc804c85356a3de9fbdcc396057d3
2014-01-28 20:26:18 +01:00
df2ad69d5d Resolves: fdo#73814 wrong name for drawing::PointSequenceSequence property
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
2014-01-27 11:14:36 +00:00
b663316e83 Resolves: fdo#73355 reconcile legacy path bug detection
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
2014-01-24 12:56:09 +00:00