From 12b2803f196b897ffb901b0eebe271c5ee43d03e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 15 Feb 2017 09:36:42 +0200
Subject: [PATCH] drop unused PRESOBJ_IMAGE

Change-Id: I8fa011bea423e961a3ebe7cd8687e4bce7c4cd77
---
 compilerplugins/clang/unusedenumconstants.py | 4 ++++
 sd/inc/pres.hxx                              | 1 -
 sd/source/core/sdpage.cxx                    | 1 -
 sd/source/ui/unoidl/unopage.cxx              | 1 -
 sd/source/ui/view/drawview.cxx               | 1 -
 sd/source/ui/view/sdview5.cxx                | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index e86bc13c2943..4d45a4231acf 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -111,6 +111,7 @@ for d in definitionSet:
          "include/svx/msdffdef.hxx",
          "include/svtools/rtftoken.h", # RTF_TOKEN_IDS
          "starmath/source/mathtype.hxx", # MathType::MTOKENS
+         "sd/source/filter/eppt/epptbase.hxx", # PPTExTextAttr
         # unit test code
          "cppu/source/uno/check.cxx",
         # general weird nonsense going on
@@ -150,6 +151,9 @@ for d in definitionSet:
          "include/svx/sxekitm.hxx", # SdrEdgeKind (from UI)
          "include/svx/paraprev.hxx", # SvxPrevLineSpace (from UI)
          "include/svx/ctredlin.hxx", # SvxRedlinDateMode (from UI)
+         "sd/source/ui/inc/animobjs.hxx", # BitmapAdjustment (from UI)
+         "sd/source/ui/dlg/PhotoAlbumDialog.hxx", # SlideImageLayout (from UI)
+         "sd/inc/pres.hxx", # AutoLayout (from UI)
         # represents constants from an external API
          "opencl/inc/opencl_device_selection.h",
          "vcl/inc/sft.hxx",
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index 793440c7adb5..c43eb8f076ab 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -30,7 +30,6 @@ enum PresObjKind
     PRESOBJ_CHART,
     PRESOBJ_ORGCHART,
     PRESOBJ_TABLE,
-    PRESOBJ_IMAGE,
     PRESOBJ_PAGE,
     PRESOBJ_HANDOUT,
     PRESOBJ_NOTES,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6fb1ae934307..e21b6fdce434 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -189,7 +189,6 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc
                 case PRESOBJ_ORGCHART:
                 case PRESOBJ_TABLE:
                 case PRESOBJ_CALC:
-                case PRESOBJ_IMAGE:
                 case PRESOBJ_MEDIA:
                     bFound = true;
                     break;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 8f0c039f287a..3b7eb5c0d81c 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1490,7 +1490,6 @@ Reference< drawing::XShape >  SdGenericDrawPage::CreateShape(SdrObject *pObj) co
                 break;
             // coverity[dead_error_begin] - following conditions exist to avoid compiler warning
             case PRESOBJ_NONE:
-            case PRESOBJ_IMAGE:
             case PRESOBJ_MAX:
                 break;
             }
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 0688cefd0286..a5e2a3b9c4ed 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -550,7 +550,6 @@ void DrawView::DeleteMarked()
                     case PRESOBJ_ORGCHART:
                     case PRESOBJ_TABLE:
                     case PRESOBJ_CALC:
-                    case PRESOBJ_IMAGE:
                     case PRESOBJ_MEDIA:
                         ePresObjKind = PRESOBJ_OUTLINE;
                         break;
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index d05f64ccd423..4e0a340e07ed 100644
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -33,7 +33,6 @@ static bool implIsMultiPresObj( PresObjKind eKind )
     case PRESOBJ_CHART:
     case PRESOBJ_ORGCHART:
     case PRESOBJ_TABLE:
-    case PRESOBJ_IMAGE:
     case PRESOBJ_MEDIA:
         return true;
     default: