mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make thse constructors non-inline.

Browse Source 
Change-Id: Iaf23a9962c9dd748247cb986ffabb1a5ba173c09
This commit is contained in:
Kohei Yoshida 2014-01-15 14:42:32 -05:00
parent e128bf2aef
commit c04cff6e12
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/svx/framelink.hxx
View File

@ -108,25 +108,16 @@ class SVX_DLLPUBLIC Style
{ {
public: public:
/** Constructs an invisible frame style. */ /** Constructs an invisible frame style. */
inline explicit Style() explicit Style();
: meRefMode( REFMODE_CENTERED )
, mnType( ::com::sun::star::table::BorderLineStyle::SOLID )
{ Clear(); }
/** Constructs a frame style with passed line widths. */ /** Constructs a frame style with passed line widths. */
inline explicit Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : explicit Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType );
meRefMode( REFMODE_CENTERED ), mnType( nType )
{ Clear(); Set( nP, nD, nS ); }
/** Constructs a frame style with passed color and line widths. */ /** Constructs a frame style with passed color and line widths. */
inline explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor, explicit Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
double nP, double nD, double nS, editeng::SvxBorderStyle nType ) : double nP, double nD, double nS, editeng::SvxBorderStyle nType );
meRefMode( REFMODE_CENTERED ), mnType( nType )
{ Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); }
/** Constructs a frame style from the passed SvxBorderLine struct. */ /** 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 ) : explicit Style( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); }
/** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */ /** 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 ) : explicit Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); }
inline RefMode GetRefMode() const { return meRefMode; } inline RefMode GetRefMode() const { return meRefMode; }
inline const Color& GetColorPrim() const { return maColorPrim; } inline const Color& GetColorPrim() const { return maColorPrim; }

31
svx/source/dialog/framelink.cxx
View File

@ -1124,6 +1124,37 @@ void lclDrawDiagFrameBorders(
#define SCALEVALUE( value ) lclScaleValue( value, fScale, nMaxWidth ) #define SCALEVALUE( value ) lclScaleValue( value, fScale, nMaxWidth )
Style::Style()
: meRefMode( REFMODE_CENTERED )
, mnType( ::com::sun::star::table::BorderLineStyle::SOLID )
{ Clear(); }
Style::Style( double nP, double nD, double nS, editeng::SvxBorderStyle nType ) :
meRefMode( REFMODE_CENTERED ), mnType( nType )
{
Clear();
Set( nP, nD, nS );
}
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 )
{
Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS );
}
Style::Style( const editeng::SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWidth ) :
meRefMode( REFMODE_CENTERED )
{
Set( rBorder, fScale, nMaxWidth );
}
Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWidth ) :
meRefMode( REFMODE_CENTERED )
{
Set( pBorder, fScale, nMaxWidth );
}
void Style::Clear() void Style::Clear()
{ {
Set( Color(), Color(), Color(), false, 0, 0, 0 ); Set( Color(), Color(), Color(), false, 0, 0, 0 );