From fd56d5fd409c832886bf42a020322e69b6a35d9e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 22 Oct 2018 10:08:13 +0200 Subject: loplugin:unusedfields improvemements treat fields touched in operator== as not being important, which finds some more stuff (but also adds some false+) Change-Id: I3f5d504d7dec7945a917afbcd58c92df74f03645 Reviewed-on: https://gerrit.libreoffice.org/62020 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/appl/appdata.cxx | 1 - sfx2/source/control/bindings.cxx | 2 +- sfx2/source/control/dispatch.cxx | 4 +--- sfx2/source/inc/appdata.hxx | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index db15fb0e9562..d122a2082e49 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -93,7 +93,6 @@ SfxAppData_Impl::SfxAppData_Impl() , pProgress(nullptr) , nDocModalMode(0) , nRescheduleLocks(0) - , nInReschedule(0) , m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessComponentContext())) , pTbxCtrlFac(nullptr) , pStbCtrlFac(nullptr) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 55372be656a6..3e225cd367c6 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1269,7 +1269,7 @@ bool SfxBindings::NextJob_Impl(Timer const * pTimer) pImpl->aAutoTimer.SetTimeout(TIMEOUT_UPDATING); // at least 10 loops and further if more jobs are available but no input - bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule; + bool bPreEmptive = pTimer; sal_uInt16 nLoops = 10; pImpl->bInNextJob = true; const std::size_t nCount = pImpl->pCaches.size(); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index f000d3896f45..55d38c2dc3bf 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -97,9 +97,8 @@ struct SfxObjectBars_Impl ToolbarId eId; // ConfigId of the Toolbox sal_uInt16 nPos; SfxVisibilityFlags nFlags; // special visibility flags - SfxInterface* pIFace; - SfxObjectBars_Impl() : eId(ToolbarId::None), nPos(0), nFlags(SfxVisibilityFlags::Invisible), pIFace(nullptr) {} + SfxObjectBars_Impl() : eId(ToolbarId::None), nPos(0), nFlags(SfxVisibilityFlags::Invisible) {} }; struct SfxDispatcher_Impl @@ -1294,7 +1293,6 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne rBar.nPos = nPos; rBar.nFlags = nFlags; rBar.eId = pIFace->GetObjectBarId(nNo); - rBar.pIFace = pIFace; if ( bUIActive || bIsActive ) { diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index aa3bed3e121d..5f892442bc4a 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -100,7 +100,6 @@ public: sal_uInt16 nDocModalMode; // counts documents in modal mode sal_uInt16 nRescheduleLocks; - sal_uInt16 nInReschedule; rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow; -- cgit