[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - chart2/source

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/inc/ObjectHierarchy.hxx |   24 ++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 6219beab24a06c4f69fb6df7e5a068e8af60d245
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Jun 17 16:28:38 2022 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Fri Aug 19 10:55:19 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>
    (cherry picked from commit 4aa706e345db84b60706b5e17102a48e5db6563e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138492
    Tested-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx 
b/chart2/source/controller/inc/ObjectHierarchy.hxx
index bac8deec2204..9391a110fd68 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -51,11 +51,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;
@@ -65,30 +64,29 @@ public:
 private:
     void createTree( const css::uno::Reference< css::chart2::XChartDocument > 
& xChartDocument );
     void createAxesTree(
-        ObjectHierarchy::tChildContainer & rContainer,
+        tChildContainer & rContainer,
         const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc,
         const css::uno::Reference< css::chart2::XDiagram > & xDiagram  );
     void createDiagramTree(
-        ObjectHierarchy::tChildContainer& rContainer,
+        tChildContainer& rContainer,
         const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc,
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
     void createDataSeriesTree(
-        ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
+        tChildContainer & rOutDiagramSubContainer,
         const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
     static void createWallAndFloor(
-        ObjectHierarchy::tChildContainer & rContainer,
+        tChildContainer & rContainer,
         const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
     void createLegendTree(
-        ObjectHierarchy::tChildContainer & rContainer,
+        tChildContainer & rContainer,
         const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc,
         const css::uno::Reference< css::chart2::XDiagram > & 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;