diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-19 18:03:59 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-19 20:15:29 +0100 |
| commit | e6fa52c2c371c7adc9c2c2cb18c3a8cf782cfa4b (patch) | |
| tree | f090c50815727c468bebe50311246ab9424d1250 /include | |
| parent | 7448b69b4aaa982940e49c5ace9842f07dd81938 (diff) | |
sw table cell borders: add optional Word-compatible border collapsing
We always compared border width and other aspects only after that, Word
works with border weight according to their implementer notes.
So extend svx::frame::Style to be able to collapse borders using weights
and opt in for that from sw/ in case a compat mode (which is related to
tables, off by default and is set by the DOC/DOCX import) is set.
Change-Id: I1f682789302c88a0d326c6c0263ad3007441cb24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89052
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/framelink.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 5296ab88d56e..ec94bda63f01 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -116,6 +116,7 @@ private: double mfSecn; /// Width of secondary (right or bottom) line. double mfPatternScale; /// Scale used for line pattern spacing. SvxBorderLineStyle mnType; + bool mbWordTableCell; public: /** Constructs an invisible frame style. */ @@ -129,7 +130,8 @@ private: mfDist(0.0), mfSecn(0.0), mfPatternScale(1.0), - mnType(SvxBorderLineStyle::SOLID) + mnType(SvxBorderLineStyle::SOLID), + mbWordTableCell(false) {} }; @@ -187,6 +189,9 @@ public: /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); + /** Enables the Word-compatible Style comparison code. */ + void SetWordTableCell(bool bWordTableCell); + bool operator==( const Style& rOther) const; bool operator<( const Style& rOther) const; }; |