[Libreoffice-commits] core.git: filter/source

[Stephan Bergmann]

 filter/source/graphicfilter/icgm/bundles.cxx |   44 ---------------------------
 filter/source/graphicfilter/icgm/bundles.hxx |    5 ---
 2 files changed, 49 deletions(-)

New commits:
commit dc952845ca93a38868fee47a02b1ca1ed4c14f88
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 27 18:31:45 2018 +0200

    Suspiciously, copy ops of Bundle-derived classes didn't copy Bundle::mnColor
    
    Lets assume that that was an oversight, and change all those user-provided
    copy assignment ops into implicitly-defined ones (that will now also copy
    Bundle::mnColor).  Avoids -Wdeprecated-copy with GCC trunk towards GCC 9, as the
    copy ctors were already left implicitly-defined (and so already copied
    Bundle::mnColor).
    
    Change-Id: I43e323b55d059c7afecaddab0d777b6df47182c8
    Reviewed-on: https://gerrit.libreoffice.org/56539
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index 3b0fb067b877..e3ced2b7153d 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -36,50 +36,6 @@ void Bundle::SetColor( sal_uInt32 nColor )
     mnColor = nColor;
 }
 
-
-LineBundle& LineBundle::operator=( const LineBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eLineType = rSource.eLineType;
-    nLineWidth = rSource.nLineWidth;
-    return *this;
-};
-
-MarkerBundle& MarkerBundle::operator=( const MarkerBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eMarkerType = rSource.eMarkerType;
-    nMarkerSize = rSource.nMarkerSize;
-    return *this;
-};
-
-EdgeBundle& EdgeBundle::operator=( const EdgeBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eEdgeType = rSource.eEdgeType;
-    nEdgeWidth = rSource.nEdgeWidth;
-    return *this;
-};
-
-TextBundle& TextBundle::operator=( const TextBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    nTextFontIndex = rSource.nTextFontIndex;
-    eTextPrecision = rSource.eTextPrecision;
-    nCharacterExpansion = rSource.nCharacterExpansion;
-    nCharacterSpacing = rSource.nCharacterSpacing;
-    return *this;
-};
-
-FillBundle& FillBundle::operator=( const FillBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eFillInteriorStyle = rSource.eFillInteriorStyle;
-    nFillPatternIndex = rSource.nFillPatternIndex;
-    nFillHatchIndex = rSource.nFillHatchIndex;
-    return *this;
-};
-
 FontEntry::FontEntry() :
     pFontName       ( nullptr ),
     eCharSetType    ( CST_CCOMPLETE ),
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index cf1516e2c5a1..40178e373f71 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -64,7 +64,6 @@ public:
     {}
 
     virtual Bundle* Clone() override { return new LineBundle( *this ); }
-    LineBundle& operator=( const LineBundle& rLineBundle );
 };
 
 
@@ -81,7 +80,6 @@ public:
         {};
 
     virtual Bundle*     Clone() override { return new MarkerBundle( *this ); } ;
-            MarkerBundle&   operator=( const MarkerBundle& rMarkerBundle );
 };
 
 
@@ -97,7 +95,6 @@ public:
         , nEdgeWidth(0)
     {}
     virtual Bundle*     Clone() override { return new EdgeBundle( *this ); }
-    EdgeBundle& operator=( const EdgeBundle& rEdgeBundle );
 };
 
 
@@ -118,7 +115,6 @@ public:
         {};
 
     virtual Bundle*     Clone() override { return new TextBundle( *this ); } ;
-            TextBundle& operator=( const TextBundle& rTextBundle );
 };
 
 
@@ -136,7 +132,6 @@ public:
         , nFillHatchIndex(0)
     {}
     virtual Bundle*     Clone() override { return new FillBundle( *this ); }
-    FillBundle& operator=( const FillBundle& rFillBundle );
 };