7121 Commits

Author SHA1 Message Date
Stephan Bergmann
b398f81576 -Werror,-Wtautological-constant-out-of-range-compare
Looks like 7d9bb549d498d6beed2c4050c402d09643febdfa "Related: #i124638# Second
step of DrawingLayer FillAttributes..." accidentally garbled this.

Change-Id: I4cdaad4fdebb8b9947e79afbec4a6e0973c55cac
2014-07-01 13:58:25 +02:00
Armin Le Grand
5f0d957ac6 Resolves: #i125045# For XMLPropertyMapper using TEXT_PROP_MAP_SHAPE_PARA...
hide the DrawingLayer FillStyle entries by moving them to the front of
aXMLParaPropMap and using a higher index for construction

(cherry picked from commit 35f3ceaf60f109f45aa7fef7077aead398bed53f)

Change-Id: I8244e4dc685a2aa35e4154a43455ff62c8ee58fe
2014-07-01 13:30:10 +02:00
Armin Le Grand
7d9bb549d4 Related: #i124638# Second step of DrawingLayer FillAttributes...
for Writer objects, now added support for Paragraph and PageStyle (including
Header and Footer) for direct attributes and style attributes

(cherry picked from commit cc25c58f7052827bfebdc9fbeec668c8fa29ed1b)

Conflicts:
	cui/source/factory/dlgfact.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cuires.hrc
	cui/source/tabpages/bbdlg.cxx
	cui/source/tabpages/bbdlg.src
	cui/source/tabpages/page.cxx
	cui/source/tabpages/tparea.cxx
	include/svx/pagectrl.hxx
	include/svx/svxdlg.hxx
	include/svx/svxids.hrc
	include/xmloff/PageMasterStyleMap.hxx
	include/xmloff/prstylei.hxx
	include/xmloff/txtprmap.hxx
	svx/Package_inc.mk
	svx/inc/svx/hdft.hxx
	svx/source/dialog/hdft.cxx
	svx/source/dialog/pagectrl.cxx
	svx/source/tbxctrls/tbxcolorupdate.cxx
	svx/source/unodraw/unobrushitemhelper.cxx
	sw/Library_sw.mk
	sw/inc/fillattributes.hxx
	sw/inc/format.hxx
	sw/inc/frmatr.hxx
	sw/inc/frmfmt.hxx
	sw/inc/hintids.hxx
	sw/inc/hints.hxx
	sw/inc/ndtxt.hxx
	sw/inc/node.hxx
	sw/inc/swunohelper.hxx
	sw/inc/unobrushitemhelper.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/attr/format.cxx
	sw/source/core/attr/hints.cxx
	sw/source/core/doc/docdesc.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/docredln.cxx
	sw/source/core/doc/poolfmt.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/docnode/node.cxx
	sw/source/core/inc/frame.hxx
	sw/source/core/inc/frmtool.hxx
	sw/source/core/inc/rolbck.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/fillattributes.cxx
	sw/source/core/layout/findfrm.cxx
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtedt.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/unocore/swunohelper.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/ui/chrdlg/paradlg.src
	sw/source/ui/chrdlg/pardlg.cxx
	sw/source/ui/fmtui/tmpdlg.cxx
	sw/source/ui/fmtui/tmpdlg.src
	sw/source/uibase/app/docst.cxx
	sw/source/uibase/app/docstyle.cxx
	sw/source/uibase/frmdlg/colex.cxx
	sw/source/uibase/shells/basesh.cxx
	sw/source/uibase/shells/textsh1.cxx
	sw/source/uibase/uiview/viewstat.cxx
	sw/source/uibase/utlui/uitool.cxx
	xmloff/inc/PageMasterImportContext.hxx
	xmloff/inc/xmloff/XMLShapeStyleContext.hxx
	xmloff/source/draw/XMLShapeStyleContext.cxx
	xmloff/source/draw/sdpropls.hxx
	xmloff/source/style/PageMasterExportPropMapper.cxx
	xmloff/source/style/PageMasterImportContext.cxx
	xmloff/source/style/PageMasterPropHdlFactory.cxx
	xmloff/source/style/PageMasterStyleMap.cxx
	xmloff/source/style/prstylei.cxx
	xmloff/source/text/txtexppr.cxx
	xmloff/source/text/txtprhdl.cxx
	xmloff/source/text/txtprmap.cxx
	xmloff/source/text/txtstyli.cxx

