Related: tdf#144389: merge ThumbnailView and ThumbnailViewBase

only ThumbnailView inherits directly from ThumbnailViewBase and it will
simplify a11y if ThumbnailView instead of ThumbnailViewBase is available

Change-Id: I715faa3f9b2cec68c1de07479b7d1dbbd9ddbcc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121848
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 7 insertions, 12 deletions

diff --git a/sfx2/inc/emojiviewitem.hxx b/sfx2/inc/emojiviewitem.hxx
index b5a614f7acba..61a3306735bd 100644
--- a/sfx2/inc/emojiviewitem.hxx
+++ b/sfx2/inc/emojiviewitem.hxx
@@ -14,7 +14,7 @@
 class EmojiViewItem final : public ThumbnailViewItem
 {
 public:
-    EmojiViewItem (ThumbnailViewBase &rView, sal_uInt16 nId);
+    EmojiViewItem(ThumbnailView& rView, sal_uInt16 nId);
 
     virtual ~EmojiViewItem () override;
 
diff --git a/sfx2/inc/templateviewitem.hxx b/sfx2/inc/templateviewitem.hxx
index 36d433b00119..41c77b060f80 100644
--- a/sfx2/inc/templateviewitem.hxx
+++ b/sfx2/inc/templateviewitem.hxx
@@ -15,7 +15,7 @@ class TemplateViewItem : public ThumbnailViewItem
 {
 public:
 
-    TemplateViewItem (ThumbnailViewBase &rView, sal_uInt16 nId);
+    TemplateViewItem(ThumbnailView& rView, sal_uInt16 nId);
 
     virtual ~TemplateViewItem () override;
 
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index f9394ea9435c..1e6ec0681351 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -22,7 +22,7 @@ using namespace basegfx::utils;
 using namespace drawinglayer::attribute;
 using namespace drawinglayer::primitive2d;
 
-EmojiViewItem::EmojiViewItem (ThumbnailViewBase &rView, sal_uInt16 nId)
+EmojiViewItem::EmojiViewItem(ThumbnailView& rView, sal_uInt16 nId)
     : ThumbnailViewItem(rView, nId)
 {
 }
@@ -31,7 +31,6 @@ EmojiViewItem::~EmojiViewItem ()
 {
 }
 
-
 void EmojiViewItem::calculateItemsPosition (const tools::Long /*nThumbnailHeight*/,
                                                 const tools::Long /*nPadding*/, sal_uInt32 nMaxTextLength,
                                                 const ThumbnailItemAttributes *pAttrs)
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 3dd20a30fd64..2d6c9d0732af 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -28,7 +28,7 @@ using namespace basegfx::utils;
 using namespace drawinglayer::attribute;
 using namespace drawinglayer::primitive2d;
 
-TemplateViewItem::TemplateViewItem (ThumbnailViewBase &rView, sal_uInt16 nId)
+TemplateViewItem::TemplateViewItem(ThumbnailView& rView, sal_uInt16 nId)
     : ThumbnailViewItem(rView, nId),
       mnRegionId(USHRT_MAX),
       mnDocId(USHRT_MAX),
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index c8cd25e22d61..7c445b9102fa 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -47,16 +47,12 @@ using namespace drawinglayer::primitive2d;
 
 constexpr int gnFineness = 5;
 
-bool ThumbnailViewBase::renameItem(ThumbnailViewItem*, const OUString&)
+bool ThumbnailView::renameItem(ThumbnailViewItem*, const OUString&)
 {
     // Do nothing by default
     return false;
 }
 
-ThumbnailViewBase::~ThumbnailViewBase()
-{
-}
-
 BitmapEx ThumbnailView::readThumbnail(const OUString &msURL)
 {
     using namespace ::com::sun::star;
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index e5ed6e3cb7f4..0f3eb5c25174 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
 using namespace drawinglayer::attribute;
 using namespace drawinglayer::primitive2d;
 
-ThumbnailViewItem::ThumbnailViewItem(ThumbnailViewBase &rView, sal_uInt16 nId)
+ThumbnailViewItem::ThumbnailViewItem(ThumbnailView& rView, sal_uInt16 nId)
     : mrParent(rView)
     , mnId(nId)
     , mbVisible(true)
diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx
index 093b6adf10d9..c99c169ddd82 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -14,7 +14,7 @@
 
 struct TemplateSearchViewItem : public TemplateViewItem
 {
-    TemplateSearchViewItem(ThumbnailViewBase& rView, sal_uInt16 nId)
+    TemplateSearchViewItem(ThumbnailView& rView, sal_uInt16 nId)
         : TemplateViewItem(rView, nId)
         , mnAssocId(0)
     {