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

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/main/ObjectHierarchy.cxx |   32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit b9ad0b67e2fc4825eff4a68c1dc250fd3be82a5b
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Jun 17 16:38:54 2022 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Fri Aug 19 10:57:28 2022 +0200

    chart2: remove unneeded class prefix in ObjectHierarchy.cxx
    
    Change-Id: Iee007f7ff4d9665ee089712e7ba98090a8090609
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138245
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    (cherry picked from commit 7601cf11ea31d4b74d82fde28aba65a2e2051258)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138494
    Tested-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx 
b/chart2/source/controller/main/ObjectHierarchy.cxx
index 064508bbdef6..9c132d46a10a 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -134,7 +134,7 @@ void ObjectHierarchy::createTree( const Reference< 
XChartDocument >& xChartDocum
     ObjectIdentifier aDiaOID;
     if( xDiagram.is() )
         aDiaOID = ObjectIdentifier( 
ObjectIdentifier::createClassifiedIdentifierForObject( xDiagram, xModel ) );
-    ObjectHierarchy::tChildContainer aTopLevelContainer;
+    tChildContainer aTopLevelContainer;
 
     // First Level
 
@@ -185,7 +185,7 @@ void ObjectHierarchy::createTree( const Reference< 
XChartDocument >& xChartDocum
             createDiagramTree( aTopLevelContainer, xChartDocument, xDiagram );
         else
         {
-            ObjectHierarchy::tChildContainer aSubContainer;
+            tChildContainer aSubContainer;
             createDiagramTree( aSubContainer, xChartDocument, xDiagram );
             if( !aSubContainer.empty() )
                 m_aChildMap[ aDiaOID ] = aSubContainer;
@@ -206,11 +206,11 @@ void ObjectHierarchy::createTree( const Reference< 
XChartDocument >& xChartDocum
         aTopLevelContainer.emplace_back( 
ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, u"" ) );
 
     if( ! aTopLevelContainer.empty())
-        m_aChildMap[ ObjectHierarchy::getRootNodeOID() ] = aTopLevelContainer;
+        m_aChildMap[ObjectHierarchy::getRootNodeOID()] = aTopLevelContainer;
 }
 
 void ObjectHierarchy::createLegendTree(
-    ObjectHierarchy::tChildContainer & rContainer,
+    tChildContainer & rContainer,
     const Reference< XChartDocument > & xChartDoc,
     const Reference< XDiagram > & xDiagram  )
 {
@@ -225,7 +225,7 @@ void ObjectHierarchy::createLegendTree(
     {
         Reference< container::XIndexAccess > xLegendShapeContainer(
             m_pExplicitValueProvider->getShapeForCID( 
aLegendOID.getObjectCID() ), uno::UNO_QUERY );
-        ObjectHierarchy::tChildContainer aLegendEntryOIDs;
+        tChildContainer aLegendEntryOIDs;
         lcl_getChildOIDs( aLegendEntryOIDs, xLegendShapeContainer );
 
         m_aChildMap[ aLegendOID ] = aLegendEntryOIDs;
@@ -233,7 +233,7 @@ void ObjectHierarchy::createLegendTree(
 }
 
 void ObjectHierarchy::createAxesTree(
-    ObjectHierarchy::tChildContainer & rContainer,
+    tChildContainer & rContainer,
     const Reference< XChartDocument > & xChartDoc,
     const Reference< XDiagram > & xDiagram  )
 {
@@ -298,7 +298,7 @@ void ObjectHierarchy::createAxesTree(
 }
 
 void ObjectHierarchy::createWallAndFloor(
-    ObjectHierarchy::tChildContainer & rContainer,
+    tChildContainer & rContainer,
     const Reference< XDiagram > & xDiagram )
 {
     sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
@@ -316,7 +316,7 @@ void ObjectHierarchy::createWallAndFloor(
 }
 
 void ObjectHierarchy::createDiagramTree(
-    ObjectHierarchy::tChildContainer & rContainer,
+    tChildContainer & rContainer,
     const Reference< XChartDocument > & xChartDoc,
     const Reference< XDiagram > & xDiagram )
 {
@@ -334,7 +334,7 @@ void ObjectHierarchy::createDiagramTree(
 }
 
 void ObjectHierarchy::createDataSeriesTree(
-    ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
+    tChildContainer & rOutDiagramSubContainer,
     const Reference< XDiagram > & xDiagram )
 {
     Reference< XCoordinateSystemContainer > xCooSysCnt( xDiagram, 
uno::UNO_QUERY_THROW );
@@ -365,7 +365,7 @@ void ObjectHierarchy::createDataSeriesTree(
                         ObjectIdentifier( 
ObjectIdentifier::createClassifiedIdentifierForParticle( aSeriesParticle ) ) );
                     rOutDiagramSubContainer.push_back( aSeriesOID );
 
-                    ObjectHierarchy::tChildContainer aSeriesSubContainer;
+                    tChildContainer aSeriesSubContainer;
 
                     Reference< chart2::XDataSeries > const & xSeries = 
aSeriesSeq[nSeriesIdx];
 
@@ -443,7 +443,7 @@ void ObjectHierarchy::createDataSeriesTree(
     }
 }
 
-void ObjectHierarchy::createAdditionalShapesTree( 
ObjectHierarchy::tChildContainer& rContainer )
+void ObjectHierarchy::createAdditionalShapesTree(tChildContainer& rContainer)
 {
     try
     {
@@ -491,7 +491,7 @@ const ObjectHierarchy::tChildContainer & 
ObjectHierarchy::getChildren( const Obj
         if( aIt != m_aChildMap.end())
             return aIt->second;
     }
-    static const ObjectHierarchy::tChildContainer EMPTY;
+    static const tChildContainer EMPTY;
     return EMPTY;
 }
 
@@ -501,13 +501,13 @@ const ObjectHierarchy::tChildContainer & 
ObjectHierarchy::getSiblings( const Obj
     {
         for (auto const& child : m_aChildMap)
         {
-            ObjectHierarchy::tChildContainer::const_iterator aElemIt(
+            tChildContainer::const_iterator aElemIt(
                 std::find( child.second.begin(), child.second.end(), rNode ));
             if( aElemIt != child.second.end())
                 return child.second;
         }
     }
-    static const ObjectHierarchy::tChildContainer EMPTY;
+    static const tChildContainer EMPTY;
     return EMPTY;
 }
 
@@ -516,8 +516,8 @@ ObjectIdentifier ObjectHierarchy::getParentImpl(
     const ObjectIdentifier & rOID ) const
 {
     // search children
-    ObjectHierarchy::tChildContainer aChildren( getChildren( rParentOID ));
-    ObjectHierarchy::tChildContainer::const_iterator aIt(
+    tChildContainer aChildren( getChildren( rParentOID ));
+    tChildContainer::const_iterator aIt(
         std::find( aChildren.begin(), aChildren.end(), rOID ));
     // recursion end
     if( aIt != aChildren.end())