1 files changed, 19 insertions, 20 deletions
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index d8f7747e8bc6..1531866aaf2b 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <ChartModel.hxx>
 #include <ObjectIdentifier.hxx>
 #include <map>
 #include <vector>
@@ -51,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;
@@ -65,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 css::uno::Reference< css::chart2::XDiagram > & xDiagram  );
+        const rtl::Reference< ::chart::Diagram > & xDiagram  );
     void createDiagramTree(
-        ObjectHierarchy::tChildContainer& rContainer,
+        tChildContainer& rContainer,
         const rtl::Reference<::chart::ChartModel>& xChartDoc,
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
+        const rtl::Reference< ::chart::Diagram >& xDiagram );
     void createDataSeriesTree(
-        ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
-        const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+        tChildContainer & rOutDiagramSubContainer,
+        const rtl::Reference< ::chart::Diagram > & xDiagram );
     static void createWallAndFloor(
-        ObjectHierarchy::tChildContainer & rContainer,
-        const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+        tChildContainer & rContainer,
+        const rtl::Reference< ::chart::Diagram > & xDiagram );
     void createLegendTree(
-        ObjectHierarchy::tChildContainer & rContainer,
+        tChildContainer & rContainer,
         const rtl::Reference<::chart::ChartModel> & xChartDoc,
-        const css::uno::Reference< css::chart2::XDiagram > & xDiagram  );
-    void createAdditionalShapesTree( ObjectHierarchy::tChildContainer& rContainer );
+        const rtl::Reference< ::chart::Diagram > & xDiagram  );
+    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;
@@ -98,8 +97,8 @@ private:
 class ObjectKeyNavigation
 {
 public:
-    explicit ObjectKeyNavigation( const ObjectIdentifier & rCurrentOID,
-                                  const rtl::Reference<::chart::ChartModel> & xChartDocument,
+    explicit ObjectKeyNavigation( ObjectIdentifier aCurrentOID,
+                                  rtl::Reference<::chart::ChartModel> xChartDocument,
                                   ExplicitValueProvider * pExplicitValueProvider );
 
     bool handleKeyEvent( const css::awt::KeyEvent & rEvent );