diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-14 11:44:23 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-15 12:58:04 +0200 |
commit | 2f16219741aba016677103e4b22738d055c39a91 (patch) | |
tree | 55a3ab0dc313b4eb28893970c10b1732658e7e89 /include | |
parent | 16fd7af90a9be159ebc7eab09083f1ef7eb64645 (diff) |
borderline: Fixed PatternScale
The applied PatternScale factor was not consequently used in
svx::frame::Style so that the Previews in the Dialogs look weird.
Fixed that and stumbled over Writer applying it's own scale
which then was leading to double scaling, ceaned that up.
Change-Id: I89f41bfd7884e5e743080301e219491e215054c3
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/framelink.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 1b130efa7f2f..414f23aaaca7 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -159,11 +159,11 @@ public: /** Constructs an invisible frame style. */ explicit Style(); /** Constructs a frame style with passed line widths. */ - explicit Style( double nP, double nD, double nS, SvxBorderLineStyle nType ); + explicit Style( double nP, double nD, double nS, SvxBorderLineStyle nType, double fScale ); /** Constructs a frame style with passed color and line widths. */ - explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, double nP, double nD, double nS, SvxBorderLineStyle nType ); + explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, double nP, double nD, double nS, SvxBorderLineStyle nType, double fScale ); /** Constructs a frame style from the passed SvxBorderLine struct. */ - explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0 ); + explicit Style( const editeng::SvxBorderLine* pBorder, double fScale ); RefMode GetRefMode() const { if(!maImplStyle) return RefMode::Centered; return maImplStyle->meRefMode; } const Color GetColorPrim() const { if(!maImplStyle) return Color(); return maImplStyle->maColorPrim; } |