diff options
| -rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 3 | ||||
| -rw-r--r-- | include/sfx2/emojiviewitem.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/thumbnailviewitem.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/emojiviewitem.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 9ed08fc878f6..c216a504b8b7 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -148,9 +148,6 @@ include/sfx2/sidebar/TitleBar.hxx:61 include/sfx2/stbitem.hxx:100 _Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,) 0 -include/sfx2/thumbnailviewitem.hxx:118 - void ThumbnailViewItem::calculateItemsPosition(const long,const long,const long,unsigned int,const struct ThumbnailItemAttributes *,) - 10111 include/svl/svdde.hxx:228 _Bool DdeGetPutItem::Put(const class DdeData *,) 0 diff --git a/include/sfx2/emojiviewitem.hxx b/include/sfx2/emojiviewitem.hxx index e0aa57675f9a..0e995664e768 100644 --- a/include/sfx2/emojiviewitem.hxx +++ b/include/sfx2/emojiviewitem.hxx @@ -26,7 +26,7 @@ public: virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs) override; - virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, + virtual void calculateItemsPosition (const long nThumbnailHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) override; private: diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 1d001de2469b..a3d1a09b1fb0 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -115,7 +115,7 @@ public: const tools::Rectangle& getDrawArea () const { return maDrawArea; } - virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, + virtual void calculateItemsPosition (const long nThumbnailHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx index f393738d045f..52bbf1d0f2e0 100644 --- a/sfx2/source/control/emojiviewitem.cxx +++ b/sfx2/source/control/emojiviewitem.cxx @@ -37,7 +37,7 @@ EmojiViewItem::~EmojiViewItem () } -void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, const long, +void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, const long /*nPadding*/, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 9d4225539351..6f4ca606ea1b 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -354,7 +354,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) } pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); - pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); + pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); if ( !((nCurCount+1) % mnCols) ) { @@ -1510,7 +1510,7 @@ void SfxThumbnailView::CalculateItemPositions(bool bScrollBarUsed) } pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); - pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); + pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get()); if ( !((nCurCount+1) % mnCols) ) { diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index c2957f9ff4bd..930debed6a05 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -120,7 +120,7 @@ void ThumbnailViewItem::setDrawArea (const ::tools::Rectangle &area) maDrawArea = area; } -void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, const long, +void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { |