loplugin:mergeclasses merge E3dScene with E3dPolyScene

Change-Id: I70f28fb4c87ad8c0e0ad46f4ce04914b6536d6b9
Reviewed-on: https://gerrit.libreoffice.org/36376
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 3 insertions, 49 deletions

diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 57edb8a46fe9..589bd33b9ac2 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -30,8 +30,8 @@
 class FmFormModel;
 class FmFormPage;
 class E3dView;
-class E3dPolyScene;
 class E3dObject;
+class E3dScene;
 
 enum class SvxPreviewObjectType { SPHERE, CUBE };
 
@@ -41,7 +41,7 @@ protected:
     FmFormModel*            mpModel;
     FmFormPage*             mpFmPage;
     E3dView*                mp3DView;
-    E3dPolyScene*           mpScene;
+    E3dScene*               mpScene;
     E3dObject*              mp3DObj;
     SvxPreviewObjectType    mnObjectType;
 
diff --git a/include/svx/globl3d.hxx b/include/svx/globl3d.hxx
index a258b6b189c7..2eed87268988 100644
--- a/include/svx/globl3d.hxx
+++ b/include/svx/globl3d.hxx
@@ -22,8 +22,7 @@
 
 #include <sal/types.h>
 
-const sal_uInt16 E3D_SCENE_ID       = 1;
-const sal_uInt16 E3D_POLYSCENE_ID   = 2;
+const sal_uInt16 E3D_SCENE_ID   = 2;
 const sal_uInt16 E3D_OBJECT_ID      = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
 const sal_uInt16 E3D_CUBEOBJ_ID     = 4;
 const sal_uInt16 E3D_SPHEREOBJ_ID   = 5;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 72d1849e300e..58d1813d35ed 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -43,7 +43,6 @@
 class SfxPoolItem;
 class Viewport3D;
 class E3dScene;
-class E3dPolyScene;
 
 namespace basegfx { class B3DPolyPolygon; }
 namespace sdr { namespace properties {
diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx
deleted file mode 100644
index 4526bca338e1..000000000000
--- a/include/svx/polysc3d.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_POLYSC3D_HXX
-#define INCLUDED_SVX_POLYSC3D_HXX
-
-#include <svx/svdpage.hxx>
-#include <svx/scene3d.hxx>
-
-/*************************************************************************
-|*
-|* 3D scene displayed through 2D polygons
-|*
-\************************************************************************/
-
-class SVX_DLLPUBLIC E3dPolyScene : public E3dScene
-{
-public:
-    E3dPolyScene();
-    E3dPolyScene(E3dDefaultAttributes& rDefault);
-
-    virtual sal_uInt16 GetObjIdentifier() const override;
-    virtual E3dPolyScene* Clone() const override;
-};
-
-#endif // INCLUDED_SVX_POLYSC3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */