Remove unused method & remove header include by using forward declaration.

Also, SvViewDataEntry has lost one friend.

Change-Id: Icf6d4127de38fed485cd260edae97748b1f78ede

17 files changed, 22 insertions, 14 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 72e9097284a9..1db51dc8bf8a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -45,6 +45,7 @@
 #include <svtools/miscopt.hxx>
 #include <svtools/svlbitm.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <tools/diagnose_ex.h>
 #include <toolkit/unohlp.hxx>
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index c0ec8004e312..0c4e1e01d2d7 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -28,6 +28,7 @@
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index afb6c95759bb..cb26fabd6b27 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -40,6 +40,7 @@
 #include "moduledbu.hxx"
 #include <svtools/localresaccess.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <algorithm>
 #include "dbtreelistbox.hxx"
 #include "IApplicationController.hxx"
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 7b8c8a0e91ee..c98228caa08d 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -19,6 +19,8 @@
 
 
 #include "listviewitems.hxx"
+#include "svtools/viewdataentry.hxx"
+
 //........................................................................
 namespace dbaui
 {
diff --git a/helpcontent2 b/helpcontent2
-Subproject 4d46d7ee993ea549cf959bc012a616308b3496c
+Subproject 3dc2e7497f1798ae4ff6c5c8c562666bc10a393
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index f1d4c787cadc..1fde2cf6b6b2 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -38,6 +38,7 @@
 
 #include "svtools/svlbitm.hxx"
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 #include "res_bmp.hrc"
 #include "glob.hrc"
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 3aa876918500..ba678aeb9186 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -37,7 +37,6 @@
 #include <tools/contnr.hxx>
 #include <svtools/treelist.hxx>
 #include <svtools/transfer.hxx>
-#include "svtools/viewdataentry.hxx"
 
 class Application;
 class SvTreeListBox;
@@ -143,11 +142,7 @@ public:
     virtual             ~SvLBoxItem();
     virtual sal_uInt16 GetType() const = 0;
     const Size&         GetSize(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const;
-    const Size&         GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
-                        {
-                            const SvViewDataItem* pIData = pData->GetItem(nItemPos);
-                            return pIData->maSize;
-                        }
+    const Size&         GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const;
 
     virtual void Paint(
         const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) = 0;
@@ -347,7 +342,7 @@ public:
     SvTreeListBox( Window* pParent, const ResId& rResId );
     virtual ~SvTreeListBox();
 
-    SvTreeList* GetModel() const { return (SvTreeList*)pModel; }
+    SvTreeList* GetModel() const { return pModel; }
     using SvListView::SetModel;
     void SetModel(SvTreeList* pNewModel);
 
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 65a3db9134eb..06860884dde7 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -39,7 +39,6 @@ struct SvViewDataItem
 class SVT_DLLPUBLIC SvViewDataEntry
 {
     friend class SvTreeList;
-    friend class SvListView;
 
     std::vector<SvViewDataItem> maItems;
     sal_uLong nVisPos;
@@ -59,7 +58,6 @@ public:
     void SetCursored( bool bCursored );
     void SetSelected( bool bSelected );
     void SetExpanded( bool bExpanded );
-    sal_uInt16 GetFlags() const;
     void SetSelectable( bool bSelectable );
 
     void Init(size_t nSize);
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index d3c0eb76ff06..369fead02d3c 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -34,6 +34,7 @@
 #include <comphelper/string.hxx>
 
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index e0f4b25f69ef..10621efe8f0c 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -20,6 +20,7 @@
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/button.hxx>
 #include <vcl/decoview.hxx>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 70b410c093cc..d0125f45efa5 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -19,6 +19,7 @@
 
 #include "svtools/treelist.hxx"
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include "osl/diagnose.h"
 
 #include <stdio.h>
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 802ec45b928a..b9c41805a949 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -37,6 +37,7 @@
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include "svimpbox.hxx"
 
 #include <set>
@@ -366,6 +367,12 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
     return pViewData->maSize;
 }
 
+const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
+{
+    const SvViewDataItem* pIData = pData->GetItem(nItemPos);
+    return pIData->maSize;
+}
+
 struct SvTreeListBoxImpl
 {
     bool m_bIsEmptyTextAllowed:1;
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 1d3bfaf87d2c..897e0e9448bc 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -109,11 +109,6 @@ void SvViewDataEntry::SetExpanded( bool bExpanded )
         nFlags |= SVLISTENTRYFLAG_EXPANDED;
 }
 
-sal_uInt16 SvViewDataEntry::GetFlags() const
-{
-    return nFlags;
-}
-
 void SvViewDataEntry::SetSelectable( bool bSelectable )
 {
     if( bSelectable )
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index f15a223f78c6..186490c6135a 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -34,6 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/treelistbox.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 #include <svtools/svlbitm.hxx>
 
 #include <map>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index dec1a0353233..fabdccc53088 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/module.hxx>
 #include <svtools/txtcmp.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/viewdataentry.hxx"
 #include <unotools/charclass.hxx>
 
 #include <editeng/unolingu.hxx>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 199a289c8ada..fbb39efa8c2c 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -20,6 +20,7 @@
 #include "svx/fontlb.hxx"
 #include <vcl/svapp.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 // ============================================================================
 
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index a03c38fae6f8..8fec3cf8e182 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -56,6 +56,7 @@
 #include <tools/diagnose_ex.h>
 #include <svtools/svlbitm.hxx>
 #include "svtools/treelistentry.hxx"
+#include "svtools/viewdataentry.hxx"
 
 #include <functional>