diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-12 16:40:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-12 21:08:45 +0200 |
commit | 6db32d598532fb0c43825fe61119d4d00f2ceb41 (patch) | |
tree | 7778f4dd8dfe7b3116d9c8d45cba20e811d0eb63 /sfx2/source | |
parent | 7e5c9220ef5d51ac23e618c5c9eeda9cf4339c88 (diff) |
loplugin:unusedmethods
Change-Id: I1e17e43bfe4a18034e9c0ff483097fe6ca0e777a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118782
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/control/listview.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 88 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 6 |
4 files changed, 2 insertions, 129 deletions
diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx index 8ed1255a594f..6aa657e7e7e4 100644 --- a/sfx2/source/control/listview.cxx +++ b/sfx2/source/control/listview.cxx @@ -276,17 +276,6 @@ void ListView::rename(const OUString& rId, const OUString& rTitle) } } -void ListView::remove(const OUString& rId) -{ - mxTreeView->remove_id(rId); - for (auto it = mListViewItems.begin(); it != mListViewItems.end(); ++it) - if ((*it)->maId == rId) - { - mListViewItems.erase(it); - break; - } -} - void ListView::clearListView() { mxTreeView->clear(); diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index c1916a44656a..0ba60c0d758b 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -426,94 +426,6 @@ bool TemplateLocalView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt return true; } -bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_uInt16 nSrcItem, - const sal_uInt16 nTargetItem) -{ - TemplateContainerItem *pTarget = nullptr; - TemplateContainerItem *pSrc = nullptr; - - for (auto const & pRegion : maRegions) - { - if (pRegion->mnId == nTargetItem) - pTarget = pRegion.get(); - else if (pRegion->mnId == nSrcItem) - pSrc = pRegion.get(); - } - - if (pTarget && pSrc) - { - sal_uInt16 nSrcRegionId = pSrc->mnRegionId; - sal_uInt16 nTargetRegion = pTarget->mnRegionId; - sal_uInt16 nTargetIdx = mpDocTemplates->GetCount(nTargetRegion); // Next Idx - - const TemplateViewItem *pViewItem = static_cast<const TemplateViewItem*>(pItem); - - bool bCopy = !mpDocTemplates->Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId); - - if (bCopy) - { - OUString sQuery = SfxResId(STR_MSG_QUERY_COPY).replaceFirst("$1", pViewItem->maTitle).replaceFirst("$2", - getRegionName(nTargetRegion)); - - std::unique_ptr<weld::MessageDialog> xQueryDlg(Application::CreateMessageDialog(GetDrawingArea(), VclMessageType::Question, VclButtonsType::YesNo, sQuery)); - if (xQueryDlg->run() != RET_YES) - return false; - - if (!mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId)) - return false; - } - // move template to destination - - TemplateItemProperties aTemplateItem; - aTemplateItem.nId = nTargetIdx + 1; - aTemplateItem.nDocId = nTargetIdx; - aTemplateItem.nRegionId = nTargetRegion; - aTemplateItem.aName = pViewItem->maTitle; - aTemplateItem.aPath = mpDocTemplates->GetPath(nTargetRegion,nTargetIdx); - aTemplateItem.aRegionName = pViewItem->maHelpText; - aTemplateItem.aThumbnail = pViewItem->maPreview1; - - pTarget->maTemplates.push_back(aTemplateItem); - - if (!bCopy) - { - // remove template from region cached data - - std::vector<TemplateItemProperties>::iterator aIter; - for (aIter = pSrc->maTemplates.begin(); aIter != pSrc->maTemplates.end();) - { - if (aIter->nDocId == pViewItem->mnDocId) - { - aIter = pSrc->maTemplates.erase(aIter); - } - else - { - // Keep region document id synchronized with SfxDocumentTemplates - if (aIter->nDocId > pViewItem->mnDocId) - --aIter->nDocId; - - ++aIter; - } - } - - // Keep view document id synchronized with SfxDocumentTemplates - for (auto const& item : mItemList) - { - auto pTemplateViewItem = static_cast<TemplateViewItem*>(item.get()); - if (pTemplateViewItem->mnDocId > pViewItem->mnDocId) - --pTemplateViewItem->mnDocId; - } - } - - CalculateItemPositions(); - Invalidate(); - - return true; - } - - return false; -} - void TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, selection_cmp_fn> &rItems, const sal_uInt16 nTargetItem) { diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index c8cd25e22d61..c66ccf2655a5 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -248,7 +248,6 @@ void ThumbnailView::ImplInit() mbHasVisibleItems = false; mbShowTooltips = false; mbDrawMnemonics = false; - mbIsMultiSelectionEnabled = true; maFilterFunc = ViewFilterAll(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); @@ -671,7 +670,7 @@ bool ThumbnailView::KeyInput( const KeyEvent& rKEvt ) bHandled = CustomWidgetController::KeyInput(rKEvt); } - if ( pNext && mbIsMultiSelectionEnabled) + if ( pNext ) { if (aKeyCode.IsShift() && bValidRange) { @@ -735,12 +734,6 @@ bool ThumbnailView::KeyInput( const KeyEvent& rKEvt ) MakeItemVisible(pNext->mnId); } - else if(pNext && !mbIsMultiSelectionEnabled) - { - deselectItems(); - SelectItem(pNext->mnId); - MakeItemVisible(pNext->mnId); - } return bHandled; } @@ -794,17 +787,7 @@ bool ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) return true; } - if ( rMEvt.GetClicks() == 1 && !mbIsMultiSelectionEnabled ) - { - deselectItems(); - pItem->setSelection(!pItem->isSelected()); - - if (!pItem->isHighlighted()) - DrawItem(pItem); - - maItemStateHdl.Call(pItem); - } - else if(rMEvt.GetClicks() == 1) + if(rMEvt.GetClicks() == 1) { if (rMEvt.IsMod1()) { @@ -1182,11 +1165,6 @@ void ThumbnailView::DrawMnemonics( bool bDrawMnemonics ) mbDrawMnemonics = bDrawMnemonics; } -void ThumbnailView::SetMultiSelectionEnabled( bool bIsMultiSelectionEnabled ) -{ - mbIsMultiSelectionEnabled = bIsMultiSelectionEnabled; -} - void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewItem*)> &func) { mnFirstLine = 0; // start at the top of the list instead of the current position diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index e1a5f4bf72a3..c4dbc7c51fff 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1377,12 +1377,6 @@ void SfxTemplateCategoryDialog::SetCategoryLBEntries(std::vector<OUString> aFold mxLBCategory->select(0); } -void SfxTemplateCategoryDialog::HideNewCategoryOption() -{ - mxCreateLabel->hide(); - mxNewCategoryEdit->hide(); -} - // SfxTemplateSelectionDialog ----------------------------------------------------------------- SfxTemplateSelectionDlg::SfxTemplateSelectionDlg(weld::Window* pParent) |