chart2/source/controller/inc/ObjectHierarchy.hxx | 24 ++++++++++------------
chart2/source/controller/main/ObjectHierarchy.cxx | 2 -
2 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit b3f71d852566059b98457edbc0685ef2191342ea
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Jun 17 16:29:23 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Aug 14 12:21:27 2022 +0200
chart2: call clear instead of creating a new empty map
Change-Id: I8b21909e92b558240e84cffd9432e0d9e270284e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138244
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index e1f3697e6250..ab1fa891377e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -105,7 +105,7 @@ namespace chart
void ObjectHierarchy::createTree( const rtl::Reference<::chart::ChartModel>&
xChartDocument )
{
- m_aChildMap = tChildMap();//clear tree
+ m_aChildMap.clear();
if( !xChartDocument.is() )
return;
commit 4aa706e345db84b60706b5e17102a48e5db6563e
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Jun 17 16:28:38 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Aug 14 12:21:17 2022 +0200
chart2: remove unneeded class prefix in ObjectHierarchy.hxx
Change-Id: I1c851933e9b25dcd9a0dc29758baad8f3be7cb2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138243
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx
b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 1255b7ac9910..1531866aaf2b 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -52,11 +52,10 @@ public:
static bool isRootNode( const ObjectIdentifier& rOID );
/// equal to getChildren( getRootNodeOID())
- const tChildContainer & getTopLevelChildren() const;
- bool hasChildren( const ObjectIdentifier& rParent ) const;
- const tChildContainer & getChildren( const ObjectIdentifier& rParent )
const;
-
- const tChildContainer & getSiblings( const ObjectIdentifier& rNode )
const;
+ const tChildContainer& getTopLevelChildren() const;
+ bool hasChildren(const ObjectIdentifier& rParent) const;
+ const tChildContainer& getChildren(const ObjectIdentifier& rParent) const;
+ const tChildContainer& getSiblings(const ObjectIdentifier& rNode) const;
/// The result is empty, if the node cannot be found in the tree
ObjectIdentifier getParent( const ObjectIdentifier& rNode )
const;
@@ -66,30 +65,29 @@ public:
private:
void createTree( const rtl::Reference<::chart::ChartModel> &
xChartDocument );
void createAxesTree(
- ObjectHierarchy::tChildContainer & rContainer,
+ tChildContainer & rContainer,
const rtl::Reference<::chart::ChartModel> & xChartDoc,
const rtl::Reference< ::chart::Diagram > & xDiagram );
void createDiagramTree(
- ObjectHierarchy::tChildContainer& rContainer,
+ tChildContainer& rContainer,
const rtl::Reference<::chart::ChartModel>& xChartDoc,
const rtl::Reference< ::chart::Diagram >& xDiagram );
void createDataSeriesTree(
- ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
+ tChildContainer & rOutDiagramSubContainer,
const rtl::Reference< ::chart::Diagram > & xDiagram );
static void createWallAndFloor(
- ObjectHierarchy::tChildContainer & rContainer,
+ tChildContainer & rContainer,
const rtl::Reference< ::chart::Diagram > & xDiagram );
void createLegendTree(
- ObjectHierarchy::tChildContainer & rContainer,
+ tChildContainer & rContainer,
const rtl::Reference<::chart::ChartModel> & xChartDoc,
const rtl::Reference< ::chart::Diagram > & xDiagram );
- void createAdditionalShapesTree( ObjectHierarchy::tChildContainer&
rContainer );
+ void createAdditionalShapesTree(tChildContainer& rContainer);
ObjectIdentifier getParentImpl(
const ObjectIdentifier& rParentOID,
const ObjectIdentifier& rOID ) const;
- typedef std::map< ObjectIdentifier, ObjectHierarchy::tChildContainer >
- tChildMap;
+ typedef std::map<ObjectIdentifier, tChildContainer> tChildMap;
tChildMap m_aChildMap;
ExplicitValueProvider* m_pExplicitValueProvider;
bool m_bFlattenDiagram;
