[Libreoffice-commits] .: basctl/source chart2/source cui/source dbaccess/source dictionaries extensions/source filter/source formula/source fpicker/source reportdesign/source sc/source sd/source sfx2/source svtools/inc svtools/Package_inc.mk svtools/source svx/inc svx/source sw/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 16 13:19:04 PST 2012
basctl/source/basicide/baside2b.cxx | 1
basctl/source/basicide/bastype2.cxx | 1
basctl/source/basicide/bastype3.cxx | 1
basctl/source/basicide/moduldl2.cxx | 1
basctl/source/basicide/moduldlg.cxx | 1
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 1
cui/source/customize/acccfg.cxx | 1
cui/source/customize/cfg.cxx | 1
cui/source/customize/cfgutil.cxx | 1
cui/source/customize/macropg.cxx | 1
cui/source/customize/selector.cxx | 1
cui/source/dialogs/hangulhanjadlg.cxx | 1
cui/source/dialogs/hlmarkwn.cxx | 1
cui/source/dialogs/linkdlg.cxx | 1
cui/source/dialogs/multipat.cxx | 1
cui/source/dialogs/scriptdlg.cxx | 1
cui/source/dialogs/srchxtra.cxx | 1
cui/source/dialogs/thesdlg.cxx | 1
cui/source/inc/autocdlg.hxx | 1
cui/source/options/certpath.cxx | 1
cui/source/options/dbregister.cxx | 1
cui/source/options/fontsubs.hxx | 1
cui/source/options/optHeaderTabListbox.cxx | 1
cui/source/options/optfltr.cxx | 1
cui/source/options/optjava.cxx | 1
cui/source/options/optlingu.cxx | 1
cui/source/options/optpath.cxx | 1
cui/source/options/treeopt.cxx | 1
cui/source/options/webconninfo.cxx | 5 +-
cui/source/tabpages/macroass.cxx | 1
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1
dbaccess/source/ui/app/AppDetailView.cxx | 1
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 1
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 1
dbaccess/source/ui/browser/unodatbr.cxx | 1
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/control/tabletree.cxx | 1
dbaccess/source/ui/dlg/indexdialog.cxx | 1
dbaccess/source/ui/dlg/sqlmessage.cxx | 1
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/source/ui/misc/WNameMatch.cxx | 1
dbaccess/source/ui/querydesign/QTableWindow.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 1
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dictionaries | 1
extensions/source/propctrlr/selectlabeldialog.cxx | 1
extensions/source/propctrlr/taborder.cxx | 1
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 1
formula/source/ui/dlg/structpg.cxx | 1
fpicker/source/office/iodlg.cxx | 1
reportdesign/source/ui/dlg/AddField.cxx | 1
reportdesign/source/ui/dlg/Navigator.cxx | 1
sc/source/ui/miscdlgs/solveroptions.cxx | 1
sc/source/ui/optdlg/calcoptionsdlg.cxx | 1
sd/source/ui/animations/CustomAnimationList.cxx | 1
sd/source/ui/dlg/custsdlg.cxx | 1
sd/source/ui/dlg/dlgassim.cxx | 1
sd/source/ui/dlg/sdtreelb.cxx | 1
sfx2/source/appl/newhelp.cxx | 1
sfx2/source/dialog/versdlg.cxx | 1
sfx2/source/doc/docvor.cxx | 1
svtools/Package_inc.mk | 1
svtools/inc/svtools/treelist.hxx | 13 ++---
svtools/inc/svtools/treelistbox.hxx | 23 +++++-----
svtools/inc/svtools/treelistentries.hxx | 20 ++++++++
svtools/inc/svtools/treelistentry.hxx | 6 --
svtools/source/contnr/fileview.cxx | 4 -
svtools/source/contnr/svimpbox.cxx | 12 +++++
svtools/source/contnr/svlbitm.cxx | 1
svtools/source/contnr/svtabbx.cxx | 1
svtools/source/contnr/treelist.cxx | 17 ++++++-
svtools/source/contnr/treelistbox.cxx | 11 ++++
svtools/source/contnr/treelistentry.cxx | 1
svtools/source/inc/svimpbox.hxx | 4 -
svtools/source/uno/treecontrolpeer.cxx | 1
svx/inc/svx/ctredlin.hxx | 1
svx/source/dialog/checklbx.cxx | 2
svx/source/dialog/docrecovery.cxx | 1
svx/source/dialog/fontlb.cxx | 1
svx/source/dialog/simptabl.cxx | 1
svx/source/form/datanavi.cxx | 1
svx/source/form/filtnav.cxx | 1
svx/source/form/fmexch.cxx | 1
svx/source/form/navigatortree.cxx | 1
svx/source/form/tabwin.cxx | 1
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 1
sw/source/ui/config/optcomp.cxx | 1
sw/source/ui/config/optload.cxx | 1
sw/source/ui/dbui/addresslistdialog.cxx | 1
sw/source/ui/dbui/dbtree.cxx | 1
sw/source/ui/dbui/mmaddressblockpage.cxx | 1
sw/source/ui/dbui/selectdbtabledialog.cxx | 1
sw/source/ui/dialog/uiregionsw.cxx | 1
sw/source/ui/envelp/label1.cxx | 1
sw/source/ui/envelp/labelexp.cxx | 1
sw/source/ui/fldui/changedb.cxx | 1
sw/source/ui/fldui/flddinf.cxx | 1
sw/source/ui/fldui/fldref.cxx | 2
sw/source/ui/index/cnttab.cxx | 1
sw/source/ui/misc/glosbib.cxx | 3 -
sw/source/ui/misc/glossary.cxx | 1
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/utlui/glbltree.cxx | 1
xmlsecurity/source/dialogs/certificatechooser.cxx | 1
xmlsecurity/source/dialogs/certificateviewer.cxx | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 1
xmlsecurity/source/dialogs/macrosecurity.cxx | 1
108 files changed, 184 insertions(+), 36 deletions(-)
New commits:
commit 43cd14d317dd463a9e7c15fd6bcd6b289f96491f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Fri Nov 16 16:14:53 2012 -0500
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
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 1ef15c5..db2888c 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 285aefc..7ea6699 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 d201081..194d52d 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 c0eebbe..1fefb92 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 cfbea3e..49c58a3 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 4714281..95398d3 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 a3ac450..d0cc24a 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 03ca2fe..97bf17a 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 e79f1c6..410cd10 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 2b0e57d..376d751 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 c3e3156..8d4af3e 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 50d0644..688a820 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 848f8b1..3ce1ba1 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 68429f2..592bbfc 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 c185887..c45337e 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 df3575f..3505102 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 f5d296d..4a6f443 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 590dda3..e428bed 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 a695604..abaf70c 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 0e7f6a4..95709ac 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 d04d3c8..aa500b4 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 04afa3e..900f8cd 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 32ba107..93909bf 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 a6d12f7..df2d57e 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 6c38810..32d9441 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 a81c354..05ee3eb 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 f1612b5..0963272 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 79eabdf..5227729 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 a0a9e03..212e990 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 513f436..f2abc5a 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 dfcea23..e4e41dd 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 d3da7bb..d0f3dc5 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 275b90e..8e02c7a 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 94472f0..a3da512 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 3c3279f..c9b65cd 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 1c53330..ce7a37a 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 05c9856..60a81e5 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 73e8624..4c7f2e0 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 f0b5d32..210d5e6 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 c58e5c4..0f605a4 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 6a40a71..b639371 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 d07ab1e..357860b 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 9c761b7..ec1c75d 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 7c4ad6f..ba731ce 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 27cd818..8c85590 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
index 028f440..0000000
--- a/dictionaries
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 028f44069fd346ba07b3a0263ee340022eb44d6c
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index d0ea487..509fa94 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 bc5c5a1..74f1efa 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 e066786..bc4c31c 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 dfdaa5f..6f1ffe3 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 2eef8ee..0e60cfb 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 3acb09d..003b205 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 7d12616..a60c093 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 8160856..2539645 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 2a7d0ef..91a4440 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 d63ac3b..5a7200f 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 b1974fd..0f89d7f 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 43171da..aefaef1 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 04b60ea..a672ed9 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 3e39f64..ff6a8fc 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 0eeaf94..aca4e4a 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 59995db..f086469 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 7ec94d3..9220721 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 79fbc1b..2332e58 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 a7e05d3..cd7aa36 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 0000000..d52d09a
--- /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 7eb015c..b3df912 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 212e581..4713aac 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 0614591..b7e7f95 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 314bc31..0cdc4a9 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 929c429..6f5e99b 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 ed278f1..dbe6df7 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 167035b..c60d1b5 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 b98b24a..c34b53c 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 b33bdc2..eb3adc5 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 f777868..daf3815 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 2eabe08..4f2c5cf 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 edbf96d..046cfb0 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 ba62dd1..700411a 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 bcfc2e0..f91359f 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 e99b1ff..2618e19 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 c77b7f1..ebe4aad 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 a9ab319..ee2d8b9 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 4e39878..3ece8bd 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 fe5968f..d66b696 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 8fa8b73..0ef95bb 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 557b754..63a0f9f 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 e7f725f..edc7fd0 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 4bd16db..ba8bfed 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 c38b3f3..51e25a0 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 760db5b..179bc63 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 7fcf1d8..17cd1bd 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 8e912fa..228534d 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 3be654e..2de0001 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 4221967..180cf4e 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 b97a30e..31f95cc 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 4f7ad77..cb990cb 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 d368c41..d99c632 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 e00fb78..a0addae 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 aaffcb7..cb73fd4 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 b0cb525..e210d44 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 e59447e..33c6265 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 034393d..e54b732 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 7742a9a..6702507 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 cfc0db0..c5382da 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 de10760..7e16319 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 eb67af9..d8653ea 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 3f5b37d..f87160f 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>
More information about the Libreoffice-commits
mailing list