diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-18 12:29:36 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-18 12:33:12 -0400 |
| commit | 24b4fbfa39f212c769bf4d966258a8fb4c98c201 (patch) | |
| tree | 2d7552fe6254b5d624f83ac8431a4025cc9e092b /svx/source/dialog | |
| parent | 50d5b97a776342d3f032f3df2f2f2c90b02d7f34 (diff) | |
fdo#75260: More adjustments.
1) Offset top and left border lines only for double lines.
2) Don't apply zoom level scaling to border widths. That's used for line
pattern spacing only.
Change-Id: I12bdd1492531cc6651e22955c3dca4bdda0f1e4c
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/framelink.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index a6a4f7224ef1..1ae4b7030823 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1130,7 +1130,7 @@ void lclDrawDiagFrameBorders( Style::Style() : meRefMode(REFMODE_CENTERED), - mfScale(1.0), + mfPatternScale(1.0), mnType(table::BorderLineStyle::SOLID) { Clear(); @@ -1138,7 +1138,7 @@ Style::Style() : Style::Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : meRefMode(REFMODE_CENTERED), - mfScale(1.0), + mfPatternScale(1.0), mnType(nType) { Clear(); @@ -1148,7 +1148,7 @@ Style::Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : Style::Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : meRefMode(REFMODE_CENTERED), - mfScale(1.0), + mfPatternScale(1.0), mnType(nType) { Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); @@ -1156,14 +1156,19 @@ Style::Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rCo Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth ) : meRefMode(REFMODE_CENTERED), - mfScale(fScale) + mfPatternScale(1.0) { Set( pBorder, fScale, nMaxWidth ); } -double Style::Scale() const +double Style::PatternScale() const { - return mfScale; + return mfPatternScale; +} + +void Style::SetPatternScale( double fScale ) +{ + mfPatternScale = fScale; } void Style::Clear() @@ -1426,7 +1431,7 @@ drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( rBorder.GetColorSecn().getBColor(), rBorder.GetColorPrim().getBColor(), rBorder.GetColorGap().getBColor(), - rBorder.UseGapColor(), rBorder.Type(), rBorder.Scale() ); + rBorder.UseGapColor(), rBorder.Type(), rBorder.PatternScale() ); return aSequence; } @@ -1454,7 +1459,7 @@ drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( rBorder.GetColorSecn().getBColor(), rBorder.GetColorPrim().getBColor(), rBorder.GetColorGap().getBColor(), - rBorder.UseGapColor(), rBorder.Type(), rBorder.Scale() ); + rBorder.UseGapColor(), rBorder.Type(), rBorder.PatternScale() ); return aSequence; } |