summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-11-27 22:01:07 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-11-28 13:28:32 -0500
commitabfe16cec61eae33c64cb1901f0fc740b0466f60 (patch)
tree115d36221b8dadce1f8c0fbaace7602d47b32838
parentf29c3435caf60b567bc67684b4633c57f6610fab (diff)
Get it to build after the rebase.
Change-Id: I86bc4fb6aa4158f0efc3ab765841abcea9063693
-rw-r--r--sc/Library_scfilt.mk1
-rw-r--r--sc/source/core/tool/orcusxml.cxx1
-rw-r--r--sc/source/filter/orcus/xmlcontext.cxx1
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx1
-rw-r--r--svtools/inc/svtools/treelistentry.hxx3
-rw-r--r--svtools/source/contnr/treelistentry.cxx10
6 files changed, 16 insertions, 1 deletions
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index c25ecb19c0a0..bdb99caccb1d 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -222,7 +222,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/worksheetsettings \
sc/source/filter/orcus/orcusfiltersimpl \
sc/source/filter/orcus/interface \
- sc/source/filter/orcus/orcusxml \
sc/source/filter/orcus/xmlcontext \
))
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index b3cbd467b6d5..c4a7b77b2569 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -10,6 +10,7 @@
#include "orcusxml.hxx"
#include "svtools/treelistbox.hxx"
+#include "svtools/treelistentry.hxx"
#include "rtl/strbuf.hxx"
ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index c62d39bb70a2..337d107ea8ef 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -13,6 +13,7 @@
#include "document.hxx"
#include "svtools/treelistbox.hxx"
+#include "svtools/treelistentry.hxx"
#define __ORCUS_STATIC_LIB
#include <orcus/spreadsheet/import_interface.hpp>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 38a1d09954d3..7a3afd4a82e6 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -20,6 +20,7 @@
#include "unotools/pathoptions.hxx"
#include "tools/urlobj.hxx"
#include "svtools/svlbitm.hxx"
+#include "svtools/treelistentry.hxx"
#include "sfx2/objsh.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx
index ef33942c3e4f..dfea2651eb0e 100644
--- a/svtools/inc/svtools/treelistentry.hxx
+++ b/svtools/inc/svtools/treelistentry.hxx
@@ -72,6 +72,9 @@ public:
bool HasChildListPos() const;
sal_uLong GetChildListPos() const;
+ SvTreeListEntries& GetChildEntries();
+ const SvTreeListEntries& GetChildEntries() const;
+
void Clone(SvTreeListEntry* pSource);
size_t ItemCount() const;
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 198c78eeb6fd..5a97b097819b 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -97,6 +97,16 @@ sal_uLong SvTreeListEntry::GetChildListPos() const
return ( nListPos & 0x7fffffff );
}
+SvTreeListEntries& SvTreeListEntry::GetChildEntries()
+{
+ return maChildren;
+}
+
+const SvTreeListEntries& SvTreeListEntry::GetChildEntries() const
+{
+ return maChildren;
+}
+
void SvTreeListEntry::Clone(SvTreeListEntry* pSource)
{
nListPos &= 0x80000000;