diff options
Diffstat (limited to 'chart2/source/model/main')
22 files changed, 0 insertions, 225 deletions
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 35fcabb89571..f8a3b90448f1 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -297,8 +297,6 @@ void lcl_CloneSubGrids( } // anonymous namespace -// ================================================================================ - namespace chart { @@ -418,8 +416,6 @@ void Axis::AllocateSubGrids() ModifyListenerHelper::addListener( *aBroadcaster, xModifyEventForwarder ); } -// -------------------------------------------------------------------------------- - // ____ XAxis ____ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) throw (uno::RuntimeException) @@ -478,7 +474,6 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties return Sequence< Reference< beans::XPropertySet > >(); } - // ____ XTitled ____ Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() throw (uno::RuntimeException) @@ -574,8 +569,6 @@ void Axis::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - // ____ OPropertySet ____ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -599,8 +592,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() return *StaticAxisInfo::get(); } -// ================================================================================ - Sequence< OUString > Axis::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 7067a4f33726..f9a5b1f1cd15 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BaseCoordinateSystem.hxx" #include "macros.hxx" #include "PropertyHelper.hxx" @@ -366,7 +365,6 @@ void BaseCoordinateSystem::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } - // ____ OPropertySet ____ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -384,7 +382,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const return *StaticCooSysInfoHelper::get(); } - // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo() throw (uno::RuntimeException) diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index e64a1ea40e13..3fa8e294a299 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -88,10 +88,7 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static( APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem, OUString("com.sun.star.comp.chart.CartesianCoordinateSystem")) - -// ================================= // ==== CartesianCoordinateSystem2d ==== -// ================================= CartesianCoordinateSystem2d::CartesianCoordinateSystem2d( const uno::Reference< uno::XComponentContext > & xContext ) : @@ -113,9 +110,7 @@ Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Stati // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, lcl_aImplementationNameCartesian2d ) -// ================================= // ==== CartesianCoordinateSystem3d ==== -// ================================= CartesianCoordinateSystem3d::CartesianCoordinateSystem3d( const uno::Reference< uno::XComponentContext > & xContext ) : diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index aa5f78fd5312..ee1c0e23ff36 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -81,9 +81,7 @@ const OUString lcl_aGDIMetaFileMIMETypeHighContrast( } // anonymous namespace -//----------------------------------------------------------------- // ChartModel Constructor and Destructor -//----------------------------------------------------------------- namespace chart { @@ -198,9 +196,7 @@ void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) //support argument "DocumentRecoverySupport"? } -//----------------------------------------------------------------- // private methods -//----------------------------------------------------------------- OUString ChartModel::impl_g_getLocation() { @@ -303,9 +299,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV } } -//----------------------------------------------------------------- // lang::XServiceInfo -//----------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) @@ -319,9 +313,7 @@ uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() return aSNS; } -//----------------------------------------------------------------- // frame::XModel (required interface) -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) @@ -496,7 +488,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr "getCurrentSelection was called on an already disposed or closed model", static_cast< ::cppu::OWeakObject* >(this) ); - uno::Reference< uno::XInterface > xReturn; uno::Reference< frame::XController > xController = impl_getCurrentController(); @@ -515,10 +506,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr return xReturn; } - -//----------------------------------------------------------------- // lang::XComponent (base of XModel) -//----------------------------------------------------------------- void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException) { Reference< XInterface > xKeepAlive( *this ); @@ -589,9 +577,7 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven return; } -//----------------------------------------------------------------- // util::XCloseBroadcaster (base of XCloseable) -//----------------------------------------------------------------- void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) throw(uno::RuntimeException) { @@ -608,9 +594,7 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos return; } -//----------------------------------------------------------------- // util::XCloseable -//----------------------------------------------------------------- void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) throw( util::CloseVetoException, uno::RuntimeException ) @@ -664,9 +648,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) impl_notifyCloseListeners(); } -//----------------------------------------------------------------- // lang::XTypeProvider -//----------------------------------------------------------------- uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() throw (uno::RuntimeException) { @@ -688,9 +670,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() return impl::ChartModel_Base::getTypes(); } -//----------------------------------------------------------------- // document::XDocumentPropertiesSupplier -//----------------------------------------------------------------- uno::Reference< document::XDocumentProperties > SAL_CALL ChartModel::getDocumentProperties() throw (uno::RuntimeException) { @@ -702,9 +682,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL return m_xDocumentProperties; } -//----------------------------------------------------------------- // document::XDocumentPropertiesSupplier -//----------------------------------------------------------------- Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aModelMutex ); @@ -713,9 +691,7 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) thro return m_pUndoManager.get(); } -//----------------------------------------------------------------- // chart2::XChartDocument -//----------------------------------------------------------------- uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram() throw (uno::RuntimeException) @@ -1168,8 +1144,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } - - namespace { enum eServiceType diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index f7d81b8dff92..ee36ddde856d 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -71,8 +71,6 @@ class SvNumberFormatter; -//============================================================================= - namespace chart { @@ -230,22 +228,16 @@ public: explicit ChartModel( const ChartModel & rOther ); virtual ~ChartModel(); - //----------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo - //----------------------------------------------------------------- APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartModel) - //----------------------------------------------------------------- // ::com::sun::star::lang::XInitialization - //----------------------------------------------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XModel (required interface) - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL attachResource( const OUString& rURL @@ -293,10 +285,7 @@ public: getCurrentSelection() throw (::com::sun::star::uno::RuntimeException); - - //----------------------------------------------------------------- // ::com::sun::star::lang::XComponent (base of XModel) - //----------------------------------------------------------------- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); @@ -310,17 +299,13 @@ public: ::com::sun::star::lang::XEventListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XCloseable - //----------------------------------------------------------------- virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw(::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable) - //----------------------------------------------------------------- virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) @@ -331,18 +316,14 @@ public: ::com::sun::star::util::XCloseListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XStorable2 (extension of XStorable) - //----------------------------------------------------------------- virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XStorable (required interface) - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL hasLocation() throw (::com::sun::star::uno::RuntimeException); @@ -370,9 +351,7 @@ public: throw (::com::sun::star::io::IOException , ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifiable (required interface) - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException); @@ -381,9 +360,7 @@ public: throw (::com::sun::star::beans::PropertyVetoException , ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifyBroadcaster (base of XModifiable) - //----------------------------------------------------------------- virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) @@ -416,9 +393,7 @@ public: const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // lang::XTypeProvider (overloaded method of WeakImplHelper) - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); @@ -430,9 +405,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager( ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::chart2::XChartDocument - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL getFirstDiagram() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 20753bfef762..b8e37ef1c34e 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartModel.hxx" #include "MediaDescriptorHelper.hxx" #include "ChartDebugTrace.hxx" @@ -196,9 +195,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( return xFilter; } -//----------------------------------------------------------------- // frame::XStorable2 -//----------------------------------------------------------------- void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor ) throw (lang::IllegalArgumentException, @@ -212,9 +209,7 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe impl_store( rMediaDescriptor, m_xStorage ); } -//----------------------------------------------------------------- // frame::XStorable (base of XStorable2) -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartModel::hasLocation() throw(uno::RuntimeException) { @@ -385,9 +380,7 @@ void ChartModel::impl_store( } } -//----------------------------------------------------------------- // frame::XLoadable -//----------------------------------------------------------------- void SAL_CALL ChartModel::initNew() throw (frame::DoubleInitializationException, io::IOException, @@ -489,7 +482,6 @@ void SAL_CALL ChartModel::initNew() #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartModel::initNew: Showing ChartDocument structure" ); - OSL_TRACE( "----------------------------------------------------" ); ::chart::debug::ChartDebugTraceDocument( Reference< chart2::XChartDocument >( this )); #endif } @@ -656,9 +648,7 @@ void ChartModel::impl_loadGraphics( } } -//----------------------------------------------------------------- // util::XModifiable -//----------------------------------------------------------------- void SAL_CALL ChartModel::impl_notifyModifiedListeners() throw( uno::RuntimeException) { @@ -712,9 +702,7 @@ void SAL_CALL ChartModel::setModified( sal_Bool bModified ) impl_notifyModifiedListeners(); } -//----------------------------------------------------------------- // util::XModifyBroadcaster (base of XModifiable) -//----------------------------------------------------------------- void SAL_CALL ChartModel::addModifyListener( const uno::Reference< util::XModifyListener >& xListener ) throw(uno::RuntimeException) @@ -737,9 +725,7 @@ void SAL_CALL ChartModel::removeModifyListener( ::getCppuType((const uno::Reference< util::XModifyListener >*)0), xListener ); } -//----------------------------------------------------------------- // util::XModifyListener -//----------------------------------------------------------------- void SAL_CALL ChartModel::modified( const lang::EventObject& ) throw (uno::RuntimeException) { @@ -747,19 +733,14 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& ) setModified( sal_True ); } -//----------------------------------------------------------------- // lang::XEventListener (base of util::XModifyListener) -//----------------------------------------------------------------- void SAL_CALL ChartModel::disposing( const lang::EventObject& ) throw (uno::RuntimeException) { // child was disposed -- should not happen from outside } - -//----------------------------------------------------------------- // document::XStorageBasedDocument -//----------------------------------------------------------------- void SAL_CALL ChartModel::loadFromStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& rMediaDescriptor ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index bcd7c4b02b75..5a2f6c5d8344 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -38,8 +38,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -// ____________________________________________________________ - namespace { @@ -86,8 +84,6 @@ struct StaticDataPointInfo : public rtl::StaticAggregate< uno::Reference< beans: } // anonymous namespace -// ____________________________________________________________ - namespace chart { diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 32befb374889..443101d3556e 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -46,7 +46,6 @@ void DataPointProperties::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { // DataPointProperties - // =================== // Common // ------ @@ -66,7 +65,6 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); // Fill Properties - // --------------- rOutProperties.push_back( Property( "FillStyle", PROP_DATAPOINT_FILL_STYLE, @@ -90,7 +88,6 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( beans::Property( "GradientStepCount", PROP_DATAPOINT_GRADIENT_STEPCOUNT, @@ -155,7 +152,6 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); // Line Properties - // --------------- rOutProperties.push_back( Property( "LineStyle", LinePropertiesHelper::PROP_LINE_STYLE, @@ -211,7 +207,6 @@ void DataPointProperties::AddPropertiesToVector( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( Property( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index e6632ec7e235..58c4b2e75361 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -40,8 +40,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -// ---------------------------------------- - namespace { @@ -150,8 +148,6 @@ void lcl_CloneAttributedDataPoints( } // anonymous namespace -// ---------------------------------------- - namespace chart { @@ -476,7 +472,6 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries: return ContainerHelper::ContainerToSequence( m_aDataSequences ); } - // ____ XRegressionCurveContainer ____ void SAL_CALL DataSeries::addRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) @@ -604,9 +599,6 @@ void DataSeries::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } - -// ================================================================================ - using impl::DataSeries_Base; using ::property::OPropertySet; diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index ec1637ba1f51..5922ae2de146 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -53,8 +53,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -// ====================================================================== - namespace { @@ -275,8 +273,6 @@ lcl_tCooSysMapping lcl_CloneCoordinateSystems( } // anonymous namespace -// ====================================================================== - namespace chart { @@ -619,8 +615,6 @@ void Diagram::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ============================================================ - Sequence< OUString > Diagram::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); @@ -713,8 +707,6 @@ void SAL_CALL Diagram::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) co ::property::OPropertySet::getFastPropertyValue( rValue,nHandle ); } -// ================================================================================ - using impl::Diagram_Base; IMPLEMENT_FORWARD_XINTERFACE2( Diagram, Diagram_Base, ::property::OPropertySet ) diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 9505b33d8d0e..95e4fb159128 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -199,9 +199,6 @@ void FormattedString::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } - -// ---------------------------------------- - Sequence< OUString > FormattedString::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); @@ -228,7 +225,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const return *StaticFormattedStringInfoHelper::get(); } - // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo() throw (uno::RuntimeException) @@ -236,8 +232,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertyS return *StaticFormattedStringInfo::get(); } -// ================================================================================ - using impl::FormattedString_Base; IMPLEMENT_FORWARD_XINTERFACE2( FormattedString, FormattedString_Base, ::property::OPropertySet ) diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 99ecea097377..018a40fe0335 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -64,7 +64,6 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { ::property::OPropertySet::setPropertyValue(p1, p2); } virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -78,7 +77,6 @@ public: virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } - protected: explicit FormattedString( const FormattedString & rOther ); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 27a444369d1d..e73fec7528c7 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GridProperties.hxx" #include "LinePropertiesHelper.hxx" #include "UserDefinedProperties.hxx" @@ -36,8 +35,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -// ____________________________________________________________ - namespace { @@ -106,7 +103,6 @@ private: return ::chart::ContainerHelper::ContainerToSequence( aProperties ); } - }; struct StaticGridInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticGridInfoHelper_Initializer > @@ -129,8 +125,6 @@ struct StaticGridInfo : public rtl::StaticAggregate< uno::Reference< beans::XPro } // anonymous namespace -// ____________________________________________________________ - namespace chart { @@ -240,8 +234,6 @@ void GridProperties::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - Sequence< OUString > GridProperties::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 21d9e5c4a244..c1d5cd1c935c 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -262,8 +262,6 @@ void Legend::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - Sequence< OUString > Legend::getSupportedServiceNames_Static() { const sal_Int32 nNumServices( 6 ); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index d200ca510efb..9f00dbbbebd0 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -110,8 +110,6 @@ struct StaticPageBackgroundInfo : public rtl::StaticAggregate< uno::Reference< b } // anonymous namespace -// ================================================================================ - namespace chart { @@ -139,8 +137,6 @@ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone() return uno::Reference< util::XCloneable >( new PageBackground( *this )); } -// ================================================================================ - // ____ OPropertySet ____ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -218,8 +214,6 @@ void PageBackground::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index f50c7b31cd7f..326afb3c18c7 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -88,10 +88,7 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem, OUString("com.sun.star.comp.chart.PolarCoordinateSystem") ) - -// ================================= // ==== PolarCoordinateSystem2d ==== -// ================================= PolarCoordinateSystem2d::PolarCoordinateSystem2d( const uno::Reference< uno::XComponentContext > & xContext ) : @@ -113,9 +110,7 @@ Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem2d, lcl_aImplementationNamePolar2d ) -// ================================= // ==== PolarCoordinateSystem3d ==== -// ================================= PolarCoordinateSystem3d::PolarCoordinateSystem3d( const uno::Reference< uno::XComponentContext > & xContext ) : diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 9cf832463e33..64bad2adecca 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "StockBar.hxx" #include "LinePropertiesHelper.hxx" #include "FillProperties.hxx" @@ -39,8 +38,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -// ____________________________________________________________ - namespace { @@ -113,8 +110,6 @@ struct StaticStockBarDefaults : public rtl::StaticAggregate< ::chart::tPropertyV } // anonymous namespace -// ____________________________________________________________ - namespace chart { @@ -145,7 +140,6 @@ StockBar::StockBar( const StockBar & rOther ) : StockBar::~StockBar() {} - // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone() throw (uno::RuntimeException) @@ -230,8 +224,6 @@ void StockBar::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - uno::Sequence< OUString > StockBar::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 346a967058af..831c81cf293e 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -206,7 +206,6 @@ private: return ::chart::ContainerHelper::ContainerToSequence( aProperties ); } - }; struct StaticTitleInfoHelper : public rtl::StaticAggregate< ::cppu::OPropertyArrayHelper, StaticTitleInfoHelper_Initializer > @@ -229,8 +228,6 @@ struct StaticTitleInfo : public rtl::StaticAggregate< uno::Reference< beans::XPr } // anonymous namespace -// ================================================================================ - namespace chart { @@ -264,8 +261,6 @@ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() return uno::Reference< util::XCloneable >( new Title( *this )); } -// -------------------------------------------------------------------------------- - // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL Title::getText() throw (uno::RuntimeException) @@ -291,8 +286,6 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm fireModifyEvent(); } -// ================================================================================ - // ____ OPropertySet ____ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -370,9 +363,6 @@ void Title::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } - -// ================================================================================ - uno::Sequence< OUString > Title::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 4809510fbd45..8228be0aaa63 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoManager.hxx" #include "ChartViewHelper.hxx" @@ -27,10 +26,8 @@ #include <officecfg/Office/Common.hxx> #include <svl/undo.hxx> -//...................................................................................................................... namespace chart { -//...................................................................................................................... using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -59,9 +56,7 @@ namespace chart namespace impl { - //============================================================================================================== //= UndoManager_Impl - //============================================================================================================== class UndoManager_Impl : public ::framework::IUndoManagerImplementation { public: @@ -81,18 +76,15 @@ namespace chart { } - // ......................................................................................................... // IUndoManagerImplementation virtual ::osl::Mutex& getMutex(); virtual ::svl::IUndoManager& getImplUndoManager(); virtual Reference< XUndoManager > getThis(); - // ......................................................................................................... // attribute access ::cppu::OWeakObject& getParent() { return m_rParent; } ::framework::UndoManagerHelper& getUndoHelper() { return m_aUndoHelper; } - // ......................................................................................................... // public interface /// is called when the owner of the UndoManager is being disposed @@ -111,25 +103,21 @@ namespace chart ::framework::UndoManagerHelper m_aUndoHelper; }; - //-------------------------------------------------------------------------------------------------------------- ::osl::Mutex& UndoManager_Impl::getMutex() { return m_rMutex; } - //-------------------------------------------------------------------------------------------------------------- ::svl::IUndoManager& UndoManager_Impl::getImplUndoManager() { return m_aUndoManager; } - //-------------------------------------------------------------------------------------------------------------- Reference< XUndoManager > UndoManager_Impl::getThis() { return &m_rAntiImpl; } - //-------------------------------------------------------------------------------------------------------------- void UndoManager_Impl::disposing() { { @@ -139,16 +127,13 @@ namespace chart m_aUndoHelper.disposing(); } - //-------------------------------------------------------------------------------------------------------------- void UndoManager_Impl::checkDisposed_lck() { if ( m_bDisposed ) throw DisposedException( OUString(), getThis() ); } - //============================================================================================================== //= UndoManagerMethodGuard - //============================================================================================================== /** guard for public UNO methods of the UndoManager The only purpose of this guard is to check for the instance being disposed already. Everything else, @@ -185,89 +170,74 @@ namespace chart virtual void release() { } }; - //-------------------------------------------------------------------------------------------------------------- ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex() { static DummyMutex s_aDummyMutex; return s_aDummyMutex; } - //-------------------------------------------------------------------------------------------------------------- void UndoManagerMethodGuard::clear() { // nothing to do. This interface implementation is a dummy. } - //-------------------------------------------------------------------------------------------------------------- void UndoManagerMethodGuard::reset() { // nothing to do. This interface implementation is a dummy. } } - //================================================================================================================== //= UndoManager - //================================================================================================================== using impl::UndoManagerMethodGuard; - //------------------------------------------------------------------------------------------------------------------ UndoManager::UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex ) :m_pImpl( new impl::UndoManager_Impl( *this, i_parent, i_mutex ) ) { } - //------------------------------------------------------------------------------------------------------------------ UndoManager::~UndoManager() { } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::acquire() throw () { m_pImpl->getParent().acquire(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::release() throw () { m_pImpl->getParent().release(); } - //------------------------------------------------------------------------------------------------------------------ void UndoManager::disposing() { m_pImpl->disposing(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().leaveUndoContext( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); @@ -276,7 +246,6 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); @@ -285,112 +254,96 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isUndoPossible(); } - //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isRedoPossible(); } - //------------------------------------------------------------------------------------------------------------------ OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } - //------------------------------------------------------------------------------------------------------------------ OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } - //------------------------------------------------------------------------------------------------------------------ Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } - //------------------------------------------------------------------------------------------------------------------ Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clear( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clearRedo( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::reset( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().reset( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::lock( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().lock(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().unlock(); } - //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isLocked(); } - //------------------------------------------------------------------------------------------------------------------ Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->getParent(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); @@ -398,22 +351,18 @@ namespace chart throw NoSupportException( OUString(), m_pImpl->getThis() ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addModifyListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeModifyListener( i_listener ); } -//...................................................................................................................... } // namespace chart -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index 2a1cf3035182..f35979b7b1e5 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -28,10 +28,8 @@ #include <boost/scoped_ptr.hpp> -//...................................................................................................................... namespace chart { -//...................................................................................................................... namespace impl { @@ -41,9 +39,7 @@ namespace chart > UndoManager_Base; } - //================================================================================================================== //= UndoManager - //================================================================================================================== class UndoManager : public impl::UndoManager_Base { public: @@ -93,9 +89,7 @@ namespace chart ::boost::scoped_ptr< impl::UndoManager_Impl > m_pImpl; }; -//...................................................................................................................... } // namespace chart -//...................................................................................................................... #endif // CHART2_UNDOMANAGER_HXX diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 1a666388bbf4..343ac5b2267e 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -115,8 +115,6 @@ struct StaticWallInfo : public rtl::StaticAggregate< uno::Reference< beans::XPro } // anonymous namespace -// ================================================================================ - namespace chart { @@ -142,8 +140,6 @@ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone() return uno::Reference< util::XCloneable >( new Wall( *this )); } -// ================================================================================ - // ____ OPropertySet ____ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -221,8 +217,6 @@ void Wall::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - uno::Sequence< OUString > Wall::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index 2139c81c42d3..30873a49fc26 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -203,6 +203,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcore_component_getFactory( return pResult; } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |