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/customshapes/EnhancedCustomShape3d.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/customshapes/EnhancedCustomShape3d.cxx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index d33942b0190f..6989760ad093 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -34,7 +34,6 @@ #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> -#include <svx/polysc3d.hxx> #include <svx/svddef.hxx> #include <svx/svx3ditems.hxx> #include <svx/extrud3d.hxx> @@ -42,6 +41,7 @@ #include <vcl/svapp.hxx> #include <svx/xlnclit.hxx> #include <svx/sdasitm.hxx> +#include <svx/scene3d.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/Direction3D.hpp> @@ -326,7 +326,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con a3DDefaultAttr.SetDefaultLatheCharacterMode( true ); a3DDefaultAttr.SetDefaultExtrudeCharacterMode( true ); - E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr ); + E3dScene* pScene = new E3dScene( a3DDefaultAttr ); bool bSceneHasObjects ( false ); bool bUseTwoFillStyles( false ); |