diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-15 15:18:37 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-17 11:33:14 -0500 |
commit | f2ff3b10547a7a3f31a8dd885a004e5f4bec1377 (patch) | |
tree | 51ff3028e11bd5ad53026b9775666e060b44cd4a /svx | |
parent | Make thse constructors non-inline. (diff) | |
download | core-f2ff3b10547a7a3f31a8dd885a004e5f4bec1377.tar.gz core-f2ff3b10547a7a3f31a8dd885a004e5f4bec1377.zip |
Pass scaling to borderline primitive objects.
This will be used when generating line patterns.
Change-Id: I2fa0298bd3e34df1cb304d9be41e471835484d83
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/framelink.cxx | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 93e16a0c57b0..82683743302c 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1124,13 +1124,18 @@ void lclDrawDiagFrameBorders( #define SCALEVALUE( value ) lclScaleValue( value, fScale, nMaxWidth ) -Style::Style() - : meRefMode( REFMODE_CENTERED ) - , mnType( ::com::sun::star::table::BorderLineStyle::SOLID ) -{ Clear(); } +Style::Style() : + meRefMode(REFMODE_CENTERED), + mfScale(1.0), + mnType(table::BorderLineStyle::SOLID) +{ + Clear(); +} Style::Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : - meRefMode( REFMODE_CENTERED ), mnType( nType ) + meRefMode(REFMODE_CENTERED), + mfScale(1.0), + mnType(nType) { Clear(); Set( nP, nD, nS ); @@ -1138,23 +1143,32 @@ 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 ), mnType( nType ) + meRefMode(REFMODE_CENTERED), + mfScale(1.0), + mnType(nType) { Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); } Style::Style( const editeng::SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWidth ) : - meRefMode( REFMODE_CENTERED ) + meRefMode(REFMODE_CENTERED), + mfScale(fScale) { Set( rBorder, fScale, nMaxWidth ); } Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth ) : - meRefMode( REFMODE_CENTERED ) + meRefMode(REFMODE_CENTERED), + mfScale(fScale) { Set( pBorder, fScale, nMaxWidth ); } +double Style::Scale() const +{ + return mfScale; +} + void Style::Clear() { Set( Color(), Color(), Color(), false, 0, 0, 0 ); @@ -1415,7 +1429,7 @@ drawinglayer::primitive2d::Primitive2DSequence CreateClippedBorderPrimitives ( rBorder.GetColorSecn().getBColor(), rBorder.GetColorPrim().getBColor(), rBorder.GetColorGap().getBColor(), - rBorder.UseGapColor(), rBorder.Type() ); + rBorder.UseGapColor(), rBorder.Type(), rBorder.Scale() ); return aSequence; } @@ -1443,7 +1457,7 @@ drawinglayer::primitive2d::Primitive2DSequence CreateBorderPrimitives( rBorder.GetColorSecn().getBColor(), rBorder.GetColorPrim().getBColor(), rBorder.GetColorGap().getBColor(), - rBorder.UseGapColor(), rBorder.Type() ); + rBorder.UseGapColor(), rBorder.Type(), rBorder.Scale() ); return aSequence; } |