[Libreoffice-commits] .: chart2/source

[David Tardon]

 chart2/source/controller/accessibility/AccessibleBase.cxx         |    1 
 chart2/source/controller/accessibility/AccessibleChartElement.cxx |   31 ----
 chart2/source/controller/accessibility/AccessibleChartView.cxx    |    3 
 chart2/source/controller/accessibility/ChartElementFactory.cxx    |   64 ----------
 4 files changed, 99 deletions(-)

New commits:
commit d839883a20a6fde49674d1dc0cc7a843dae52b1b
Author: Timo Heino <eraggo at gmail.com>
Date:   Mon Nov 22 18:32:45 2010 +0200

    Removed commented out code
    
    Removed code that was commented out from some files inside
    calc/chart2/source/controller/accessibility/ folder.
    
    Signed-off-by: Timo Heino <eraggo at gmail.com>

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 2b7eaec..1bc5425 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -779,7 +779,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
             if( xParent.is() )
                 aParentLocOnScreen = xParent->getLocationOnScreen();
 
-            // aOffset = aParentLocOnScreen - GetUpperLeftOnScreen()
             awt::Point aULOnScreen = GetUpperLeftOnScreen();
             awt::Point aOffset( aParentLocOnScreen.X - aULOnScreen.X,
                                 aParentLocOnScreen.Y - aULOnScreen.Y );
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index dd00d7e..f0cee9c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -130,30 +130,6 @@ void AccessibleChartElement::InitTextEdit()
             ASSERT_EXCEPTION( ex );
         }
 }
-//     OSL_ASSERT( m_pTextHelper == 0 );
-
-//     // /-- solar
-//     SolarMutexGuard aSolarGuard;
-//     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
-//     if( pWindow )
-//     {
-//         // we need ChartController::m_pDrawViewWrapper here
-//         SdrView * pView = 0;
-//         if( pView )
-//         {
-//             SdrObject * pTextObj = m_pDrawViewWrapper->getTextEditObject();
-//             if( pTextObj )
-//             {
-//                 SvxEditSource * pEditSource = new SvxEditSource( pTextObj, pView, pWindow );
-//                 m_pTextHelper = new ::accessibility::AccessibleTextHelper(
-//                     ::std::auto_ptr< SvxEditSource >( pEditSource ));
-//                 if( m_pTextHelper )
-//                     m_pTextHelper->SetEventSource( this );
-//             }
-//         }
-//     }
-//     // \-- solar
-// }
 
 // ____________________________________
 // ____________________________________
@@ -169,14 +145,7 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
     Reference< XAccessible > xResult;
 
     if( m_bHasText )
-    {
         xResult.set( m_xTextHelper->getAccessibleChild( i ));
-        // /-- solar
-//         SolarMutexGuard aSolarGuard;
-//         if( m_pTextHelper )
-//             xResult.set( m_pTextHelper->GetChild( i ) );
-        // \-- solar
-    }
     else
         xResult.set( AccessibleBase::ImplGetAccessibleChildById( i ));
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index b816204..1b3280f 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -93,9 +93,6 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const
     if( ! xWindow.is())
         return awt::Rectangle();
 
-    // this should do, but it doesn't => HACK
-//     return xWindow->getPosSize();
-
     awt::Rectangle aBBox( xWindow->getPosSize() );
 
     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx
index c630ff9..3fff9b7 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -77,70 +77,6 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
     }
 
     return 0;
-
-    /*
-    sal_uInt16 nObjId = rId.GetObjectId();
-    switch( nObjId )
-    {
-        case CHOBJID_LEGEND:
-            return new AccLegend( pParent );
-        case AccLegendEntry::ObjectId:
-            return new AccLegendEntry( pParent, rId.GetIndex1() );
-
-        case CHOBJID_TITLE_MAIN:
-            return new AccTitle( pParent, Title::MAIN );
-        case CHOBJID_TITLE_SUB:
-            return new AccTitle( pParent, Title::SUB );
-        case CHOBJID_DIAGRAM_TITLE_X_AXIS:
-            return new AccTitle( pParent, Title::X_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Y_AXIS:
-            return new AccTitle( pParent, Title::Y_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
-            return new AccTitle( pParent, Title::Z_AXIS );
-
-        case CHOBJID_DIAGRAM:
-            return new AccDiagram( pParent );
-
-        // series
-        case CHOBJID_DIAGRAM_ROWGROUP:
-            return new AccDataSeries( pParent, rId.GetIndex1() );
-
-        // data points
-        case CHOBJID_DIAGRAM_DATA:
-            return new AccDataPoint( pParent, rId.GetIndex1(), rId.GetIndex2() );
-
-        case Axis::X_AXIS:
-        case Axis::Y_AXIS:
-        case Axis::Z_AXIS:
-        case Axis::SEC_X_AXIS:
-        case Axis::SEC_Y_AXIS:
-            return new AccAxis( pParent, static_cast< Axis::AxisType >( nObjId ) );
-
-        case Grid::X_MAJOR:
-        case Grid::Y_MAJOR:
-        case Grid::Z_MAJOR:
-        case Grid::X_MINOR:
-        case Grid::Y_MINOR:
-        case Grid::Z_MINOR:
-            return new AccGrid( pParent, static_cast< AccGrid::GridType >( nObjId ) );
-
-        case AccStatisticsObject::MEAN_VAL_LINE:
-        case AccStatisticsObject::ERROR_BARS:
-        case AccStatisticsObject::REGRESSION:
-            return new AccStatisticsObject( pParent,
-                                         static_cast< AccStatisticsObject::StatisticsObjectType >( nObjId ),
-                                         rId.GetIndex1() );
-
-        case CHOBJID_DIAGRAM_WALL:
-            return new AccWall( pParent );
-
-        case CHOBJID_DIAGRAM_FLOOR:
-            return new AccFloor( pParent );
-
-        case CHOBJID_DIAGRAM_AREA:
-            return new AccArea( pParent );
-    }
-    */
 }
 
 } // namespace chart