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

15 files changed, 16 insertions, 2 deletions

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;