Commit Graph

1985 Commits

Author SHA1 Message Date
09f27e518b fix strict namespace list generation
The two perl scripts were apparently only generating the same order by
luck. It did not work on all systems.

Change-Id: Ib83ee5c6572d3bae2e2ac1846850bd65303e7d43
2014-03-02 17:56:15 +01:00
b7381c5197 make more places aware of OOXML strict relations
Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442
2014-03-02 17:56:14 +01:00
6471204afd remove empty lines after comment removal
Change-Id: Iad5cb7303f3797c06a53651b0f0c7e7c2273ef55
2014-03-01 16:23:09 +01:00
e34870c239 support OOXML strict documents in Calc
Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d
2014-03-01 16:23:09 +01:00
6ba394e611 handle OOXML strict namespaces
Change-Id: I198862388426161e3f054a5f128639c59f3c9d24
2014-03-01 16:23:09 +01:00
a143beb3a0 make sure the two namespace lists are sorted the same way
Change-Id: I90b3182e10dbbfc8993010dd885509537d2fe537
2014-03-01 16:23:09 +01:00
63308b1e6c fix OOXML validation issue, related fdo#33951
Change-Id: I6e455ee4bb649a299023f1dba88a01ef5674e074
2014-03-01 16:23:09 +01:00
cf28abed08 writerfilter: extend tokens and model.xml for w:compatSettings
Word stores compatibility mode and additional compatibility
settings (like enableOpenTypeFeatures) in w:compatSetting. This
needs to be preserved as well.

Change-Id: I40895cc00952b7c3799edff0bf7f4328106305a1
2014-02-28 20:24:36 +01:00
440fbd6090 DOCX import: handle font theme references in group shape text
Change-Id: I1d5b86ad17b2c4a0945f483c94ac6abf410cf1d6
2014-02-28 13:51:35 +01:00
af63727b9f Resolves: #i15508# Added support for BMP file type
(cherry picked from commit 9956ed1303545cd61901e33b110698c4e5e224c4)

Conflicts:
	filter/source/msfilter/escherex.cxx
	include/vcl/gfxlink.hxx
	svx/source/xml/xmlgrhlp.cxx
	sw/source/ui/docvw/romenu.cxx
	vcl/source/filter/graphicfilter.cxx

Change-Id: Ibcbb69b9c57cd8a438788e9a9c95744e99b6fcdd
2014-02-27 19:30:40 +00:00
6654106b71 oox: add "styleSet" to token list
Change-Id: Idf9ca432849e9ca53a533ee6d82267aa9d546423
2014-02-27 17:35:03 +01:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
40961d7bcd Remove visual noise from oox
Change-Id: Ie25838f20f00dc32d9d22959308c118cef688e94
Reviewed-on: https://gerrit.libreoffice.org/8288
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-26 09:37:22 -06:00
c816729beb fix OOXML validation error for text shapes, related fdo#31551
blipFill and other fill elements are not allowed to appear together. See
EG_FillProperties in the OOXML spec.

See fdo31551-2.ods

Change-Id: If5869ab9dc69815938c1f4c6fb180b0c1652ddcc
2014-02-26 07:37:28 +01:00
3ca2069f0d use const reference for OUString
Change-Id: I66b5f144da7951f36e32a840b8ed70f38539f105
2014-02-26 07:37:28 +01:00
66cbbe4f3a fix indentation
Change-Id: Iae492bf19edffe84f86bfa9bf247f120f8c9cb79
2014-02-26 07:37:28 +01:00
c26ebdb818 reduntant check
Change-Id: I7969af2e6c73175b020816156478021dcaf8afb0
2014-02-26 07:37:28 +01:00
75f5eb2646 first step in improving the OOXML validation result
Change-Id: Ie4b99e2791cd3575d6544bfca6c6b4e386ac04ea
2014-02-26 07:37:27 +01:00
9321117acd remove unused code oox::core::Decrypt::aes128cbc
Change-Id: I12478278de8b719c51b87c335abd5c440a56bd36
2014-02-25 15:17:00 +02:00
b071ce32be Resolves: #i118640# force early destruction of last FragmentHandler...
to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)

