Fix the Windows build breakage by reorganizing svtools headers.

Also removed a fair amount of implicit inline methods to promote use
of more forward declaration.

Change-Id: I5ad21f0d7abc85281708b7e87f1036b02a053627

108 files changed, 184 insertions, 35 deletions

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 1ef15c52e05d..db2888c0f74c 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -42,6 +42,7 @@
 #include <vcl/txtattr.hxx>
 #include <svtools/textwindowpeer.hxx>
 #include <svtools/syntaxhighlight.hxx>
+#include "svtools/treelistentry.hxx"
 #include <vcl/taskpanelist.hxx>
 #include <vcl/help.hxx>
 
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 285aefccdbc1..7ea6699b8719 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -36,6 +36,7 @@
 #include <tools/diagnose_ex.h>
 #include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index d201081dd30a..194d52d175e3 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <deque>
 #include <sfx2/docfac.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index c0eebbe0774b..1fefb9291a81 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -41,6 +41,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <sot/storage.hxx>
 #include <com/sun/star/io/Pipe.hpp>
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index cfbea3e86b0e..49c58a31af09 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -39,6 +39,7 @@
 #include <vcl/msgbox.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmlscript/xmldlg_imexp.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace basctl
 {
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 47142817410f..95398d38faca 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -27,6 +27,7 @@
 #include <svtools/svtabbx.hxx>
 // header for class SvTreeListBox
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace chart
 {
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a3ac4500cc61..d0cc24a65358 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <svl/stritem.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <sal/macros.h>
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 03ca2fe25865..97bf17a203c7 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -44,6 +44,7 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/diagnose_ex.h>
 #include <toolkit/unohlp.hxx>
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index e79f1c61d7b6..410cd1090a2c 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -55,6 +55,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/imagemgr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <unotools/configmgr.hxx>
 #include "dialmgr.hxx"
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2b0e57d2aa71..376d75188142 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -23,6 +23,7 @@
 #include <vcl/msgbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/app.hxx>
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index c3e31567d2f4..8d4af3ef78f4 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -63,6 +63,7 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::container;
 
 #include <svtools/imagemgr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 50d0644a0b8e..688a8203cec6 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -38,6 +38,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
+#include "svtools/treelistentry.hxx"
 
 #define HHC editeng::HangulHanjaConversion
 #define LINE_CNT        static_cast< sal_uInt16 >(2)
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 848f8b1d657a..3ce1ba13ce7c 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <toolkit/unohlp.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <cuires.hrc>
 #include "hlmarkwn.hrc"
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 68429f218272..592bbfc433f5 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -32,6 +32,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/timer.hxx>
 #include <svtools/svtabbx.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <svuidlg.hrc>
 #include <sfx2/linkmgr.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c185887919d5..c45337eff82c 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -34,6 +34,7 @@
 
 #include <unotools/localfilehelper.hxx>
 #include <unotools/pathoptions.hxx>
+#include "svtools/treelistentry.hxx"
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index df3575fe87e0..3505102b83c2 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -54,6 +54,7 @@
 
 #include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/urlobj.hxx>
 #include <vector>
 #include <algorithm>
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index f5d296d2a44b..4a6f443e81dd 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -35,6 +35,7 @@
 #include <svx/dialogs.hrc> // RID_SVXPAGE_...
 #include <tools/resary.hxx>
 #include <rtl/strbuf.hxx>
+#include "svtools/treelistentry.hxx"
 
 // class SvxSearchFormatDialog -------------------------------------------
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 590dda315bac..e428bedabca0 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -27,6 +27,7 @@
 #include <svtools/filter.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index a695604698c1..abaf70c7f121 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -26,6 +26,7 @@
 #include <vcl/field.hxx>
 #include <vcl/metric.hxx>
 #include <svx/langbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 class CharClass;
 class CollatorWrapper;
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 0e7f6a488783..95709aceff65 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -31,6 +31,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <svtools/stdctrl.hxx>
+#include "svtools/treelistentry.hxx"
 #include <unotools/securityoptions.hxx>
 #include <cuires.hrc>
 #include "certpath.hxx"
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d04d3c816141..aa500b45a96c 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -24,6 +24,7 @@
 #include <svl/filenotation.hxx>
 #include "helpid.hrc"
 #include <svtools/editbrowsebox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <cuires.hrc>
 #include <vcl/field.hxx>
 #include <svl/eitem.hxx>
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 04afa3ebc13a..900f8cd96d5e 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -24,6 +24,7 @@
 #include <svx/simptabl.hxx>
 #include <vcl/toolbox.hxx>
 #include <svtools/ctrlbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 // class SvxFontSubstCheckListBox ------------------------------------------
 
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 32ba1070735e..93909bf8716b 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/headbar.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace svx
 {
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index a6d12f7f024b..df2d57e4718a 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -26,6 +26,7 @@
 #include <dialmgr.hxx>
 
 #include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
 
 enum MSFltrPg2_CheckBoxEntries {
     Math,
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 6c38810b92d3..32d944186f71 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -32,6 +32,7 @@
 #include <vcl/waitobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/imagemgr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a81c354bec96..05ee3ebf2887 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svtools/langhelp.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f1612b5e4922..09632725f8e9 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/app.hxx>
 #include <svl/aeitem.hxx>
 #include <svtools/svtabbx.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/defaultoptions.hxx>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 79eabdff22a8..5227729d81bf 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -90,6 +90,7 @@
 #include <vcl/help.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
+#include "svtools/treelistentry.hxx"
 
 #ifndef _SVX_LANGITEM_HXX
 #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index a0a9e034c5d9..212e9901e269 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "webconninfo.hxx"
+#include "webconninfo.hrc"
 #include <dialmgr.hxx>
 #include <cuires.hrc>
 #include <sal/macros.h>
@@ -26,8 +28,7 @@
 #include <com/sun/star/task/XPasswordContainer2.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
-#include "webconninfo.hxx"
-#include "webconninfo.hrc"
+#include "svtools/treelistentry.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 513f43695ddd..f2abc5ae2d74 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -37,6 +37,7 @@
 #include <vcl/fixed.hxx>
 #include "headertablistbox.hxx"
 #include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index dfcea23ffa12..e4e41dd96417 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -62,6 +62,7 @@
 #include <tools/stream.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "IApplicationController.hxx"
+#include "svtools/treelistentry.hxx"
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index d3da7bbf5c0d..d0f3dc532260 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -39,6 +39,7 @@
 #include "IController.hxx"
 #include "moduledbu.hxx"
 #include <svtools/localresaccess.hxx>
+#include "svtools/treelistentry.hxx"
 #include <algorithm>
 #include "dbtreelistbox.hxx"
 #include "IApplicationController.hxx"
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 275b90e4f931..8e02c7a0c2b3 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -27,6 +27,7 @@
 #include "dbtreelistbox.hxx"
 #include "dbu_brw.hrc"
 #include "dbtreemodel.hxx"
+#include "svtools/treelistentry.hxx"
 
 using namespace ::com::sun::star::frame;
 using namespace ::dbtools;
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 94472f0f515a..a3da51223fa6 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -38,6 +38,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
+#include "svtools/treelistentry.hxx"
 
 #include <functional>
 // .........................................................................
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 3c3279fdb4f4..c9b65cda0928 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -107,6 +107,7 @@
 #include <unotools/moduleoptions.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svx/algitem.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/databaseregistrationui.hxx>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 1c53330cb4a4..ce7a37a2035a 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -38,6 +38,8 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <framework/imageproducer.hxx>
 #include <vcl/svapp.hxx>
+#include "svtools/treelistentry.hxx"
+
 #include <memory>
 
 // .........................................................................
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 05c9856cc5e2..60a81e519453 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -42,6 +42,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <connectivity/dbmetadata.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <algorithm>
 #include <o3tl/compat_functional.hxx>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 73e8624875e3..4c7f2e06513c 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include "UITools.hxx"
 #include <svtools/imgdef.hxx>
+#include "svtools/treelistentry.hxx"
 #include "browserids.hxx"
 #include <connectivity/dbtools.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f0b5d32c643a..210d5e6b8f58 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -26,6 +26,7 @@
 #include <vcl/fixed.hxx>
 #include <osl/diagnose.h>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svtools/svmedit.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlerror.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index c58e5c4c6640..0f605a4d2c3a 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -46,6 +46,7 @@
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
 #include <svtools/imgdef.hxx>
+#include "svtools/treelistentry.hxx"
 #include "TablesSingleDlg.hxx"
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 6a40a71f7f4e..b639371ffc1a 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -25,6 +25,7 @@
 #include "dbu_misc.hrc"
 #include "WizardPages.hrc"
 #include <vcl/scrbar.hxx>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index d07ab1eb3408..357860bc450b 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -40,7 +40,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/uno3.hxx>
 #include "UITools.hxx"
-
+#include "svtools/treelistentry.hxx"
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 9c761b7bb7c3..ec1c75dffe19 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -49,6 +49,7 @@
 #include <comphelper/extract.hxx>
 #include "dbu_qry.hrc"
 #include <vcl/msgbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 7c4ad6f91343..ba731cea2a67 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -39,6 +39,7 @@
 #include "sqlmessage.hxx"
 #include "UITools.hxx"
 #include <osl/diagnose.h>
+#include "svtools/treelistentry.hxx"
 
 using namespace ::svt;
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 27cd818442fb..8c85590ac7a8 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -42,7 +42,7 @@
 #include "TableWindowAccess.hxx"
 #include "browserids.hxx"
 #include <connectivity/dbtools.hxx>
-
+#include "svtools/treelistentry.hxx"
 
 using namespace dbaui;
 using namespace ::utl;
diff --git a/dictionaries b/dictionaries
deleted file mode 160000
-Subproject 028f44069fd346ba07b3a0263ee340022eb44d6
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index d0ea48735be1..509fa940f13e 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
+#include "svtools/treelistentry.hxx"
 
 //............................................................................
 namespace pcr
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index bc5c5a10d1de..74f1efa1e8a5 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/XTabController.hpp>
 #include <vcl/scrbar.hxx>
+#include "svtools/treelistentry.hxx"
 
 //............................................................................
 namespace pcr
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index e066786ce44a..bc4c31c1292d 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -30,6 +30,7 @@
 #include <osl/file.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <rtl/uri.hxx>
 
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index dfdaa5f1e108..6f1ffe37e03b 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include "structpg.hxx"
 #include "formdlgs.hrc"
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2eef8ee1b60e..0e60cfb49d60 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -37,6 +37,7 @@
 #include "svtools/fileview.hxx"
 #include "svtools/sfxecode.hxx"
 #include "svtools/svtabbx.hxx"
+#include "svtools/treelistentry.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/localfilehelper.hxx>
 
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 3acb09dddd19..003b205ee57e 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -42,6 +42,7 @@
 
 #include <comphelper/property.hxx>
 #include <svtools/imgdef.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 7d12616f3ea3..a60c093aced1 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -41,6 +41,7 @@
 #include "cppuhelper/basemutex.hxx"
 #include "comphelper/SelectionMultiplex.hxx"
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svl/solar.hrc>
 #include "ReportVisitor.hxx"
 #include "ModuleHelper.hxx"
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 816085682577..2539645a2e56 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -37,6 +37,7 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <algorithm>
 
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 2a7d0ef89c79..91a44408e0c9 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -31,6 +31,7 @@
 #include "scresid.hxx"
 
 #include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
 
 namespace {
 
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index d63ac3b67fde..5a7200f39a95 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -46,6 +46,7 @@
 #include "sdresid.hxx"
 
 #include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
 
 #include "res_bmp.hrc"
 #include "glob.hrc"
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index b1974fd4f572..0f89d7fe79ac 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -43,6 +43,7 @@
 #include "app.hxx"
 #include "customshowlist.hxx"
 #include <vcl/msgbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 
 /////////////////////
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 43171daca5ef..aefaef16ec25 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -39,6 +39,7 @@
 
 #include <vcl/svapp.hxx>
 #include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
 
 #include "dlgassim.hxx"
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 04b60ea104d3..a672ed972763 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -54,6 +54,7 @@
 
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <svtools/embedtransfer.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/diagnose_ex.h>
 #include <comphelper/servicehelper.hxx>
 #include <ViewShell.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 3e39f645395c..ff6a8fc81d8b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -30,6 +30,7 @@
 #include "sfx2/imgmgr.hxx"
 #include "srchdlg.hxx"
 #include "sfx2/sfxhelp.hxx"
+#include "svtools/treelistentry.hxx"
 
 #include "app.hrc"
 #include "newhelp.hrc"
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 0eeaf942df89..aca4e4aa65f7 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -27,6 +27,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/datetime.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include "versdlg.hrc"
 #include "versdlg.hxx"
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 59995db6e8d2..f086469c9d2c 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -61,6 +61,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <svtools/localresaccess.hxx>
 #include <svtools/addresstemplate.hxx>
+#include "svtools/treelistentry.hxx"
 #include <comphelper/processfactory.hxx>
 
 sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 7ec94d3407d0..92207215194c 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistbox.hxx,svtools/treelistbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistentry.hxx,svtools/treelistentry.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistentries.hxx,svtools/treelistentries.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 79fbc1b796e9..2332e5882633 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -30,7 +30,8 @@
 #define _SVTREELIST_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/treelistentry.hxx"
+#include "svtools/treelistentries.hxx"
+
 #include <tools/solar.h>
 #include <tools/link.hxx>
 #include <tools/string.hxx>
@@ -248,9 +249,8 @@ public:
     bool Remove( const SvTreeListEntry* pEntry );
     void                Clear();
 
-    sal_Bool            HasChildren( SvTreeListEntry* pEntry ) const;
-    sal_Bool            HasParent( SvTreeListEntry* pEntry ) const
-    { return (sal_Bool)(pEntry->pParent!=pRootItem); }
+    bool HasChildren( const SvTreeListEntry* pEntry ) const;
+    bool HasParent( const SvTreeListEntry* pEntry ) const;
 
     bool                IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const;
     SvTreeListEntry*        GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const;
@@ -270,9 +270,8 @@ public:
     std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator>
         GetChildIterators(SvTreeListEntry* pParent);
 
-    sal_uLong           GetAbsPos( SvTreeListEntry* pEntry ) const;
-    sal_uLong           GetRelPos( SvTreeListEntry* pChild ) const
-    { return pChild->GetChildListPos(); }
+    sal_uLong GetAbsPos( const SvTreeListEntry* pEntry ) const;
+    sal_uLong GetRelPos( const SvTreeListEntry* pChild ) const;
 
     sal_uLong GetChildCount( const SvTreeListEntry* pParent ) const;
     sal_uInt16 GetDepth( const SvTreeListEntry* pEntry ) const;
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index a7e05d36fde5..cd7aa36bd1c9 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -194,6 +194,18 @@ public:
     virtual void        Clone( SvLBoxItem* pSource ) = 0;
 };
 
+inline SvLBoxItem* new_clone(const SvLBoxItem& rSrc)
+{
+    SvLBoxItem* p = rSrc.Create();
+    p->Clone(const_cast<SvLBoxItem*>(&rSrc));
+    return p;
+}
+
+inline void delete_clone(const SvLBoxItem* p)
+{
+    delete p;
+}
+
 // *********************************************************************
 // ****************************** SvTreeListBox ************************
 // *********************************************************************
@@ -829,17 +841,6 @@ public:
     void        Hide();
 };
 
-inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvTreeListEntry* pEntry,
-    SvLBoxItem* pItem) const
-{
-    SvViewDataEntry* pEntryData =
-        (SvViewDataEntry*)SvListView::GetViewData(pEntry);
-    DBG_ASSERT(pEntryData,"Entry not in View");
-    DBG_ASSERT(pEntryData->pItemData,"No ItemData");
-    sal_uInt16 nItemPos = pEntry->GetPos(pItem);
-    return (pEntryData->pItemData+nItemPos);
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/treelistentries.hxx b/svtools/inc/svtools/treelistentries.hxx
new file mode 100755
index 000000000000..d52d09aac107
--- /dev/null
+++ b/svtools/inc/svtools/treelistentries.hxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __SVTOOLS_TREELISTENTRIES_HXX__
+#define __SVTOOLS_TREELISTENTRIES_HXX__
+
+#include <boost/ptr_container/ptr_vector.hpp>
+
+class SvTreeListEntry;
+typedef boost::ptr_vector<SvTreeListEntry> SvTreeListEntries;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx
index 7eb015c7199b..b3df912149bf 100644
--- a/svtools/inc/svtools/treelistentry.hxx
+++ b/svtools/inc/svtools/treelistentry.hxx
@@ -31,6 +31,8 @@
 
 #include "svtdllapi.h"
 #include "tools/solar.h"
+#include "treelistbox.hxx"
+#include "treelistentries.hxx"
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -46,10 +48,6 @@
 #define SV_ENTRYFLAG_USER_FLAGS         0xF000
 #define SV_ENTRYFLAG_SEMITRANSPARENT    0x8000      // draw semi-transparent entry bitmaps
 
-class SvLBoxItem;
-class SvTreeListEntry;
-
-typedef boost::ptr_vector<SvTreeListEntry> SvTreeListEntries;
 
 class SVT_DLLPUBLIC SvTreeListEntry
 {
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 212e5810b945..4713aacf67ee 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -26,8 +26,9 @@
  *
  ************************************************************************/
 
+#include "fileview.hxx"
 #include "sal/config.h"
-
+#include "svtools/treelistentry.hxx"
 #include <svtools/fileview.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/imagemgr.hxx>
@@ -35,7 +36,6 @@
 #include <svtools/svtabbx.hxx>
 #include <svtools/svtools.hrc>
 #include "fileview.hrc"
-#include "fileview.hxx"
 #include "contentenumeration.hxx"
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 06145918f11d..b7e7f9505901 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -42,6 +42,8 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
+#include "svtools/treelistentry.hxx"
+
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
 
@@ -3325,6 +3327,16 @@ void SvImpLBox::NotifyTabsChanged()
     }
 }
 
+bool SvImpLBox::IsExpandable() const
+{
+    return pCursor->HasChildren() || pCursor->HasChildrenOnDemand();
+}
+
+bool SvImpLBox::IsNowExpandable() const
+{
+    return IsExpandable() && !pView->IsExpanded( pCursor );
+}
+
 IMPL_LINK(SvImpLBox,MyUserEvent,void*, pArg )
 {
     nCurUserEvent = 0xffffffff;
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 314bc310a822..0cdc4a906c27 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -28,6 +28,7 @@
 
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/button.hxx>
 #include <vcl/decoview.hxx>
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 929c429cc00c..6f5e99bd841e 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -31,6 +31,7 @@
 #include <svtools/svtresid.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtools.hrc>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include "svtaccessiblefactory.hxx"
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index ed278f1d2dfd..dbe6df752cec 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -26,7 +26,8 @@
  *
  ************************************************************************/
 
-#include <svtools/treelist.hxx>
+#include "svtools/treelist.hxx"
+#include "svtools/treelistentry.hxx"
 #include "osl/diagnose.h"
 
 #include <stdio.h>
@@ -1100,13 +1101,18 @@ sal_uLong SvTreeList::Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,s
 |*
 *************************************************************************/
 
-sal_uLong SvTreeList::GetAbsPos( SvTreeListEntry* pEntry) const
+sal_uLong SvTreeList::GetAbsPos( const SvTreeListEntry* pEntry) const
 {
     if ( !bAbsPositionsValid )
         ((SvTreeList*)this)->SetAbsolutePositions();
     return pEntry->nAbsPos;
 }
 
+sal_uLong SvTreeList::GetRelPos( const SvTreeListEntry* pChild ) const
+{
+    return pChild->GetChildListPos();
+}
+
 /*************************************************************************
 |*
 |*    SvTreeList::
@@ -1816,7 +1822,7 @@ void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pPar
     }
 }
 
-sal_Bool SvTreeList::HasChildren( SvTreeListEntry* pEntry ) const
+bool SvTreeList::HasChildren( const SvTreeListEntry* pEntry ) const
 {
     if ( !pEntry )
         pEntry = pRootItem;
@@ -1824,6 +1830,11 @@ sal_Bool SvTreeList::HasChildren( SvTreeListEntry* pEntry ) const
     return !pEntry->maChildren.empty();
 }
 
+bool SvTreeList::HasParent( const SvTreeListEntry* pEntry ) const
+{
+    return pEntry->pParent != pRootItem;
+}
+
 SvTreeListEntry* SvTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const
 {   if ( !pParent )
         pParent = pRootItem;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 167035b79416..c60d1b58ac9a 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -46,6 +46,7 @@
 
 #include <svtools/svmedit.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 #include "svimpbox.hxx"
 
 #include <set>
@@ -973,6 +974,16 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const
     return nCount;
 }
 
+SvViewDataItem* SvTreeListBox::GetViewDataItem( SvTreeListEntry* pEntry, SvLBoxItem* pItem ) const
+{
+    SvViewDataEntry* pEntryData =
+        (SvViewDataEntry*)SvListView::GetViewData(pEntry);
+    DBG_ASSERT(pEntryData,"Entry not in View");
+    DBG_ASSERT(pEntryData->pItemData,"No ItemData");
+    sal_uInt16 nItemPos = pEntry->GetPos(pItem);
+    return (pEntryData->pItemData+nItemPos);
+}
+
 SvViewData* SvTreeListBox::CreateViewData( SvTreeListEntry* )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index b98b24af9bf5..c34b53c680b2 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -28,7 +28,6 @@
 
 #include "svtools/treelistentry.hxx"
 #include "svtools/treelist.hxx"
-#include "svtools/treelistbox.hxx"
 
 #include <limits>
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index b33bdc214592..eb3adc5221da 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -232,10 +232,10 @@ private:
     void                NotifyTabsChanged();
 
     // if element at cursor can be expanded in general
-    bool IsExpandable() const { return pCursor->HasChildren() || pCursor->HasChildrenOnDemand(); }
+    bool IsExpandable() const;
 
     // if element at cursor can be expanded at this moment
-    bool IsNowExpandable() const { return IsExpandable() && !pView->IsExpanded( pCursor ); }
+    bool IsNowExpandable() const;
 
     static  void        implInitDefaultNodeImages();
 
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index f77786864cba..daf381525727 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -42,6 +42,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <svtools/svlbitm.hxx>
 
 #include <map>
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 2eabe080f7a2..4f2c5cfc73bf 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -45,6 +45,7 @@
 #include <vcl/tabctrl.hxx>
 #include <tools/datetime.hxx>
 #include <svtools/txtcmp.hxx>
+#include "svtools/treelistentry.hxx"
 #include "svx/svxdllapi.h"
 
 #define FLT_DATE_BEFORE     0
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index edbf96d40814..046cfb04f76a 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -35,6 +35,8 @@
 
 #include <svx/dialogs.hrc>
 
+#include "svtools/treelistentry.hxx"
+
 // class SvxCheckListBox -------------------------------------------------
 
 SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) :
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index ba62dd19e5e8..700411a00458 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -64,6 +64,7 @@
 #include <rtl/bootstrap.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/localfilehelper.hxx>
+#include "svtools/treelistentry.hxx"
 
 namespace svx{
     namespace DocRecovery{
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index bcfc2e0f4fec..f91359fe36df 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -28,6 +28,7 @@
 
 #include "svx/fontlb.hxx"
 #include <vcl/svapp.hxx>
+#include "svtools/treelistentry.hxx"
 
 // ============================================================================
 
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index e99b1ff76ecd..2618e19e7678 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 
 // SvxSimpleTableContainer  ------------------------------------------------------
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index c77b7f1d92ab..ebe4aad2e1ca 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -44,6 +44,7 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
 #include <svtools/svtools.hrc>
+#include "svtools/treelistentry.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index a9ab319df386..ee2d8b9ba63a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -64,6 +64,7 @@
 #include <vcl/wrkwin.hxx>
 #include <tools/diagnose_ex.h>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <functional>
 
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 4e39878b0502..3ece8bd79636 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,6 +33,7 @@
 
 #include <sot/formats.hxx>
 #include <svtools/treelistbox.hxx>
+#include "svtools/treelistentry.hxx"
 #include <tools/diagnose_ex.h>
 
 
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index fe5968f542fd..d66b69613fae 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -60,6 +60,7 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include "svtools/treelistentry.hxx"
 #include <rtl/logfile.hxx>
 //............................................................................
 namespace svxform
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 8fa8b73c5c85..0ef95bbe8045 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -62,6 +62,7 @@
 #include <comphelper/property.hxx>
 #include <sfx2/frame.hxx>
 #include <svx/dataaccessdescriptor.hxx>
+#include "svtools/treelistentry.hxx"
 
 const long STD_WIN_SIZE_X = 120;
 const long STD_WIN_SIZE_Y = 150;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 557b754de54a..63a0f9f7bdde 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -41,6 +41,7 @@
 // header for class HeaderBar
 #include <svtools/headbar.hxx>
 #include <svtools/svlbitm.hxx>
+#include "svtools/treelistentry.hxx"
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // header for class SvtLinguConfigItem
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index e7f725fc17ce..edc7fd0fd366 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -42,6 +42,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
+#include "svtools/treelistentry.hxx"
 #include <IDocumentSettingAccess.hxx>
 
 using namespace ::com::sun::star::beans;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 4bd16dbca1f0..ba8bfed09a38 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 
 #include <svtools/insdlg.hxx>
+#include "svtools/treelistentry.hxx"
 #include <sot/clsids.hxx>
 #include <unotools/configmgr.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index c38b3f3baae8..51e25a09fc07 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -41,6 +41,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/sdbc/XCloseable.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 760db5bfd581..179bc639800f 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -52,6 +52,7 @@
 #include <dbtree.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <helpid.h>
 #include <utlui.hrc>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 7fcf1d8b5f97..17cd1bddae7c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <comphelper/string.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <vector>
 #include <boost/scoped_ptr.hpp>
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 8e912fac17ea..228534d3d83e 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -29,6 +29,7 @@
 #include <swtypes.hxx>
 #include <selectdbtabledialog.hxx>
 #include <dbtablepreviewdialog.hxx>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 3be654ee003c..2de000116575 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -43,6 +43,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svtools/htmlcfg.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <comphelper/storagehelper.hxx>
 #include <uitool.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 4221967662db..180cf4eaa3bb 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -28,6 +28,7 @@
 
 #include <vcl/waitobj.hxx>
 #include <rtl/ustring.hxx>
+#include "svtools/treelistentry.hxx"
 #include <com/sun/star/uno/Sequence.h>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index b97a30eb8666..31f95cc98bf0 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
+#include "svtools/treelistentry.hxx"
 #include <swtypes.hxx>
 #include <labfmt.hxx>
 #include <unotools.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 4f7ad7736a57..cb990cb31c2f 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/sdb/XDatabaseAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index d368c41f347b..d99c6325cc24 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <helpid.h>
 #include <swtypes.hxx>
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e00fb78d3546..a0addae35f11 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -43,6 +43,8 @@
 #include <IDocumentMarkAccess.hxx>
 #include <ndtxt.hxx>
 
+#include "svtools/treelistentry.hxx"
+
 #define REFFLDFLAG          0x4000
 #define REFFLDFLAG_BOOKMARK 0x4800
 #define REFFLDFLAG_FOOTNOTE 0x5000
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index aaffcb78fecc..cb73fd4b5b1c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <svtools/indexentryres.hxx>
+#include "svtools/treelistentry.hxx"
 #include <editeng/unolingu.hxx>
 #include <column.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index b0cb52534d0e..e210d44d3bdc 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -24,8 +24,9 @@
 #include <vcl/help.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/tempfile.hxx>
-
 #include <unotools/pathoptions.hxx>
+#include "svtools/treelistentry.hxx"
+
 #include <swtypes.hxx>
 #include <glosbib.hxx>
 #include <gloshdl.hxx>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index e59447e5a603..33c6265c4680 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -51,6 +51,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
+#include "svtools/treelistentry.hxx"
 #include <swwait.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 034393d6d503..e54b73278731 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -86,6 +86,7 @@
 #include <redline.hxx>
 #include <docary.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include "swabstdlg.hxx"
 #include "globals.hrc"
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 7742a9afdff0..67025071c413 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -38,6 +38,7 @@
 #include <svl/eitem.hxx>
 #include <svl/urlbmk.hxx>
 #include <svtools/filter.hxx>
+#include "svtools/treelistentry.hxx"
 #include <sfx2/docinsert.hxx>
 #include <sfx2/filedlghelper.hxx>
 
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index cfc0db0f22f3..c5382da95a74 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -32,6 +32,7 @@
 #include <dialogs.hrc>
 #include <resourcemanager.hxx>
 #include <vcl/msgbox.hxx>
+#include "svtools/treelistentry.hxx"
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index de1076006189..7e163193917b 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -26,6 +26,7 @@
 
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/datetime.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include "dialogs.hrc"
 #include "resourcemanager.hxx"
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index eb67af93f76d..d8653eaef442 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -47,6 +47,7 @@
 
 #include <tools/date.hxx>
 #include <tools/time.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include "dialogs.hrc"
 #include "digitalsignaturesdialog.hrc"
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 3f5b37dc1d5c..f87160fedf63 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <tools/urlobj.hxx>
+#include "svtools/treelistentry.hxx"
 
 #include <vcl/msgbox.hxx>