Commit Graph

70 Commits

Author SHA1 Message Date
7b34d19473 sprmids is used only inside sw/source/filter/ww8
Change-Id: Iebae4a08a452117e71f72836ed686221031a61e6
2014-05-14 22:37:25 +02:00
2732f2b18d coverity#707784 Uninitialized scalar field
Change-Id: Ibbe836d360fad481f2828b703871c8a242767cef
2014-05-10 21:13:03 +01:00
371046c6a3 add missing modelines to cxx and hxx files
some of them have no copyright header

Change-Id: I9c2c0c859dabe231cb29af29290847e7b4aa46a3
2014-04-24 11:58:15 +02:00
187a513742 coverity#1202981 Non-virtual destructor
Change-Id: Iabf91e6c8e450b72b83de51c6a1fb6986f88b430
2014-04-16 11:23:14 +01:00
893590f16e The entry points for these are hidden behind OSL_DEBUG_LEVEL > 1 too.
Change-Id: I728e808ac897aa1be184fb4a8bbbf781eb816cf0
2014-04-14 15:46:22 +02:00
52494aad92 Clean up function declarations and some unused functions
Change-Id: I68b488d45c77ebf82029bfede98dca2400e02f2f
2014-04-14 12:25:30 +02:00
6a7d04a9cb Rename .doc SPRM IDs to match current MS specs
I understand that Libreoffice's names for SPRM IDs come from old
documentation for WW8 (Word '97), plus some later additions named by
OpenOffice developers as they encountered newer SPRMs in the wild.

Meanwhile Microsoft has released newer documentation which supplies
names for these previously undocumented SPRMs, plus it renames some
WW8 properties to have the suffix "80" to make room for newer
versions of those properties.

This commit aims to bring LibreOffice's SPRM ID names in line with
the current file format specification from Microsoft.
http://msdn.microsoft.com/en-us/library/dd923581.aspx

Change-Id: I904c1db17a776e2d9e6076f87369160e3b80f2e4
Reviewed-on: https://gerrit.libreoffice.org/8884
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-07 08:47:44 -05:00
8f6c55a839 Replace SV_DECL/IMPL_REF macros with SvRef template
Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058
2014-04-07 12:38:27 +02:00
c78f918a7c Full colour table borders in .doc export
Currently LO writes table cell border information to .doc files as part
of the "sprmTDefTable" property, but this only supports the WW8 (Word '97)
BRC (BoRder Control) structure which can only select from 16 colours.
There is no newer version of this property.

This commit adds output of an alternate property "sprmTSetBrc" which
specifies border details for a sequence of cells.  There is a WW9
(Word 2000) version of this property supporting full colours.

For LO I have used the constant name NS_sprm::LN_TSetBorder following
the existing naming convention here, which is to use *Border for the WW9
version because *Brc is taken for the WW8 version.

Conflicts:
	include/filter/msfilter/sprmids.hxx

Change-Id: Ie091d91c6d187e1c2542f59f58cec9a373a23e11
2014-04-06 16:53:04 +02:00
5fa564d4a9 filter: LN_TSetBrc -> LN_TSetBrc80 to match spec
Change-Id: I81b78e09130141704c7ec62c1c52bf50d5428dfd
2014-04-06 16:53:04 +02:00
abc429987c filter/msfilter: sal_Bool->bool
Change-Id: I24deda680469ce99ba358a68e83551bdb584751a
2014-04-03 09:17:52 +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
567ef6d578 Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
ad51d4952d Full colour borders in .doc import/export
The BRC (BoRder Control) structure used in .doc files to specify border
properties has undergone several revisions over time.  LibreOffice
supports the WW6 and WW8 (Word '97) BRC versions, which allow the border
colour to be selected from a palette of only 16 colours.

This changeset adds support for the WW9 (Word 2000) BRC version, along
with some new SPRMs (Single PRoperty Modifiers) which use it, so that
border colours are preserved accurately in .doc import/export.

This change covers:
- page borders
- paragraph borders
- borders around a sequence of characters
- table / table cell borders (import only)

Further work is required to extend coverage to borders of pictures and
export of borders in tables.

The LO code was using the same class WW8_BRC to store the bits for either
the WW6 or WW8 BRC.  This becomes a bit unmanagable when adding a third
BRC version, so I have split this into a separate class for each version.

Fixes fdo#68475, fdo#50185

Change-Id: I7ebc15236497cbab9312d8659fe7ed0bee2c59ed
Reviewed-on: https://gerrit.libreoffice.org/8646
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-23 12:57:52 +00:00
d593f45886 filter,formula: prefer passing OUString by reference
Change-Id: I332f1a593853283b72ecf4dfd82b36cc091661b4
2014-03-17 09:00:07 +02:00
47ab3749bf hardcoded sprmCFELayout
Change-Id: I911c1cdf503c46ace38afc80ec63bb0696d1c84b
2014-03-11 14:37:11 +01:00
8792ec7b21 Remove visual noise from include
Conflicts:
	include/framework/preventduplicateinteraction.hxx
	include/sfx2/sfxbasecontroller.hxx
	include/sfx2/sfxbasemodel.hxx
	include/toolkit/awt/vclxtabpagemodel.hxx
	include/vcl/field.hxx
	include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 09:51:32 -06:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
69388f4753 cid#707782 Uninitialized pointer field
Change-Id: I3392cc01c0f7f69d166900a0dca9a9fcef239772
2014-02-21 11:59:07 +02:00
3e971c792c sal_Bool->bool
Change-Id: Ibd5178f35d735e94065a3fbb6b61de53e53b1b0c
2014-02-14 14:15:13 +02:00
0c7f352775 remove SvStream::operator>> methods
in favour of ReadXXX methods.

Change-Id: Ic2c0a7b6b92ff4c236ae99b39d77f3d935b301e3
Reviewed-on: https://gerrit.libreoffice.org/7915
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-12 19:45:10 +00:00
ed5cf167c6 coverity#708947 Empty virtual destructor
Change-Id: I3f660aff0c53b1cd35c7ae57bde612daf0950349
2014-02-11 20:21:47 +00:00
7ab03b245d coverity#707785 Unitialized scalar field
Change-Id: If3a54628ae6dc0deb605ff075695147d6a58762b
2014-02-08 12:30:16 -06:00
618891adc6 coverity#707784 Unitialized scalar field
Change-Id: Iac0a1bb3dd01cc51d17e040a96a8c866fac01058
2014-02-08 12:30:16 -06:00
47a82e10ca coverity#707783 Unitialized scalar field
Change-Id: I7d294c217da28b45fd94fb256d8f990d0f9427f5
2014-02-08 12:30:16 -06:00
bfcd369f9b coverity#707774: Uninitialized scalar value
Change-Id: Icba50e53a162276b90c1602d22f28fa3ef42f05d
2014-02-08 12:30:15 -06:00
3bd0d1f63d sw: hardwired NS_sprm::LN_CCv
Change-Id: Ibbffd00b146369be75c462f9eea243e3582f14e6
2014-02-06 21:59:49 +01:00
a9102eba62 coverity#707781 Uninitialized scalar field
Change-Id: Ic29735bc125b2b9e662e97402dfccf72f7dedb5d
2014-02-06 15:11:56 +00:00
186b4ebc99 convert specialised SvStream::operator>> methods to ReadXXX methods
as preparation for converting the SvStream::operator>> methods on
primitive types

Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9
Reviewed-on: https://gerrit.libreoffice.org/7798
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-04 22:50:39 +00:00
2df08acc4c sw: hardcoded NS_sprm::LN_CPbiIBullet
Change-Id: I51d4638b588da290853422750b90365b454c046f
2014-01-31 10:52:10 +01:00
a797452912 sw: hardcoded NS_sprm::LN_CPbiGrf
Change-Id: I2a63d1c937392be194c00909213bc89ffe26a550
2014-01-28 21:23:23 +01:00
f0dc6cda75 bool improvements
Change-Id: Ib0f16e57ce84a40412fd95bffd4f41a113810a96
2014-01-28 20:24:40 +01:00
4520e37785 filter: add sprmids header
This was generated previously in writerfilter, but keeping around an XML
file of 8000+ lines just to generate these constants is an overkill.

Additionally, these constants are hardwired in all available WW8 files,
so they won't change. By copying it here, it's possible to incrementally
remove what's still remaining from writerfilter's not used doctok.

Change-Id: I1d30da1f635946b15a37de68080fd9eebc2ad88e
2014-01-27 20:19:14 +01:00
7649e53d6f fdo#39468 Translate German comments (include/filter/msfilter/svdfppt.hxx)
Translate remaining German comments to English.
Also remove an empty comment.

Change-Id: I11b8fad73a7a7e9bfc751d812be05d4b81784fbb
Reviewed-on: https://gerrit.libreoffice.org/7666
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-26 17:36:03 +00:00
f1ec5dcfca fdo#69616: Fix for VML part missing for group.
Cause:
 - In altenrate content, Fallback contains only group tag.
Implementation:
 - Added export logic in Vml export.
 - Added unit test case for vml group.

Change-Id: Ia1c9834950528dc892caea1cb675a7f42165d9ba
Reviewed-on: https://gerrit.libreoffice.org/7276
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-24 08:43:08 +00:00
8bb8187016 Removed unused solar.h reference in filter
Change-Id: Ieffee3f06a12836b8a01dcebe2a6dc097b35dde9
Reviewed-on: https://gerrit.libreoffice.org/7520
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-20 21:33:34 +00:00
c4ff46485f fdo#65833 Fix to preserve VML Canvas Information
Grab-bagged the "editas" attribute of v:group and added UT for
the same

Please verify this fix on MS Office 2007 as it renders the mc:Fallback VML part

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/7335

Change-Id: I4e4456997621089967514009005ee775b71d6d69
2014-01-13 17:48:18 +01:00
b55259eeb5 typo fixes
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
2013-12-20 15:55:00 +01:00
8fe352be80 fdo#65836 Do not compress WMF / EMF file incase of OOXML export
Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/6849
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-13 11:49:35 +00:00
a44e42b9cd filter: handle ooxml shapes in EscherPropertyContainer::GetCustomShapeType()
The problem was that the shapes produced by the drawingML import had
types like ooxml-triangle, and EnhancedCustomShapeTypeNames::Get() only
handles VML/binary MSO shapes (e.g. isosceles-triangle). Add an OOXML
mode, and in that case use msfilter::util::GETVMLShapeType() instead,
and only fall back to EnhancedCustomShapeTypeNames::Get() if necessary.

Change-Id: Ic93ba4719133dd3e96c17d2562642a03e559fefa
2013-12-03 11:58:23 +01:00
7f9a03e1b7 msfilter: add a drawingML -> VML map
This can be used later for the VML or binary export of shapes imported
from drawingML. Note that without this, drawingML shapes won't be
exported to VML, as e.g. for a triangle it expects a
'isosceles-triangle' type, while the shype's type is 'ooxml-triangle'.

Change-Id: I59abc27febdd026c181a7ff38b16c93567058cb9
2013-12-02 19:04:18 +01:00
8dbedf1667 oox: move lcl_GetPresetGeometry to msfilter, so filter can use it
Change-Id: Ia741d392a87eaa2f02615a6c9626417a420f205c
2013-12-02 19:04:18 +01:00
8d7cb7773d Moved 'DateTimeToOString' from 'filter' package to 'tools' package
After the move now other classes can convert DateTime to OString also

Reviewed on:
	https://gerrit.libreoffice.org/6816

Change-Id: I0ceb9a5cc26103a6cb36d7765a717770ec3fbe7d
2013-11-26 14:02:02 +01:00
9f3aa81c5d Lenght -> Length
Change-Id: Ic338484627a1b74fba2d4d0794f8865290177464
2013-11-23 23:22:25 +01:00
6e9e1dfc05 -Werror,-Wshift-sign-overflow
Change-Id: I24a341ef92a41682622a3d497638b6724419a89b
2013-11-14 10:15:04 +01:00
f96cfc8ca4 fdo#65108 inter-module includes <> include/filter
Change-Id: I3ddab6b426b0dda32487e51aa5433fd21cbf21ec
2013-11-09 18:48:52 -06:00
6df9dd68ec move OOXML_COLOR_AUTO from writerfilter to msfilter, we need it from sw
Change-Id: I145c08d17ccb36bfbf734306cd9d27e8423debdd
2013-10-25 18:23:01 +02:00
1130a359cb fixincludeguards.sh: include - the rest
Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9
2013-10-23 23:22:31 +02:00
352f4f1f04 FILTER_PLUGIN_PUBLIC is not used anywhere
Change-Id: I2788bac96326f888e758a895d587125d4b8a3b3b
2013-10-12 20:03:29 +03:00
0d586f5b7e convert leftovers in filter module from String to OUString
Change-Id: If8954c39fec724066d46fe5d8c7e486d9bf6e955
2013-10-01 10:08:37 +02:00