include/sfx2/templatelocalview.hxx | 2 +- include/sfx2/thumbnailview.hxx | 2 +- sfx2/source/control/templatelocalview.cxx | 10 ++++------ sfx2/source/control/thumbnailview.cxx | 26 +++++++++++++------------- sfx2/source/control/thumbnailviewitem.cxx | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-)
New commits: commit 9dbae9762c38ac69d71b2a763b812e3711c28921 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Apr 26 10:59:12 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Apr 29 09:29:17 2024 +0200 rearrange to clarify that ThumbnailViewItem* was never null Change-Id: Ie10ed0193fbaeae2fb711caa9059906513c42e1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166730 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 9d44e54d7cf4..4284c74b334f 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -116,7 +116,7 @@ public: bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, std::u16string_view rName); - virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) override; + virtual bool renameItem(ThumbnailViewItem& rItem, const OUString& sNewTitle) override; virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 08babad793cb..d1945dbfe85c 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -191,7 +191,7 @@ public: sal_uInt16 GetItemId( const Point& rPos ) const; - virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); + virtual bool renameItem(ThumbnailViewItem& rItem, const OUString& sNewTitle); bool isDrawMnemonic() const { return mbDrawMnemonics; } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index ada15399951e..11a870e39d2f 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -598,13 +598,11 @@ bool TemplateLocalView::exportTo(const sal_uInt16 nItemId, const sal_uInt16 nReg return false; } -bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) +bool TemplateLocalView::renameItem(ThumbnailViewItem& rItem, const OUString& sNewTitle) { sal_uInt16 nRegionId = 0; sal_uInt16 nDocId = USHRT_MAX; - TemplateViewItem* pDocItem = dynamic_cast<TemplateViewItem*>( pItem ); - - if ( pDocItem ) + if (TemplateViewItem* pDocItem = dynamic_cast<TemplateViewItem*>(&rItem)) { nRegionId = pDocItem->mnRegionId; nDocId = pDocItem->mnDocId; @@ -641,8 +639,8 @@ bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNe OUString sHelpText = SfxResId(STR_TEMPLATE_TOOLTIP); sHelpText = (sHelpText.replaceFirst("$1", sNewTitle)).replaceFirst("$2", sRegionName); - pItem->setHelpText(sHelpText); - pItem->maTitle = sNewTitle; + rItem.setHelpText(sHelpText); + rItem.maTitle = sNewTitle; } return bRes; } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index b47d9600b0f2..f1c01188de69 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -52,7 +52,7 @@ using namespace drawinglayer::primitive2d; constexpr int gnFineness = 5; -bool ThumbnailView::renameItem(ThumbnailViewItem*, const OUString&) +bool ThumbnailView::renameItem(ThumbnailViewItem&, const OUString&) { // Do nothing by default return false; @@ -416,11 +416,11 @@ void ThumbnailView::CalculateItemPositions(bool bScrollBarUsed) size_t nCurCount = 0; for ( size_t i = 0; i < nItemCount; i++ ) { - ThumbnailViewItem *const pItem = mFilteredItemList[i]; + ThumbnailViewItem& rItem = *mFilteredItemList[i]; #if !ENABLE_WASM_STRIP_RECENT // tdf#38742 - show pinned items in a separate line - if (auto const pRecentDocsItem = dynamic_cast<RecentDocsViewItem*>(pItem)) + if (auto const pRecentDocsItem = dynamic_cast<RecentDocsViewItem*>(&rItem)) { if (bPinnedItems && !pRecentDocsItem->isPinned()) { @@ -438,23 +438,23 @@ void ThumbnailView::CalculateItemPositions(bool bScrollBarUsed) if ((nCurCount >= nFirstItem) && (nCurCount < nLastItem)) { - if( !pItem->isVisible()) + if( !rItem.isVisible()) { if ( ImplHasAccessibleListeners() ) { css::uno::Any aOldAny, aNewAny; - aNewAny <<= css::uno::Reference<css::accessibility::XAccessible>(pItem->GetAccessible( false )); + aNewAny <<= css::uno::Reference<css::accessibility::XAccessible>(rItem.GetAccessible( false )); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } - pItem->show(true); + rItem.show(true); - maItemStateHdl.Call(pItem); + maItemStateHdl.Call(&rItem); } - pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); - pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); + rItem.setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); + rItem.calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); if ( !((nCurCount+1) % mnCols) ) { @@ -466,19 +466,19 @@ void ThumbnailView::CalculateItemPositions(bool bScrollBarUsed) } else { - if( pItem->isVisible()) + if( rItem.isVisible()) { if ( ImplHasAccessibleListeners() ) { css::uno::Any aOldAny, aNewAny; - aOldAny <<= css::uno::Reference<css::accessibility::XAccessible>(pItem->GetAccessible( false )); + aOldAny <<= css::uno::Reference<css::accessibility::XAccessible>(rItem.GetAccessible( false )); ImplFireAccessibleEvent( css::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny ); } - pItem->show(false); + rItem.show(false); - maItemStateHdl.Call(pItem); + maItemStateHdl.Call(&rItem); } } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index ae874408b8af..4aa7d13f1107 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -107,7 +107,7 @@ void ThumbnailViewItem::setHighlight (bool state) void ThumbnailViewItem::setTitle (const OUString& rTitle) { - if (mrParent.renameItem(this, rTitle)) + if (mrParent.renameItem(*this, rTitle)) maTitle = rTitle; }
