From 4b713fb40833ace1543d3645d429fe9a202dbfc8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 6 Oct 2018 20:38:11 +0100 Subject: unused Dialog field in FuPoor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic8ff613f7de37476054874f60bc83666d4cf404c Reviewed-on: https://gerrit.libreoffice.org/61479 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/func/fupoor.cxx | 12 ------------ sd/source/ui/inc/fupoor.hxx | 3 --- 2 files changed, 15 deletions(-) diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 2e939b91d11b..078bdb610c5a 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -72,7 +71,6 @@ FuPoor::FuPoor ( mpDocSh( pDrDoc->GetDocSh() ), mpDoc(pDrDoc), nSlotId( rReq.GetSlot() ), - pDialog(nullptr), bIsInDragMode(false), bNoScrollUntilInside (true), bScrollable (false), @@ -98,15 +96,10 @@ FuPoor::~FuPoor() aDragTimer.Stop(); aScrollTimer.Stop(); aDelayToScrollTimer.Stop(); - pDialog.disposeAndClear(); } void FuPoor::Activate() { - if (pDialog) - { - pDialog->Show(); - } } void FuPoor::Deactivate() @@ -116,11 +109,6 @@ void FuPoor::Deactivate() aDelayToScrollTimer.Stop (); bScrollable = bDelayActive = false; - if (pDialog) - { - pDialog->Hide(); - } - if (mpWindow && mpWindow->IsMouseCaptured()) mpWindow->ReleaseMouse(); } diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 4f003c045709..ca77a62a83f3 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -29,7 +29,6 @@ class SdDrawDocument; class SfxRequest; -class Dialog; class SdrObject; class CommandEvent; class HelpEvent; @@ -152,8 +151,6 @@ protected: sal_uInt16 nSlotId; - VclPtr pDialog; - Timer aScrollTimer; ///< for auto-scrolling DECL_LINK( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); -- cgit