From 9fa75f677a7b48a2177fe11cca0d00f5a2deb7da Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 10 Apr 2017 13:13:44 +0200 Subject: loplugin:mergeclasses merge E3dScene with E3dPolyScene Change-Id: I70f28fb4c87ad8c0e0ad46f4ce04914b6536d6b9 Reviewed-on: https://gerrit.libreoffice.org/36376 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/inc/pch/precompiled_sd.hxx | 1 - sd/source/ui/func/fucon3d.cxx | 3 +-- sd/source/ui/func/fudraw.cxx | 6 +++--- sd/source/ui/func/fusel.cxx | 4 ++-- sd/source/ui/func/futransf.cxx | 1 - sd/source/ui/view/drviews4.cxx | 2 +- sd/source/ui/view/drviewsj.cxx | 8 ++++---- 7 files changed, 11 insertions(+), 14 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index bb12f7c1a65b..72edaa133137 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -417,7 +417,6 @@ #include #include #include -#include #include #include #include diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index d26f8fd56531..dfbb806136b6 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -45,7 +45,6 @@ #include "ToolBarManager.hxx" #include -#include #include using namespace com::sun::star; @@ -374,7 +373,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const double fW(aVolume.getWidth()); double fH(aVolume.getHeight()); ::tools::Rectangle a3DRect(0, 0, (long)fW, (long)fH); - E3dScene* pScene = new E3dPolyScene(mpView->Get3DDefaultAttributes()); + E3dScene* pScene = new E3dScene(mpView->Get3DDefaultAttributes()); // copied code from E3dView::InitScene double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0)); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 25b3483b9a24..404b3be53d65 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "anminfo.hxx" @@ -568,7 +568,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) // test for animation or ImageMap bDefPointer = !SetPointer(pObj, aPnt); - if (bDefPointer && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)) + if (bDefPointer && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dScene* >(pObj) != nullptr)) { // take a glance into the group pObj = mpView->PickObj(aPnt, mpView->getHitTolLog(), pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::DEEP); @@ -754,7 +754,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) bReturn = SetHelpText(pObj, aPosPixel, aVEvt); - if (!bReturn && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)) + if (!bReturn && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dScene* >(pObj) != nullptr)) { // take a glance into the group SdrPageView* pPV = nullptr; diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index f17998f58024..725ea9f4e54e 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "drawview.hxx" #include #include @@ -308,7 +308,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if ( ! bSelectionOnly) bReturn = AnimateObj(pObj, aMDPos); - if( !bReturn && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)) + if( !bReturn && (dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr || dynamic_cast< const E3dScene* >(pObj) != nullptr)) { if(rMEvt.GetClicks() == 1) { diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index d8f33c578bbd..45aeff70c7b5 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -20,7 +20,6 @@ #include "futransf.hxx" #include -#include #include #include diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index fc5d537e2796..064c9a611fe6 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -703,7 +703,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } else if( nInv == SdrInventor::E3d ) { - if( nId == E3D_POLYSCENE_ID || nId == E3D_SCENE_ID ) + if( nId == E3D_SCENE_ID ) { if( !mpDrawView->IsGroupEntered() ) aPopupId = "3dscene"; diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index cc52eb9e5ab9..fc1f80294393 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -31,8 +31,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -127,14 +127,14 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) /* If it is not a group object or 3D object, we disable "enter group". */ - if( !( ( dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default ) || - (dynamic_cast< const E3dPolyScene* >(pObj) != nullptr|| dynamic_cast< const E3dScene* >(pObj) != nullptr /*|| pObj->ISA (E3dCompoundObject) */) ) ) + if( !( ( dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default ) || + ( dynamic_cast< const E3dScene* >(pObj) != nullptr ) ) ) { rSet.DisableItem( SID_ENTER_GROUP ); } // If it is not a group object, we disable "ungroup" - if(!(dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default)) + if(!(dynamic_cast< const SdrObjGroup *>( pObj ) != nullptr && nInv == SdrInventor::Default)) { rSet.DisableItem(SID_UNGROUP); } -- cgit