sc/inc/orcusxml.hxx | 4 ++--
sc/source/core/tool/orcusxml.cxx | 2 +-
sc/source/filter/orcus/orcusfiltersimpl.cxx | 8 ++++----
sc/source/ui/inc/xmlsourcedlg.hxx | 10 +++++-----
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 22 +++++++++++-----------
5 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 4f2856c017310f8775b8617797f21bf2fbf208fb
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Wed Nov 7 13:06:35 2012 -0500
Get it to build again after the rebase.
The breakage is mostly due to my tree control rework on master.
Change-Id: I1db09fa18b4d997cf77fea2968e787cbce3b0a72
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 2c4b07b..a133b78 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -16,7 +16,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
-class SvLBoxEntry;
+class SvTreeListEntry;
/**
* Parameter used during call to ScOrcusFilters::loadXMLStructure().
@@ -47,7 +47,7 @@ struct ScOrcusXMLTreeParam
*/
UserDataStoreType maUserDataStore;
- static SC_DLLPUBLIC EntryData* getUserData(SvLBoxEntry& rEntry);
+ static SC_DLLPUBLIC EntryData* getUserData(SvTreeListEntry& rEntry);
};
#endif
diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index 068fddf..8d5d91b 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -14,7 +14,7 @@
ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) :
meType(eType), maLinkedPos(ScAddress::INITIALIZE_INVALID),
mbRangeParent(false) {}
-ScOrcusXMLTreeParam::EntryData* ScOrcusXMLTreeParam::getUserData(SvLBoxEntry&
rEntry)
+ScOrcusXMLTreeParam::EntryData*
ScOrcusXMLTreeParam::getUserData(SvTreeListEntry& rEntry)
{
return static_cast<ScOrcusXMLTreeParam::EntryData*>(rEntry.GetUserData());
}
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx
b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index b4a1408..0549156 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -177,7 +177,7 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, const
OUString& rPath) cons
namespace {
void setUserDataToEntry(
- SvLBoxEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore,
ScOrcusXMLTreeParam::EntryType eType)
+ SvTreeListEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore,
ScOrcusXMLTreeParam::EntryType eType)
{
rStore.push_back(new ScOrcusXMLTreeParam::EntryData(eType));
rEntry.SetUserData(&rStore.back());
@@ -186,10 +186,10 @@ void setUserDataToEntry(
void populateTree(
SvTreeListBox& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
const orcus::xml_structure_tree::entity_name& rElemName, bool bRepeat,
- SvLBoxEntry* pParent, ScOrcusXMLTreeParam& rParam)
+ SvTreeListEntry* pParent, ScOrcusXMLTreeParam& rParam)
{
OUString aName(rElemName.name.get(), rElemName.name.size(),
RTL_TEXTENCODING_UTF8);
- SvLBoxEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
+ SvTreeListEntry* pEntry = rTreeCtrl.InsertEntry(aName, pParent);
if (!pEntry)
// Can this ever happen!?
return;
@@ -217,7 +217,7 @@ void populateTree(
for (; it != itEnd; ++it)
{
orcus::xml_structure_tree::entity_name aAttrName = *it;
- SvLBoxEntry* pAttr = rTreeCtrl.InsertEntry(
+ SvTreeListEntry* pAttr = rTreeCtrl.InsertEntry(
OUString(aAttrName.name.get(), aAttrName.name.size(),
RTL_TEXTENCODING_UTF8), pEntry);
if (!pAttr)
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx
b/sc/source/ui/inc/xmlsourcedlg.hxx
index 0f8f0cb..c283ec4 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -74,9 +74,9 @@ private:
void HandleGetFocus(Control* pCtrl);
void HandleLoseFocus(Control* pCtrl);
void TreeItemSelected();
- void DefaultElementSelected(SvLBoxEntry& rEntry);
- void RepeatElementSelected(SvLBoxEntry& rEntry);
- void AttributeSelected(SvLBoxEntry& rEntry);
+ void DefaultElementSelected(SvTreeListEntry& rEntry);
+ void RepeatElementSelected(SvTreeListEntry& rEntry);
+ void AttributeSelected(SvTreeListEntry& rEntry);
void SetNonLinkable();
void SetSingleLinkable();
@@ -87,9 +87,9 @@ private:
* not checked; its parent is the first one to be checked, then all its
* parents get checked all the way to the root.
*/
- bool IsParentDirty(SvLBoxEntry* pEntry) const;
+ bool IsParentDirty(SvTreeListEntry* pEntry) const;
- bool IsChildrenDirty(SvLBoxEntry* pEntry) const;
+ bool IsChildrenDirty(SvTreeListEntry* pEntry) const;
DECL_LINK(GetFocusHdl, Control*);
DECL_LINK(LoseFocusHdl, Control*);
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index b9d518b..eae0f99 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -90,7 +90,7 @@ void ScXMLSourceDlg::SetReference(const ScRange& rRange,
ScDocument* pDoc)
mpActiveEdit->SetRefString(aStr);
// Set this address to currently selected tree item.
- SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
+ SvTreeListEntry* pEntry = maLbTree.GetCurEntry();
if (!pEntry)
return;
@@ -195,7 +195,7 @@ void ScXMLSourceDlg::HandleLoseFocus(Control* /*pCtrl*/)
void ScXMLSourceDlg::TreeItemSelected()
{
- SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
+ SvTreeListEntry* pEntry = maLbTree.GetCurEntry();
if (!pEntry)
return;
@@ -228,7 +228,7 @@ void ScXMLSourceDlg::TreeItemSelected()
}
}
-void ScXMLSourceDlg::DefaultElementSelected(SvLBoxEntry& rEntry)
+void ScXMLSourceDlg::DefaultElementSelected(SvTreeListEntry& rEntry)
{
ScOrcusXMLTreeParam::EntryData* pUserData = NULL;
@@ -236,7 +236,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvLBoxEntry&
rEntry)
{
// Only an element with no child elements (leaf element) can be linked.
bool bHasChild = false;
- for (SvLBoxEntry* pChild = maLbTree.FirstChild(&rEntry); pChild;
pChild = maLbTree.NextSibling(pChild))
+ for (SvTreeListEntry* pChild = maLbTree.FirstChild(&rEntry); pChild;
pChild = maLbTree.NextSibling(pChild))
{
pUserData = ScOrcusXMLTreeParam::getUserData(*pChild);
OSL_ASSERT(pUserData);
@@ -266,7 +266,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvLBoxEntry&
rEntry)
SetSingleLinkable();
}
-void ScXMLSourceDlg::RepeatElementSelected(SvLBoxEntry& rEntry)
+void ScXMLSourceDlg::RepeatElementSelected(SvTreeListEntry& rEntry)
{
// Check all its parents first.
@@ -290,13 +290,13 @@ void ScXMLSourceDlg::RepeatElementSelected(SvLBoxEntry&
rEntry)
SetRangeLinkable();
}
-void ScXMLSourceDlg::AttributeSelected(SvLBoxEntry& rEntry)
+void ScXMLSourceDlg::AttributeSelected(SvTreeListEntry& rEntry)
{
// Check all its parent elements and make sure non of them are linked nor
// repeat elements. In attribute's case, it's okay to have the immediate
// parent element linked (but not range-linked).
- SvLBoxEntry* pParent = maLbTree.GetParent(&rEntry);
+ SvTreeListEntry* pParent = maLbTree.GetParent(&rEntry);
OSL_ASSERT(pParent); // attribute should have a parent element.
ScOrcusXMLTreeParam::EntryData* pUserData =
ScOrcusXMLTreeParam::getUserData(*pParent);
@@ -338,10 +338,10 @@ void ScXMLSourceDlg::SetRangeLinkable()
maRefBtn.Enable();
}
-bool ScXMLSourceDlg::IsParentDirty(SvLBoxEntry* pEntry) const
+bool ScXMLSourceDlg::IsParentDirty(SvTreeListEntry* pEntry) const
{
ScOrcusXMLTreeParam::EntryData* pUserData = NULL;
- SvLBoxEntry* pParent = maLbTree.GetParent(pEntry);
+ SvTreeListEntry* pParent = maLbTree.GetParent(pEntry);
while (pParent)
{
pUserData = ScOrcusXMLTreeParam::getUserData(*pParent);
@@ -361,10 +361,10 @@ bool ScXMLSourceDlg::IsParentDirty(SvLBoxEntry* pEntry)
const
return false;
}
-bool ScXMLSourceDlg::IsChildrenDirty(SvLBoxEntry* pEntry) const
+bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* pEntry) const
{
ScOrcusXMLTreeParam::EntryData* pUserData = NULL;
- for (SvLBoxEntry* pChild = maLbTree.FirstChild(pEntry); pChild; pChild =
maLbTree.NextSibling(pChild))
+ for (SvTreeListEntry* pChild = maLbTree.FirstChild(pEntry); pChild; pChild
= maLbTree.NextSibling(pChild))
{
pUserData = ScOrcusXMLTreeParam::getUserData(*pChild);
OSL_ASSERT(pUserData);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
