summaryrefslogtreecommitdiff
path: root/sfx2/source/control/bindings.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 11:07:15 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 14:23:07 +0200
commitd7824bf16898d8cb776420e0c2bff82e6df61b86 (patch)
tree88405234c55eb24a3d7770c833ac8eeea2db412e /sfx2/source/control/bindings.cxx
parentf05d0d05829dd51cb9d8071ac97cc219779ee40a (diff)
loplugin:unusedfields in sfx2 part2
Change-Id: I227b643641250d47ac6b2218f57ddb231765960e Reviewed-on: https://gerrit.libreoffice.org/39038 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/control/bindings.cxx')
-rw-r--r--sfx2/source/control/bindings.cxx33
1 files changed, 0 insertions, 33 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index eb0592dc479f..15e1f9151f76 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -124,12 +124,10 @@ public:
css::uno::Reference< css::frame::XDispatchProvider > xProv;
SfxWorkWindow* pWorkWin;
SfxBindings* pSubBindings;
- SfxBindings* pSuperBindings;
std::vector<SfxStateCache *> pCaches; // One chache for each binding
std::size_t nCachedFunc1; // index for the last one called
std::size_t nCachedFunc2; // index for the second last called
std::size_t nMsgPos; // Message-Position relative the one to be updated
- SfxPopupAction ePopupAction; // Checked in DeleteFloatinWindow()
bool bContextChanged;
bool bMsgDirty; // Has a MessageServer been invalidated?
bool bAllMsgDirty; // Has a MessageServer been invalidated?
@@ -139,7 +137,6 @@ public:
bool bInUpdate; // for Assertions
bool bInNextJob; // for Assertions
bool bFirstRound; // First round in Update
- sal_uInt16 nFirstShell; // Shell, the first round is preferred
sal_uInt16 nOwnRegLevel; // Counts the real Locks, except those of the Super Bindings
InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update
};
@@ -155,7 +152,6 @@ SfxBindings::SfxBindings()
pImpl->bContextChanged = false;
pImpl->bMsgDirty = true;
pImpl->bAllDirty = true;
- pImpl->ePopupAction = SfxPopupAction::DELETE;
pImpl->nCachedFunc1 = 0;
pImpl->nCachedFunc2 = 0;
pImpl->bCtrlReleased = false;
@@ -163,7 +159,6 @@ SfxBindings::SfxBindings()
pImpl->bInNextJob = false;
pImpl->bInUpdate = false;
pImpl->pSubBindings = nullptr;
- pImpl->pSuperBindings = nullptr;
pImpl->pWorkWin = nullptr;
pImpl->nOwnRegLevel = nRegLevel;
@@ -256,37 +251,12 @@ void SfxBindings::DeleteControllers_Impl()
void SfxBindings::HidePopups( bool bHide )
{
- // Hide SfxPopupWindows
- HidePopupCtrls_Impl( bHide );
- SfxBindings *pSub = pImpl->pSubBindings;
- while ( pSub )
- {
- pImpl->pSubBindings->HidePopupCtrls_Impl( bHide );
- pSub = pSub->pImpl->pSubBindings;
- }
-
// Hide SfxChildWindows
DBG_ASSERT( pDispatcher, "HidePopups not allowed without dispatcher" );
if ( pImpl->pWorkWin )
pImpl->pWorkWin->HidePopups_Impl( bHide, true );
}
-void SfxBindings::HidePopupCtrls_Impl( bool bHide )
-{
- if ( bHide )
- {
- // Hide SfxPopupWindows
- pImpl->ePopupAction = SfxPopupAction::HIDE;
- }
- else
- {
- // Show SfxPopupWindows
- pImpl->ePopupAction = SfxPopupAction::SHOW;
- }
-
- pImpl->ePopupAction = SfxPopupAction::DELETE;
-}
-
void SfxBindings::Update_Impl(SfxStateCache& rCache /*The up to date SfxStatusCache*/)
{
if (rCache.GetDispatch().is() && rCache.GetItemLink())
@@ -685,7 +655,6 @@ void SfxBindings::InvalidateShell
pImpl->aAutoTimer.SetTimeout(TIMEOUT_FIRST);
pImpl->aAutoTimer.Start();
pImpl->bFirstRound = true;
- pImpl->nFirstShell = nLevel;
}
}
}
@@ -1680,7 +1649,6 @@ void SfxBindings::SetSubBindings_Impl( SfxBindings *pSub )
if ( pImpl->pSubBindings )
{
pImpl->pSubBindings->SetDispatchProvider_Impl( css::uno::Reference< css::frame::XDispatchProvider > () );
- pImpl->pSubBindings->pImpl->pSuperBindings = nullptr;
}
pImpl->pSubBindings = pSub;
@@ -1688,7 +1656,6 @@ void SfxBindings::SetSubBindings_Impl( SfxBindings *pSub )
if ( pSub )
{
pImpl->pSubBindings->SetDispatchProvider_Impl( pImpl->xProv );
- pSub->pImpl->pSuperBindings = this;
}
}