fdo#73487, fdo#73886: Overhaul cell borders to make them look sane.

Change-Id: Ie563f272b60ec8b6b8a4ff0df7256902997610c1
Reviewed-on: https://gerrit.libreoffice.org/7597
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

1 files changed, 8 insertions, 15 deletions

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 952d66e73806..afae83e428e7 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -108,25 +108,16 @@ class SVX_DLLPUBLIC Style
 {
 public:
     /** Constructs an invisible frame style. */
-    inline explicit     Style()
-        : meRefMode( REFMODE_CENTERED )
-        , mnType( ::com::sun::star::table::BorderLineStyle::SOLID )
-    { Clear(); }
+    explicit Style();
     /** Constructs a frame style with passed line widths. */
-    inline explicit     Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) :
-                            meRefMode( REFMODE_CENTERED ), mnType( nType )
-                            { Clear(); Set( nP, nD, nS ); }
+    explicit Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType );
     /** Constructs a frame style with passed color and line widths. */
-    inline explicit     Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
-                            double nP, double nD, double nS, editeng::SvxBorderStyle nType ) :
-                            meRefMode( REFMODE_CENTERED ), mnType( nType )
-                            { Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); }
+    explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
+                    double nP, double nD, double nS, editeng::SvxBorderStyle nType );
     /** Constructs a frame style from the passed SvxBorderLine struct. */
-    inline explicit     Style( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
-                            meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); }
+    explicit Style( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
     /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
-    inline explicit     Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
-                            meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); }
+    explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
 
     inline RefMode      GetRefMode() const { return meRefMode; }
     inline const Color& GetColorPrim() const { return maColorPrim; }
@@ -136,6 +127,7 @@ public:
     inline double       Prim() const { return mnPrim; }
     inline double       Dist() const { return mnDist; }
     inline double       Secn() const { return mnSecn; }
+    double Scale() const;
     inline editeng::SvxBorderStyle Type() const { return mnType; }
 
     /** Returns the total width of this frame style. */
@@ -176,6 +168,7 @@ private:
     double              mnPrim;     /// Width of primary (single, left, or top) line.
     double              mnDist;     /// Distance between primary and secondary line.
     double              mnSecn;     /// Width of secondary (right or bottom) line.
+    double              mfScale;
     editeng::SvxBorderStyle      mnType;
 };