diff options
author | Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk> | 2011-01-16 10:40:01 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-17 20:37:08 +0000 |
commit | 253326f6e66c83422abc0966e0eac59d488c78d6 (patch) | |
tree | d26eaba83aec19f5273d2962c21fc8636ee91b7c /chart2/source/controller/accessibility | |
parent | c8f158e7afe19b5964dd752a95b2c74d3c12f4f0 (diff) |
Removed bogus comments from calc-chart2
Removed bogus comments from calc/chart2/accesibility and .../chartapiwrapper
Diffstat (limited to 'chart2/source/controller/accessibility')
5 files changed, 3 insertions, 58 deletions
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx index 62fbc83e39d7..f9e852992772 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx @@ -40,27 +40,9 @@ namespace chart AccStatisticsObject::AccStatisticsObject( const AccessibleElementInfo& rAccInfo ) : AccessibleChartElement( rAccInfo, false/*NoChildren*/, true/*AlwaysTransparent*/ ) - //, m_eType( eType ) - //, m_nSeriesIndex( nSeriesIndex ) -{ -// ChartModel * pModel = GetChartModel(); -// OSL_ASSERT( pModel ); - // /-- solar +{ SolarMutexGuard aSolarGuard; -/* switch( eType ) - { - case MEAN_VAL_LINE: - SetItemSet( pModel->GetAverageAttr( m_nSeriesIndex )); - break; - case ERROR_BARS: - SetItemSet( pModel->GetErrorAttr( m_nSeriesIndex )); - break; - case REGRESSION: - SetItemSet( pModel->GetRegressAttr( m_nSeriesIndex )); - break; - }*/ - // \-- solar } AccStatisticsObject::~AccStatisticsObject() diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx index 94933446f324..eb101831f900 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx @@ -56,10 +56,6 @@ public: // ________ XServiceInfo ________ virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - -private: - //const StatisticsObjectType m_eType; - //const sal_uInt16 m_nSeriesIndex; }; } // accessibility diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 386856d1f938..bb63345bfd2f 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -200,12 +200,11 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId else if( m_bMayHaveChildren ) { bool bStop = false; - // /-- + ClearableMutexGuard aGuard( GetMutex() ); // make local copy for notification ChildListVectorType aLocalChildList( m_aChildList ); aGuard.clear(); - // \-- ChildListVectorType::iterator aEndIter = aLocalChildList.end(); for( ChildListVectorType::iterator aIter = aLocalChildList.begin() ; @@ -245,7 +244,6 @@ bool AccessibleBase::UpdateChildren() { bool bMustUpdateChildren = false; { - // /-- MutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || m_bIsDisposed ) @@ -253,7 +251,6 @@ bool AccessibleBase::UpdateChildren() bMustUpdateChildren = ( m_bMayHaveChildren && ! m_bChildrenInitialized ); - // \-- } // update unguarded @@ -319,7 +316,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild ) OSL_ENSURE( pChild != NULL, "Invalid Child" ); if( pChild ) { - // /-- ClearableMutexGuard aGuard( GetMutex() ); Reference< XAccessible > xChild( pChild ); @@ -334,10 +330,8 @@ void AccessibleBase::AddChild( AccessibleBase * pChild ) aNew <<= xChild; aGuard.clear(); - // \-- (1st) BroadcastAccEvent( AccessibleEventId::CHILD, aNew, aEmpty ); } - // \-- (2nd) } } @@ -346,7 +340,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild ) */ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId ) { - // /-- ClearableMutexGuard aGuard( GetMutex() ); ChildOIDMap::iterator aIt( m_aChildOIDMap.find( rOId )); @@ -370,7 +363,6 @@ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId ) // call listeners unguarded aGuard.clear(); - // \-- (1st) // inform listeners of removed child if( bInitialized ) @@ -393,11 +385,9 @@ awt::Point AccessibleBase::GetUpperLeftOnScreen() const awt::Point aResult; if( m_aAccInfo.m_pParent ) { - // /-- ClearableMutexGuard aGuard( GetMutex() ); AccessibleBase * pParent = m_aAccInfo.m_pParent; aGuard.clear(); - // \-- if( pParent ) { @@ -416,7 +406,6 @@ void AccessibleBase::BroadcastAccEvent( const Any & rOld, bool bSendGlobally ) const { - // /-- ClearableMutexGuard aGuard( GetMutex() ); if ( !m_nEventNotifierId && !bSendGlobally ) @@ -434,7 +423,6 @@ void AccessibleBase::BroadcastAccEvent( ::comphelper::AccessibleEventNotifier::addEvent( m_nEventNotifierId, aEvent ); aGuard.clear(); - // \-- // send event to global message queue if( bSendGlobally ) @@ -445,7 +433,6 @@ void AccessibleBase::BroadcastAccEvent( void AccessibleBase::KillAllChildren() { - // /-- ClearableMutexGuard aGuard( GetMutex() ); // make local copy for notification @@ -456,7 +443,6 @@ void AccessibleBase::KillAllChildren() m_aChildOIDMap.clear(); aGuard.clear(); - // \-- // call dispose for all children // and notify listeners @@ -507,7 +493,6 @@ AccessibleUniqueId AccessibleBase::GetId() const // ________ (XComponent::dispose) ________ void SAL_CALL AccessibleBase::disposing() { - // /-- ClearableMutexGuard aGuard( GetMutex() ); OSL_ENSURE( ! m_bIsDisposed, "dispose() called twice" ); @@ -536,7 +521,6 @@ void SAL_CALL AccessibleBase::disposing() // call listeners unguarded aGuard.clear(); - // \-- if( m_bMayHaveChildren ) { @@ -557,7 +541,6 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() throw (RuntimeException) { - // /-- ClearableMutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || m_bIsDisposed ) @@ -567,7 +550,6 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() ! m_bChildrenInitialized ); aGuard.clear(); - // \-- // update unguarded if( bMustUpdateChildren ) @@ -588,13 +570,11 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 CheckDisposeState(); Reference< XAccessible > xResult; - // /-- ResettableMutexGuard aGuard( GetMutex() ); bool bMustUpdateChildren = ( m_bMayHaveChildren && ! m_bChildrenInitialized ); aGuard.clear(); - // \-- if( bMustUpdateChildren ) UpdateChildren(); @@ -602,14 +582,13 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 xResult.set( ImplGetAccessibleChildById( i )); return xResult; - // \-- } Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const throw (lang::IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xResult; - // /-- + MutexGuard aGuard( GetMutex()); if( ! m_bMayHaveChildren || i < 0 || @@ -727,11 +706,9 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw if( ( aRect.X <= aPoint.X && aPoint.X <= (aRect.X + aRect.Width) ) && ( aRect.Y <= aPoint.Y && aPoint.Y <= (aRect.Y + aRect.Height))) { - // /-- ClearableMutexGuard aGuard( GetMutex() ); ChildListVectorType aLocalChildList( m_aChildList ); aGuard.clear(); - // \-- Reference< XAccessibleComponent > aComp; for( ChildListVectorType::const_iterator aIter = aLocalChildList.begin(); @@ -768,7 +745,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() Rectangle aRect( aLogicRect.X, aLogicRect.Y, aLogicRect.X + aLogicRect.Width, aLogicRect.Y + aLogicRect.Height ); - // /-- solar SolarMutexGuard aSolarGuard; aRect = pWindow->LogicToPixel( aRect ); @@ -785,7 +761,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() return awt::Rectangle( aRect.getX() - aOffset.X, aRect.getY() - aOffset.Y, aRect.getWidth(), aRect.getHeight()); - // \-- solar } } diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 05ad9ed2b3ad..cfa3d17da075 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -98,12 +98,10 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow )); if( pWindow ) { - // /-- solar SolarMutexGuard aSolarGuard; Point aVCLPoint( pWindow->OutputToAbsoluteScreenPixel( Point( 0, 0 ) )); aBBox.X = aVCLPoint.getX(); aBBox.Y = aVCLPoint.getY(); - // \-- solar } return aBBox; diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 013d423ad049..9fd7695b301a 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -86,7 +86,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg if( !xEventSource.is() || aCID.getLength() == 0 ) return; - // /-- solar SolarMutexGuard aSolarGuard; if( m_pTextHelper ) @@ -111,7 +110,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg } OSL_ENSURE( m_pTextHelper, "Couldn't create text helper" ); - // \-- solar } // ____ XAccessibleContext ____ @@ -120,10 +118,8 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg { if( m_pTextHelper ) { - // /-- solar SolarMutexGuard aSolarGuard; return m_pTextHelper->GetChildCount(); - // \-- solar } return 0; } @@ -134,10 +130,8 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa { if( m_pTextHelper ) { - // /-- solar SolarMutexGuard aSolarGuard; return m_pTextHelper->GetChild( i ); - // \-- solar } return Reference< XAccessible >(); } |