Conflicts:
	svx/source/dialog/hdft.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txtatr2.cxx
	sw/source/core/unocore/unostyle.cxx

Change-Id: I7e8779db6c0cbd1e242b63eab888f468f2de509a
2014-07-01 13:30:09 +02:00
Julien Nabet
430484932e Typo: beeing->being
Change-Id: I34937e400ac8576154d33e1e11b80690222f532c
2014-06-29 13:15:51 +02:00
Michael Stahl
924a28a7b1 fdo#80009: xmloff: ignore excessive fo:clip values
These cause problems in drawinglayer, and nobody needs a 5km clip.

Change-Id: Ic485250413194adbcd0ccf855f12e89e532d7120
2014-06-28 00:15:44 +02:00
Stephan Bergmann
e48a233960 loplugin:unreffun: also warn about redundant redeclarations
Change-Id: I9a812220b58cf6da00d854e65794f7c673ab239d
2014-06-27 15:27:39 +02:00
Caolán McNamara
7af733d9ef tweak assert so comment appears in abort message
Change-Id: Ibf78e5cd1620f0b61cae030e3870be4a6f87e71d
2014-06-27 08:55:56 +01:00
Noel Grandin
533c6cb6ba fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"

Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-06-25 17:10:43 +02:00
Noel Grandin
e2080e70fe new compilerplugin returnbyref
Find places where we are returning a pointer to something, where we can
be returning a reference.
e.g.
   class A {
     struct X x;
     public X* getX() { return &x; }
   }
which can be:
     public X& getX() { return x; }

Change-Id: I796fd23fd36a18aedf6e36bc28f8fab4f518c6c7
2014-06-24 11:34:21 +02:00
Matúš Kukan
a2aa0e6087 Create SvtSaveOptions() outside of for loop.
Helps to save few cycles.

Change-Id: Iea908bd84fa1201f05ec698f8de51ea78d841eb6
2014-06-21 09:42:51 +02:00
Kohei Yoshida
1d38cb3655 fdo#71076, fdo#71767: Preserve number formats when charts are copied.
Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
2014-06-19 14:46:56 -04:00
Stephan Bergmann
d8e7624c9a Do not dereference null pointer
...and XMLTextCharStyleNamesElementExport only requires a non-null rPropSet arg
when its bDoSomething arg is true.

Reported by CppunitTest_sw_odfexport under -sanitize=undefined.

Change-Id: Ia45fa7db250f83d746829c7f411e78bbc50bf721
2014-06-19 17:51:36 +02:00
Noel Grandin
3e82897353 improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
2014-06-17 10:55:17 +02:00
Zolnai Tamás
b7f2cad987 Revert "Make glTF support an experimental feature"
Actually make it experimental mode was unecessary on master.

This reverts commit 653bac184f579524bc25a9f40281763a736ae6fd.

Conflicts:
	sd/qa/unit/import-tests.cxx
	xmloff/source/draw/ximpshap.cxx

Change-Id: Ie8747745a9a89ce4d6500a35d15a98e28bda840a
2014-06-16 18:59:25 +02:00
Zolnai Tamás
04b7b2c72f Fix gltf export: close plugin element before export fallback
Change-Id: I2e1f27e535ee45259f7bdf783ea5224b2ad559ef
2014-06-16 13:55:40 +02:00
Zolnai Tamás
4d8c4e7fe3 glTF import/export: fallback must be the second one inside the frame
The previous solution was good because older LO versions
import the fallback image without changing their code, but
it came out it does not fit to ODF standard so export
fallback image as the second object after the glTF model.

