[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang filter/source include/canvas

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Nov 24 06:05:50 UTC 2018


 compilerplugins/clang/unusedenumconstants.untouched.results |   34 ------------
 filter/source/graphicfilter/idxf/dxf2mtf.hxx                |    4 -
 filter/source/graphicfilter/ipict/ipict.cxx                 |    2 
 filter/source/msfilter/eschesdo.hxx                         |    2 
 include/canvas/spriteredrawmanager.hxx                      |    2 
 5 files changed, 2 insertions(+), 42 deletions(-)

New commits:
commit f359f87d5f56c0d5905a8852cebe8b95bd47d9f3
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 22 11:04:36 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Nov 24 07:05:39 2018 +0100

    remove some unused enums in filter
    
    Change-Id: I25c3d6718e9a2e9767a16777b88a0f96afb77b89
    Reviewed-on: https://gerrit.libreoffice.org/63905
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results b/compilerplugins/clang/unusedenumconstants.untouched.results
index 6daa7bc07636..11c0bae17d1f 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -100,38 +100,6 @@ drawinglayer/source/tools/emfpbrush.hxx:83
     enum emfplushelper::EmfPlusHatchStyle HatchStyleSolidDiamond
 drawinglayer/source/tools/emfpimage.hxx:31
     emfplushelper::ImageDataType ImageDataTypeUnknown
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-    enum BrushStyle BRUSH_NULL
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-    enum BrushStyle BRUSH_HORZ
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-    enum BrushStyle BRUSH_VERT
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-    enum BrushStyle BRUSH_SOLID
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-    enum BrushStyle BRUSH_CROSS
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-    enum BrushStyle BRUSH_DIAGCROSS
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-    enum BrushStyle BRUSH_DOWNDIAG
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-    enum BrushStyle BRUSH_UPDIAG
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-    enum BrushStyle BRUSH_75
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-    enum BrushStyle BRUSH_25
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-    enum BrushStyle BRUSH_50
-filter/source/graphicfilter/ipict/ipict.cxx:71
-    enum PictReaderInternal::Pattern::BrushStyle BRUSH_NULL
-filter/source/msfilter/eschesdo.hxx:29
-    enum ImplEESdrPageType NORMAL
-filter/source/msfilter/eschesdo.hxx:29
-    enum ImplEESdrPageType UNDEFINED
-filter/source/msfilter/eschesdo.hxx:29
-    enum ImplEESdrPageType NOTICE
-filter/source/msfilter/eschesdo.hxx:29
-    enum ImplEESdrPageType MASTER
 include/connectivity/dbtools.hxx:822
     enum connectivity::dbase::DBFType dBaseIVMemo
 include/desktop/exithelper.h:25
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index ba5cc3ac84c5..e510c3e16789 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -25,10 +25,6 @@
 #include <vcl/lineinfo.hxx>
 
 enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
-                  BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
-                  BRUSH_25, BRUSH_50, BRUSH_75 };
-
 
 class DXF2GDIMetaFile {
 private:
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index afe4236071be..5f88c398e975 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -68,7 +68,7 @@ namespace PictReaderInternal {
     bool isDefault() const { return !isRead; }
 
     enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-    enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
+    enum BrushStyle { BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
               BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
               BRUSH_25, BRUSH_50, BRUSH_75 };
     // Data
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 537e78aa5761..4602a320b557 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -26,8 +26,6 @@
 
 // fractions of Draw PPTWriter etc.
 
-enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
-
 class ImplEESdrWriter;
 class SdrObject;
 class SdrPage;
commit cfb09a460d236861c88380cbf6d5ebbf5c84cf71
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 22 11:01:26 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Nov 24 07:05:29 2018 +0100

    remove unused SpriteChangeRecord::ChangeType::none
    
    Change-Id: I66d6a8824df0430a560e4aabed0f829e51399467
    Reviewed-on: https://gerrit.libreoffice.org/63904
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results b/compilerplugins/clang/unusedenumconstants.untouched.results
index eee40dba2f0a..6daa7bc07636 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -132,8 +132,6 @@ filter/source/msfilter/eschesdo.hxx:29
     enum ImplEESdrPageType NOTICE
 filter/source/msfilter/eschesdo.hxx:29
     enum ImplEESdrPageType MASTER
-include/canvas/spriteredrawmanager.hxx:145
-    enum canvas::SpriteRedrawManager::SpriteChangeRecord::ChangeType none
 include/connectivity/dbtools.hxx:822
     enum connectivity::dbase::DBFType dBaseIVMemo
 include/desktop/exithelper.h:25
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index e7df64e81d93..4a3359d6d442 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -142,7 +142,7 @@ namespace canvas
          */
         struct SpriteChangeRecord
         {
-            enum class ChangeType { none=0, move, update };
+            enum class ChangeType { move, update };
 
             SpriteChangeRecord( const Sprite::Reference&    rSprite,
                                 const ::basegfx::B2DPoint&  rOldPos,


More information about the Libreoffice-commits mailing list