diff options
author | Luke Deller <luke@deller.id.au> | 2014-03-05 23:30:39 +1100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-23 12:57:52 +0000 |
commit | ad51d4952dc30e0d1cdcc6037556cd7c66a61542 (patch) | |
tree | d11178fd5005238bd69552e5c785c97bcba02064 /include/filter | |
parent | 8d2da0b94ac5d679ef697683cacb2c83498cc497 (diff) |
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>
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/sprmids.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx index a760a64346d0..adddee01e393 100644 --- a/include/filter/msfilter/sprmids.hxx +++ b/include/filter/msfilter/sprmids.hxx @@ -228,6 +228,10 @@ namespace NS_sprm { const sal_uInt16 LN_SBrcLeft = 0x702c; const sal_uInt16 LN_SBrcBottom = 0x702d; const sal_uInt16 LN_SBrcRight = 0x702e; + const sal_uInt16 LN_SBorderTop = 0xd234; + const sal_uInt16 LN_SBorderLeft = 0xd235; + const sal_uInt16 LN_SBorderBottom = 0xd236; + const sal_uInt16 LN_SBorderRight = 0xd237; const sal_uInt16 LN_SPgbProp = 0x522f; const sal_uInt16 LN_SDxtCharSpace = 0x7030; const sal_uInt16 LN_SDyaLinePitch = 0x9031; |