diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-28 14:55:43 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 11:34:33 +0000 |
| commit | dd9c97d587d2a295d44e8685d253d30542a2c85a (patch) | |
| tree | 8736a3552ac8c56fc9102a6518072c68295c4a25 /chart2/source/controller/chartapiwrapper | |
| parent | 05bd5b46ea659df95fb6f0c895c090629b541e0f (diff) | |
fdo#62475 removed pointless comments
Change-Id: I3f5e86dba2df950aeb12c895f52d99274c0959aa
Reviewed-on: https://gerrit.libreoffice.org/5148
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
49 files changed, 0 insertions, 391 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index e7c4b542435d..394d34825367 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AreaWrapper.hxx" #include "macros.hxx" #include "ContainerHelper.hxx" @@ -70,12 +69,8 @@ struct StaticAreaWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P { }; - } // anonymous namespace -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -148,8 +143,6 @@ void SAL_CALL AreaWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - // WrappedPropertySet Reference< beans::XPropertySet > AreaWrapper::getInnerPropertySet() { @@ -174,8 +167,6 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 89f4364f58b7..665ea5301656 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -224,7 +224,6 @@ void lcl_AddPropertiesToVector( ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( Property( "Origin", PROP_AXIS_ORIGIN, @@ -260,7 +259,6 @@ void lcl_AddPropertiesToVector( ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); - //Properties for labels: rOutProperties.push_back( Property( "DisplayLabels", @@ -371,8 +369,6 @@ struct StaticAxisWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -568,8 +564,6 @@ void SAL_CALL AxisWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - //ReferenceSizePropertyProvider void AxisWrapper::updateReferenceSize() { @@ -594,8 +588,6 @@ awt::Size AxisWrapper::getCurrentSizeForReference() return m_spChart2ModelContact->GetPageSize(); } -// ================================================================================ - Reference< chart2::XAxis > AxisWrapper::getAxis() { Reference< chart2::XAxis > xAxis; @@ -673,8 +665,6 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index f892059f2ea9..80132a8286ee 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "Chart2ModelContact.hxx" #include "ChartModelHelper.hxx" #include "LegendHelper.hxx" @@ -168,8 +167,6 @@ sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForSeries( ); } -//----------------------------------------------------------------------------- - awt::Size Chart2ModelContact::GetPageSize() const { return ChartModelHelper::getPageSize(m_xChartModel); diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 86d9128df4d3..519afd867487 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -121,7 +121,6 @@ public: ::com::sun::star::awt::Point GetTitlePosition( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > & xTitle ) const; - /** Returns the size of the object in logic coordinates. */ ::com::sun::star::awt::Size GetAxisSize( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 6560eaeabbb8..0ca43ba6305f 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -105,15 +105,11 @@ uno::Sequence< uno::Sequence< double > > lcl_getDBL_MINInsteadNAN( const uno::Se } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper { -//-------------------------------------------------------------------------------------- - struct lcl_Operator { lcl_Operator() @@ -130,8 +126,6 @@ struct lcl_Operator } }; -//-------------------------------------------------------------------------- - struct lcl_AllOperator : public lcl_Operator { lcl_AllOperator( const Reference< XChartData >& xDataToApply ) @@ -179,8 +173,6 @@ struct lcl_AllOperator : public lcl_Operator Reference< XChartData > m_xDataToApply; }; -//-------------------------------------------------------------------------- - struct lcl_DataOperator : public lcl_Operator { lcl_DataOperator( const Sequence< Sequence< double > >& rData ) @@ -198,8 +190,6 @@ struct lcl_DataOperator : public lcl_Operator const Sequence< Sequence< double > >& m_rData; }; -//-------------------------------------------------------------------------- - struct lcl_RowDescriptionsOperator : public lcl_Operator { lcl_RowDescriptionsOperator( const Sequence< OUString >& rRowDescriptions @@ -232,8 +222,6 @@ struct lcl_RowDescriptionsOperator : public lcl_Operator bool m_bDataInColumns; }; -//-------------------------------------------------------------------------- - struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator { lcl_ComplexRowDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexRowDescriptions @@ -265,7 +253,6 @@ struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator Reference< chart2::XChartDocument > m_xChartDoc; bool m_bDataInColumns; }; -//-------------------------------------------------------------------------- struct lcl_AnyRowDescriptionsOperator : public lcl_Operator { @@ -289,8 +276,6 @@ struct lcl_AnyRowDescriptionsOperator : public lcl_Operator const Sequence< Sequence< uno::Any > >& m_rAnyRowDescriptions; }; -//-------------------------------------------------------------------------- - struct lcl_ColumnDescriptionsOperator : public lcl_Operator { lcl_ColumnDescriptionsOperator( const Sequence< OUString >& rColumnDescriptions @@ -323,8 +308,6 @@ struct lcl_ColumnDescriptionsOperator : public lcl_Operator bool m_bDataInColumns; }; -//-------------------------------------------------------------------------- - struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator { lcl_ComplexColumnDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexColumnDescriptions @@ -357,8 +340,6 @@ struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator bool m_bDataInColumns; }; -//-------------------------------------------------------------------------- - struct lcl_AnyColumnDescriptionsOperator : public lcl_Operator { lcl_AnyColumnDescriptionsOperator( const Sequence< Sequence< uno::Any > >& rAnyColumnDescriptions ) @@ -381,8 +362,6 @@ struct lcl_AnyColumnDescriptionsOperator : public lcl_Operator const Sequence< Sequence< uno::Any > >& m_rAnyColumnDescriptions; }; -//-------------------------------------------------------------------------- - struct lcl_DateCategoriesOperator : public lcl_Operator { lcl_DateCategoriesOperator( const Sequence< double >& rDates ) @@ -406,8 +385,6 @@ struct lcl_DateCategoriesOperator : public lcl_Operator const Sequence< double >& m_rDates; }; -//-------------------------------------------------------------------------- - ChartDataWrapper::ChartDataWrapper( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : m_spChart2ModelContact( spChart2ModelContact ), m_aEventListenerContainer( m_aMutex ) @@ -559,8 +536,6 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa DiagramHelper::switchToDateCategories( xChartDoc ); } -//-------------------------------------------------------------------------------------- - // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< @@ -620,7 +595,6 @@ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ { } - void ChartDataWrapper::fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ) { @@ -644,8 +618,6 @@ void ChartDataWrapper::fireChartDataChangeEvent( } } -// -------------------------------------------------------------------------------- - void ChartDataWrapper::switchToInternalDataProvider() { //create an internal data provider that is connected to the model @@ -709,7 +681,6 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) uno::Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments( aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) ); - // /-- locked controllers ControllerLockGuard aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -745,8 +716,6 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) // \-- locked controllers } -// -------------------------------------------------------------------------------- - uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); @@ -756,8 +725,6 @@ uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static() return aServices; } -// ================================================================================ - // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, lcl_aServiceName ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 0ff551e9d61d..ee2d47256964 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -138,7 +138,6 @@ protected: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - void fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ); private: //methods diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 48c39c180279..fc2d7c2cc64d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -265,8 +265,6 @@ namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- - //PROP_DOCUMENT_LABELS_IN_FIRST_ROW class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty @@ -366,9 +364,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen return aRet; } -//----------------------------------------------------------------------------------------------------------------- - - //PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty { @@ -467,9 +462,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe return aRet; } -//----------------------------------------------------------------------------------------------------------------- - - //PROP_DOCUMENT_HAS_LEGEND class WrappedHasLegendProperty : public WrappedProperty { @@ -554,9 +546,6 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope return aRet; } -//----------------------------------------------------------------------------------------------------------------- - - //PROP_DOCUMENT_HAS_MAIN_TITLE class WrappedHasMainTitleProperty : public WrappedProperty { @@ -630,9 +619,6 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr return aRet; } -//----------------------------------------------------------------------------------------------------------------- - - //PROP_DOCUMENT_HAS_SUB_TITLE class WrappedHasSubTitleProperty : public WrappedProperty { @@ -670,7 +656,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const if( ! (rOuterValue >>= bNewValue) ) throw lang::IllegalArgumentException("Property HasSubTitle requires value of type boolean", 0, 0 ); - try { if( bNewValue ) @@ -707,8 +692,6 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro return aRet; } -//----------------------------------------------------------------------------------------------------------------- - ChartDocumentWrapper::ChartDocumentWrapper( const Reference< uno::XComponentContext > & xContext ) : m_spChart2ModelContact( new Chart2ModelContact( xContext ) ), @@ -955,7 +938,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( return 0; } - // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() throw (uno::RuntimeException) @@ -1522,8 +1504,6 @@ void ChartDocumentWrapper::_disposing( const lang::EventObject& rSource ) m_xChartView.set( 0 ); } -// ================================================================================ - // WrappedPropertySet Reference< beans::XPropertySet > ChartDocumentWrapper::getInnerPropertySet() { @@ -1553,8 +1533,6 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert return aWrappedProperties; } -// ================================================================================ - uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 2b37fec5ad87..9b5b622c5d7e 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -210,9 +210,6 @@ struct StaticPointWrapperPropertyArray : public rtl::StaticAggregate< Sequence< { }; -//---------------------------------------------------------------------------------------------------------------------- - - //PROP_SERIES_ATTACHED_AXIS class WrappedAttachedAxisProperty : public ::chart::WrappedProperty { @@ -286,8 +283,6 @@ void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, cons } } -//---------------------------------------------------------------------------------------------------------------------- - class WrappedSegmentOffsetProperty : public ::chart::WrappedProperty { public: @@ -330,8 +325,6 @@ Any WrappedSegmentOffsetProperty::convertOuterToInnerValue( const Any& rOuterVal return aResult; } -//---------------------------------------------------------------------------------------------------------------------- - class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty { public: @@ -393,8 +386,6 @@ Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPrope return WrappedSeriesAreaOrLineProperty::getPropertyDefault( xInnerPropertyState ); } -//---------------------------------------------------------------------------------------------------------------------- - class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty { public: @@ -449,9 +440,6 @@ void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPr } // anonymous namespace - -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -544,8 +532,6 @@ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Sour { } -// ================================================================================ - bool DataSeriesPointWrapper::isSupportingAreaProperties() { Reference< chart2::XDataSeries > xSeries( this->getDataSeries() ); @@ -590,8 +576,6 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties( return xPointProp; } -// ================================================================================ - //ReferenceSizePropertyProvider void DataSeriesPointWrapper::updateReferenceSize() { @@ -616,8 +600,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() return m_spChart2ModelContact->GetPageSize(); } -// ================================================================================ - // WrappedPropertySet //XPropertyState @@ -854,8 +836,6 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty return WrappedPropertySet::getPropertyValue( rPropertyName ); } -// ================================================================================ - uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 7 ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 8c31e5838355..a6ed19046157 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -572,7 +572,6 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() return g_aChartTypeNameMap; } - OUString lcl_getOldChartTypeName( const OUString & rNewChartTypeName ) { OUString aOld(rNewChartTypeName); @@ -588,8 +587,6 @@ OUString lcl_getOldChartTypeName( const OUString & rNewChartTypeName ) } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -930,7 +927,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() return Reference< beans::XPropertySet >( m_xZAxis, uno::UNO_QUERY ); } - // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() throw (uno::RuntimeException) @@ -940,7 +936,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() return Reference< beans::XPropertySet >( m_xSecondXAxis, uno::UNO_QUERY ); } - // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() throw (uno::RuntimeException) @@ -980,7 +975,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() return xRet; } - // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() throw (uno::RuntimeException) @@ -990,7 +984,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() return Reference< beans::XPropertySet >( m_xSecondYAxis, uno::UNO_QUERY ); } - // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() throw (uno::RuntimeException) @@ -1168,8 +1161,6 @@ void SAL_CALL DiagramWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_DATAROW_SOURCE class WrappedDataRowSourceProperty : public WrappedProperty { @@ -1270,8 +1261,6 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_STACKED //PROP_DIAGRAM_DEEP //PROP_DIAGRAM_PERCENT_STACKED @@ -1386,8 +1375,6 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_THREE_D class WrappedDim3DProperty : public WrappedProperty { @@ -1459,8 +1446,6 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_VERTICAL class WrappedVerticalProperty : public WrappedProperty { @@ -1537,8 +1522,6 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_NUMBER_OF_LINES class WrappedNumberOfLinesProperty : public WrappedProperty { @@ -1693,8 +1676,6 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS class WrappedAttributedDataPointsProperty : public WrappedProperty { @@ -1812,8 +1793,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_SOLIDTYPE class WrappedSolidTypeProperty : public WrappedProperty { @@ -1888,8 +1867,6 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope return uno::makeAny( ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID ); } -//----------------------------------------------------------------------------------------------------------------- - class WrappedAutomaticSizeProperty : public WrappedProperty { public: @@ -1961,8 +1938,6 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP return aRet; } -//----------------------------------------------------------------------------------------------------------------- - //PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS class WrappedIncludeHiddenCellsProperty : public WrappedProperty { @@ -1997,8 +1972,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue ChartModelHelper::setIncludeHiddenCells( bNewValue, m_spChart2ModelContact->getChartModel() ); } -//----------------------------------------------------------------------------------------------------------------- - // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() throw (uno::RuntimeException) @@ -2014,8 +1987,6 @@ void SAL_CALL DiagramWrapper::setDiagram( OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" ); } -// ================================================================================ - Reference< beans::XPropertySet > DiagramWrapper::getInnerPropertySet() { return Reference< beans::XPropertySet >( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); @@ -2059,8 +2030,6 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 8 ); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 77f97d072261..412dc0a2ac12 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "GridWrapper.hxx" #include "macros.hxx" #include "AxisHelper.hxx" @@ -74,8 +73,6 @@ struct StaticGridWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -138,8 +135,6 @@ void SAL_CALL GridWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - // WrappedPropertySet Reference< beans::XPropertySet > GridWrapper::getInnerPropertySet() @@ -178,8 +173,6 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > GridWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 262ab9e93ec9..9153da8da659 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -51,8 +51,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//----------------------------------------------------------------------------- - namespace chart { class WrappedLegendAlignmentProperty : public WrappedProperty @@ -209,7 +207,6 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV return uno::makeAny( eNewPos ); } } -//----------------------------------------------------------------------------- namespace { @@ -272,8 +269,6 @@ struct StaticLegendWrapperPropertyArray : public rtl::StaticAggregate< Sequence< } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -368,8 +363,6 @@ void SAL_CALL LegendWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - //ReferenceSizePropertyProvider void LegendWrapper::updateReferenceSize() { @@ -395,8 +388,6 @@ awt::Size LegendWrapper::getCurrentSizeForReference() return m_spChart2ModelContact->GetPageSize(); } -// ================================================================================ - // WrappedPropertySet Reference< beans::XPropertySet > LegendWrapper::getInnerPropertySet() { @@ -429,8 +420,6 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 2c287e1084dc..b25c0d108659 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "MinMaxLineWrapper.hxx" #include "macros.hxx" #include "Chart2ModelContact.hxx" @@ -119,8 +118,6 @@ struct StaticMinMaxLineWrapperInfo : public rtl::StaticAggregate< uno::Reference } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -410,9 +407,6 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const return aRetSeq; } - -// ================================================================================ - Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 29ecbf883db7..bc6b2eee7c3e 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -24,7 +24,6 @@ #include "WrappedIgnoreProperty.hxx" #include <cppuhelper/interfacecontainer.hxx> - #include <com/sun/star/chart2/XDiagram.hpp> // header for class OPropertyArrayHelper diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index ad07eb12c70a..ecbe98db34bc 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -45,7 +45,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - namespace chart { class WrappedTitleStringProperty : public WrappedProperty @@ -109,8 +108,6 @@ Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPro return uno::makeAny( OUString() );//default title is a empty String } -//----------------------------------------------------------------------------- - class WrappedStackedTextProperty : public WrappedProperty { public: @@ -128,8 +125,6 @@ WrappedStackedTextProperty::~WrappedStackedTextProperty() }// end namespace chart -//----------------------------------------------------------------------------- - namespace { static const OUString lcl_aServiceName("com.sun.star.comp.chart.Title"); @@ -198,8 +193,6 @@ struct StaticTitleWrapperPropertyArray : public rtl::StaticAggregate< Sequence< } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -288,8 +281,6 @@ void SAL_CALL TitleWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet() { Reference< beans::XPropertySet > xProp; @@ -352,7 +343,6 @@ void TitleWrapper::setFastCharacterPropertyValue( } } -// ================================================================================ // WrappedPropertySet void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) @@ -465,8 +455,6 @@ void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPrope WrappedPropertySet::removePropertyChangeListener( rPropertyName, xListener ); } -// ================================================================================ - //ReferenceSizePropertyProvider void TitleWrapper::updateReferenceSize() { @@ -492,8 +480,6 @@ awt::Size TitleWrapper::getCurrentSizeForReference() return m_spChart2ModelContact->GetPageSize(); } -// ================================================================================ - Reference< chart2::XTitle > TitleWrapper::getTitleObject() { return TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ); @@ -525,8 +511,6 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ec5e3dcf9f73..cbdf23a73731 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UpDownBarWrapper.hxx" #include "macros.hxx" #include "Chart2ModelContact.hxx" @@ -121,8 +120,6 @@ struct StaticUpDownBarWrapperDefaults : public rtl::StaticAggregate< ::chart::tP } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -373,9 +370,6 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const return aRetSeq; } - -// ================================================================================ - Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index cc63338de0dd..c67b21e90e12 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -23,7 +23,6 @@ #include "MutexContainer.hxx" #include <cppuhelper/interfacecontainer.hxx> - #include <com/sun/star/chart2/XDiagram.hpp> // header for class OPropertyArrayHelper diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index bad2b3d6e76a..3ff1d7709b3d 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WallFloorWrapper.hxx" #include "macros.hxx" #include "Chart2ModelContact.hxx" @@ -76,8 +75,6 @@ struct StaticWallFloorWrapperPropertyArray : public rtl::StaticAggregate< Sequen } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { namespace wrapper @@ -121,8 +118,6 @@ void SAL_CALL WallFloorWrapper::removeEventListener( m_aEventListenerContainer.removeInterface( aListener ); } -// ================================================================================ - // WrappedPropertySet Reference< beans::XPropertySet > WallFloorWrapper::getInnerPropertySet() { @@ -159,8 +154,6 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( return aWrappedProperties; } -// ================================================================================ - Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index af7f07e34c33..1afed5737854 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedAddInProperty.hxx" #include "macros.hxx" @@ -25,10 +24,8 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. namespace wrapper { @@ -57,8 +54,6 @@ Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet return uno::makeAny( m_rChartDocumentWrapper.getAddIn() ); } -//............................................................................. - WrappedBaseDiagramProperty::WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ) : ::chart::WrappedProperty( "BaseDiagram" , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) @@ -84,8 +79,6 @@ Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPrope return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() ); } -//............................................................................. - WrappedAdditionalShapesProperty::WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ) : ::chart::WrappedProperty( "AdditionalShapes" , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) @@ -107,8 +100,6 @@ Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::X return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() ); } -//............................................................................. - WrappedRefreshAddInAllowedProperty::WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ) : ::chart::WrappedProperty( "RefreshAddInAllowed" , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) @@ -138,5 +129,4 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans } //namespace chart - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index 6bd31b50b9e9..665074024564 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -22,10 +22,8 @@ #include "WrappedProperty.hxx" #include "ChartDocumentWrapper.hxx" -//............................................................................. namespace chart { -//............................................................................. namespace wrapper { @@ -97,7 +95,6 @@ private: } //namespace chart - // CHART_WRAPPED_ADDIN_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 4bdb59ac315c..28e3019955fd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedAutomaticPositionProperties.hxx" #include "FastPropertyIdRanges.hxx" #include "macros.hxx" @@ -30,7 +29,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper @@ -118,8 +116,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList ) }//anonymous namespace -//----------------------------------------------------------------------------- - void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -130,8 +126,6 @@ void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property | beans::PropertyAttribute::MAYBEDEFAULT )); } -//----------------------------------------------------------------------------- - void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList ) { lcl_addWrappedProperties( rList ); @@ -139,6 +133,5 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< Wrap } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index a4de32458f98..b7b45be5684a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -23,7 +23,6 @@ #include "WrappedProperty.hxx" #include <vector> -//............................................................................. namespace chart { namespace wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index d21f485166fe..ffae3a8344aa 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedAxisAndGridExistenceProperties.hxx" #include "AxisHelper.hxx" #include "ChartModelHelper.hxx" @@ -29,7 +28,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { namespace wrapper @@ -202,8 +200,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< be return aRet; } -//--------------------------------------------------------------------------------------------------------------- - class WrappedAxisTitleExistenceProperty : public WrappedProperty { public: @@ -318,8 +314,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean return aRet; } -//--------------------------------------------------------------------------------------------------------------- - class WrappedAxisLabelExistenceProperty : public WrappedProperty { public: @@ -427,6 +421,5 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx index fbb472b6f7bd..80a3f1e1d5a7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx @@ -25,7 +25,6 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -38,8 +37,6 @@ public: , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; -//--------------------------------------------------------------------------------------------------------------- - class WrappedAxisTitleExistenceProperties { public: @@ -47,8 +44,6 @@ public: , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; -//--------------------------------------------------------------------------------------------------------------- - class WrappedAxisLabelExistenceProperties { public: @@ -58,7 +53,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SCALE_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index a8923502b4c7..a7e7dc1d8bbe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedCharacterHeightProperty.hxx" #include "macros.hxx" #include "RelativeSizeHelper.hxx" @@ -27,8 +26,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -//............................................................................. - namespace chart { namespace wrapper @@ -116,8 +113,6 @@ Any WrappedCharacterHeightProperty_Base::convertOuterToInnerValue( const Any& rO return rOuterValue; } -//----------------------------------------------------------------------------- - WrappedCharacterHeightProperty::WrappedCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) : WrappedCharacterHeightProperty_Base( "CharHeight", pRefSizePropProvider ) { @@ -126,8 +121,6 @@ WrappedCharacterHeightProperty::~WrappedCharacterHeightProperty() { } -//----------------------------------------------------------------------------- - WrappedAsianCharacterHeightProperty::WrappedAsianCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) : WrappedCharacterHeightProperty_Base( "CharHeightAsian", pRefSizePropProvider ) { @@ -136,8 +129,6 @@ WrappedAsianCharacterHeightProperty::~WrappedAsianCharacterHeightProperty() { } -//----------------------------------------------------------------------------- - WrappedComplexCharacterHeightProperty::WrappedComplexCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) : WrappedCharacterHeightProperty_Base( "CharHeightComplex", pRefSizePropProvider ) { @@ -148,6 +139,5 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty() } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index 4f40de00153d..ee4bbe180d91 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -23,7 +23,6 @@ #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -57,8 +56,6 @@ protected: ReferenceSizePropertyProvider* m_pRefSizePropProvider; }; -//----------------------------------------------------------------------------- - class WrappedCharacterHeightProperty : public WrappedCharacterHeightProperty_Base { public: @@ -68,8 +65,6 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, ReferenceSizePropertyProvider* pRefSizePropProvider ); }; -//----------------------------------------------------------------------------- - class WrappedAsianCharacterHeightProperty : public WrappedCharacterHeightProperty_Base { public: @@ -77,8 +72,6 @@ public: virtual ~WrappedAsianCharacterHeightProperty(); }; -//----------------------------------------------------------------------------- - class WrappedComplexCharacterHeightProperty : public WrappedCharacterHeightProperty_Base { public: @@ -88,7 +81,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_CHARACTERHEIGHT_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 5c4765297777..9a24704c4ed7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedDataCaptionProperties.hxx" #include "WrappedSeriesOrDiagramProperty.hxx" #include "macros.hxx" @@ -32,14 +31,11 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------- - class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 > { public: @@ -103,8 +99,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList }//anonymous namespace -//----------------------------------------------------------------------------- - void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -115,24 +109,18 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO | beans::PropertyAttribute::MAYBEDEFAULT )); } -//----------------------------------------------------------------------------- - void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES ); } -//----------------------------------------------------------------------------- - void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM ); } -//----------------------------------------------------------------------------- - WrappedDataCaptionProperty::WrappedDataCaptionProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) @@ -163,10 +151,7 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp xSeriesPropertySet->setPropertyValue( "Label", uno::makeAny( aLabel ) ); } -//----------------------------------------------------------------------------- - } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index 9b7f485d9671..0de5e20c7b80 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -25,14 +25,11 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- - class WrappedDataCaptionProperties { public: @@ -45,7 +42,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_DATACAPTION_PROPERTIES_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 77083d950958..bd79828d029c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedGapwidthProperty.hxx" #include "macros.hxx" #include "DiagramHelper.hxx" @@ -27,8 +26,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; - -//............................................................................. namespace chart { namespace wrapper @@ -37,8 +34,6 @@ namespace wrapper const sal_Int32 DEFAULT_GAPWIDTH = 100; const sal_Int32 DEFAULT_OVERLAP = 0; -//----------------------------------------------------------------------------- - WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base( const OUString& rOuterName , const OUString& rInnerSequencePropertyName @@ -157,8 +152,6 @@ Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::X return m_aOuterValue; } -//----------------------------------------------------------------------------- - WrappedGapwidthProperty::WrappedGapwidthProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedBarPositionProperty_Base( "GapWidth", "GapwidthSequence", DEFAULT_GAPWIDTH, spChart2ModelContact ) @@ -168,8 +161,6 @@ WrappedGapwidthProperty::~WrappedGapwidthProperty() { } -//----------------------------------------------------------------------------- - WrappedBarOverlapProperty::WrappedBarOverlapProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedBarPositionProperty_Base( "Overlap", "OverlapSequence", DEFAULT_OVERLAP, spChart2ModelContact ) @@ -181,6 +172,5 @@ WrappedBarOverlapProperty::~WrappedBarOverlapProperty() } // namespace wrapper } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 53ec6a5b08bb..a4010a81e4e2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedNumberFormatProperty.hxx" #include "macros.hxx" @@ -25,12 +24,10 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -//............................................................................. namespace chart { namespace wrapper { -//............................................................................. WrappedNumberFormatProperty::WrappedNumberFormatProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedDirectStateProperty( "NumberFormat", "NumberFormat" ) @@ -101,8 +98,6 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr return uno::makeAny( sal_Int32( 0 ) ); } -//----------------------------------------------------------------------------- - WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty ) : WrappedProperty( "LinkNumberFormatToSource", OUString() ) , m_pWrappedNumberFormatProperty( pWrappedNumberFormatProperty ) @@ -177,9 +172,7 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans: return uno::makeAny( bLink ); } -//............................................................................. } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index a8f16c2b5c3c..fd6d9e0fd75b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -24,12 +24,10 @@ #include <boost/shared_ptr.hpp> -//............................................................................. namespace chart { namespace wrapper { -//............................................................................. class WrappedLinkNumberFormatProperty; @@ -75,10 +73,8 @@ private: WrappedNumberFormatProperty* m_pWrappedNumberFormatProperty; }; -//............................................................................. } //namespace wrapper } //namespace chart -//............................................................................. // CHART2_WRAPPEDNUMBERFORMATPROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index e3ffbea7331e..38f830f320da 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedScaleProperty.hxx" #include "macros.hxx" #include "CommonConverters.hxx" @@ -33,7 +32,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::chart::TimeIncrement; -//............................................................................. namespace chart { namespace wrapper @@ -587,6 +585,5 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const } // namespace wrapper } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 98b6282b9f5e..bd2aea76192e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -25,7 +25,6 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -81,7 +80,6 @@ private: //member } // namespace wrapper } // namespace chart -//............................................................................. // CHART_WRAPPED_SCALE_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 43fc6ba744dc..5b6e32e9054c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedScaleTextProperties.hxx" #include "FastPropertyIdRanges.hxx" #include "macros.hxx" @@ -30,7 +29,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper @@ -128,7 +126,6 @@ enum }//anonymous namespace -//----------------------------------------------------------------------------- void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -139,8 +136,6 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut | beans::PropertyAttribute::MAYBEDEFAULT )); } -//----------------------------------------------------------------------------- - void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { @@ -149,6 +144,5 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedPrope } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index 8dcd04ccb7aa..eced30ed10af 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -26,7 +26,6 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -42,7 +41,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 621593c4a878..e899617838fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedSceneProperty.hxx" #include "macros.hxx" #include "DiagramHelper.hxx" @@ -29,7 +28,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { namespace wrapper @@ -41,8 +39,6 @@ void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* > rList.push_back( new WrappedD3DTransformMatrixProperty( spChart2ModelContact ) ); } -//---------------------------------------------------------------------------------------------------------------------- - WrappedD3DTransformMatrixProperty::WrappedD3DTransformMatrixProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedProperty("D3DTransformMatrix","D3DTransformMatrix") @@ -114,6 +110,5 @@ Any WrappedD3DTransformMatrixProperty::getPropertyDefault( const Reference< bean } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 45ca7e4a3d1c..b35089567405 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -25,13 +25,11 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- class WrappedSceneProperty { public: @@ -39,7 +37,6 @@ public: , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); }; -//---------------------------------------------------------------------------------------------------------------------- class WrappedD3DTransformMatrixProperty : public WrappedProperty { public: @@ -62,7 +59,6 @@ private: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SCENE_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index f31f14cfeb07..ed6180fca95b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedSeriesAreaOrLineProperty.hxx" #include "DataSeriesPointWrapper.hxx" #include "macros.hxx" using ::com::sun::star::uno::Any; - -//............................................................................. namespace chart { namespace wrapper @@ -56,6 +53,5 @@ OUString WrappedSeriesAreaOrLineProperty::getInnerName() const } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index 9051aded4905..726a8e33cdc9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -21,7 +21,6 @@ #include "WrappedProperty.hxx" -//............................................................................. namespace chart { namespace wrapper @@ -46,7 +45,6 @@ protected: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SERIES_AREA_OR_LINE_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 3934c8e8bcf0..461ff72ac9c3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -28,7 +28,6 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -175,7 +174,6 @@ protected: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SERIES_OR_DIAGRAM_PROPERTY_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 2b0294107fff..498bd26170c7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedSplineProperties.hxx" #include "macros.hxx" #include "FastPropertyIdRanges.hxx" @@ -31,13 +30,11 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------- //PROPERTYTYPE is the type of the outer property template< typename PROPERTYTYPE > @@ -180,7 +177,6 @@ enum }//anonymous namespace -//----------------------------------------------------------------------------- void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -206,7 +202,6 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro | beans::PropertyAttribute::MAYBEVOID )); } -//----------------------------------------------------------------------------- void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { @@ -215,8 +210,6 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty rList.push_back( new WrappedSplineProperty<sal_Int32>( "SplineResolution", "CurveResolution", uno::makeAny(sal_Int32(20)), spChart2ModelContact ) ); } -//----------------------------------------------------------------------------- - WrappedSplineTypeProperty::WrappedSplineTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedSplineProperty<sal_Int32>( "SplineType", "CurveStyle", uno::makeAny(sal_Int32(0)), spChart2ModelContact ) { @@ -293,6 +286,5 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index ff2c7760b18d..351fe53a19ea 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -25,14 +25,11 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- - class WrappedSplineProperties { public: @@ -43,7 +40,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SPLINE_PROPERTIES_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 216217f7ee83..c1f105036655 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedStatisticProperties.hxx" #include "WrappedSeriesOrDiagramProperty.hxx" #include "macros.hxx" @@ -41,7 +40,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper @@ -57,8 +55,6 @@ Any lcl_getRegressionDefault() return aRet; } -//----------------------------------------------------------------------------- - ::com::sun::star::chart::ChartRegressionCurveType lcl_getRegressionCurveType( RegressionCurveHelper::tRegressionType eRegressionType ) { ::com::sun::star::chart::ChartRegressionCurveType eRet = ::com::sun::star::chart::ChartRegressionCurveType_NONE; @@ -89,8 +85,6 @@ Any lcl_getRegressionDefault() return eRet; } -//----------------------------------------------------------------------------- - RegressionCurveHelper::tRegressionType lcl_getRegressionType( ::com::sun::star::chart::ChartRegressionCurveType eRegressionCurveType ) { RegressionCurveHelper::tRegressionType eRet; @@ -173,8 +167,6 @@ void lcl_ConvertRangeToXML( }//anonymous namespace -//----------------------------------------------------------------------------- - template< typename PROPERTYTYPE > class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTYTYPE > { @@ -186,7 +178,6 @@ public: {} virtual ~WrappedStatisticProperty() {}; - protected: uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const { @@ -209,7 +200,6 @@ protected: }; -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_CONST_ERROR_LOW class WrappedConstantErrorLowProperty : public WrappedStatisticProperty< double > { @@ -264,7 +254,6 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans:: } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_CONST_ERROR_HIGH class WrappedConstantErrorHighProperty : public WrappedStatisticProperty< double > { @@ -319,7 +308,6 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans: } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_MEAN_VALUE class WrappedMeanValueProperty : public WrappedStatisticProperty< sal_Bool > { @@ -363,7 +351,6 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_CATEGORY // deprecated, replaced by ErrorBarStyle class WrappedErrorCategoryProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorCategory > @@ -463,7 +450,6 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_PERCENT_ERROR class WrappedPercentageErrorProperty : public WrappedStatisticProperty< double > { @@ -518,7 +504,6 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_MARGIN class WrappedErrorMarginProperty : public WrappedStatisticProperty< double > { @@ -573,7 +558,6 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_INDICATOR class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType > { @@ -646,8 +630,6 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP } } - -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_BAR_STYLE // this is the new constant group that replaces the deprecated enum ChartErrorCategory class WrappedErrorBarStyleProperty : public WrappedStatisticProperty< sal_Int32 > @@ -695,7 +677,6 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE class WrappedErrorBarRangePositiveProperty : public WrappedStatisticProperty< OUString > { @@ -762,7 +743,6 @@ void WrappedErrorBarRangePositiveProperty::setValueToSeries( const Reference< be } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE class WrappedErrorBarRangeNegativeProperty : public WrappedStatisticProperty< OUString > { @@ -829,7 +809,6 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_REGRESSION_CURVES class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType > { @@ -882,7 +861,6 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans:: } } -//----------------------------------------------------------------------------- //PROP_CHART_STATISTIC_REGRESSION_PROPERTIES //PROP_CHART_STATISTIC_ERROR_PROPERTIES //PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES @@ -957,8 +935,6 @@ void WrappedStatisticPropertySetProperty::setValueToSeries( { } -//----------------------------------------------------------------------------- - namespace { enum @@ -1101,14 +1077,12 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut | beans::PropertyAttribute::MAYBEVOID )); } -//----------------------------------------------------------------------------- void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES ); } -//----------------------------------------------------------------------------- void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { @@ -1117,6 +1091,5 @@ void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< Wr } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index 112c8e377969..d191121eda07 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -25,7 +25,6 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper @@ -43,7 +42,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_STATISTIC_PROPERTIES_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index fc8096067b9f..181d3a3b3820 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedStockProperties.hxx" #include "macros.hxx" #include "FastPropertyIdRanges.hxx" @@ -33,14 +32,11 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------- - class WrappedStockProperty : public WrappedProperty { public: @@ -119,8 +115,6 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r return m_aDefaultValue; } -//------------------------------------------------------------------------------------- - class WrappedVolumeProperty : public WrappedStockProperty { public: @@ -192,8 +186,6 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla return xTemplate; } -//------------------------------------------------------------------------------------- - class WrappedUpDownProperty : public WrappedStockProperty { public: @@ -269,7 +261,6 @@ enum }//anonymous namespace -//----------------------------------------------------------------------------- void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -288,7 +279,6 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp | beans::PropertyAttribute::MAYBEVOID )); } -//----------------------------------------------------------------------------- void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { @@ -298,6 +288,5 @@ void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index 88840e71ec91..cc44339e6a7d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -25,14 +25,11 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- - class WrappedStockProperties { public: @@ -43,7 +40,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_STOCK_PROPERTIES_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index c9bdcb88c894..a9eb28b2919f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedSymbolProperties.hxx" #include "WrappedSeriesOrDiagramProperty.hxx" #include "macros.hxx" @@ -60,15 +59,11 @@ bool operator!=( const awt::Size & rSize1, const awt::Size & rSize2 ) } } } } -//............................................................................. namespace chart { namespace wrapper { - -//----------------------------------------------------------------------------- - class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 > { public: @@ -190,7 +185,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList }//anonymous namespace -//----------------------------------------------------------------------------- void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( @@ -222,22 +216,18 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro | beans::PropertyAttribute::MAYBEDEFAULT )); } -//----------------------------------------------------------------------------- void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES ); } -//----------------------------------------------------------------------------- void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) { lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM ); } -//----------------------------------------------------------------------------- - WrappedSymbolTypeProperty::WrappedSymbolTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) @@ -324,8 +314,6 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc return WrappedProperty::getPropertyState( xInnerPropertyState ); } -//----------------------------------------------------------------------------- - WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) @@ -394,9 +382,6 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries( } } - -//----------------------------------------------------------------------------- - namespace { @@ -519,8 +504,6 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc return beans::PropertyState_DEFAULT_VALUE; } -//----------------------------------------------------------------------------- - WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) @@ -570,6 +553,5 @@ beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Refe } //namespace wrapper } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 3c619052196a..db4b86463470 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -25,14 +25,11 @@ #include <boost/shared_ptr.hpp> #include <vector> -//............................................................................. namespace chart { namespace wrapper { -//----------------------------------------------------------------------------------------------------------------- - class WrappedSymbolProperties { public: @@ -45,7 +42,6 @@ public: } //namespace wrapper } //namespace chart -//............................................................................. // CHART_WRAPPED_SYMBOL_PROPERTIES_HXX #endif diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 96fedf6f9b20..9d496a3d9886 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedTextRotationProperty.hxx" #include "macros.hxx" #include <com/sun/star/beans/XPropertyState.hpp> @@ -25,8 +24,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; - -//............................................................................. namespace chart { @@ -71,6 +68,5 @@ Any WrappedTextRotationProperty::convertOuterToInnerValue( const Any& rOuterValu } } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 862a59f2d820..6cb2aa9e389c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -21,7 +21,6 @@ #include "WrappedProperty.hxx" -//............................................................................. namespace chart { @@ -42,7 +41,6 @@ protected: }; } //namespace chart -//............................................................................. // CHART_WRAPPED_TEXTROTATION_PROPERTY_HXX #endif |