diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-13 10:14:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-13 10:54:19 +0200 |
| commit | 280553e30f4ddc932838f98a9efaac03a988a0df (patch) | |
| tree | ca69442f319a8056adb152dba1d93cd409dd3efe /sc/source/filter/orcus | |
| parent | 601fd58cc3a4ce3a13bc0dad1cc16f0a841aa765 (diff) | |
sc: boost::ptr_vector->std::vector
Change-Id: Ia78f3596888df89b13578bd383df2615bcb854a7
Diffstat (limited to 'sc/source/filter/orcus')
| -rw-r--r-- | sc/source/filter/orcus/xmlcontext.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index d0412b25c111..618b0ce2416d 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -34,20 +34,13 @@ using namespace com::sun::star; namespace { ScOrcusXMLTreeParam::EntryData& setUserDataToEntry( - SvTreeListEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore, ScOrcusXMLTreeParam::EntryType eType) + SvTreeListEntry& rEntry, ScOrcusXMLTreeParam::EntryDataVec& rStore, ScOrcusXMLTreeParam::EntryType eType) { - rStore.push_back(new ScOrcusXMLTreeParam::EntryData(eType)); + rStore.push_back(ScOrcusXMLTreeParam::EntryData(eType)); rEntry.SetUserData(&rStore.back()); return rStore.back(); } -void setEntityNameToUserData( - ScOrcusXMLTreeParam::EntryData& rEntryData, - const orcus::xml_structure_tree::entity_name& entity, const orcus::xml_structure_tree::walker& walker) -{ - rEntryData.mnNamespaceID = walker.get_xmlns_index(entity.ns); -} - OUString toString(const orcus::xml_structure_tree::entity_name& entity, const orcus::xml_structure_tree::walker& walker) { OUStringBuffer aBuf; @@ -75,8 +68,7 @@ void populateTree( ScOrcusXMLTreeParam::EntryData& rEntryData = setUserDataToEntry( *pEntry, rParam.maUserDataStore, bRepeat ? ScOrcusXMLTreeParam::ElementRepeat : ScOrcusXMLTreeParam::ElementDefault); - - setEntityNameToUserData(rEntryData, rElemName, rWalker); + rEntryData.mnNamespaceID = rWalker.get_xmlns_index(rElemName.ns); if (bRepeat) { @@ -104,7 +96,7 @@ void populateTree( ScOrcusXMLTreeParam::EntryData& rAttrData = setUserDataToEntry(*pAttr, rParam.maUserDataStore, ScOrcusXMLTreeParam::Attribute); - setEntityNameToUserData(rAttrData, rAttrName, rWalker); + rAttrData.mnNamespaceID = rWalker.get_xmlns_index(rAttrName.ns); rTreeCtrl.SetExpandedEntryBmp(pAttr, rParam.maImgAttribute); rTreeCtrl.SetCollapsedEntryBmp(pAttr, rParam.maImgAttribute); |