New Template Manager: Remove inheritance of TemplateContainerItem

Conflicts:
	include/sfx2/templatelocalview.hxx
	sfx2/source/control/templatelocalview.cxx

Change-Id: I5eb120853be768c3770a71829c40d00c97fcdadb
Reviewed-on: https://gerrit.libreoffice.org/25272
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

4 files changed, 9 insertions, 23 deletions

diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 2d6ad72f8cec..903c997abd99 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -31,6 +31,7 @@
 
 class SfxDocumentTemplates;
 class TemplateViewItem;
+class TemplateContainerItem;
 
 enum class FILTER_APPLICATION
 {
@@ -86,7 +87,7 @@ public:
 
     virtual void showAllTemplates () = 0;
 
-    virtual void showRegion (ThumbnailViewItem *pItem) = 0;
+    virtual void showRegion (TemplateContainerItem *pItem) = 0;
 
     virtual sal_uInt16 createRegion (const OUString &rName) = 0;
 
diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx
index 99047c303a6f..3aedcb2fb487 100644
--- a/include/sfx2/templatecontaineritem.hxx
+++ b/include/sfx2/templatecontaineritem.hxx
@@ -11,34 +11,19 @@
 #define INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
 
 #include <sfx2/templateproperties.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
 
-class TemplateContainerItem : public ThumbnailViewItem
+class TemplateContainerItem
 {
 public:
 
+    sal_uInt16 mnId;
     sal_uInt16 mnRegionId;
-    BitmapEx maPreview2;
-    BitmapEx maPreview3;
-    BitmapEx maPreview4;
+    OUString maTitle;
     std::vector<TemplateItemProperties> maTemplates;
 
-    TemplateContainerItem (ThumbnailView &rView, sal_uInt16 nId);
+    TemplateContainerItem (sal_uInt16 nId);
 
     virtual ~TemplateContainerItem ();
-
-    virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
-                        const ThumbnailItemAttributes *pAttrs) override;
-
-    virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
-                                         const long nPadding, sal_uInt32 nMaxTextLength,
-                                         const ThumbnailItemAttributes *pAttrs) override;
-
-    bool HasMissingPreview( );
-
-private:
-
-    Rectangle maThumbnailArea;
 };
 
 #endif // INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index b4265313427e..1cfc8d86f285 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -43,7 +43,7 @@ public:
 
     virtual void showAllTemplates () override;
 
-    virtual void showRegion (ThumbnailViewItem *pItem) override;
+    virtual void showRegion (TemplateContainerItem *pItem) override;
 
     void showRegion (const OUString &rName);
 
@@ -53,7 +53,7 @@ public:
 
     sal_uInt16 getCurRegionItemId () const;
 
-    ThumbnailViewItem* getRegion(OUString const & sStr);
+    TemplateContainerItem* getRegion(OUString const & sStr);
 
     sal_uInt16 getRegionId (size_t pos) const;
 
diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index 854a6c5a639b..067ef0ad7f64 100644
--- a/include/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
@@ -25,7 +25,7 @@ public:
 
     virtual void showAllTemplates () override;
 
-    virtual void showRegion (ThumbnailViewItem *pItem) override;
+    virtual void showRegion (TemplateContainerItem *pItem) override;
 
     bool loadRepository (TemplateRepository* pRepository);