diff options
45 files changed, 8 insertions, 331 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index c612fa53904f..d04835a4049c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -113,10 +113,9 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r { try { - // /-- locked controllers + // locked controllers ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); xTemplate->changeDiagram( xDiagram ); - // \-- locked controllers } catch( uno::Exception & ex ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index e38416317ca7..e8984a0e0b4f 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -338,7 +338,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame { uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY); - // /-- locked controllers + // locked controllers ControllerLockGuard aCtrlLockGuard( xModel ); uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel ); DiagramHelper::tTemplateWithServiceName aTemplateWithService( @@ -357,7 +357,6 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame if( xDiaProp.is() ) xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) ); } - // \-- locked controllers } return false; } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index cb17d564752d..b7461c404363 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -144,7 +144,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx { static uno::Sequence< uno::Type > aTypeList; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !aTypeList.getLength() ) { @@ -162,7 +161,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx } return aTypeList; - // \-- } uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) { @@ -294,7 +292,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing() m_xChartModel.clear(); m_xParentWindow.clear(); - // /-- SolarMutexGuard aSolarGuard; if( m_pDialog ) { @@ -317,7 +314,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing() { ASSERT_EXCEPTION( ex ); } - // \-- } //XPropertySet diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index b13e93a573b2..ff26d19ea7f0 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -182,11 +182,10 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel() break; } - // /-- locked controllers + // locked controllers ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); ThreeDHelper::setRoundedEdgesAndObjectLines( ::chart::ChartModelHelper::findDiagram( m_xChartModel ), nCurrentRoundedEdges, nObjectLines ); - // \-- locked controllers } void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel() @@ -307,7 +306,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) return 0; { - // /-- locked controllers + // locked controllers ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) ); @@ -320,7 +319,6 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) { OSL_ENSURE( false, "Invalid Entry selected" ); } - // \-- locked controllers } // update other controls diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index cb04fae0769e..e112c8b424be 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -784,7 +784,7 @@ void ChartController::impl_deleteDrawViewController() uno::Reference< util::XModeChangeBroadcaster > xViewBroadcaster( m_xChartView, uno::UNO_QUERY ); if( xViewBroadcaster.is() ) xViewBroadcaster->removeModeChangeListener(this); - // /-- + impl_invalidateAccessible(); SolarMutexGuard aSolarGuard; impl_deleteDrawViewController(); @@ -797,7 +797,6 @@ void ChartController::impl_deleteDrawViewController() m_pChartWindow = NULL;//m_pChartWindow is deleted via UNO due to dispose of m_xViewWindow (trigerred by Framework (Controller pretends to be XWindow also)) m_xViewWindow->dispose(); m_xChartView.clear(); - // \-- } // remove as listener to layout manager events @@ -1312,7 +1311,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType() UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard( ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHARTTYPE ))), m_xUndoManager, getModel() ); - // /-- SolarMutexGuard aSolarGuard; //prepare and open dialog ChartTypeDialog aDlg( m_pChartWindow, getModel(), m_xCC ); @@ -1321,7 +1319,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType() impl_adaptDataSeriesAutoResize(); aUndoGuard.commitAction(); } - // \-- } void SAL_CALL ChartController::executeDispatch_SourceData() @@ -1338,7 +1335,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData() ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_DATA_RANGES ))), m_xUndoManager, getModel() ); if( xChartDoc.is()) { - // /-- SolarMutexGuard aSolarGuard; ::chart::DataSourceDialog aDlg( m_pChartWindow, xChartDoc, m_xCC ); if( aDlg.Execute() == RET_OK ) @@ -1346,7 +1342,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData() impl_adaptDataSeriesAutoResize(); aUndoGuard.commitAction(); } - // \-- } } diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 1ddb8ede5b93..4f1cc58bb06b 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -63,7 +63,6 @@ void ChartController::executeDispatch_EditData() Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); { - // /-- SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData( @@ -73,7 +72,6 @@ void ChartController::executeDispatch_EditData() // the dialog has no OK/Cancel aDataEditorDialog.Execute(); aUndoGuard.commitAction(); - // \-- } } } diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index baaa3b1c3959..d352e92a3c65 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -106,7 +106,7 @@ namespace DBG_ERROR("unknown ObjectType"); return NULL; } - //-- + rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS")); //------------------------------------------------------------- @@ -842,13 +842,11 @@ void SAL_CALL ChartController::executeDispatch_View3D() ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_3D_VIEW ))), m_xUndoManager, getModel()); - // /-- //open dialog SolarMutexGuard aSolarGuard; View3DDialog aDlg( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorTable() ); if( aDlg.Execute() == RET_OK ) aUndoGuard.commitAction(); - // \-- } catch( uno::RuntimeException& e) { diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 91557b6b1b35..d1245b57f27d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -113,13 +113,11 @@ void SAL_CALL UndoCommandDispatch::dispatch( if( m_xUndoManager.is() ) { // why is it necessary to lock the solar mutex here? - // /-- SolarMutexGuard aSolarGuard; if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" ))) m_xUndoManager->undo( m_xModel ); else m_xUndoManager->redo( m_xModel ); - // \-- } } diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 3fbdeff2c13c..6c4f5673308e 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -56,14 +56,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet : // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet public ::cppu::OPropertySetHelper, // includes uno::XWeak (and XInterface, esp. ref-counting) -// public virtual ::cppu::OWeakObject, -// public virtual ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::beans::XMultiPropertyStates, public ::com::sun::star::style::XStyleSupplier -// public ::com::sun::star::beans::XFastPropertyState { public: OPropertySet( ::osl::Mutex & rMutex ); @@ -101,7 +98,6 @@ protected: { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -110,7 +106,6 @@ protected: } return xInfo; - // \-- } </pre> @@ -121,9 +116,6 @@ protected: @see ::cppu::OPropertySetHelper */ -// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL -// getPropertySetInfo() -// throw (::com::sun::star::uno::RuntimeException) = 0; /** Try to convert the value <code>rValue</code> to the type required by the property associated with <code>nHandle</code>. @@ -206,20 +198,6 @@ protected: // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); -// virtual void SAL_CALL acquire() throw (); -// virtual void SAL_CALL release() throw (); - - - // ____ XServiceInfo ____ -// virtual ::rtl::OUString SAL_CALL -// getImplementationName() -// throw (::com::sun::star::uno::RuntimeException); -// virtual sal_Bool SAL_CALL -// supportsService( const ::rtl::OUString& ServiceName ) -// throw (::com::sun::star::uno::RuntimeException); -// virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL -// getSupportedServiceNames() -// throw (::com::sun::star::uno::RuntimeException); // ____ XTypeProvider ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL @@ -271,21 +249,6 @@ protected: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - // ____ XFastPropertyState ____ -// virtual ::com::sun::star::beans::PropertyState SAL_CALL getFastPropertyState( sal_Int32 nHandle ) -// throw (::com::sun::star::beans::UnknownPropertyException, -// ::com::sun::star::uno::RuntimeException); -// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getFastPropertyStates( const ::com::sun::star::uno::Sequence< sal_Int32 >& aHandles ) -// throw (::com::sun::star::beans::UnknownPropertyException, -// ::com::sun::star::uno::RuntimeException); -// virtual void SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle ) -// throw (::com::sun::star::beans::UnknownPropertyException, -// ::com::sun::star::uno::RuntimeException); -// virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyDefault( sal_Int32 nHandle ) -// throw (::com::sun::star::beans::UnknownPropertyException, -// ::com::sun::star::lang::WrappedTargetException, -// ::com::sun::star::uno::RuntimeException); - // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 4f5bd0301e28..2920f7316f1a 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -222,7 +222,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -444,27 +443,21 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) chart2::ScaleData SAL_CALL Axis::getScaleData() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aMutex ); return m_aScaleData; - // \-- } Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aMutex ); return m_xGrid; - // \-- } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aMutex ); return m_aSubGridProperties; - // \-- } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties() @@ -479,10 +472,8 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); return m_xTitle; - // \-- } void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) @@ -580,7 +571,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -598,7 +588,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL Axis::getInfoHelper() @@ -614,7 +603,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -623,7 +611,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ================================================================================ diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index fae7f1f69698..bd09a595ff39 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -80,7 +80,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -355,7 +354,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -370,7 +368,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -390,7 +387,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -399,7 +395,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } using impl::BaseCoordinateSystem_Base; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 3fcfb6f2c365..5bb4a5ed27db 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -773,10 +773,8 @@ sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aModelMutex ); return m_xDataProvider; - // \-- } // ____ XDataReceiver ____ @@ -785,7 +783,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data throw (uno::RuntimeException) { { - // /-- MutexGuard aGuard( m_aModelMutex ); uno::Reference< beans::XPropertySet > xProp( xDataProvider, uno::UNO_QUERY ); if( xProp.is() ) @@ -804,7 +801,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data m_xInternalDataProvider.clear(); //the numberformatter is kept independent of the data provider! - // \-- } setModified( sal_True ); } @@ -813,7 +809,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti throw (uno::RuntimeException) { { - // /-- MutexGuard aGuard( m_aModelMutex ); if( xNewSupplier==m_xNumberFormatsSupplier ) return; @@ -836,7 +831,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti m_xNumberFormatsSupplier.set( xNewSupplier ); m_xOwnNumberFormatsSupplier.clear(); - // \-- } setModified( sal_True ); } @@ -846,7 +840,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& uno::RuntimeException) { { - // /-- MutexGuard aGuard( m_aModelMutex ); if( !m_xDataProvider.is() ) return; @@ -890,7 +883,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& ASSERT_EXCEPTION( ex ); } unlockControllers(); - // \-- } setModified( sal_True ); } @@ -932,10 +924,8 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh throw (uno::RuntimeException) { { - // /-- MutexGuard aGuard( m_aModelMutex ); m_xChartTypeManager = xNewManager; - // \-- } setModified( sal_True ); } @@ -943,42 +933,34 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aModelMutex ); return m_xChartTypeManager; - // \-- } uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aModelMutex ); return m_xPageBackground; - // \-- } // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( m_aModelMutex ); return m_xTitle; - // \-- } void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle ) throw (uno::RuntimeException) { { - // /-- MutexGuard aGuard( m_aModelMutex ); if( m_xTitle.is() ) ModifyListenerHelper::removeListener( m_xTitle, this ); m_xTitle = xTitle; ModifyListenerHelper::addListener( m_xTitle, this ); - // \-- } setModified( sal_True ); } diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 2b2f3482376d..d3b7b49df869 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -58,7 +58,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -234,7 +233,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -243,7 +241,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index a949d9e68722..b9925b8b88a8 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -60,7 +60,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -248,7 +247,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -269,7 +267,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const throw beans::UnknownPropertyException(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -290,7 +287,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -299,7 +295,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } void SAL_CALL DataSeries::getFastPropertyValue diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index a414cf2ae405..00ec27e5ff5e 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -193,7 +193,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -594,7 +593,6 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -610,7 +608,6 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -630,7 +627,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -639,7 +635,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XFastPropertySet ____ diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 32713538730b..b0e753e4066b 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -52,7 +52,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -114,10 +113,8 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() ::rtl::OUString SAL_CALL FormattedString::getString() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex()); return m_aString; - // \-- } void SAL_CALL FormattedString::setString( const ::rtl::OUString& String ) @@ -204,7 +201,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -219,7 +215,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const throw beans::UnknownPropertyException(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -236,7 +231,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -245,7 +239,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ================================================================================ diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 14b15d38a232..082fde0c2710 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -87,7 +87,6 @@ const Sequence< Property > & lcl_getPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -152,7 +151,6 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) lcl_addDefaultsToMap( aStaticDefaults ); @@ -164,7 +162,6 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL GridProperties::getInfoHelper() @@ -179,7 +176,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -188,7 +184,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XCloneable ____ diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 53847b4e1ea8..710a10c5afa5 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -125,7 +125,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -312,7 +311,6 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -330,7 +328,6 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const return Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL Legend::getInfoHelper() @@ -346,7 +343,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -355,7 +351,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 6b24505f2854..964529f6aa16 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -66,7 +66,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -135,7 +134,6 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -153,7 +151,6 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL PageBackground::getInfoHelper() @@ -169,7 +166,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -178,7 +174,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index f2703df4d07b..71abae7b5095 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -62,7 +62,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -147,7 +146,6 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -166,7 +164,6 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL StockBar::getInfoHelper() @@ -181,7 +178,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -190,7 +186,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 8e125e708271..f5fb4432ee98 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -184,7 +184,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -286,7 +285,6 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -306,7 +304,6 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL Title::getInfoHelper() @@ -322,7 +319,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -331,7 +327,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 037d8a8d6e35..344f14c6cb78 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -71,7 +71,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -138,7 +137,6 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -159,7 +157,6 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL Wall::getInfoHelper() @@ -175,7 +172,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -184,7 +180,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 98a5e49da85a..599e05f54dff 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -81,7 +81,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -136,7 +135,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -151,7 +149,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL AreaChartTypeTemplate::getInfoHelper() @@ -167,7 +164,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -176,7 +172,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } sal_Int32 AreaChartTypeTemplate::getDimension() const diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index bd504417d42b..a40bc31d4123 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -89,7 +89,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -229,7 +228,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -244,7 +242,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL BarChartTypeTemplate::getInfoHelper() @@ -260,7 +257,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -269,7 +265,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } void SAL_CALL BarChartTypeTemplate::applyStyle( diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index f502cba4d4e2..e863bb4d0a53 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -66,7 +66,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -180,7 +179,6 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -195,7 +193,6 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -215,7 +212,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -224,7 +220,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static() diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 0c3dee1fae53..6f8b41cbe9b9 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -75,7 +75,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -126,7 +125,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -141,7 +139,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL BubbleChartTypeTemplate::getInfoHelper() @@ -157,7 +154,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -166,7 +162,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } sal_Int32 BubbleChartTypeTemplate::getDimension() const diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 40ecfa6087c1..96ef8e94325e 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -111,7 +111,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -123,7 +122,7 @@ const Sequence< Property > & lcl_GetPropertySequence() ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); - // transfer result to static Sequence + // transfer result to static Sequence aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties ); } @@ -264,7 +263,6 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -279,7 +277,6 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -299,7 +296,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -308,7 +304,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index db202923152b..7193e298d47c 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -249,7 +249,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -258,7 +257,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index b117a0e525ac..c6080cb8e64b 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -84,7 +84,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -141,7 +140,6 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -156,7 +154,6 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL ColumnChartType::getInfoHelper() @@ -174,7 +171,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -183,10 +179,8 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } -// uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static() { diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 58631b1267aa..716fe9dce6c5 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -87,7 +87,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -142,7 +141,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -157,7 +155,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL ColumnLineChartTypeTemplate::getInfoHelper() @@ -173,7 +170,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -182,7 +178,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } void ColumnLineChartTypeTemplate::createChartTypes( diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 3c8b403f1444..9d1c8eeac7a7 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -94,7 +94,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -153,7 +152,6 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -168,7 +166,6 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL LineChartType::getInfoHelper() @@ -187,7 +184,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -196,7 +192,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static() diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index c062ac4fbb06..a6702ac42b0e 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -104,7 +104,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -164,7 +163,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -179,7 +177,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL LineChartTypeTemplate::getInfoHelper() @@ -195,7 +192,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -204,7 +200,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } sal_Int32 LineChartTypeTemplate::getDimension() const diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 5c947f6a0504..1f1f0f06dfb8 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -124,7 +124,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -133,7 +132,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } //----------------------------------------------------------------------------- diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 29fd80d3614b..81760c2d3f39 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -78,7 +78,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -177,7 +176,6 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -192,7 +190,6 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -212,7 +209,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -221,7 +217,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static() diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 3ff448664e57..3d7b0fff5f28 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -98,7 +98,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -156,7 +155,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() } // ____ XChartType ____ -// ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, @@ -217,13 +215,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptional { static uno::Sequence< ::rtl::OUString > aOptRolesSeq; -// if( aOptRolesSeq.getLength() == 0 ) -// { -// aOptRolesSeq.realloc( 2 ); -// aOptRolesSeq[0] = C2U( "error-bars-x" ); -// aOptRolesSeq[1] = C2U( "error-bars-y" ); -// } - return aOptRolesSeq; } @@ -234,7 +225,6 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -249,7 +239,6 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } // ____ OPropertySet ____ @@ -269,7 +258,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -278,7 +266,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static() diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 28bbee840c08..f34ae6a52fe4 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -106,7 +106,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -165,7 +164,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -180,7 +178,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL ScatterChartTypeTemplate::getInfoHelper() @@ -196,7 +193,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -205,7 +201,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } sal_Int32 ScatterChartTypeTemplate::getDimension() const diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 7565e333ea40..d47bb48f2763 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -118,7 +118,6 @@ const Sequence< Property > & lcl_GetPropertySequence() { static Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -183,7 +182,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -198,7 +196,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL StockChartTypeTemplate::getInfoHelper() @@ -214,7 +211,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -223,7 +219,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } sal_Int32 StockChartTypeTemplate::getAxisCountByDimension( sal_Int32 nDimension ) diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 1c25fe346d32..ea3f24395161 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -288,47 +288,32 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName ) Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); if( m_eCurrentDataType == NUMERICAL ) return m_aNumericalSequence; else return Impl_getNumericalData(); - // \-- } // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); if( m_eCurrentDataType == TEXTUAL ) return m_aTextualSequence; else return Impl_getTextualData(); - // \-- } -// void SAL_CALL CachedDataSequence::setTextualData( const Sequence< OUString >& aData ) -// throw (uno::RuntimeException) -// { -// // /-- -// MutexGuard aGuard( GetMutex() ); -// Impl_setTextualData( aData ); -// // \-- -// } - // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); - // \-- } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 37e4f3ce1b9b..2e59f6d3f92d 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -463,10 +463,9 @@ void DataSourceHelper::setRangeSegmentation( if( !xTemplate.is() ) return; - // /-- locked controllers + // locked controllers ControllerLockGuard aCtrlLockGuard( xChartModel ); xTemplate->changeDiagramData( xDiagram, xDataSource, aArguments ); - // \-- locked controllers } Sequence< OUString > DataSourceHelper::getRangesFromLabeledDataSequence( diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 268a538a9f50..49041d182f35 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -123,7 +123,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -211,7 +210,6 @@ uno::Any ErrorBar::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -227,7 +225,6 @@ uno::Any ErrorBar::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL ErrorBar::getInfoHelper() @@ -243,7 +240,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -252,7 +248,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ____ XModifyBroadcaster ____ diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 65f33aec111e..cb07e35d228b 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -68,7 +68,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -243,7 +242,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -258,7 +256,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL RegressionCurveModel::getInfoHelper() @@ -274,7 +271,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL { static uno::Reference< beans::XPropertySetInfo > xInfo; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -283,7 +279,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } // ================================================================================ diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 452242df6705..d6f6bbe93db9 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -67,7 +67,6 @@ enum { PROP_EQUATION_SHOW, PROP_EQUATION_SHOW_CORRELATION_COEFF, -// PROP_EQUATION_SEPARATOR, PROP_EQUATION_REF_PAGE_SIZE, PROP_EQUATION_REL_POS, PROP_EQUATION_NUMBER_FORMAT @@ -90,13 +89,6 @@ void lcl_AddPropertiesToVector( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); -// rOutProperties.push_back( -// Property( C2U( "Separator" ), -// PROP_EQUATION_SEPARATOR, -// ::getCppuType( reinterpret_cast< ::rtl::OUString * >(0)), -// beans::PropertyAttribute::BOUND -// | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( Property( C2U( "ReferencePageSize" ), PROP_EQUATION_REF_PAGE_SIZE, @@ -124,7 +116,6 @@ void lcl_AddDefaultsToMap( { ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); -// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' ))); // override other defaults ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE ); @@ -140,7 +131,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence() { static uno::Sequence< Property > aPropSeq; - // /-- MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aPropSeq.getLength() ) { @@ -209,7 +199,6 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const { static tPropertyValueMap aStaticDefaults; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( 0 == aStaticDefaults.size() ) { @@ -229,7 +218,6 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const return uno::Any(); return (*aFound).second; - // \-- } ::cppu::IPropertyArrayHelper & SAL_CALL RegressionEquation::getInfoHelper() @@ -244,7 +232,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL { static Reference< beans::XPropertySetInfo > xInfo; - // /-- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !xInfo.is()) { @@ -253,7 +240,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } return xInfo; - // \-- } @@ -317,16 +303,13 @@ void RegressionEquation::fireModifyEvent() uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); return m_aStrings; - // \-- } void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings ) throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder ); @@ -334,7 +317,6 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< ModifyListenerHelper::addListenerToAllElements( ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder ); fireModifyEvent(); - // \-- } // ================================================================================ diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index ccaca323b60e..f90feb01bd38 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -58,7 +58,6 @@ static const OUString lcl_aServiceName( enum { -// PROP_SOURCE_IDENTIFIER, PROP_NUMBERFORMAT_KEY, PROP_PROPOSED_ROLE, PROP_XML_RANGE @@ -186,7 +185,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() throw (uno::RuntimeException) { Sequence< double > aResult; - // /-- MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) { @@ -196,7 +194,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() aResult.getArray(), CommonFunctors::AnyToDouble()); } return aResult; - // \-- } // ________ XTextualDataSequence ________ @@ -204,7 +201,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() throw (uno::RuntimeException) { Sequence< OUString > aResult; - // /-- MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) { @@ -214,19 +210,16 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() aResult.getArray(), CommonFunctors::AnyToString()); } return aResult; - // \-- } // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() throw (uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) return m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ); return Sequence< Any >(); - // \-- } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() @@ -258,7 +251,6 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno lang::WrappedTargetException, uno::RuntimeException) { - // /-- MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); if( Index < aData.getLength() && diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 8b30805300c4..7082699b5d91 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -67,7 +67,6 @@ Reference< beans::XPropertyState > WrappedPropertySet::getInnerPropertyState() void WrappedPropertySet::clearWrappedPropertySet() { - // /-- ::osl::MutexGuard aGuard( m_aMutex ); //delete all wrapped properties @@ -85,7 +84,6 @@ void WrappedPropertySet::clearWrappedPropertySet() DELETEZ(m_pWrappedPropertyMap); m_xInfo = NULL; - // \-- } //XPropertySet @@ -94,13 +92,11 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet { if( !m_xInfo.is() ) { - // /-- ::osl::MutexGuard aGuard( m_aMutex ); if( !m_xInfo.is() ) { m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } - // \-- } return m_xInfo; } @@ -208,7 +204,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr else xInnerPropertySet->addPropertyChangeListener( rPropertyName, xListener ); } -// m_aBoundListenerContainer.addInterface( (sal_Int32)nHandle, xListener ); } void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) @@ -438,14 +433,12 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence { if(!m_pPropertyArrayHelper) { - // /-- ::osl::MutexGuard aGuard( m_aMutex ); if(!m_pPropertyArrayHelper) { sal_Bool bSorted = sal_True; m_pPropertyArrayHelper = new ::cppu::OPropertyArrayHelper( getPropertySequence(), bSorted ); } - // \-- } return *m_pPropertyArrayHelper; } @@ -456,7 +449,6 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() { if(!m_pWrappedPropertyMap) { - // /-- ::osl::MutexGuard aGuard( m_aMutex ); if(!m_pWrappedPropertyMap) { @@ -486,7 +478,6 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() } } } - // \-- } return *m_pWrappedPropertyMap; } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index ae221f48cb8c..d4654624fef8 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -197,13 +197,11 @@ void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments if( !m_pDrawModelWrapper.get() ) { - // /-- SolarMutexGuard aSolarGuard; m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) ); m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory(); m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage(); StartListening( m_pDrawModelWrapper->getSdrModel(), FALSE /*bPreventDups*/ ); - // \-- } } @@ -463,7 +461,6 @@ struct AxisUsage void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); ::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex ); - //tFullAxisIndex getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys ); ScaleAutomatism aScaleAutomatism; @@ -482,19 +479,6 @@ AxisUsage::~AxisUsage() aCoordinateSystems.clear(); } -/* -tFullScaleIndex AxisUsage::getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys ) -{ - tFullScaleIndex aRet(0,0); - - tCoordinateSystemMap::const_iterator aFound( aCoordinateSystems.find(pCooSys) ); - if(aFound!=aCoordinateSystems.end()) - aRet = aFound->second; - - return aRet; -} -*/ - void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { if(!pCooSys) @@ -1557,24 +1541,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped(); } - /* - uno::Reference< drawing::XShape > xDiagramPlusAxes_KeepRatio( xDiagramPlusAxes_Shapes, uno::UNO_QUERY ); - - awt::Size aNewSize( rAvailableSize ); - awt::Point aNewPos( rAvailablePos ); - if( bKeepAspectRatio ) - { - awt::Size aCurrentSize( xDiagramPlusAxes_KeepRatio->getSize()); - - aNewSize = ShapeFactory::calculateNewSizeRespectingAspectRatio( - rAvailableSize, aCurrentSize ); - aNewPos = ShapeFactory::calculateTopLeftPositionToCenterObject( - rAvailablePos, rAvailableSize, aNewSize ); - } - - xDiagramPlusAxes_KeepRatio->setPosition( aNewPos ); - xDiagramPlusAxes_KeepRatio->setSize( aNewSize ); - */ for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ ) { VSeriesPlotter* pSeriesPlotter = *aPlotterIter; @@ -1584,8 +1550,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& if( bUseFixedInnerSize ) { - //if( !bIsPieOrDonut ) - // aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) ); aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(), aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() ); } else @@ -2598,12 +2562,10 @@ void ChartView::createShapes() impl_deleteCoordinateSystems(); if( m_pDrawModelWrapper ) { - // /-- SolarMutexGuard aSolarGuard; // #i12587# support for shapes in chart m_pDrawModelWrapper->getSdrModel().EnableUndo( FALSE ); m_pDrawModelWrapper->clearMainDrawPage(); - // \-- } lcl_setDefaultWritingMode( m_pDrawModelWrapper, m_xChartModel ); @@ -2807,10 +2769,8 @@ void ChartView::impl_updateView() //prepare draw model { - // /-- SolarMutexGuard aSolarGuard; m_pDrawModelWrapper->lockControllers(); - // \-- } //create chart view @@ -2844,10 +2804,8 @@ void ChartView::impl_updateView() } { - // /-- SolarMutexGuard aSolarGuard; m_pDrawModelWrapper->unlockControllers(); - // \-- } impl_notifyModeChangeListener(C2U("valid")); |