diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-10 13:13:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-11 10:16:16 +0200 |
| commit | 9fa75f677a7b48a2177fe11cca0d00f5a2deb7da (patch) | |
| tree | aecf6d5d272166c169935e1563517d020085ee54 /svx/source/unodraw/unopage.cxx | |
| parent | 88829fd914105a0837ee41d3f00f9178228c19cf (diff) | |
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>
Diffstat (limited to 'svx/source/unodraw/unopage.cxx')
| -rw-r--r-- | svx/source/unodraw/unopage.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index e41825f7fb85..5da13dbcbc40 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -41,13 +41,13 @@ #include "shapeimpl.hxx" #include "svdglob.hxx" #include "svx/globl3d.hxx" -#include <svx/polysc3d.hxx> #include <svx/unoprov.hxx> #include <svx/svdopath.hxx> #include "svx/unoapi.hxx" #include <svx/svdomeas.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> +#include <svx/scene3d.hxx> #include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> #include <tools/globname.hxx> @@ -484,10 +484,9 @@ SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS if (!pNewObj) return nullptr; - if( dynamic_cast<const E3dPolyScene* >(pNewObj) != nullptr) + if( auto pScene = dynamic_cast<E3dScene* >(pNewObj) ) { // initialise scene - E3dScene* pScene = static_cast<E3dScene*>(pNewObj); double fW = (double)aSize.Width; double fH = (double)aSize.Height; @@ -585,7 +584,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent switch( nType ) { case E3D_SCENE_ID : - case E3D_POLYSCENE_ID : pRet = new Svx3DSceneObject( pObj, mpPage ); break; case E3D_CUBEOBJ_ID : @@ -781,10 +779,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent nObjId = OBJ_CIRC; break; - case E3D_SCENE_ID | E3D_INVENTOR_FLAG: - nObjId = E3D_POLYSCENE_ID | E3D_INVENTOR_FLAG; - break; - case OBJ_TITLETEXT: case OBJ_OUTLINETEXT: nObjId = OBJ_TEXT; |