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

24 files changed, 26 insertions, 2 deletions

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;