Move overlay attribute from subclasses to TemplateAbstractView.

Change-Id: Ia64c226f481a24c06bb3e248f4441fbbca5ad085

6 files changed, 15 insertions, 13 deletions

diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx
index 1985cd320f0a..580bcbb19575 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -12,6 +12,8 @@
 
 #include <sfx2/thumbnailview.hxx>
 
+class TemplateView;
+
 class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView
 {
 public:
@@ -21,6 +23,10 @@ public:
     TemplateAbstractView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
 
     virtual ~TemplateAbstractView ();
+
+protected:
+
+    TemplateView *mpItemView;
 };
 
 #endif // __SFX2_TEMPLATEABSTRACTVIEW_HXX__
diff --git a/sfx2/inc/sfx2/templatefolderview.hxx b/sfx2/inc/sfx2/templatefolderview.hxx
index db4a33a8d35e..e75c49e209ce 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -17,7 +17,6 @@
 
 class SfxDocumentTemplates;
 class TemplateFolderViewItem;
-class TemplateView;
 
 enum FILTER_APPLICATION
 {
@@ -87,7 +86,6 @@ private:
     bool mbFilteredResults;     // Flag keep track if overlay has been filtered so folders can get filtered too afterwards
     FILTER_APPLICATION meFilterOption;
     SfxDocumentTemplates *mpDocTemplates;
-    TemplateView *mpItemView;
     Link maTemplateStateHdl;
 };
 
diff --git a/sfx2/inc/sfx2/templateonlineview.hxx b/sfx2/inc/sfx2/templateonlineview.hxx
index 64ff27d26f05..e38ad712f0dc 100644
--- a/sfx2/inc/sfx2/templateonlineview.hxx
+++ b/sfx2/inc/sfx2/templateonlineview.hxx
@@ -14,8 +14,6 @@
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
-class TemplateView;
-
 class TemplateOnlineView : public TemplateAbstractView
 {
 public:
@@ -37,7 +35,6 @@ private:
 
 private:
 
-    TemplateView *mpItemView;
     com::sun::star::uno::Sequence< rtl::OUString > maUrls;
     com::sun::star::uno::Sequence< rtl::OUString > maNames;
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 5fda14f9a4bc..ceed5aebcaa9 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -9,18 +9,23 @@
 
 #include <sfx2/templateabstractview.hxx>
 
+#include <sfx2/templateview.hxx>
+
 TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren)
-    : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren)
+    : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
+      mpItemView(new TemplateView(this))
 {
 }
 
 TemplateAbstractView::TemplateAbstractView(Window *pParent, const ResId &rResId, bool bDisableTransientChildren)
-    : ThumbnailView(pParent,rResId,bDisableTransientChildren)
+    : ThumbnailView(pParent,rResId,bDisableTransientChildren),
+      mpItemView(new TemplateView(this))
 {
 }
 
 TemplateAbstractView::~TemplateAbstractView ()
 {
+    delete mpItemView;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatefolderview.cxx
index 647cb7ee0c31..74b330b465d4 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -273,8 +273,7 @@ TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, b
     : TemplateAbstractView(pParent,rResId,bDisableTransientChildren),
       mbFilteredResults(false),
       meFilterOption(FILTER_APP_NONE),
-      mpDocTemplates(new SfxDocumentTemplates),
-      mpItemView(new TemplateView(this))
+      mpDocTemplates(new SfxDocumentTemplates)
 {
     Size aViewSize = mpItemView->CalcWindowSizePixel(INIT_VIEW_COLS,INIT_VIEW_LINES,
                                                      ITEM_MAX_WIDTH,ITEM_MAX_HEIGHT,ITEM_SPACE);
@@ -291,7 +290,6 @@ TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, b
 
 TemplateFolderView::~TemplateFolderView()
 {
-    delete mpItemView;
     delete mpDocTemplates;
 }
 
diff --git a/sfx2/source/control/templateonlineview.cxx b/sfx2/source/control/templateonlineview.cxx
index 7d81cf4d915a..7b502a65e383 100644
--- a/sfx2/source/control/templateonlineview.cxx
+++ b/sfx2/source/control/templateonlineview.cxx
@@ -47,8 +47,7 @@ enum
 };
 
 TemplateOnlineView::TemplateOnlineView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren)
-    : TemplateAbstractView(pParent,nWinStyle,bDisableTransientChildren),
-      mpItemView(new TemplateView(this))
+    : TemplateAbstractView(pParent,nWinStyle,bDisableTransientChildren)
 {
     mpItemView->SetColor(Color(COL_WHITE));
 
@@ -61,7 +60,6 @@ TemplateOnlineView::TemplateOnlineView (Window *pParent, WinBits nWinStyle, bool
 
 TemplateOnlineView::~TemplateOnlineView ()
 {
-    delete mpItemView;
 }
 
 void TemplateOnlineView::Populate()