diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-07 20:25:45 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-08 09:35:54 +0200 |
commit | aed5ce3547cc6c28c2cb25d77f3982c53100fee8 (patch) | |
tree | 239d2f394d39c666df0b9a9bd333c42076059041 /sfx2/source | |
parent | 1f07faf2caf8fd8df6fa8824ff5030b01c0c0634 (diff) |
loplugin:unusedfields
Change-Id: I9758fd606c7d4c251a3ac06661d642a47260b5fc
Reviewed-on: https://gerrit.libreoffice.org/73674
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/control/emojiview.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/templatedefaultview.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 22 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 22 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 |
5 files changed, 2 insertions, 48 deletions
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index 79bb1b0a000f..65d9c5d415d5 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -190,7 +190,6 @@ void EmojiView::KeyInput( const KeyEvent& rKEvt ) if (!pItem->isSelected()) { pItem->setSelection(true); - maItemStateHdl.Call(pItem); } } diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 5193b498fa15..23533d532bc8 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -56,7 +56,6 @@ void TemplateDefaultView::showAllTemplates() mnCurRegionId = 0; insertItems(maAllTemplates, false); - maOpenRegionHdl.Call(nullptr); } void TemplateDefaultView::KeyInput( const KeyEvent& rKEvt ) diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 80232e4205e2..d7b75e740f67 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -36,7 +36,7 @@ #define MNI_OPEN 1 #define MNI_EDIT 2 -#define MNI_DEFAULT_TEMPLATE 3 +//#define MNI_DEFAULT_TEMPLATE 3 #define MNI_DELETE 4 #define MNI_RENAME 5 @@ -182,8 +182,6 @@ void TemplateLocalView::showAllTemplates() mnCurRegionId = 0; insertItems(maAllTemplates, false, true); - - maOpenRegionHdl.Call(nullptr); } void TemplateLocalView::showRegion(TemplateContainerItem const *pItem) @@ -191,8 +189,6 @@ void TemplateLocalView::showRegion(TemplateContainerItem const *pItem) mnCurRegionId = pItem->mnRegionId+1; insertItems(pItem->maTemplates); - - maOpenRegionHdl.Call(nullptr); } TemplateContainerItem* TemplateLocalView::getRegion(OUString const & rName) @@ -240,13 +236,9 @@ IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) if (xQueryDlg->run() != RET_YES) break; - maDeleteTemplateHdl.Call(maSelectedItem); reload(); } break; - case MNI_DEFAULT_TEMPLATE: - maDefaultTemplateHdl.Call(maSelectedItem); - break; default: break; } @@ -372,7 +364,6 @@ void TemplateLocalView::Command( const CommandEvent& rCEvt ) { deselectItems(); pItem->setSelection(true); - maItemStateHdl.Call(pItem); tools::Rectangle aRect = pItem->getDrawArea(); maPosition = aRect.Center(); maSelectedItem = dynamic_cast<TemplateViewItem*>(pItem); @@ -397,7 +388,6 @@ void TemplateLocalView::KeyInput( const KeyEvent& rKEvt ) if (!pItem->isSelected()) { pItem->setSelection(true); - maItemStateHdl.Call(pItem); } } @@ -412,16 +402,6 @@ void TemplateLocalView::KeyInput( const KeyEvent& rKEvt ) if (xQueryDlg->run() != RET_YES) return; - //copy to avoid changing filtered item list during deletion - ThumbnailValueItemList mFilteredItemListCopy = mFilteredItemList; - - for (ThumbnailViewItem* pItem : mFilteredItemListCopy) - { - if (pItem->isSelected()) - { - maDeleteTemplateHdl.Call(pItem); - } - } reload(); } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 2343aeee11f7..b97285f28096 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -171,8 +171,6 @@ void ThumbnailView::ImplDeleteItems() if (pItem->isSelected()) { pItem->setSelection(false); - maItemStateHdl.Call(pItem); - // fire accessible event??? } @@ -361,8 +359,6 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) } pItem->show(true); - - maItemStateHdl.Call(pItem); } pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); @@ -389,8 +385,6 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) } pItem->show(false); - - maItemStateHdl.Call(pItem); } } @@ -657,8 +651,6 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt ) if (pCurItem->isVisible()) DrawItem(pCurItem); - - maItemStateHdl.Call(pCurItem); } } } @@ -738,8 +730,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) if (!pItem->isHighlighted()) DrawItem(pItem); - - maItemStateHdl.Call(pItem); } else if(rMEvt.GetClicks() == 1) { @@ -771,8 +761,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) if (pCurItem->isVisible()) DrawItem(pCurItem); - - maItemStateHdl.Call(pCurItem); } } @@ -794,8 +782,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) if (pCurItem->isVisible()) DrawItem(pCurItem); - - maItemStateHdl.Call(pCurItem); } nCurPos += dir; @@ -819,8 +805,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) if (!pItem->isHighlighted()) DrawItem(pItem); - maItemStateHdl.Call(pItem); - //fire accessible event?? } } @@ -989,7 +973,6 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId ) if ((*it)->isSelected()) { (*it)->setSelection(false); - maItemStateHdl.Call(*it); } delete *it; @@ -1082,7 +1065,6 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId ) return; pItem->setSelection(true); - maItemStateHdl.Call(pItem); if (IsReallyVisible() && IsUpdateMode()) Invalidate(); @@ -1145,8 +1127,6 @@ void ThumbnailView::deselectItems() if (p->isSelected()) { p->setSelection(false); - - maItemStateHdl.Call(p.get()); } } @@ -1198,8 +1178,6 @@ void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewIte pItem->show(false); pItem->setSelection(false); - - maItemStateHdl.Call(pItem); } } } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 9cc1161769ff..a078525f5c03 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -97,12 +97,10 @@ typedef std::vector<Data_Impl*> SfxTabDlgData_Impl; struct TabDlg_Impl { - bool bModal : 1, - bHideResetBtn : 1; + bool bHideResetBtn : 1; SfxTabDlgData_Impl aData; explicit TabDlg_Impl( sal_uInt8 nCnt ) : - bModal ( true ), bHideResetBtn ( false ) { aData.reserve( nCnt ); |