Conflicts:
	oox/source/core/xmlfilterbase.cxx

Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
2014-02-25 12:24:51 +00:00
1efe2782de fix OOXML validation error
Change-Id: Ia27f9615b063393a0733e061df7dd1666283badb
2014-02-25 10:55:02 +01:00
76b114f849 implicitboolconversion: warn about implicit conversion of call args to bool
...to be able to find problems like 6e0bdf04add338b7d5b29fc7b3fc9f08cfd5e96f
"sal_Bool arg of SetUseImagesInMenus was abused to squeeze '2' through it"
earlier when converting occurrences of sal_Bool to bool.

Restricting this check to function call arguments avoids too much noise while
hopefully still catching all the relevant problems.

(This check partially overlaps the pointertobool check, so implicit conversions
from pointers to bool call arguments will now generate two loplugin warnings,
but that's harmless.)

Change-Id: I0b03b1d1615aaf8bc18e7a84c56fff3ef9903508
2014-02-24 17:25:05 +01:00
a1e63e7410 OOXML chart import: ignore rot values outside the valid range
Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef
2014-02-24 14:55:56 +01:00
a35a29829d drawingML import: remove some unneeded member
Change-Id: Iea975665b9225e535dcc4fbdcd666d7c7bff8ef3
2014-02-23 19:19:46 +01:00
c7f6b81646 oox: add some more missing w14 tokens
Change-Id: Ied80a30419ac809c0cb20f8c29427ff0945f5904
2014-02-23 17:40:08 +01:00
18ab4793d9 prevent invalid OOXML chart files, related #i82905#
Change-Id: I27166772c6eefb4e49eb4c097683a1c6aea4476a
2014-02-23 06:42:01 +01:00
783a0757da prevent invalid OOXML chart files, related #i75121#
Change-Id: I8e34fd2941ce98a30d27861db2c6a625ff873aa6
2014-02-23 06:42:01 +01:00
c68ea7ef4a don't write axId for dougnught chart, related fdo#63114
Change-Id: I75168888ff8da6f18089311a99135c124c7a7e72
2014-02-23 06:42:01 +01:00
0ce0c369aa Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-23 03:38:49 +00:00
cd033b12cc we only support simple labels in the InternalDataProvider, bnc#864396
Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63
2014-02-22 05:52:27 +01:00
12f22bd781 drawingML import: paragraph spacing inside group shape
unotext: a conversion was missing during the corresponding
SvxLineSpacingItem was filled with "ParaLineSpacing" UNO property.

Change-Id: I02559ed7e8b46150a88eed2bf20afdf084aec47b
2014-02-21 22:11:35 +01:00
e8f8f24c84 vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
2014-02-21 12:53:51 +01:00
756d0b1dff drawingML import: run fonts inside group shape
Change-Id: Ib54fe868c11c0c22b85d8821fa7274c80918362c
2014-02-21 09:28:25 +01:00
191f648ffd drawingML export: gradient fill defined by imported theme
Plus avoid writing out empty <a:gradFill></a:gradFill>.

Change-Id: I50fa92b2cc30eedfe28a8c6af697d43d98a3aee8
2014-02-21 09:28:24 +01:00
d81936f96b Added word 2010 - w14 namespace and w14 elements
Change-Id: I8098cc4bd49c3480bd45875a541d8273b9c7f287
2014-02-20 17:54:46 +01:00
a18a1a4545 Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx
Added vcl/settings.hxx to all cxx files which require it.
This helps to speed up compilation after changes to the settings.

Conflicts:
	sc/source/ui/dbgui/pvlaydlg.cxx

Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4
Reviewed-on: https://gerrit.libreoffice.org/7933
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-20 16:22:17 +00:00
c9b1fd6345 drawingML import: fix position of cildren in shape groups
Translate component of parent shapes' transformation
have to be applied to children when there is no explicit
child transformation.

Note. Export also use this concept.

Change-Id: I51bd3325fb53ee250402326ee361c8f07038ed07
2014-02-18 17:31:01 +01:00
3c058338fb DOCX drawingML import: handle paragraph top margin
Change-Id: I4a69647af5b068c35bea0a5f9665a5e68eb76293
2014-02-18 16:03:49 +01:00
53146f93ad prevent invalid OOXML files with trendlines, related #i88825#
Change-Id: I503b24233060400cf4bbb40701bec0a3e101512a
2014-02-18 02:25:45 +01:00
dd0c9e6483 fix indentation
Change-Id: I36be2de793d3d32433530bf71632cb73a676bb9a
2014-02-18 02:25:45 +01:00
05f742d28b comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
2014-02-17 17:55:19 +01:00
5ecf769266 prevent invalid ooxml files during notes export, related #i83060#
Change-Id: I151c14cd75477445465e0221271f9bf17385af9f
2014-02-17 16:44:11 +01:00
c7c761455f drawingML export: make WritePolyPolygon robuster
Make sure a:cubicBezTo conatins three a:pt elements.

escherex: It seems a cubic bezier curve last point has
a POLY_NORMAL flag and not POLY_CONTROL.

Change-Id: Id6dc2160c7ae171a720e4a1aa9161cef2b3b9413
2014-02-16 17:45:37 +01:00
a05ad6dd36 fdo#74137: Fix for courruption of Pie chart after roundtrip.
Problem:
  - Pie chart with data labels files gets corrupt because of label position is
    bestFit in original file.
  - But after round trip, data labels position gets changes to top, left and right.
    For some data labels postion value is missing.
Implementaion:
  - In LO, while converting data label from model, the position gets changed.
    So we are ignoring this hack for Pie chart.

Conflicts:
	chart2/qa/extras/chart2export.cxx

Change-Id: Ic51845cd6f39bc905439eea8971e878607d25dac
2014-02-15 06:17:55 +01:00
a6278bc3a9 drawingML import: fix inheritance of character height
The problem was that in case a shape had multiple (e.g. two) paragraphs,
and in case the first paragraph had an explicit character height, but
not the second, then the cursor carried over the explicit character
height to the second paragraph, but it shouldn't, as that leads to
incorrect character height in the second paragraph.

Fix this by remembering the default character height and using that in
case nothing is set explicitly.

Change-Id: I66e06d5cf192739fb254f7280c74617171d9ee6a
2014-02-14 16:50:19 +01:00
cf4e5e4979 FDO#74774 : issue with number of child nodes of tag CubicBezierTo.
Issue :
 - Number of child nodes required by cubicBexTo should be 3 of type "pt".
   While exporting, sometimes the child nodes are less than 3.
   The sequence of writing these tags was getting messed up.

Implementation :
 - corrected the logic for writing the sequence of cubicBexTo tag.

Change-Id: Ic26db72b2c516276c2e6452a21b4106d6a0a1a80
Reviewed-on: https://gerrit.libreoffice.org/7990
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-14 11:12:19 +00:00
b21910c9ca Fix win build
Use namespace to avoid ambiguity.

Change-Id: Iaef6869b12839edbb94695aa5e3d877863e9b669
2014-02-13 15:47:57 +01:00
f16368777b drawingML export: hatching of shapes
Change-Id: I7111d4064d033e27659c7b45650d596df22c593f
2014-02-13 15:25:58 +01:00
31b186239c drawingML import: improve mapping of some filling pattern to hatching
For a better visual match.

Change-Id: I6f8a2f4b500c4ea04ef92572984a2bac597d85be
2014-02-13 15:25:58 +01:00
515b5c7688 fdo#74110 : Issue with <a:prstGeom prst="rect"> tag in document.xml
Issue:
 - While exporting the system used to write adjustment values for preset shape type "rect" in document.xml
   with the shape guide name(adjustment name) being empty.
 - This is not accepted by MS Office. Hence the file was resulting as corrupt.

Implementation:
 - The preset shapes are being picked up from GetOOXMLPresetGeometry(), which refers pCustomShapeTypeTranslationTable[] array
   for the mapping.
 - Most of the shape types have been commented in the pCustomShapeTypeTranslationTable[] array therefore the GetOOXMLPresetGeometry()
   defaults the shapetype as rect, whereas the adjustment values are being picked up for the actual shape type(s).
 - Uncommenting the commented shape type translations( for instance textInflateTop) in pCustomShapeTypeTranslationTable will
   eventually write prst="textInflateTop" under the tag prstGeom which is invalid.
 - It should probably go under prstTxWrap.
 - In order to avoid the corruption, thought of adding a check before writing the adjustment values. If the shape type is "rect"( which is defaulted
   and does not have adjustment values defined in presetShapeDefinitions.xml) then avoid writing the adjustment values under this tag.

Conflicts:
	oox/source/export/drawingml.cxx
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/7765

Change-Id: I6511e9a3ee0c01962d6e82997705a484161086ef
2014-02-13 14:19:08 +01:00