[Libreoffice-commits] core.git: include/vcl vcl/source

[Thorsten Behrens]

 include/vcl/salbtype.hxx          |   20 ----------------
 vcl/source/gdi/pdfwriter_impl.hxx |   47 --------------------------------------
 2 files changed, 1 insertion(+), 66 deletions(-)

New commits:
commit e0b0501452e6a72ba800ae9f536d766f8111ed78
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Tue Aug 18 18:36:51 2015 +0200

    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/17846
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 673c285..9528ffa 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -105,7 +105,6 @@ private:
 public:
 
     inline              BitmapColor();
-    inline              BitmapColor( const BitmapColor& rBitmapColor );
     inline              BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue );
     inline              BitmapColor( const Color& rColor );
     explicit inline     BitmapColor( sal_uInt8 cIndex );
@@ -114,7 +113,6 @@ public:
 
     inline bool         operator==( const BitmapColor& rBitmapColor ) const;
     inline bool         operator!=( const BitmapColor& rBitmapColor ) const;
-    inline BitmapColor& operator=( const BitmapColor& rBitmapColor );
 
     inline bool         IsIndex() const;
 
@@ -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 ) :
             mcBlueOrIndex   ( rColor.GetBlue() ),
             mcGreen         ( rColor.GetGreen() ),
@@ -312,16 +302,6 @@ inline bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const
     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
 {
     return mbIndex;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index aa941d9..43081aa 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -182,15 +182,6 @@ public:
 
         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
         {
             return (m_aPixelSize == rComp.m_aPixelSize &&
@@ -701,7 +692,7 @@ private:
     // graphics state
     struct GraphicsState
     {
-        vcl::Font                       m_aFont;
+        vcl::Font                        m_aFont;
         MapMode                          m_aMapMode;
         Color                            m_aLineColor;
         Color                            m_aFillColor;
@@ -741,42 +732,6 @@ private:
                 m_nFlags( PushFlags::ALL ),
                 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;
     GraphicsState                           m_aCurrentPDFState;