Change-Id: Ib9b2044b1f36b32d980cb79f6dac8dcf94d6209b
2014-06-16 12:59:19 +02:00
Zolnai Tamás
9ee69cbd6f glTF export: Use plural folder names
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
2014-06-16 12:58:52 +02:00
Stephan Bergmann
c21979a327 loplugin:staticcall
Change-Id: I7691a6d267ea572e3fdd028c1cfae7b721a76da7
2014-06-13 17:54:37 +02:00
Zolnai Tamás
e8fcf1153f Change glTF mime type: {application -> model}/vnd.gltf+json
There is no an accepted mime type for glTF models yet, so
follow collada's mime type: model/vnd.collada+xml.

Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc
2014-06-12 21:43:36 +02:00
Zolnai Tamás
653bac184f Make glTF support an experimental feature
Change-Id: I75e69ba1acafbab8362536f02f4d39a8fc2deed1
2014-06-12 21:43:36 +02:00
Zolnai Tamás
fe70101856 Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and
Linux.

Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-06-12 21:43:35 +02:00
Tor Lillqvist
1b450cfd42 WaE: unused function 'isString'
Change-Id: I991cbf4a0203debaa98887d2db3fec9654dc1c5b
2014-06-12 19:51:40 +03:00
Kohei Yoshida
a2a1a59a44 fdo#77506: More reliable way to determine label strings.
Not beautiful, but doable.

Change-Id: I6f3b00d620e7d7d19cc05ec4239deeb14d0d5201
2014-06-12 11:27:19 -04:00
Noel Grandin
184a00b962 loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
2014-06-09 10:10:13 +02:00
Markus Mohrhard
684d79906f avoid memory leak and invalid documents
See e.g. fdo54757-1.xlsx exported to ods.

Change-Id: I81fb9a18519c5770b52dfb8131211e440ad9682f
2014-06-08 07:31:19 +02:00
Thomas Arnhold
c2034f3993 fixincludeguards: fix include guards
Change-Id: Ie6e8d4272b0b1d0d2ce93bcbc2e818a9eac1a56b
Reviewed-on: https://gerrit.libreoffice.org/9629
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-06-06 19:16:40 +00:00
Kohei Yoshida
61d958f37e fdo#72727: Revert "-Werror=unused-but-set-variable second try"
This reverts commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc.
2014-06-05 15:18:15 -04:00
Kohei Yoshida
91ca3a92c5 fdo#72727: Revert "fdo#68663 don't blindly force categories when there are none"
This reverts commit b090cbdf82e0827234caf5969124f6631311ef35.
2014-06-05 15:04:20 -04:00
Noel Grandin
0e507ae031 various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
2014-06-05 08:17:52 +02:00
Miklos Vajna
c7c14abfd8 xmloff: fix import of tables inside textboxes inside shapes
We already had the concept of having a XML_TEXT_TYPE_SHAPE type (for
editeng-based text) and a XML_TEXT_TYPE_TEXTBOX (for Writer-based text),
but in case of draw:custom-shape, the previous was always assumed,
implicitly.

Check if the shape is marked as having a textbox, and if so, use the
XML_TEXT_TYPE_TEXTBOX handler, which makes e.g. the table import work.

Change-Id: I45f28b36df1836eeba89e9eef44c7abd87fcbd56
2014-06-02 18:21:32 +02:00
Miklos Vajna
9d310ecfce sw textboxes: implement ODF import/export
Map Writer shapes' new TextBox property to an loext:text-box boolean
attribute.

Change-Id: Ie47e15130adc1c480666c689c55a6c9e8460e385
2014-06-02 10:30:35 +02:00
Matúš Kukan
d2e0465d40 fdo#76324: Use one static SvXMLTokenMap object, it's faster.
For me it saves ~10% of load time for calc document with 2000 comments.
Thanks to Michael for noticing this oddity.

Change-Id: Id44f44c02df2ae9360d02c28081601f5f7a8ea27
2014-05-30 14:04:08 +02:00
Noel Grandin
ebc0a15515 remove more unnecesary OUString constructor use
when throwing exceptions

Change-Id: I6edfb6b6745499f802b0e3c0e096a36fb7c32aac
2014-05-29 09:01:40 +02:00
Peter Senna Tschudin
3b24dcc8a8 Remove unnecessary semicolons
A simplified version of the semantic match that finds this problem is
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
    cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Change-Id: Ib9708d37fbb4c6060f88d5dae3814a2d37b2091e
Reviewed-on: https://gerrit.libreoffice.org/9493
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-27 01:19:00 -05:00
Oliver-Rainer Wittmann
192abfb36b 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

Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
2014-05-23 20:38:13 +01:00
Caolán McNamara
57223dbe8f coverity#1213120 Unchecked dynamic_cast
Change-Id: I170e392fa883936f835f60ec4798548701f2a3d8
2014-05-23 20:37:34 +01:00
Noel Grandin
e7bc3cab01 remove boilerplate in UNO Exception constructor calls
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.

Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
2014-05-23 15:06:00 +02:00
Maxim Monastirsky
c354deac3c fdo#78921 Don't crash when there is no storage specified
Not sure it's a good idea to get here at all
when exporting as flat xml, but anyway it
shouldn't crash.

Change-Id: Ib2ce6b044b4395222a394312d49f5a01d157f9f3
2014-05-21 08:59:59 +03:00
Julien Nabet
227af32d8c Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-20 23:29:53 +02:00
Markus Mohrhard
fefad3715a fix import issue with property mapping
Change-Id: Iab06c8676569121f6def631fed07eaa57ffb07a2
2014-05-19 08:13:37 +02:00
Chris Laplante
3c1e30b77d Correct common misspellings, and remove some ASCII art along the way.
Change-Id: I42787db31769e8bde984c5f4f0aa90335e889b1c
Reviewed-on: https://gerrit.libreoffice.org/9356
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2014-05-17 12:38:38 +00:00
Julien Nabet
f62de9113a Comment why it's not a copy paste error
See http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-td4109071.html
Thank you Lionel!

Change-Id: I999bad0d6de0327bea7ba04a6c61a497d45f53a0
2014-05-17 09:37:35 +02:00
Zolnai Tamás
b862a216f7 ODF filters: fallback glTF model to bitmap for older versions
Change-Id: I33161401a29f511e61429355dd2905d4643fe8ff
2014-05-16 16:24:10 +02:00
Zolnai Tamás
e627929e5e Fix class name typo in comment
Change-Id: Ie37583fb53578fb91a121f7d2ec654a4fae01002
2014-05-16 16:24:10 +02:00
Julien Nabet
c288b17cc5 Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part12
Change-Id: I7c514b7a1d86f52d77672b826b1f08b825fd7aa7
2014-05-14 23:18:57 +02:00
Julien Nabet
a362f15f85 Typo: shoud -> should
Change-Id: I44f4fb9682a56af6654e1f7462dc37557d60e735
2014-05-13 23:26:20 +02:00
Julien Nabet
bd59628620 Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part10
Change-Id: I67acda35fa127547dcea0cd18c9dc16db7c00294
2014-05-11 10:16:42 +02:00
Julien Nabet
fa51b55680 Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part9
Change-Id: I82ed4a4868cb22566706ca0f4b1321e0d45016cf
2014-05-10 23:54:07 +02:00
Julien Nabet
5ec7a589be Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part8
Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf
2014-05-10 06:19:42 +02:00
Laurent Balland-Poirier
3d2a17fd2e fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ
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>
2014-05-08 19:54:02 +00:00