summaryrefslogtreecommitdiff
path: root/vcl/source/window/dockmgr.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-15 14:48:24 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-17 15:07:07 +0200
commitf9d5da8b491e30a08fa6996164e12e4d8715af46 (patch)
tree2362d2c036744f419757f0a56d33c61531e6a112 /vcl/source/window/dockmgr.cxx
parent8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a (diff)
loplugin:unusedfields in vcl part2
Change-Id: Icd02f63e9738c0bb91348e2084649f9edc281e67 Reviewed-on: https://gerrit.libreoffice.org/38833 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window/dockmgr.cxx')
-rw-r--r--vcl/source/window/dockmgr.cxx15
1 files changed, 3 insertions, 12 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 1ee6bdc309a3..a0621c405345 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -420,7 +420,6 @@ tools::Rectangle DockingManager::GetPosSizePixel( const vcl::Window *pWindow )
class ImplPopupFloatWin : public FloatingWindow
{
private:
- ImplDockingWindowWrapper* mpDockingWin;
bool mbMoving;
bool mbTrackingEnabled;
Point maDelta;
@@ -428,9 +427,8 @@ private:
void ImplSetBorder();
public:
- ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip );
+ ImplPopupFloatWin( vcl::Window* pParent, bool bHasGrip );
virtual ~ImplPopupFloatWin() override;
- virtual void dispose() override;
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
@@ -448,12 +446,11 @@ public:
bool hasGrip() const { return mbHasGrip; }
};
-ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) :
+ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, bool bHasGrip ) :
FloatingWindow( pParent, WB_NOBORDER | WB_SYSTEMWINDOW | WB_NOSHADOW )
{
mpWindowImpl->mbToolbarFloatingWindow = true; // indicate window type, required for accessibility
// which should not see this window as a toplevel window
- mpDockingWin = pDockingWin;
mbMoving = false;
mbTrackingEnabled = false;
mbHasGrip = bHasGrip;
@@ -466,12 +463,6 @@ ImplPopupFloatWin::~ImplPopupFloatWin()
disposeOnce();
}
-void ImplPopupFloatWin::dispose()
-{
- mpDockingWin = nullptr;
- FloatingWindow::dispose();
-}
-
css::uno::Reference< css::accessibility::XAccessible > ImplPopupFloatWin::CreateAccessible()
{
// switch off direct accessibility support for this window
@@ -965,7 +956,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
if ( bUseStdPopup )
pWin = VclPtr<FloatingWindow>::Create( mpParent, WB_STDPOPUP );
else
- pWin = VclPtr<ImplPopupFloatWin>::Create( mpParent, this, bAllowTearOff );
+ pWin = VclPtr<ImplPopupFloatWin>::Create( mpParent, bAllowTearOff );
pWin->SetPopupModeEndHdl( LINK( this, ImplDockingWindowWrapper, PopupModeEnd ) );
pWin->SetText( GetWindow()->GetText() );