Kaydet (Commit) e0b05014 authored tarafından Thorsten Behrens's avatar Thorsten Behrens Kaydeden (comit) Caolán McNamara

vcl: kill 'special member functions' the compiler generates

No need to spell out otherwise auto-generated functions.

Change-Id: I1d2aec552df197f6656b0a495cef22696667dc4b
Reviewed-on: https://gerrit.libreoffice.org/17846Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6b7354ae
...@@ -105,7 +105,6 @@ private: ...@@ -105,7 +105,6 @@ private:
public: public:
inline BitmapColor(); inline BitmapColor();
inline BitmapColor( const BitmapColor& rBitmapColor );
inline BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ); inline BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue );
inline BitmapColor( const Color& rColor ); inline BitmapColor( const Color& rColor );
explicit inline BitmapColor( sal_uInt8 cIndex ); explicit inline BitmapColor( sal_uInt8 cIndex );
...@@ -114,7 +113,6 @@ public: ...@@ -114,7 +113,6 @@ public:
inline bool operator==( const BitmapColor& rBitmapColor ) const; inline bool operator==( const BitmapColor& rBitmapColor ) const;
inline bool operator!=( const BitmapColor& rBitmapColor ) const; inline bool operator!=( const BitmapColor& rBitmapColor ) const;
inline BitmapColor& operator=( const BitmapColor& rBitmapColor );
inline bool IsIndex() const; inline bool IsIndex() const;
...@@ -276,14 +274,6 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBl ...@@ -276,14 +274,6 @@ inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBl
{ {
} }
inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) :
mcBlueOrIndex ( rBitmapColor.mcBlueOrIndex ),
mcGreen ( rBitmapColor.mcGreen ),
mcRed ( rBitmapColor.mcRed ),
mbIndex ( rBitmapColor.mbIndex )
{
}
inline BitmapColor::BitmapColor( const Color& rColor ) : inline BitmapColor::BitmapColor( const Color& rColor ) :
mcBlueOrIndex ( rColor.GetBlue() ), mcBlueOrIndex ( rColor.GetBlue() ),
mcGreen ( rColor.GetGreen() ), mcGreen ( rColor.GetGreen() ),
...@@ -312,16 +302,6 @@ inline bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const ...@@ -312,16 +302,6 @@ inline bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const
return !( *this == rBitmapColor ); return !( *this == rBitmapColor );
} }
inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor )
{
mcBlueOrIndex = rBitmapColor.mcBlueOrIndex;
mcGreen = rBitmapColor.mcGreen;
mcRed = rBitmapColor.mcRed;
mbIndex = rBitmapColor.mbIndex;
return *this;
}
inline bool BitmapColor::IsIndex() const inline bool BitmapColor::IsIndex() const
{ {
return mbIndex; return mbIndex;
......
...@@ -182,15 +182,6 @@ public: ...@@ -182,15 +182,6 @@ public:
BitmapID() : m_nSize( 0 ), m_nChecksum( 0 ), m_nMaskChecksum( 0 ) {} BitmapID() : m_nSize( 0 ), m_nChecksum( 0 ), m_nMaskChecksum( 0 ) {}
BitmapID& operator=( const BitmapID& rCopy )
{
m_aPixelSize = rCopy.m_aPixelSize;
m_nSize = rCopy.m_nSize;
m_nChecksum = rCopy.m_nChecksum;
m_nMaskChecksum = rCopy.m_nMaskChecksum;
return *this;
}
bool operator==( const BitmapID& rComp ) const bool operator==( const BitmapID& rComp ) const
{ {
return (m_aPixelSize == rComp.m_aPixelSize && return (m_aPixelSize == rComp.m_aPixelSize &&
...@@ -701,7 +692,7 @@ private: ...@@ -701,7 +692,7 @@ private:
// graphics state // graphics state
struct GraphicsState struct GraphicsState
{ {
vcl::Font m_aFont; vcl::Font m_aFont;
MapMode m_aMapMode; MapMode m_aMapMode;
Color m_aLineColor; Color m_aLineColor;
Color m_aFillColor; Color m_aFillColor;
...@@ -741,42 +732,6 @@ private: ...@@ -741,42 +732,6 @@ private:
m_nFlags( PushFlags::ALL ), m_nFlags( PushFlags::ALL ),
m_nUpdateFlags( 0xffff ) m_nUpdateFlags( 0xffff )
{} {}
GraphicsState( const GraphicsState& rState ) :
m_aFont( rState.m_aFont ),
m_aMapMode( rState.m_aMapMode ),
m_aLineColor( rState.m_aLineColor ),
m_aFillColor( rState.m_aFillColor ),
m_aTextLineColor( rState.m_aTextLineColor ),
m_aOverlineColor( rState.m_aOverlineColor ),
m_aClipRegion( rState.m_aClipRegion ),
m_bClipRegion( rState.m_bClipRegion ),
m_nAntiAlias( rState.m_nAntiAlias ),
m_nLayoutMode( rState.m_nLayoutMode ),
m_aDigitLanguage( rState.m_aDigitLanguage ),
m_nTransparentPercent( rState.m_nTransparentPercent ),
m_nFlags( rState.m_nFlags ),
m_nUpdateFlags( rState.m_nUpdateFlags )
{
}
GraphicsState& operator=(const GraphicsState& rState )
{
m_aFont = rState.m_aFont;
m_aMapMode = rState.m_aMapMode;
m_aLineColor = rState.m_aLineColor;
m_aFillColor = rState.m_aFillColor;
m_aTextLineColor = rState.m_aTextLineColor;
m_aOverlineColor = rState.m_aOverlineColor;
m_aClipRegion = rState.m_aClipRegion;
m_bClipRegion = rState.m_bClipRegion;
m_nAntiAlias = rState.m_nAntiAlias;
m_nLayoutMode = rState.m_nLayoutMode;
m_aDigitLanguage = rState.m_aDigitLanguage;
m_nTransparentPercent = rState.m_nTransparentPercent;
m_nFlags = rState.m_nFlags;
m_nUpdateFlags = rState.m_nUpdateFlags;
return *this;
}
}; };
std::list< GraphicsState > m_aGraphicsStack; std::list< GraphicsState > m_aGraphicsStack;
GraphicsState m_aCurrentPDFState; GraphicsState m_aCurrentPDFState;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment