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 | |
| 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')
485 files changed, 0 insertions, 3107 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 074b23250570..ad10a1d5630e 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -111,7 +111,6 @@ void Chart2ImportTest::testErrorBarRange() CPPUNIT_ASSERT_EQUAL(aRangePos, OUString("$Sheet1.$C$2:$C$4")); } - // stepped line interpolation void Chart2ImportTest::testSteppedLines() { diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx index 0d4a1e3616dd..930546901642 100644 --- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx +++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccStatisticsObject.hxx" #include <vcl/svapp.hxx> #include <svx/svditer.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 86716738669a..21474063a36b 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleBase.hxx" #include "AccessibleChartShape.hxx" #include "ObjectHierarchy.hxx" @@ -99,8 +98,6 @@ AccessibleBase::~AccessibleBase() OSL_ASSERT( m_bIsDisposed ); } -// ________ public ________ - bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const throw (lang::DisposedException) { @@ -222,8 +219,6 @@ void AccessibleBase::RemoveState( sal_Int16 aState ) m_pStateSetHelper->RemoveState( aState ); } -// ________ protected ________ - bool AccessibleBase::UpdateChildren() { bool bMustUpdateChildren = false; @@ -467,13 +462,6 @@ AccessibleUniqueId AccessibleBase::GetId() const return m_aAccInfo.m_aOID; } -// ____________________________________ -// ____________________________________ -// -// Interfaces -// ____________________________________ -// ____________________________________ - // ________ (XComponent::dispose) ________ void SAL_CALL AccessibleBase::disposing() { @@ -647,7 +635,6 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet( return m_aStateSet; } - lang::Locale SAL_CALL AccessibleBase::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index f1a4d0c6594e..f480aa2fae98 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleChartElement.hxx" #include "CharacterProperties.hxx" #include "ObjectIdentifier.hxx" @@ -118,12 +117,8 @@ void AccessibleChartElement::InitTextEdit() } } -// ____________________________________ -// ____________________________________ // // Interfaces -// ____________________________________ -// ____________________________________ // ________ AccessibleBase::XAccessibleContext ________ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const @@ -268,7 +263,6 @@ sal_Int32 SAL_CALL AccessibleChartElement::getBackground() return AccessibleBase::getBackground(); } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 0d3fd837bcdc..07e5714fe145 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleChartShape.hxx" #include "ObjectHierarchy.hxx" #include "ObjectIdentifier.hxx" @@ -33,7 +32,6 @@ using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; - namespace chart { diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index d6827e30fe80..d95aa72b8bc7 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -25,7 +25,6 @@ #include <cppuhelper/implbase1.hxx> #include <svx/AccessibleShapeTreeInfo.hxx> - namespace accessibility { class AccessibleShape; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index ecf9290287ab..0df51e1e1d88 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleChartView.hxx" #include "chartview/ExplicitValueProvider.hxx" #include "servicenames.hxx" @@ -50,10 +49,8 @@ using ::com::sun::star::uno::WeakReference; using ::com::sun::star::uno::Any; using osl::MutexGuard; -//............................................................................. namespace chart { -//............................................................................. AccessibleChartView::AccessibleChartView( const Reference< uno::XComponentContext >& xContext, SdrView* pView ) : @@ -74,7 +71,6 @@ AccessibleChartView::~AccessibleChartView() delete m_pViewForwarder; } - awt::Rectangle AccessibleChartView::GetWindowPosSize() const { Reference< awt::XWindow > xWindow( GetInfo().m_xWindow ); @@ -174,9 +170,7 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() return aResult; } -//----------------------------------------------------------------- // lang::XInitialization -//----------------------------------------------------------------- void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments ) throw (uno::Exception, uno::RuntimeException) @@ -351,9 +345,7 @@ ExplicitValueProvider* AccessibleChartView::getExplicitValueProvider() return ExplicitValueProvider::getExplicitValueProvider(m_xChartView); } -//------------------------------------------------------------------------- // view::XSelectionChangeListener -//------------------------------------------------------------------------- void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException) @@ -379,24 +371,18 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* } } -//------------------------------------------------------------------------- // lang::XComponent::dispose() -//------------------------------------------------------------------------- void SAL_CALL AccessibleChartView::disposing() { AccessibleBase::disposing(); } -//------------------------------------------------------------------------- // XEventListener -//------------------------------------------------------------------------- void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) { } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 6a2b04235f5c..e9c71af0709f 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleTextHelper.hxx" #include "DrawViewWrapper.hxx" @@ -181,8 +180,6 @@ lang::Locale SAL_CALL AccessibleTextHelper::getLocale() return lang::Locale(); } - - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index f94750d471cc..d5570ad9883c 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleViewForwarder.hxx" #include "AccessibleChartView.hxx" @@ -25,7 +24,6 @@ using namespace ::com::sun::star; - namespace chart { diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx index a3238cee8a12..5c2c4f8b74ac 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.cxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartElementFactory.hxx" #include "ObjectIdentifier.hxx" #include "AccessibleChartElement.hxx" 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 diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx index 884a7d69c162..7f47f3e8a2b3 100644 --- a/chart2/source/controller/dialogs/ChangingResource.cxx +++ b/chart2/source/controller/dialogs/ChangingResource.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChangingResource.hxx" -//............................................................................. namespace chart { -//............................................................................. ResourceChangeListener::~ResourceChangeListener() { @@ -41,8 +38,6 @@ void ChangingResource::setChangeListener( ResourceChangeListener* pListener ) m_pChangeListener = pListener; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx index cd30cfd3ee6d..d64c1705dc63 100644 --- a/chart2/source/controller/dialogs/ChangingResource.hxx +++ b/chart2/source/controller/dialogs/ChangingResource.hxx @@ -20,12 +20,9 @@ #ifndef _CHART2_CHANGINGRESOURCE_HXX #define _CHART2_CHANGINGRESOURCE_HXX -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -49,9 +46,7 @@ protected: ResourceChangeListener* m_pChangeListener; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 78e3e14c1e0a..46abae8b5cff 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartTypeDialogController.hxx" #include "ResId.hxx" #include "HelpIds.hrc" @@ -43,10 +42,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -112,10 +109,6 @@ bool ChartTypeParameter::mapsToSimilarService( const ChartTypeParameter& rParame return true; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - ChartTypeDialogController::ChartTypeDialogController() : bSupportsXAxisWithValues(false) , bSupports3D(true) @@ -397,7 +390,6 @@ void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter& /*r void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const throw (uno::RuntimeException) { } -//-------------------------------------------------------------------------- ColumnOrBarChartDialogController_Base::ColumnOrBarChartDialogController_Base() : ChartTypeDialogController() @@ -421,7 +413,6 @@ void ColumnOrBarChartDialogController_Base::adjustSubTypeAndEnableControls( Char rParameter.nSubTypeIndex=1; } } -//-------------------------------------------------------------------------- ColumnChartDialogController::ColumnChartDialogController() { } @@ -497,8 +488,6 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } -//-------------------------------------------------------------------------- - BarChartDialogController::BarChartDialogController() { } @@ -573,8 +562,6 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const Ch rSubTypeList.SetItemText( 4, SCH_RESSTR( STR_DEEP ) ); } -//-------------------------------------------------------------------------- - PieChartDialogController::PieChartDialogController() { } @@ -637,7 +624,6 @@ void PieChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPa if(rParameter.eStackMode==GlobalStackMode_STACK_Z) rParameter.eStackMode = GlobalStackMode_NONE; } -//-------------------------------------------------------------------------- LineChartDialogController::LineChartDialogController() { } @@ -656,7 +642,6 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - //------------------------------------------------------- ( "com.sun.star.chart2.template.Symbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) ( "com.sun.star.chart2.template.StackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) ( "com.sun.star.chart2.template.PercentStackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y_PERCENT,true,false) ) @@ -666,11 +651,9 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl ( "com.sun.star.chart2.template.Line" , ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) ) ( "com.sun.star.chart2.template.StackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) ) ( "com.sun.star.chart2.template.PercentStackedLine" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) ) - //------------------------------------------------------- ( "com.sun.star.chart2.template.StackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) ) ( "com.sun.star.chart2.template.PercentStackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) ( "com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) - //------------------------------------------------------- ; return m_aTemplateMap; } @@ -788,7 +771,6 @@ void LineChartDialogController::adjustParameterToMainType( ChartTypeParameter& r ChartTypeDialogController::adjustParameterToMainType( rParameter ); } -//-------------------------------------------------------------------------- XYChartDialogController::XYChartDialogController() { bSupportsXAxisWithValues = true; @@ -808,7 +790,6 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat { static tTemplateServiceChartTypeParameterMap m_aTemplateMap = tTemplateServiceChartTypeParameterMap - //------------------------------------------------------- ( "com.sun.star.chart2.template.ScatterSymbol" , ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) ( "com.sun.star.chart2.template.ScatterLineSymbol" , ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) ( "com.sun.star.chart2.template.ScatterLine" , ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) @@ -889,7 +870,6 @@ void XYChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPar break; } } -//-------------------------------------------------------------------------- AreaChartDialogController::AreaChartDialogController() { } @@ -971,7 +951,6 @@ void AreaChartDialogController::adjustParameterToMainType( ChartTypeParameter& r ChartTypeDialogController::adjustParameterToMainType( rParameter ); } -//-------------------------------------------------------------------------- NetChartDialogController::NetChartDialogController() { bSupports3D = false; @@ -1064,7 +1043,6 @@ void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPa break; } } -//-------------------------------------------------------------------------- StockChartDialogController::StockChartDialogController() { bSupports3D = false; @@ -1112,7 +1090,6 @@ void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& r rParameter.b3DLook = false; rParameter.eStackMode = GlobalStackMode_NONE; } -//-------------------------------------------------------------------------- CombiColumnLineChartDialogController::CombiColumnLineChartDialogController() : m_pFT_NumberOfLines(0) , m_pMF_NumberOfLines(0) @@ -1267,7 +1244,6 @@ void CombiColumnLineChartDialogController::adjustParameterToSubType( ChartTypePa break; } } -//-------------------------------------------------------------------------- BubbleChartDialogController::BubbleChartDialogController() { } @@ -1301,8 +1277,6 @@ void BubbleChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter.b3DLook = false; rParameter.eStackMode = GlobalStackMode_NONE; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index d751df52992a..498db10e780e 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -37,12 +37,9 @@ class ValueSet; -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -302,9 +299,7 @@ public: virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx index 124d04085714..15b2312a743e 100644 --- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx +++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/chart2/XChartTypeTemplate.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -39,9 +36,7 @@ public: virtual ~ChartTypeTemplateProvider() {} }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 9f107573fa9a..2ea1cf0babae 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -92,12 +92,9 @@ sal_Int32 lcl_getColumnInData( sal_uInt16 nCol ) } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { -// ---------------------------------------- namespace impl { @@ -425,7 +422,6 @@ struct applyChangesFunctor : public ::std::unary_function< ::boost::shared_ptr< }; } // namespace impl -// ---------------------------------------- namespace { @@ -469,7 +465,6 @@ sal_Int32 lcl_getColumnInDataOrHeader( } // anonymous namespace - DataBrowser::DataBrowser( Window* pParent, const ResId& rId, bool bLiveUpdate ) : ::svt::EditBrowseBox( pParent, rId, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ), m_nSeekRow( 0 ), @@ -744,7 +739,6 @@ bool DataBrowser::IsReadOnly() const return m_bIsReadOnly; } - void DataBrowser::SetClean() { m_bIsDirty = false; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index e28259c5a007..5a63bad5c77d 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DataBrowserModel.hxx" #include "DialogModel.hxx" #include "ChartModelHelper.hxx" @@ -58,7 +57,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - namespace { OUString lcl_getRole( @@ -80,7 +78,6 @@ OUString lcl_getRole( return aResult; } - OUString lcl_getRole( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) { @@ -230,7 +227,6 @@ bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagr namespace chart { - struct DataBrowserModel::tDataColumn { ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 57b6f42c7c89..7ac81f8f654a 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DialogModel.hxx" #include "RangeSelectionHelper.hxx" #include "PropertyHelper.hxx" @@ -57,8 +56,6 @@ using namespace ::chart::ContainerHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// ---------------------------------------- - namespace { const OUString lcl_aLabelRole( "label" ); @@ -359,9 +356,6 @@ struct lcl_addSeriesNumber : public ::std::binary_function< } // anonymous namespace -// ---------------------------------------- - - namespace chart { diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index b630f3a055e4..ef63d909ad2c 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ObjectNameProvider.hxx" #include "ResId.hxx" #include "Strings.hrc" @@ -38,10 +37,8 @@ #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -315,8 +312,6 @@ OUString ObjectNameProvider::getAxisName( const OUString& rObjectCID { OUString aRet; - - Reference< XAxis > xAxis( ObjectIdentifier::getObjectPropertySet( rObjectCID , xChartModel ), uno::UNO_QUERY ); @@ -412,7 +407,6 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID { OUString aRet; - sal_Int32 nCooSysIndex = -1; sal_Int32 nDimensionIndex = -1; sal_Int32 nAxisIndex = -1; @@ -714,7 +708,6 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, return aRet; } - OUString ObjectNameProvider::getNameForCID( const OUString& rObjectCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) @@ -794,8 +787,6 @@ OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType return aRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/RangeEdit.cxx b/chart2/source/controller/dialogs/RangeEdit.cxx index 17ff406cbb31..345eb9b2b505 100644 --- a/chart2/source/controller/dialogs/RangeEdit.cxx +++ b/chart2/source/controller/dialogs/RangeEdit.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RangeEdit.hxx" namespace chart { -//============================================================================ // class RangeEdit -//---------------------------------------------------------------------------- RangeEdit::RangeEdit( Window* pParent, const ResId& rResId): Edit( pParent , rResId ) { @@ -55,8 +52,6 @@ void RangeEdit::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput( rKEvt ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx index 04a970c8a1cd..2b14e8e77c0d 100644 --- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RangeSelectionButton.hxx" #include "Bitmaps.hrc" #include "Strings.hrc" #include "ResId.hxx" -//............................................................................. namespace chart { -//............................................................................. RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) @@ -39,8 +36,6 @@ RangeSelectionButton::~RangeSelectionButton() { } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index 006f673a0c69..b96d063e677b 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RangeSelectionHelper.hxx" #include "RangeSelectionListener.hxx" #include "macros.hxx" @@ -39,8 +38,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// ---------------------------------------- - namespace chart { diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index 2662c1d20d9a..dcc65e2507fe 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RangeSelectionListener.hxx" using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 91863c84f723..af699e4e3d49 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TextDirectionListBox.hxx" #include "ResId.hxx" #include "Strings.hrc" diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 11b0f0a3b302..a4c4a55ee684 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TimerTriggeredControllerLock.hxx" // header for define EDIT_UPDATEDATA_TIMEOUT #include <vcl/edit.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; @@ -55,8 +52,6 @@ IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout) return 0; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 91d44353934e..f015394cc7bf 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TitleDialogData.hxx" #include "TitleHelper.hxx" #include "ChartModelHelper.hxx" #include "AxisHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -109,8 +106,6 @@ bool TitleDialogData::writeDifferenceToModel( return bChanged; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index b40d3db3281f..0ad8d370f115 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_ChartType.hxx" #include "dlg_ChartType.hrc" #include "ResId.hxx" @@ -29,10 +28,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -63,8 +60,6 @@ ChartTypeDialog::~ChartTypeDialog() delete m_pChartTypeTabPage; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 6a91a9a92191..e2323de4799e 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -17,28 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_ChartType_UNO.hxx" #include "dlg_ChartType.hxx" #include "servicenames.hxx" #include <osl/mutex.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; uno::Reference< uno::XInterface > SAL_CALL ChartTypeUnoDlg::Create(const uno::Reference< uno::XComponentContext >& _xContext) { return *(new ChartTypeUnoDlg(_xContext)); } -// ----------------------------------------------------------------------------- ChartTypeUnoDlg::ChartTypeUnoDlg( const uno::Reference< uno::XComponentContext >& _xContext ) : ChartTypeUnoDlg_BASE( _xContext ) { } -// ----------------------------------------------------------------------------- ChartTypeUnoDlg::~ChartTypeUnoDlg() { // we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor, @@ -50,41 +45,33 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() destroyDialog(); } } -//------------------------------------------------------------------------- // lang::XServiceInfo -//------------------------------------------------------------------------- OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeException) { return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME; } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- - uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } -//------------------------------------------------------------------------- uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------------ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) { beans::PropertyValue aProperty; @@ -98,25 +85,20 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -//------------------------------------------------------------------------------ Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext ); } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException) { return createPropertySetInfo( getInfoHelper() ); } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& ChartTypeUnoDlg::getInfoHelper() { return *const_cast<ChartTypeUnoDlg*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* ChartTypeUnoDlg::createArrayHelper( ) const { uno::Sequence< beans::Property > aProps; @@ -124,8 +106,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySe return new ::cppu::OPropertyArrayHelper(aProps); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index a89d323dd627..4a8a2c180323 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_CreationWizard.hxx" #include "dlg_CreationWizard.hrc" #include "ResId.hxx" @@ -32,10 +31,8 @@ #include "ChartTypeTemplateProvider.hxx" #include "DialogModel.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; #define PATH_FULL 1 @@ -222,8 +219,6 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const return SCH_RESSTR(nResId); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 2776e33e0c90..b15a43f97fe2 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_CreationWizard_UNO.hxx" #include "dlg_CreationWizard.hxx" #include "macros.hxx" @@ -38,10 +37,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/Desktop.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponentContext >& xContext ) @@ -65,7 +62,6 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() m_pDialog = 0; } } -//------------------------------------------------------------------------- // lang::XServiceInfo APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME) @@ -77,7 +73,6 @@ APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMP return aSNS; } -//------------------------------------------------------------------------- // XInterface uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException) { @@ -121,7 +116,6 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp return OComponentHelper::queryAggregation( rType ); } -//------------------------------------------------------------------------- #define LCL_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const uno::Reference<t> *>(0))) uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException) @@ -157,8 +151,6 @@ uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( vo return theCreationWizardUnoDlgImplementationId::get().getSeq(); } -//------------------------------------------------------------------------- - // XTerminateListener void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException) { @@ -172,8 +164,6 @@ void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& / } } -//------------------------------------------------------------------------- - void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException) { // we are going down, so dispose us! @@ -185,11 +175,9 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source //Listener should deregister himself and relaese all references to the closing object. } -//------------------------------------------------------------------------- void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException) { } -//------------------------------------------------------------------------- void CreationWizardUnoDlg::createDialogOnDemand() { SolarMutexGuard aSolarGuard; @@ -222,7 +210,6 @@ void CreationWizardUnoDlg::createDialogOnDemand() } } } -//------------------------------------------------------------------------- IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent*, pEvent ) { if(pEvent && (pEvent->GetId() == VCLEVENT_OBJECT_DYING) ) @@ -230,7 +217,6 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent*, pEvent ) return 0; } -//------------------------------------------------------------------------- sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException) { sal_Int16 nRet = RET_CANCEL; @@ -247,7 +233,6 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException return nRet; } -//------------------------------------------------------------------------- void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException) { const uno::Any* pArguments = aArguments.getConstArray(); @@ -268,7 +253,6 @@ void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& } } -//------------------------------------------------------------------------- // ____ OComponentHelper ____ /// Called in dispose method after the listeners were notified. void SAL_CALL CreationWizardUnoDlg::disposing() @@ -404,8 +388,6 @@ void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString OSL_FAIL("not implemented"); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 9406c3bad501..6a4bb14bb8ca 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_DataEditor.hxx" #include "dlg_DataEditor.hrc" #include "Strings.hrc" @@ -41,7 +40,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; - namespace chart { diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index e601d84f5152..03c369b26a6b 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_DataSource.hxx" #include "dlg_DataSource.hrc" #include "Strings.hrc" @@ -40,14 +39,9 @@ using namespace ::chart; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// -------------------------------------------------------------------------------- - - namespace chart { -// ---------------------------------------- - class DocumentChartTypeTemplateProvider : public ChartTypeTemplateProvider { public: @@ -88,8 +82,6 @@ Reference< chart2::XChartTypeTemplate > DocumentChartTypeTemplateProvider::getCu return m_xTemplate; } -// ---------------------------------------- - class DataSourceTabControl : public TabControl { public: @@ -133,8 +125,6 @@ void DataSourceTabControl::EnableTabToggling() m_bTogglingEnabled = true; } -// ---------------------------------------- - sal_uInt16 DataSourceDialog::m_nLastPageId = 0; DataSourceDialog::DataSourceDialog( @@ -237,7 +227,6 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage ) } } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 9b59ed4f4e37..58895414e2e4 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -28,10 +28,8 @@ // header for class SfxBoolItem #include <svl/eitem.hxx> -//............................................................................. namespace chart { -//............................................................................. InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() : aPossibilityList(6) @@ -44,11 +42,9 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() aExistenceList[nN]=false; } -//============================== // // SchAxisDlg // -//============================== SchAxisDlg::SchAxisDlg(Window* pWindow, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg) @@ -112,10 +108,6 @@ SchGridDlg::~SchGridDlg() { } -//............................................................................. } //namespace chart -//............................................................................. - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 78889e3e1769..9a1663821544 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_InsertDataLabel.hxx" #include "dlg_InsertDataLabel.hrc" #include "ResId.hxx" #include "ObjectNameProvider.hxx" #include "res_DataLabel.hxx" -//............................................................................. namespace chart { -//............................................................................. DataLabelsDialog::DataLabelsDialog(Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) : ModalDialog(pWindow, SchResId(DLG_DATA_DESCR)), @@ -58,8 +55,6 @@ void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs) m_apDataLabelResources->FillItemSet(rOutAttrs); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 4112ee228dbe..f539abe64336 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_InsertErrorBars.hxx" #include "dlg_InsertErrorBars.hrc" #include "res_ErrorBar.hxx" @@ -38,10 +37,8 @@ using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//............................................................................. namespace chart { -//............................................................................. InsertErrorBarsDialog::InsertErrorBarsDialog( Window* pParent, const SfxItemSet& rMyAttrs, @@ -119,8 +116,6 @@ double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( return fStepWidth; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index de6ad1005d38..44d6ab19e7f7 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -24,10 +24,8 @@ #include "ResId.hxx" #include "NoWarningThisInCTOR.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; @@ -57,8 +55,6 @@ bool SchLegendDlg::writeToModel( const uno::Reference< frame::XModel >& xChartMo return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index b67208b8e65f..334e413f0ac2 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -24,10 +24,8 @@ #include "NoWarningThisInCTOR.hxx" #include "ObjectNameProvider.hxx" -//............................................................................. namespace chart { -//............................................................................. SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData& rInput ) : ModalDialog(pWindow, SchResId(DLG_TITLE)) @@ -51,8 +49,6 @@ void SchTitleDlg::getResult( TitleDialogData& rOutput ) m_apTitleResources->readFromResources( rOutput ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 741bebc5e5e6..e8884e0def51 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_NumberFormat.hxx" // header for class SfxItemSet @@ -33,10 +32,8 @@ // header for SvNumberFormatter #include <svl/zforlist.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet) @@ -70,8 +67,6 @@ SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemP return SfxItemSet( rItemPool, nWhichPairs ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index c57460891348..c2e5778cc177 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -24,10 +24,8 @@ class Window; class SfxItemSet; -//............................................................................. namespace chart { -//............................................................................. class NumberFormatDialog : public SfxSingleTabDialog { @@ -38,9 +36,7 @@ public: static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index de868dc390b9..bacd18e4358a 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -66,19 +66,13 @@ #include <svl/cjkoptions.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString& rObjectCID ) : m_aObjectCID( rObjectCID ) , m_eObjectType( ObjectIdentifier::getObjectType( m_aObjectCID ) ) @@ -323,10 +317,6 @@ bool ObjectPropertiesDialogParameter::IsComplexCategoriesAxis() const const sal_uInt16 nNoArrowNoShadowDlg = 1101; -//------------------------------------------------------------------- -//------------------------------------------------------------------- -//------------------------------------------------------------------- - void SchAttribTabDlg::setSymbolInformation( SfxItemSet* pSymbolShapeProperties, Graphic* pAutoSymbolGraphic ) { @@ -570,7 +560,6 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) case TP_ALIGNMENT: break; - case TP_AXIS_POSITIONS: { AxisPositionsTabPage* pPage = dynamic_cast< AxisPositionsTabPage* >( &rPage ); @@ -656,8 +645,6 @@ bool SchAttribTabDlg::DialogWasClosedWithOK() const return m_bOKPressed; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index b29f7deefe1a..a58b2d62a383 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_ShapeFont.hxx" #include "ViewElementListProvider.hxx" #include "ResId.hxx" @@ -32,10 +31,8 @@ using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. ShapeFontDialog::ShapeFontDialog( Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider ) @@ -77,8 +74,6 @@ void ShapeFontDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index d6b323266ae8..bb0449d63ae1 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_ShapeParagraph.hxx" #include "ResId.hxx" #include "ResourceIds.hrc" @@ -30,10 +29,8 @@ using ::com::sun::star::uno::Reference; using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. ShapeParagraphDialog::ShapeParagraphDialog( Window* pParent, const SfxItemSet* pAttr ) :SfxTabDialog( pParent, SchResId( DLG_SHAPE_PARAGRAPH ), pAttr ) @@ -78,8 +75,6 @@ void ShapeParagraphDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index eb5bfaf50c6a..6d7ee358fe5c 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlg_View3D.hxx" #include "dlg_View3D.hrc" #include "Strings.hrc" @@ -35,18 +34,12 @@ // for RET_OK #include <vcl/msgbox.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//------------------------------------------------------------------- -//------------------------------------------------------------------- - sal_uInt16 View3DDialog::m_nLastPageId = 0; View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) @@ -102,8 +95,6 @@ short View3DDialog::Execute() return nResult; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 9550871a3432..fc4b3add5769 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_BarGeometry.hxx" #include "ResourceIds.hrc" #include "Strings.hrc" @@ -25,10 +24,8 @@ #include <svtools/controldims.hrc> -//............................................................................. namespace chart { -//............................................................................. BarGeometryResources::BarGeometryResources( Window* pWindow ) : m_aFT_Geometry( pWindow, pWindow->GetStyle() ) @@ -96,8 +93,6 @@ void BarGeometryResources::SelectEntryPos( sal_uInt16 nPos ) m_aLB_Geometry.SelectEntryPos( nPos ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index 4f72dd4a2fb7..925d4e35f5f3 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -24,10 +24,8 @@ // header for class ListBox #include <vcl/lstbox.hxx> -//............................................................................. namespace chart { -//............................................................................. class BarGeometryResources { @@ -52,9 +50,7 @@ private: ListBox m_aLB_Geometry; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 3b247553b5c9..48d558971c80 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_DataLabel.hxx" #include "res_DataLabel_IDs.hrc" @@ -46,11 +45,8 @@ #include <svl/zforlist.hxx> #include <svtools/controldims.hrc> - -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -405,8 +401,6 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs) EnableControls(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index cea21f7b737b..cf9e9211cc4b 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -31,10 +31,8 @@ class SvNumberFormatter; -//............................................................................. namespace chart { -//............................................................................. class DataLabelResources { @@ -90,9 +88,7 @@ private: void EnableControls(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 713fed233640..1ecf30a197f4 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_ErrorBar.hxx" #include "res_ErrorBar_IDs.hrc" #include "ResId.hxx" @@ -74,11 +73,8 @@ sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind ) } } // anonymous namespace - -//............................................................................. namespace chart { -//............................................................................. ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, @@ -751,8 +747,6 @@ bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit ) return bIsValid; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 0760a8bf01c5..c5e5cf530296 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_LegendPosition.hxx" #include "ResourceIds.hrc" #include "Strings.hrc" @@ -36,10 +35,8 @@ #include <svl/intitem.hxx> #include <svl/eitem.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -258,8 +255,6 @@ void LegendPositionResources::SetAccessibleRelationMemberOf(Window* pMemberOf) m_aRbtBottom.SetAccessibleRelationMemberOf(pMemberOf); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index d8b33ef6d91f..f3bd42eb0d28 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -27,10 +27,8 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//............................................................................. namespace chart { -//............................................................................. class LegendPositionResources { @@ -48,7 +46,6 @@ public: void writeToModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ) const; - void initFromItemSet( const SfxItemSet& rInAttrs ); void writeToItemSet( SfxItemSet& rOutAttrs ) const; @@ -76,9 +73,7 @@ private: Link m_aChangeLink; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx index 61804776560a..700476106dab 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.cxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_TextSeparator.hxx" #include "ResourceIds.hrc" #include "Strings.hrc" @@ -26,10 +25,8 @@ #include <svtools/controldims.hrc> -//............................................................................. namespace chart { -//............................................................................. TextSeparatorResources::TextSeparatorResources( Window* pWindow ) : m_aFT_Separator( pWindow, pWindow->GetStyle() ) @@ -140,8 +137,6 @@ void TextSeparatorResources::SetDefault() return OUString( " " ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx index 9f89dcca7927..a7a1b4ec50f2 100644 --- a/chart2/source/controller/dialogs/res_TextSeparator.hxx +++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx @@ -26,10 +26,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. class TextSeparatorResources { @@ -60,9 +58,7 @@ private: const sal_uInt16 m_nDefaultPos; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index ee1b2391e87a..8d819ebda944 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_Titles.hxx" #include "res_Titles.hrc" #include "ResId.hxx" #include "TitleDialogData.hxx" #include <svtools/controldims.hrc> -//............................................................................. namespace chart { -//............................................................................. TitleResources::TitleResources( Window* pWindow, bool bShowSecondaryAxesTitle ) : m_aFT_Main(pWindow, SchResId(FT_MAINTITLE)) @@ -205,8 +202,6 @@ void TitleResources::readFromResources( TitleDialogData& rOutput ) rOutput.aTextList[6] = m_aEd_SecondaryYAxis.GetText(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx index 50a653b9bb6d..7410ce85991f 100644 --- a/chart2/source/controller/dialogs/res_Titles.hxx +++ b/chart2/source/controller/dialogs/res_Titles.hxx @@ -23,10 +23,8 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -//............................................................................. namespace chart { -//............................................................................. class TitleResources { @@ -62,9 +60,7 @@ private: Edit m_aEd_SecondaryYAxis; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index df44c8b2e86e..1ab5a730dc26 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "res_Trendline.hxx" #include "tp_Trendline.hrc" #include "ResId.hxx" @@ -88,7 +87,6 @@ TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInA TrendlineResources::~TrendlineResources() {} - IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton ) { if( pRadioButton == &m_aRBLinear ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 7c16bd2e153d..0e7804ee922b 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_3D_SceneAppearance.hxx" #include "tp_3D_SceneAppearance.hrc" #include "ResId.hxx" @@ -82,10 +81,8 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing: } // anonymous namespace -//............................................................................. namespace chart { -//............................................................................. #define POS_3DSCHEME_SIMPLE 0 #define POS_3DSCHEME_REALISTIC 1 @@ -346,8 +343,6 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check return 0; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index cf319c42f09e..4707538b9d58 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -34,10 +34,8 @@ #include "ControllerLockGuard.hxx" -//............................................................................. namespace chart { -//............................................................................. class ThreeD_SceneAppearance_TabPage : public TabPage { @@ -82,9 +80,7 @@ private: ControllerLockHelper & m_rControllerLockHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 0fe8ac881125..3635d507e9fd 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_3D_SceneGeometry.hxx" #include "tp_3D_SceneGeometry.hrc" #include "ResId.hxx" @@ -31,10 +30,8 @@ #include <editeng/unoprnms.hxx> #include <com/sun/star/drawing/ProjectionMode.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; @@ -135,7 +132,6 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow m_aMFPerspective.SetModifyHdl( LINK( this, ThreeD_SceneGeometry_TabPage, PerspectiveEdited ) ); m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); - //RightAngledAxes sal_Bool bRightAngledAxes = false; @@ -282,8 +278,6 @@ IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled) return 0; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index f0e59f20e834..c134a868ed0a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -33,10 +33,8 @@ #include "ControllerLockGuard.hxx" -//............................................................................. namespace chart { -//............................................................................. class ThreeD_SceneGeometry_TabPage : public TabPage { @@ -95,9 +93,7 @@ private: ControllerLockHelper & m_rControllerLockHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index ec691e58c013..fb8b8fd59a04 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_3D_SceneIllumination.hxx" #include "tp_3D_SceneIllumination.hrc" #include "ResId.hxx" @@ -40,10 +39,8 @@ #include <svx/svx3ditems.hxx> #include <svx/svddef.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -90,8 +87,6 @@ bool LightButton::isLightOn() const return m_bLightOn; } -//----------------------------------------------------------------------------- - ColorButton::ColorButton( Window* pParent, const ResId& rResId ) : ImageButton( pParent, rResId ) { @@ -103,8 +98,6 @@ ColorButton::~ColorButton() { } -//----------------------------------------------------------------------------- - struct LightSource { long nDiffuseColor; @@ -145,8 +138,6 @@ void LightSourceInfo::initButtonFromSource() ) ) ); } -//----------------------------------------------------------------------------- - namespace { OUString lcl_makeColorName( Color rColor ) @@ -265,8 +256,6 @@ namespace } } -//----------------------------------------------------------------------------- - ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel @@ -634,8 +623,6 @@ void ThreeD_SceneIllumination_TabPage::updatePreview() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 0e6208b7bdef..6e5812d8f95f 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -35,10 +35,8 @@ // header for class SvxLightCtl3D #include <svx/dlgctl3d.hxx> -//............................................................................. namespace chart { -//............................................................................. class LightButton : public ImageButton { @@ -125,9 +123,7 @@ private: ::com::sun::star::frame::XModel > m_xChartModel; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 991d2a7d0adc..606052f466b6 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -32,10 +32,8 @@ #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> -//............................................................................. namespace chart { -//............................................................................. SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, SchResId( TP_AXIS_LABEL ), rInAttrs ), @@ -92,7 +90,6 @@ void SchAxisLabelTabPage::Construct() { } - SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAttrs ) { return new SchAxisLabelTabPage( pParent, rAttrs ); @@ -291,7 +288,6 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) } // event handling routines -// ----------------------- IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) { @@ -313,8 +309,6 @@ IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) return 0L; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 108c911c130e..6d505bfc0645 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -27,12 +27,9 @@ #include <svx/orienthelper.hxx> #include "TextDirectionListBox.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -85,9 +82,7 @@ public: void ShowStaggeringControls( sal_Bool bShowStaggeringControls ); void SetComplexCategories( bool bComplexCategories ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 73dd06b475c2..e97bcc89bb08 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -48,10 +48,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -133,7 +131,6 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn long nLabelPlacementWidth = m_aFT_PlaceLabels.CalcMinimumSize().Width(); long nMarkPlacementWidth = m_aFT_PlaceTicks.CalcMinimumSize().Width(); - long nWidth_0 = ::std::max( m_aFT_Major.CalcMinimumSize().Width(), m_aFT_Minor.CalcMinimumSize().Width() ); nWidth_0 = ::std::max( nWidth_0, nLabelPlacementWidth ); nWidth_0 = ::std::max( nWidth_0, nMarkPlacementWidth ); @@ -358,7 +355,6 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) else m_aLB_PlaceTicks.SetNoSelection(); - if( !m_bSupportAxisPositioning ) { m_aFL_AxisLine.Show(false); @@ -480,8 +476,6 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl) return 0; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index aed839bf350b..c95ab3a2e8aa 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -27,10 +27,8 @@ #include <vcl/field.hxx> #include <vcl/lstbox.hxx> -//............................................................................. namespace chart { -//............................................................................. class AxisPositionsTabPage : public SfxTabPage { @@ -96,9 +94,7 @@ private: //member: bool m_bSupportAxisPositioning; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 3e4ff3c9a950..cdc63da44bc1 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_ChartType.hxx" #include "tp_ChartType.hrc" #include "Strings.hrc" @@ -37,10 +36,8 @@ //for auto_ptr #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -70,7 +67,6 @@ namespace } } -//-------------------------------------------------------------------------- class AxisTypeResourceGroup : public ChangingResource { public: @@ -129,7 +125,6 @@ IMPL_LINK_NOARG(AxisTypeResourceGroup, AxisTypeCheckHdl) m_pChangeListener->stateChanged(this); return 0; } -//-------------------------------------------------------------------------- #define POS_3DSCHEME_SIMPLE 0 #define POS_3DSCHEME_REALISTIC 1 @@ -229,8 +224,6 @@ IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl) return 0; } -//-------------------------------------------------------------------------- - class SortByXValuesResourceGroup : public ChangingResource { public: @@ -285,7 +278,6 @@ IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl) m_pChangeListener->stateChanged(this); return 0; } -//-------------------------------------------------------------------------- class StackingResourceGroup : public ChangingResource { public: @@ -425,7 +417,6 @@ IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl) m_pChangeListener->stateChanged(this); return 0; } -//-------------------------------------------------------------------------- class SplinePropertiesDialog : public ModalDialog { public: @@ -513,7 +504,6 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl) return 0; } -//-------------------------------------------------------------------------- class SteppedPropertiesDialog : public ModalDialog { public: @@ -586,8 +576,6 @@ void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter, boo rParameter.eCurveStyle=CurveStyle_STEP_CENTER_X; } -//-------------------------------------------------------------------------- - #define POS_LINETYPE_STRAIGHT 0 #define POS_LINETYPE_SMOOTH 1 #define POS_LINETYPE_STEPPED 2 @@ -798,8 +786,6 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) return 0; } -//-------------------------------------------------------------------------- - class GeometryResourceGroup : public ChangingResource { public: @@ -860,10 +846,6 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) return 0; } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- - ChartTypeTabPage::ChartTypeTabPage( Window* pParent , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext @@ -1250,8 +1232,6 @@ uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() cons return 0; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 228149909d34..8bfae88f3dcf 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -36,12 +36,9 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- class AxisTypeResourceGroup; class Dim3DLookResourceGroup; class StackingResourceGroup; @@ -108,9 +105,7 @@ protected: TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 8cf01ce37564..53bcebfaca51 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -22,10 +22,8 @@ #include "TabPages.hrc" #include "ResId.hxx" -//............................................................................. namespace chart { -//............................................................................. DataLabelsTabPage::DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_DATA_DESCR), rInAttrs), @@ -59,8 +57,6 @@ void DataLabelsTabPage::SetNumberFormatter( SvNumberFormatter* pFormatter ) m_aDataLabelResources.SetNumberFormatter( pFormatter ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 37fedaacb07d..7a902fac110c 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -24,12 +24,9 @@ class SvNumberFormatter; -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -50,9 +47,7 @@ private: DataLabelResources m_aDataLabelResources; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 43d7d1956da7..ffbd7bcb69b1 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_DataSource.hxx" #include "tp_DataSource.hrc" #include "Strings.hrc" @@ -51,8 +50,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// -------------------------------------------------------------------------------- - namespace { @@ -212,8 +209,6 @@ void lcl_increaseHeightOfControl( Control & rControl, long nYOffset ) } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index f193943fe60a..44511ce8322d 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_DataSourceControls.hxx" using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 70b31288dac7..5bc51e61d8f7 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_ErrorBars.hxx" #include "ResId.hxx" #include "TabPages.hrc" @@ -25,10 +24,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, SchResId( TP_YERRORBAR ), rInAttrs ), @@ -85,8 +82,6 @@ void ErrorBarsTabPage::SetChartDocumentForRangeChoosing( m_aErrorBarResources.SetChartDocumentForRangeChoosing( xChartDocument ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index e681dca0c973..6821aa994387 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -23,10 +23,8 @@ #include <sfx2/tabdlg.hxx> -//............................................................................. namespace chart { -//............................................................................. class ErrorBarsTabPage : public SfxTabPage { @@ -50,9 +48,7 @@ private: ErrorBarResources m_aErrorBarResources; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index d659269cda20..cdd2db7332de 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -27,10 +27,8 @@ #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> -//............................................................................. namespace chart { -//............................................................................. SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInAttrs) @@ -74,8 +72,6 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs) m_aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index ac49aae0fbf2..7715cd8d4d45 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -27,10 +27,8 @@ #include <memory> #include "TextDirectionListBox.hxx" -//............................................................................. namespace chart { -//............................................................................. class LegendPositionResources; class SchLegendPosTabPage : public SfxTabPage @@ -53,9 +51,7 @@ public: virtual void Reset(const SfxItemSet& rInAttrs); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 35a021ccefaf..36c8c7caa06f 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -29,10 +29,8 @@ // header for class Svx3DHorizontalSegmentsItem #include <svx/svx3ditems.hxx> -//............................................................................. namespace chart { -//............................................................................. SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_LAYOUT), rInAttrs) @@ -87,8 +85,6 @@ void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index 28c110d3dfa9..3a066979b89a 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -22,10 +22,8 @@ // header for SfxTabPage #include <sfx2/tabdlg.hxx> -//............................................................................. namespace chart { -//............................................................................. class BarGeometryResources; class SchLayoutTabPage : public SfxTabPage @@ -42,9 +40,7 @@ private: BarGeometryResources* m_pGeometryResources; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index c836dc2b9e73..5ac89c14eab4 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -27,10 +27,8 @@ #include <svl/intitem.hxx> #include <svtools/controldims.hrc> -//............................................................................. namespace chart { -//............................................................................. PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet& rInAttrs ) : SfxTabPage( pWindow, SchResId(TP_POLAROPTIONS), rInAttrs ), @@ -110,8 +108,6 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 4d9f5737b387..50712b0d0540 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -25,10 +25,8 @@ #include <vcl/field.hxx> #include <svx/dialcontrol.hxx> -//............................................................................. namespace chart { -//............................................................................. class PolarOptionsTabPage : public SfxTabPage { @@ -52,9 +50,7 @@ private: CheckBox m_aCB_IncludeHiddenCells; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index c3cfe0325640..9223e06fb26e 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_RangeChooser.hxx" #include "tp_RangeChooser.hrc" #include "Strings.hrc" @@ -67,17 +66,14 @@ void lcl_shiftControlY( Control & rControl, long nYOffset ) } } // anonymous namespace -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - RangeChooserTabPage::RangeChooserTabPage( Window* pParent , DialogModel & rDialogModel , ChartTypeTemplateProvider* pTemplateProvider @@ -362,7 +358,6 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) return 0; } - void RangeChooserTabPage::listeningFinished( const OUString & rNewRange ) { //user has selected a new range @@ -397,8 +392,6 @@ void RangeChooserTabPage::setDirty() m_bIsDirty = true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 1cff9464e6e5..3976bc7c561b 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -33,12 +33,9 @@ #include <vcl/fixed.hxx> #include <com/sun/star/sheet/XRangeSelection.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class ChartTypeTemplateProvider; @@ -110,9 +107,7 @@ protected: //member TabPageNotifiable * m_pTabPageNotifiable; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index e1e062a8339b..409cfd8127fc 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -47,10 +47,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -806,8 +804,6 @@ void ScaleTabPage::HideAllControls() m_aLB_HelpTimeUnit.Hide(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 1879ee0f68fe..55eb8faee113 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -32,10 +32,8 @@ // header for class ListBox #include <vcl/lstbox.hxx> -//............................................................................. namespace chart { -//............................................................................. class ScaleTabPage : public SfxTabPage { @@ -133,9 +131,7 @@ private: void HideAllControls(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 64596c6a4f82..efebb436a813 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -33,10 +33,8 @@ #include <com/sun/star/chart/MissingValueTreatment.hpp> -//............................................................................. namespace chart { -//............................................................................. SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, @@ -171,7 +169,6 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) m_pCBAxisSideBySide->Show(sal_False); } - //missing value treatment { ::com::sun::star::uno::Sequence < sal_Int32 > aMissingValueTreatments; @@ -246,8 +243,6 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility() m_pGrpBar->Show(sal_False); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index c38dec3cc429..fc9172ac4316 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -28,10 +28,8 @@ // header for MetricField #include <vcl/field.hxx> -//............................................................................. namespace chart { -//............................................................................. class SchOptionTabPage : public SfxTabPage { @@ -75,9 +73,7 @@ private: //member bool m_bProvidesBarConnectors; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index f3c92e91d9f0..225398a54232 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -29,10 +29,8 @@ // header for class SfxInt32Item #include <svl/intitem.hxx> -//............................................................................. namespace chart { -//............................................................................. SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, const SfxItemSet& rInAttrs, bool bWithRotation) : @@ -104,14 +102,10 @@ void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs) bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue(); aOrientHlp.SetStackedState( bStacked ? STATE_CHECK : STATE_NOCHECK ); - if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pItem) == SFX_ITEM_SET) aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) ); } -//............................................................................. } //namespace chart -//............................................................................. - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 8c36b5f2d474..3d6f504b7078 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -27,10 +27,8 @@ #include <vcl/fixed.hxx> #include "TextDirectionListBox.hxx" -//............................................................................. namespace chart { -//............................................................................. class SchAlignmentTabPage : public SfxTabPage { @@ -54,9 +52,7 @@ public: virtual void Reset(const SfxItemSet& rInAttrs); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 448fe85c6cdb..a942c0d560cc 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_Trendline.hxx" #include "ResId.hxx" #include "TabPages.hrc" -//............................................................................. namespace chart { -//............................................................................. TrendlineTabPage::TrendlineTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, SchResId( TP_TRENDLINE ), rInAttrs ), @@ -62,8 +59,6 @@ void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) m_aTrendlineResources.FillValueSets(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index 0fa8f7f2585d..40d6c64cbd0f 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -23,10 +23,8 @@ #include <sfx2/tabdlg.hxx> -//............................................................................. namespace chart { -//............................................................................. class TrendlineTabPage : public SfxTabPage { @@ -44,9 +42,7 @@ private: TrendlineResources m_aTrendlineResources; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 72c0b6a56a59..515b200dd8c3 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tp_Wizard_TitlesAndObjects.hxx" #include "tp_Wizard_TitlesAndObjects.hrc" #include "Strings.hrc" @@ -32,14 +31,11 @@ #include "NoWarningThisInCTOR.hxx" #include "ControllerLockGuard.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; - TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext ) @@ -168,9 +164,6 @@ bool TitlesAndObjectsTabPage::canAdvance() const return false; } - -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 5bb3c77b6516..753b603e1506 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -30,12 +30,9 @@ #include <memory> #include <com/sun/star/uno/XComponentContext.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class TitleResources; @@ -79,9 +76,7 @@ protected: TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index ccecd3ecb27d..f97c537a411a 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -49,10 +49,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -236,7 +234,6 @@ void DrawViewWrapper::MarkObject( SdrObject* pObj ) this->showMarkHandles(); } - void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider ) { m_pMarkHandleProvider = pMarkHandleProvider; @@ -387,8 +384,6 @@ SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference< return pRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index d4827cee52a9..2b6564cdd7df 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -40,7 +40,6 @@ // header for class XLineEndItem #include <svx/xlnedit.hxx> -//------------ //oldChartModelWrapper // header for class SfxItemPool @@ -49,23 +48,17 @@ #include <svtools/ctrltool.hxx> // header for class Application #include <vcl/svapp.hxx> -//------------ // header for class SdrObject #include <svx/svdobj.hxx> - -//--------------- //for creation of a symbol Graphic // header for class VirtualDevice #include <vcl/virdev.hxx> // header for class SdrView #include <svx/svdview.hxx> -//--------------- -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; ViewElementListProvider::ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper ) @@ -80,9 +73,6 @@ ViewElementListProvider::~ViewElementListProvider() delete m_pFontList; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - XColorListRef ViewElementListProvider::GetColorTable() const { if(m_pDrawModelWrapper) @@ -124,8 +114,6 @@ XBitmapListRef ViewElementListProvider::GetBitmapList() const return XBitmapListRef(); } -//----------------------------------------------------------------------------- - //create chartspecific symbols for linecharts SdrObjList* ViewElementListProvider::GetSymbolList() const { @@ -203,9 +191,6 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co return aGraph; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - FontList* ViewElementListProvider::getFontList() const { //was old chart: @@ -221,8 +206,6 @@ FontList* ViewElementListProvider::getFontList() const } return m_pFontList; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index ea2ca55ebe38..8e7885f4b211 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -77,7 +77,6 @@ struct AccessibleElementInfo ::accessibility::IAccessibleViewForwarder* m_pViewForwarder; }; - namespace impl { typedef ::cppu::PartialWeakComponentImplHelper6< @@ -230,7 +229,6 @@ protected: virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) { WeakComponentImplHelperBase::removeEventListener(xListener); } - // ________ WeakComponentImplHelper (XComponent::dispose) ________ virtual void SAL_CALL disposing(); diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 205f0257ec05..35ec327c0789 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -41,10 +41,8 @@ namespace accessibility class IAccessibleViewForwarder; } -//............................................................................. namespace chart { -//............................................................................. class ExplicitValueProvider; @@ -141,9 +139,7 @@ private: // members AccessibleChartView(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx index 99bd7a30553e..62376ea7e8ff 100644 --- a/chart2/source/controller/inc/ConfigurationAccess.hxx +++ b/chart2/source/controller/inc/ConfigurationAccess.hxx @@ -23,12 +23,9 @@ // header for enum FieldUnit #include <tools/fldunit.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -45,9 +42,7 @@ namespace ConfigurationAccess FieldUnit getFieldUnit(); } -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 5831a2351909..9f1208a39344 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -25,12 +25,9 @@ class SdrModel; -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** The DrawViewWrapper should help us to reduce effort if the underlying DrawingLayer changes. Another task is to hide functionality we do not need, for example more than one page. */ @@ -71,7 +68,6 @@ public: //void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False); void MarkObject( SdrObject* pObj ); - //---------------------- //pMarkHandleProvider can be NULL; ownership is not taken void setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider ); void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); @@ -100,9 +96,7 @@ private: MapMode m_aMapModeToRestore; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index d8762bac9c5d..9231ad56ccf6 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -79,16 +79,12 @@ public: SfxItemPool& rItemPool ); virtual ~ItemConverter(); - // typedefs ------------------------------- - typedef sal_uInt16 tWhichIdType; typedef OUString tPropertyNameType; typedef sal_uInt8 tMemberIdType; typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId; - // ---------------------------------------- - /** applies all properties that can be mapped to items into the given item set. diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index de35b44f0ac7..cab8ee697c5f 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -19,11 +19,9 @@ #ifndef CHART_ITEMPROPERTYMAP_HXX #define CHART_ITEMPROPERTYMAP_HXX - #include <comphelper/InlineContainer.hxx> #include "ItemConverter.hxx" - #define IPM_MAP_ENTRY(wid,uno,mid) (wid, ::std::make_pair< ::comphelper::ItemConverter::tPropertyNameType, ::comphelper::ItemConverter::tMemberIdType >(\ uno, mid)) diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 2ff51e53f754..c046c8f1dae6 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** Provides localized ui strings for the userinterface. */ @@ -73,9 +70,7 @@ public: static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 07f9250259c8..aadaba6c8ec0 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -23,12 +23,9 @@ #include "ObjectIdentifier.hxx" #include <com/sun/star/frame/XModel.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -46,9 +43,7 @@ public: , const ::com::sun::star::awt::Rectangle& rPageRectangle ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/RangeEdit.hxx b/chart2/source/controller/inc/RangeEdit.hxx index 9b5e86bdc17b..b3aa5c87613c 100644 --- a/chart2/source/controller/inc/RangeEdit.hxx +++ b/chart2/source/controller/inc/RangeEdit.hxx @@ -23,10 +23,8 @@ #include <vcl/accel.hxx> #include <tools/link.hxx> -//............................................................................. namespace chart { -//............................................................................. class RangeEdit : public Edit { @@ -42,9 +40,7 @@ private: Link m_aKeyInputLink; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx index c0b7911c90a4..21e32bb64312 100644 --- a/chart2/source/controller/inc/RangeSelectionButton.hxx +++ b/chart2/source/controller/inc/RangeSelectionButton.hxx @@ -23,12 +23,9 @@ // header for Class ImageButton #include <vcl/button.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -39,9 +36,7 @@ public: virtual ~RangeSelectionButton(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 79364423f35c..92ab5e02cc5d 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -37,8 +37,6 @@ protected: ~RangeSelectionListenerParent() {} }; -// ---------------------------------------- - class RangeSelectionListener : public ::cppu::WeakImplHelper1< ::com::sun::star::sheet::XRangeSelectionListener > diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 3da42ebecc27..d10e6fea6735 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -21,7 +21,6 @@ #include "ItemConverter.hxx" - #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/XCoordinateSystem.hpp> diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 15bf31ae5ee7..d356671964ad 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -25,10 +25,8 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. class TimerTriggeredControllerLock { @@ -48,9 +46,7 @@ private: DECL_LINK( TimerTimeout, void* ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index c07df8998447..ea1e3cb80960 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -25,12 +25,9 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -57,9 +54,7 @@ struct TitleDialogData , TitleDialogData* pOldState=NULL ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx index 3086c5995b7d..bde0e85d7ae0 100644 --- a/chart2/source/controller/inc/ViewElementListProvider.hxx +++ b/chart2/source/controller/inc/ViewElementListProvider.hxx @@ -24,10 +24,8 @@ class FontList; -//............................................................................. namespace chart { -//............................................................................. class DrawModelWrapper; @@ -56,9 +54,7 @@ private: mutable FontList* m_pFontList; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 1729b8200324..6367071b3b4f 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -28,10 +28,8 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//............................................................................. namespace chart { -//............................................................................. class ChartTypeTabPage; class ChartTypeDialog : public ModalDialog @@ -58,9 +56,7 @@ private: ::com::sun::star::uno::XComponentContext> m_xCC; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index a7746b0e16e6..eaebd39c9483 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -27,10 +27,8 @@ #include <vcl/vclevent.hxx> #include <svtools/genericunodialog.hxx> -//............................................................................. namespace chart { -//............................................................................. typedef ::svt::OGenericUnoDialog ChartTypeUnoDlg_BASE; class ChartTypeUnoDlg : public ChartTypeUnoDlg_BASE ,public ::comphelper::OPropertyArrayUsageHelper< ChartTypeUnoDlg > @@ -71,9 +69,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index fb394ff44c2d..ecc84a169cb0 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -31,10 +31,8 @@ // for auto_ptr #include <memory> -//............................................................................. namespace chart { -//............................................................................. class RangeChooserTabPage; class DataSourceTabPage; @@ -93,9 +91,7 @@ private: // DataSourceTabPage * m_pDataSourceTabPage; bool m_bCanTravel; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 2c7328787ff0..93aead4a4be5 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -36,10 +36,8 @@ #include <tools/link.hxx> #include <vcl/vclevent.hxx> -//............................................................................. namespace chart { -//............................................................................. class CreationWizard; class CreationWizardUnoDlg : public MutexContainer @@ -115,9 +113,7 @@ private: sal_Bool m_bUnlockControllersOnExecute; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 868a6579e6fb..bba11b1ca2e6 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -27,10 +27,8 @@ #include <vcl/button.hxx> #include <com/sun/star/uno/Sequence.hxx> -//............................................................................. namespace chart { -//............................................................................. struct InsertAxisOrGridDialogData { @@ -62,7 +60,6 @@ public: void getResult( InsertAxisOrGridDialogData& rOutput ); }; - /************************************************************************* |* |* Grid dialog @@ -75,9 +72,7 @@ public: virtual ~SchGridDlg(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index 99732981248b..131154832ba1 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -30,10 +30,8 @@ class SvNumberFormatter; -//............................................................................. namespace chart { -//............................................................................. class DataLabelResources; class DataLabelsDialog : public ModalDialog @@ -55,9 +53,7 @@ public: void FillItemSet(SfxItemSet& rOutAttrs); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 9d14cac4e674..3244e488329c 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -27,10 +27,8 @@ #include "res_ErrorBar.hxx" -//............................................................................. namespace chart { -//............................................................................. class InsertErrorBarsDialog : public ModalDialog { @@ -63,9 +61,7 @@ private: ::std::auto_ptr< ErrorBarResources > m_apErrorBarResources; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index 6ab8c05e4beb..982e2d5f4608 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -28,10 +28,8 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//............................................................................. namespace chart { -//............................................................................. class LegendPositionResources; class SchLegendDlg : public ModalDialog @@ -54,9 +52,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel ) const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index 7507ede35737..ed2a47dce5bb 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -25,10 +25,8 @@ //for auto_ptr #include <memory> -//............................................................................. namespace chart { -//............................................................................. class TitleResources; class SchTitleDlg : public ModalDialog { @@ -46,9 +44,7 @@ public: void getResult( TitleDialogData& rOutput ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 8a8080e96c67..8db580fcc9e2 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -24,10 +24,8 @@ #include <svx/dlgctrl.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. class ObjectPropertiesDialogParameter { @@ -141,9 +139,7 @@ public: bool DialogWasClosedWithOK() const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index bbd1d16299b3..9faf9c2653d8 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -21,10 +21,8 @@ #include <sfx2/tabdlg.hxx> -//............................................................................. namespace chart { -//............................................................................. class ViewElementListProvider; @@ -43,9 +41,7 @@ private: const ViewElementListProvider* m_pViewElementListProvider; }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_DLG_SHAPEFONT_HXX #endif diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index ca6a0ad86394..e654f195914e 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -21,10 +21,8 @@ #include <sfx2/tabdlg.hxx> -//............................................................................. namespace chart { -//............................................................................. /** dialog for paragraph properties of shapes */ @@ -38,9 +36,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_DLG_SHAPEPARAGRAPH_HXX #endif diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index dd8697d567fd..8aae2ea5d483 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -33,10 +33,8 @@ #include "ControllerLockGuard.hxx" -//............................................................................. namespace chart { -//............................................................................. class ThreeD_SceneGeometry_TabPage; class ThreeD_SceneAppearance_TabPage; class ThreeD_SceneIllumination_TabPage; @@ -67,9 +65,7 @@ private: static sal_uInt16 m_nLastPageId; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index f0ea1c9e4b93..6d9a838ce0c3 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -36,10 +36,8 @@ class Dialog; -//............................................................................. namespace chart { -//............................................................................. class RangeSelectionHelper; @@ -138,9 +136,7 @@ private: bool isRangeFieldContentValid( Edit & rEdit ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index e06643667b5b..328dd8cad1b0 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -703,7 +703,6 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet } break; - case SCHATTR_AXIS_AUTO_ORIGIN: { if( (static_cast< const SfxBoolItem & >( diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 6575587535b5..6d598d38d89b 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -64,8 +64,6 @@ namespace } } // anonymous namespace -// ======================================== - namespace chart { namespace wrapper diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index f2a0423f66c8..f93a98487323 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -297,7 +297,6 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa return true; } - bool DataPointItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( uno::Exception ) diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index e87f6d482898..620bbda26bb8 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -150,8 +150,6 @@ bool lcl_SetContentForNamedProperty( } // anonymous namespace -// ======================================== - namespace chart { namespace wrapper diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 5a6e5b1ed28e..78399931f8f0 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -228,7 +228,6 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) return bItemsChanged; } -// -------------------------------------------------------------------------------- void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItemSet &rSourceSet ) { SfxWhichIter aIter (rSourceSet); diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 03d947736c0d..de1246e0ae6b 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -97,7 +97,6 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN return false; } - bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rInItemSet ) throw( uno::Exception ) { diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index b131e35775e6..99ea0eeca82a 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -42,8 +42,6 @@ namespace chart namespace wrapper { -//----------------------------------------------------------------------------- - SAL_WNODEPRECATED_DECLARATIONS_PUSH AllAxisItemConverter::AllAxisItemConverter( const uno::Reference< frame::XModel > & xChartModel, @@ -81,8 +79,6 @@ const sal_uInt16 * AllAxisItemConverter::GetWhichPairs() const return nAllAxisWhichPairs; } -//----------------------------------------------------------------------------- - AllGridItemConverter::AllGridItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, @@ -111,7 +107,6 @@ const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const return nGridWhichPairs; } -//----------------------------------------------------------------------------- SAL_WNODEPRECATED_DECLARATIONS_PUSH AllDataLabelItemConverter::AllDataLabelItemConverter( const uno::Reference< frame::XModel > & xChartModel, @@ -160,7 +155,6 @@ const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const return nDataLabelWhichPairs; } -//----------------------------------------------------------------------------- SAL_WNODEPRECATED_DECLARATIONS_PUSH AllTitleItemConverter::AllTitleItemConverter( const uno::Reference< frame::XModel > & xChartModel, @@ -195,8 +189,6 @@ const sal_uInt16 * AllTitleItemConverter::GetWhichPairs() const return nTitleWhichPairs; } -//----------------------------------------------------------------------------- - AllSeriesStatisticsConverter::AllSeriesStatisticsConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool ) diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 6e9e8b1bf5cb..2bf790005f9f 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -121,7 +121,6 @@ bool RegressionCurveItemConverter::GetItemProperty( return false; } - bool RegressionCurveItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( uno::Exception ) diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index f813eb2598e5..7f9d18886a6e 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RegressionEquationItemConverter.hxx" #include "SchWhichPairs.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 15fe0a816b50..1b6f1aa529d6 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SeriesOptionsItemConverter.hxx" #include "SchWhichPairs.hxx" @@ -53,8 +52,6 @@ namespace chart namespace wrapper { -// ======================================== - SeriesOptionsItemConverter::SeriesOptionsItemConverter( const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext > & xContext diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index c3d71356a4e7..a45f05692bdd 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -96,7 +96,6 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar( return eType; } - uno::Reference< beans::XPropertySet > lcl_GetDefaultErrorBar() { // todo: use a valid context diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 981b8dc55c70..0f008e02a0cb 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -52,8 +52,6 @@ namespace chart namespace wrapper { -// ======================================== - class FormattedStringsConverter : public ::comphelper::MultipleItemConverter { public: @@ -70,8 +68,6 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const; }; -// ---------------------------------------- - SAL_WNODEPRECATED_DECLARATIONS_PUSH FormattedStringsConverter::FormattedStringsConverter( const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings, @@ -108,8 +104,6 @@ const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const return nCharacterPropertyWhichPairs; } -// ======================================== - SAL_WNODEPRECATED_DECLARATIONS_PUSH TitleItemConverter::TitleItemConverter( const ::com::sun::star::uno::Reference< @@ -184,7 +178,6 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi return true; } - bool TitleItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) throw( uno::Exception ) diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 4f7a4a1978c4..0ae910b1acaa 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -82,10 +82,8 @@ // react on this by rebuilding the view #define TEST_ENABLE_MODIFY_LISTENER -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; @@ -94,9 +92,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; DBG_NAME(ChartController) -//----------------------------------------------------------------- // ChartController Constructor and Destructor -//----------------------------------------------------------------- ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) : m_aLifeTimeManager( NULL ), @@ -129,8 +125,6 @@ ChartController::~ChartController() stopDoubleClickWaiting(); } -//----------------------------------------------------------------- - ChartController::RefCountable::RefCountable() : m_nRefCount(0) { } @@ -149,8 +143,6 @@ void ChartController::RefCountable::release() delete this; } -//----------------------------------------------------------------- - ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) : m_xModel( xModel ), m_xCloseable( NULL ), @@ -254,8 +246,6 @@ void ChartController::TheModel::tryTermination() } } -//----------------------------------------------------------------- - ChartController::TheModelRef::TheModelRef( TheModel* pTheModel, osl::Mutex& rMutex ) : m_pTheModel(pTheModel), m_rModelMutex(rMutex) @@ -308,10 +298,7 @@ sal_Bool ChartController::TheModelRef::is() const return (m_pTheModel != 0); } - -//----------------------------------------------------------------- // private methods -//----------------------------------------------------------------- sal_Bool ChartController::impl_isDisposedOrSuspended() const { @@ -326,9 +313,7 @@ sal_Bool ChartController::impl_isDisposedOrSuspended() const return sal_False; } -//----------------------------------------------------------------- // lang::XServiceInfo -//----------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME) @@ -341,9 +326,7 @@ uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() return aSNS; } -//----------------------------------------------------------------- // XController -//----------------------------------------------------------------- void SAL_CALL ChartController::attachFrame( const uno::Reference<frame::XFrame>& xFrame ) @@ -372,9 +355,6 @@ void SAL_CALL ChartController::attachFrame( //@todo nothing right??? - - - //-------------------------------------------------- //create view @todo is this the correct place here?? Window* pParent = NULL; @@ -694,7 +674,6 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) return sal_True; } - void ChartController::impl_createDrawViewController() { SolarMutexGuard aGuard; @@ -719,9 +698,7 @@ void ChartController::impl_deleteDrawViewController() } } -//----------------------------------------------------------------- // XComponent (base of XController) -//----------------------------------------------------------------- void SAL_CALL ChartController::dispose() throw(uno::RuntimeException) @@ -847,10 +824,7 @@ void SAL_CALL ChartController::removeEventListener( m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0), xListener ); } - -//----------------------------------------------------------------- // util::XCloseListener -//----------------------------------------------------------------- void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) @@ -932,9 +906,7 @@ bool ChartController::impl_releaseThisModel( return bReleaseModel; } -//----------------------------------------------------------------- // util::XEventListener (base of XCloseListener) -//----------------------------------------------------------------- void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) throw(uno::RuntimeException) @@ -963,10 +935,7 @@ void SAL_CALL ChartController::layoutEvent( } } - -//----------------------------------------------------------------- // XDispatchProvider (required interface) -//----------------------------------------------------------------- namespace { @@ -1056,9 +1025,7 @@ uno::Sequence<uno::Reference<frame::XDispatch > > return uno::Sequence<uno::Reference<frame::XDispatch > > (); } -//----------------------------------------------------------------- // frame::XDispatch -//----------------------------------------------------------------- void SAL_CALL ChartController::dispatch( const util::URL& rURL, @@ -1076,7 +1043,6 @@ void SAL_CALL ChartController::dispatch( this->executeDispatch_Cut(); else if(aCommand == "DataRanges" ) this->executeDispatch_SourceData(); - //---------------------------------- else if(aCommand == "Update" ) //Update Chart { ChartViewHelper::setViewToDirtyState( getModel() ); @@ -1261,9 +1227,7 @@ void SAL_CALL ChartController::removeStatusListener( //@todo } -//----------------------------------------------------------------- // XContextMenuInterception (optional interface) -//----------------------------------------------------------------- void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) throw(uno::RuntimeException) @@ -1281,10 +1245,6 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor( // ____ XEmbeddedClient ____ // implementation see: ChartController_EditData.cxx -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_ChartType() { // using assignment for broken gcc 3.3 @@ -1388,8 +1348,6 @@ void SAL_CALL ChartController::modified( //todo? update menu states ? } -//----------------------------------------------------------------------------- - IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction ) { ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L ); @@ -1557,8 +1515,6 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn ; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 442fa8e7dda0..7d644e55ad87 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -59,7 +59,6 @@ #include <boost/shared_ptr.hpp> #include <set> - class SdrModel; namespace svt @@ -75,11 +74,8 @@ namespace graphic { } }}} - -//............................................................................. namespace chart { -//............................................................................. class UndoGuard; @@ -160,16 +156,12 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext); virtual ~ChartController(); - //----------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo - //----------------------------------------------------------------- APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartController) - //----------------------------------------------------------------- // ::com::sun::star::frame::XController (required interface) - //----------------------------------------------------------------- virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) @@ -197,9 +189,7 @@ public: suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang::XComponent (base of XController) - //----------------------------------------------------------------- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); @@ -213,9 +203,7 @@ public: ::com::sun::star::lang::XEventListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XDispatchProvider (required interface) - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> SAL_CALL queryDispatch( const ::com::sun::star::util::URL& rURL @@ -230,9 +218,7 @@ public: ::com::sun::star::frame::DispatchDescriptor > & xDescripts) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::view::XSelectionSupplier (optional interface) - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& rSelection ) throw ( com::sun::star::lang::IllegalArgumentException ); @@ -250,9 +236,7 @@ public: com::sun::star::view::XSelectionChangeListener > & xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::ui::XContextMenuInterception (optional interface) - //----------------------------------------------------------------- virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) @@ -263,14 +247,9 @@ public: ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) throw (::com::sun::star::uno::RuntimeException); - - //----------------------------------------------------------------- - //----------------------------------------------------------------- //additional interfaces - //----------------------------------------------------------------- // ::com::sun::star::util::XCloseListener - //----------------------------------------------------------------- virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source , sal_Bool GetsOwnership ) @@ -281,16 +260,12 @@ public: notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------- // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) - //------------------------------------------------------------------------------------- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XDispatch - //----------------------------------------------------------------- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL @@ -310,9 +285,7 @@ public: , const ::com::sun::star::util::URL& aURL ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::awt::XWindow - //----------------------------------------------------------------- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) @@ -333,7 +306,6 @@ public: virtual void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException); - //---------------- virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) @@ -394,9 +366,7 @@ public: ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang XMultiServiceFactory - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, @@ -411,32 +381,24 @@ public: getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifyListener - //----------------------------------------------------------------- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModeChangeListener - //----------------------------------------------------------------- virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::frame::XLayoutManagerListener - //----------------------------------------------------------------- virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // chart2::WindowController - //----------------------------------------------------------------- virtual void PrePaint(); virtual void execute_Paint( const Rectangle& rRect ); virtual void execute_MouseButtonDown( const MouseEvent& rMEvt ); @@ -457,9 +419,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - //----------------------------------------------------------------- - //----------------------------------------------------------------- - static bool isObjectDeleteable( const ::com::sun::star::uno::Any& rSelection ); void setDrawMode( ChartDrawMode eMode ) { m_eDrawMode = eMode; } @@ -470,16 +429,7 @@ public: DECL_LINK( NotifyUndoActionHdl, SdrUndoAction* ); public: - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- //private - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - //----------------------------------------------------------------- - private: DrawModelWrapper* GetDrawModelWrapper(); @@ -722,9 +672,7 @@ private: void impl_switchDiagramPositioningToExcludingPositioning(); }; -//............................................................................. } // namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index d7bc61d64ae4..ee1498c48114 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -55,8 +55,6 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <svx/ActionDescriptionProvider.hxx> -//-------------------------------------- - // header for define RET_OK #include <vcl/msgbox.hxx> // header for class OUStringBuffer @@ -66,14 +64,11 @@ // header for class ::vos::OGuard #include <osl/mutex.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. - namespace { struct lcl_InsertMeanValueLine @@ -100,10 +95,8 @@ private: } // anonymous namespace -//............................................................................. namespace chart { -//............................................................................. void ChartController::executeDispatch_InsertAxes() { @@ -177,9 +170,6 @@ void ChartController::executeDispatch_InsertGrid() } } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::executeDispatch_InsertTitles() { UndoGuard aUndoGuard( @@ -261,9 +251,6 @@ void ChartController::executeDispatch_OpenLegendDialog() } } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::executeDispatch_InsertMenu_DataLabels() { UndoGuard aUndoGuard( @@ -890,8 +877,6 @@ void ChartController::executeDispatch_DeleteMinorGrid() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index b0c56b81fe26..752495f7b54e 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -42,16 +42,11 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectangle& rPosAndSize, const awt::Size aOriginalSize ) { long nPosX(0); @@ -150,7 +145,6 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible ); OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" ); - if( pDlg->Execute() == RET_OK ) { const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); @@ -181,8 +175,6 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 09c24ea36475..f1a64789de63 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -62,10 +62,8 @@ #include <osl/mutex.hxx> #include <svx/ActionDescriptionProvider.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -86,7 +84,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH { ::comphelper::ItemConverter* pItemConverter=NULL; - //------------------------------------------------------------- //get type of selected object ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID ); if( OBJECTTYPE_UNKNOWN==eObjectType ) @@ -97,7 +94,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID ); bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS"; - //------------------------------------------------------------- if( !bAffectsMultipleObjects ) { uno::Reference< beans::XPropertySet > xObjectProperties = @@ -435,14 +431,12 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rSelectedCID, xChartModel ); uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt( xSeries, uno::UNO_QUERY ); - //------------------------------------------------------------------------- //legend if( rDispatchCommand.equals("Legend") || rDispatchCommand.equals("FormatLegend") ) { eObjectType = OBJECTTYPE_LEGEND; //@todo set particular aParticleID if we have more than one legend } - //------------------------------------------------------------------------- //wall floor area else if( rDispatchCommand.equals("DiagramWall") || rDispatchCommand.equals("FormatWall") ) { @@ -459,7 +453,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { eObjectType = OBJECTTYPE_PAGE; } - //------------------------------------------------------------------------- //title else if( rDispatchCommand.equals("MainTitle") || rDispatchCommand.equals("SubTitle") @@ -473,7 +466,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getTitleCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //axis else if( rDispatchCommand.equals("DiagramAxisX") || rDispatchCommand.equals("DiagramAxisY") @@ -485,7 +477,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getAxisCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //grid else if( rDispatchCommand.equals("DiagramGridYMain") || rDispatchCommand.equals("DiagramGridXMain") @@ -498,7 +489,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { return lcl_getGridCIDForCommand( rDispatchCommand, xChartModel ); } - //------------------------------------------------------------------------- //data series else if( rDispatchCommand.equals("FormatDataSeries") ) { @@ -508,13 +498,11 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_SERIES, ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID ) ); } - //------------------------------------------------------------------------- //data point else if( rDispatchCommand.equals("FormatDataPoint") ) { return rSelectedCID; } - //------------------------------------------------------------------------- //data labels else if( rDispatchCommand.equals("FormatDataLabels") ) { @@ -524,7 +512,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_LABELS, OUString(), rSelectedCID ); } - //------------------------------------------------------------------------- //data labels else if( rDispatchCommand.equals("FormatDataLabel") ) { @@ -545,7 +532,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } } - //------------------------------------------------------------------------- //mean value line else if( rDispatchCommand.equals("FormatMeanValue") ) { @@ -557,7 +543,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getMeanValueLine( xRegCurveCnt ) ), true ); } - //------------------------------------------------------------------------- //trend line else if( rDispatchCommand.equals("FormatTrendline") ) { @@ -569,7 +554,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ), false ); } - //------------------------------------------------------------------------- //trend line equation else if( rDispatchCommand.equals("FormatTrendlineEquation") ) { @@ -581,19 +565,16 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) ) ); } - //------------------------------------------------------------------------- // y error bars else if( rDispatchCommand.equals("FormatXErrorBars") ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_X, eSelectedType, rSelectedCID ); } - //------------------------------------------------------------------------- // y error bars else if( rDispatchCommand.equals("FormatYErrorBars") ) { return lcl_getErrorCIDForCommand(OBJECTTYPE_DATA_ERRORS_Y, eSelectedType, rSelectedCID ); } - //------------------------------------------------------------------------- // axis else if( rDispatchCommand.equals("FormatAxis") ) { @@ -605,7 +586,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis , xChartModel ); } } - //------------------------------------------------------------------------- // major grid else if( rDispatchCommand.equals("FormatMajorGrid") ) { @@ -618,7 +598,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: } } - //------------------------------------------------------------------------- // minor grid else if( rDispatchCommand.equals("FormatMinorGrid") ) { @@ -630,14 +609,12 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: return ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, 0 /*sub grid index*/ ); } } - //------------------------------------------------------------------------- // title else if( rDispatchCommand.equals("FormatTitle") ) { if( eSelectedType == OBJECTTYPE_TITLE ) return rSelectedCID; } - //------------------------------------------------------------------------- // stock loss else if( rDispatchCommand.equals("FormatStockLoss") ) { @@ -646,7 +623,6 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: else return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DATA_STOCK_LOSS, OUString()); } - //------------------------------------------------------------------------- // stock gain else if( rDispatchCommand.equals("FormatStockGain") ) { @@ -726,7 +702,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri } try { - //------------------------------------------------------------- //get type of object ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); if( OBJECTTYPE_UNKNOWN==eObjectType ) @@ -739,7 +714,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri return bRet; } - //------------------------------------------------------------- //convert properties to ItemSet SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -761,7 +735,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri apItemConverter->FillItemSet( aItemSet ); - //------------------------------------------------------------- //prepare dialog ObjectPropertiesDialogParameter aDialogParameter = ObjectPropertiesDialogParameter( rObjectCID ); aDialogParameter.init( getModel() ); @@ -797,7 +770,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(), m_xChartView, rObjectCID ) ); } - //------------------------------------------------------------- //open the dialog if( aDlg.Execute() == RET_OK || (bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso && aDlg.DialogWasClosedWithOK()) ) { @@ -840,8 +812,6 @@ void SAL_CALL ChartController::executeDispatch_View3D() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 1db54ebadefd..b64c65c53da3 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -45,23 +45,15 @@ #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixel ) { this->StartTextEdit( pMousePixel ); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::StartTextEdit( const Point* pMousePixel ) { //the first marked object will be edited @@ -156,9 +148,6 @@ bool ChartController::EndTextEdit() return true; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() { SolarMutexGuard aGuard; @@ -229,9 +218,6 @@ uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > return xResult; } - -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index cd25717fcaf5..bfe6fc1535bd 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartController.hxx" #include "ChartWindow.hxx" #include "ChartModelHelper.hxx" @@ -943,7 +942,6 @@ void ChartController::executeDispatch_ToggleGridVertical() } } - void ChartController::impl_ShapeControllerDispatch( const util::URL& rURL, const Sequence< beans::PropertyValue >& rArgs ) { Reference< frame::XDispatch > xDispatch( m_aDispatchContainer.getShapeController() ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 0dd17f619f0d..cb99f8ec70e4 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -83,10 +83,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -225,9 +223,7 @@ OUString lcl_getFormatCommandForObjectCID( const OUString& rCID ) const short HITPIX=2; //hit-tolerance in pixel -//----------------------------------------------------------------- // awt::XWindow -//----------------------------------------------------------------- void SAL_CALL ChartController::setPosSize( sal_Int32 X, sal_Int32 Y, @@ -469,9 +465,7 @@ void SAL_CALL ChartController::removePaintListener( xWindow->removePaintListener( xListener ); } -//----------------------------------------------------------------- // impl vcl window controller methods -//----------------------------------------------------------------- void ChartController::PrePaint() { // forward VCLs PrePaint window event to DrawingLayer @@ -535,10 +529,6 @@ bool isDoubleClick( const MouseEvent& rMEvt ) !rMEvt.IsMod1() && !rMEvt.IsMod2() && !rMEvt.IsShift(); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - void ChartController::startDoubleClickWaiting() { SolarMutexGuard aGuard; @@ -585,8 +575,6 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) return 0; } -//------------------------------------------------------------------------ - void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) { SolarMutexGuard aGuard; @@ -1599,9 +1587,7 @@ bool ChartController::requestQuickHelp( return bResult; } -//----------------------------------------------------------------- // XSelectionSupplier (optional interface) -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartController ::select( const uno::Any& rSelection ) throw( lang::IllegalArgumentException ) @@ -2019,8 +2005,6 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index c15b9d2b6014..154db84f5955 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartDropTargetHelper.hxx" #include "DiagramHelper.hxx" #include "DataSourceHelper.hxx" diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index ddf5e916f797..f9ca3834050b 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -50,7 +50,6 @@ private: bool satisfiesPrerequisites() const; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument; }; diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 2e2713ba3b67..8c1c609dcdff 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -26,10 +26,8 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/frame/XLoadable.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; @@ -56,9 +54,7 @@ ChartFrameLoader::~ChartFrameLoader() return sal_False; } -//----------------------------------------------------------------- // lang::XServiceInfo -//----------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) @@ -70,9 +66,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT return aSNS; } -//----------------------------------------------------------------- // frame::XFrameLoader -//----------------------------------------------------------------- sal_Bool SAL_CALL ChartFrameLoader ::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor @@ -125,7 +119,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT return sal_False; } - //connect frame, controller and model one to each other: if(xController.is()&&xModel.is()) { @@ -193,8 +186,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT m_bCancelRequired = sal_False; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 54344e7153d9..8ea4ff1e2b16 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -26,10 +26,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> -//............................................................................. namespace chart { -//............................................................................. class ChartFrameLoader : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader @@ -54,16 +52,12 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext); virtual ~ChartFrameLoader(); - //----------------------------------------------------------------- // ::com::sun::star::lang::XServiceInfo - //----------------------------------------------------------------- APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(ChartFrameLoader) - //----------------------------------------------------------------- // ::com::sun::star::frame::XFrameLoader - //----------------------------------------------------------------- virtual sal_Bool SAL_CALL load( const ::com::sun::star::uno::Sequence< @@ -76,9 +70,7 @@ public: cancel() throw (::com::sun::star::uno::RuntimeException); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index d9bda071e8fe..f8ae21852ef8 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartModelClone.hxx" #include "ChartModelHelper.hxx" #include "ControllerLockGuard.hxx" @@ -36,10 +35,8 @@ #include <comphelper/property.hxx> #include <tools/diagnose_ex.h> -//...................................................................................................................... namespace chart { -//...................................................................................................................... using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -64,9 +61,7 @@ namespace chart using ::com::sun::star::chart2::data::XDataSource; using ::com::sun::star::chart2::data::XLabeledDataSequence; - // ================================================================================================================= // = helper - // ================================================================================================================= namespace { Reference< XModel > lcl_cloneModel( const Reference< XModel > & xModel ) @@ -86,10 +81,7 @@ namespace chart } - // ================================================================================================================= // = ChartModelClone - // ================================================================================================================= - // ----------------------------------------------------------------------------------------------------------------- ChartModelClone::ChartModelClone( const Reference< XModel >& i_model, const ModelFacet i_facet ) { m_xModelClone.set( lcl_cloneModel( i_model ) ); @@ -117,15 +109,12 @@ namespace chart } } - - // ----------------------------------------------------------------------------------------------------------------- ChartModelClone::~ChartModelClone() { if ( !impl_isDisposed() ) dispose(); } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::dispose() { if ( impl_isDisposed() ) @@ -145,7 +134,6 @@ namespace chart m_aSelection.clear(); } - // ----------------------------------------------------------------------------------------------------------------- ModelFacet ChartModelClone::getFacet() const { if ( m_aSelection.hasValue() ) @@ -155,7 +143,6 @@ namespace chart return E_MODEL; } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::applyToModel( const Reference< XModel >& i_model ) const { applyModelContentToModel( i_model, m_xModelClone, m_xDataClone ); @@ -174,7 +161,6 @@ namespace chart } } - // ----------------------------------------------------------------------------------------------------------------- namespace { void ImplApplyDataToModel( const Reference< XModel >& i_model, const Reference< XInternalDataProvider > & i_data ) @@ -197,7 +183,6 @@ namespace chart } } - // ----------------------------------------------------------------------------------------------------------------- void ChartModelClone::applyModelContentToModel( const Reference< XModel >& i_model, const Reference< XModel >& i_modelToCopyFrom, const Reference< XInternalDataProvider >& i_data ) { @@ -262,9 +247,6 @@ namespace chart } } - -//...................................................................................................................... } // namespace chart -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx index a4af3d25b0f9..5aaf53f500d3 100644 --- a/chart2/source/controller/main/ChartModelClone.hxx +++ b/chart2/source/controller/main/ChartModelClone.hxx @@ -25,14 +25,10 @@ #include <boost/noncopyable.hpp> -//...................................................................................................................... namespace chart { -//...................................................................................................................... - //================================================================================================================== //= ModelFacet - //================================================================================================================== enum ModelFacet { E_MODEL, @@ -40,9 +36,7 @@ namespace chart E_MODEL_WITH_SELECTION }; - //================================================================================================================== //= ChartModelClone - //================================================================================================================== class ChartModelClone : public ::boost::noncopyable { public: @@ -73,9 +67,7 @@ namespace chart ::com::sun::star::uno::Any m_aSelection; }; -//...................................................................................................................... } // namespace chart -//...................................................................................................................... #endif // CHART2_CHARTMODELCLONE_HXX diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 7e6360509136..6761c4838bb5 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartTransferable.hxx" #include <unotools/streamwrap.hxx> diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 69a0125d6216..e103b56ba595 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -38,11 +38,8 @@ namespace } } // anonymous namespace - -//............................................................................. namespace chart { -//............................................................................. ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, WinBits nStyle ) : Window(pParent, nStyle) @@ -256,8 +253,6 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) ::Window::Invalidate( rRegion, nFlags ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index c04ddbe00b23..f943962d9d25 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -21,15 +21,11 @@ #include <vcl/window.hxx> -//............................................................................. namespace chart { -//............................................................................. - class WindowController; -//----------------------------------------------------------------------------- /** The ChartWindow collects events from the window and forwards them the to the controller thus the controller can perform appropriate actions */ @@ -73,9 +69,7 @@ private: void adjustHighContrastMode(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 2c547fba4c04..cee92934ece5 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CommandDispatch.hxx" #include "CommonFunctors.hxx" #include "macros.hxx" @@ -189,8 +188,6 @@ void CommandDispatch::fireStatusEventForURL( } } - - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 483fedf4d9d3..7c6e72d6bcf2 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CommandDispatchContainer.hxx" #include "UndoCommandDispatch.hxx" #include "StatusBarCommandDispatch.hxx" diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 31a088120f35..20a5df87286f 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigurationAccess.hxx" #include "macros.hxx" @@ -28,11 +27,8 @@ // header for rtl::Static #include <rtl/instance.hxx> - -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -47,8 +43,6 @@ bool lcl_IsMetric() } }//end anonymous namespace -// ---------------------------------------- - class CalcConfigItem : public ::utl::ConfigItem { public: @@ -105,8 +99,6 @@ namespace ConfigurationAccess } } //namespace ConfigurationAccess -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 10227164a800..85df6635cb1a 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ControllerCommandDispatch.hxx" #include "ChartModelHelper.hxx" #include "DiagramHelper.hxx" @@ -75,8 +74,6 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController namespace chart { -// ---------------------------------------- - namespace impl { @@ -139,7 +136,6 @@ struct ControllerState bool bMayFormatYErrorBars; }; - ControllerState::ControllerState() : bHasSelectedObject( false ), bIsPositionableObject( false ), @@ -307,7 +303,6 @@ void ControllerState::update( } } - /** Represents the current state of the model. You can set the state by calling update(). After this call the state is @@ -461,7 +456,6 @@ bool ModelState::HasAnyTitle() const } // namespace impl -// ---------------------------------------- DBG_NAME(ControllerCommandDispatch) ControllerCommandDispatch::ControllerCommandDispatch( @@ -800,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve CommandDispatch::modified( aEvent ); } - // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 2724551354a3..9072a90556e3 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DragMethod_Base.hxx" #include "Strings.hrc" @@ -31,10 +30,8 @@ #include <svx/ActionDescriptionProvider.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -78,8 +75,6 @@ Pointer DragMethod_Base::GetSdrDragPointer() const else return Pointer(POINTER_MOVE); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index abf58cbc149e..3aa1f2a84df5 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DragMethod_PieSegment.hxx" #include "Strings.hrc" @@ -29,10 +28,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -148,8 +145,6 @@ void DragMethod_PieSegment::createSdrDragEntries() addSdrDragEntry(new SdrDragEntryPolyPolygon(aNewPolyPolygon)); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index a983d85ba5b8..14c3a61745b5 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -38,10 +38,8 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -221,8 +219,6 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage addToOverlayObjectList(*pNew); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index c03404fa2d45..0ff2135af9cb 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawCommandDispatch.hxx" #include "DrawCommandDispatch.hrc" #include "ChartController.hxx" @@ -52,11 +51,8 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; - -//............................................................................. namespace { -//............................................................................. // comparing two PropertyValue instances struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool > @@ -71,15 +67,10 @@ namespace } }; -//............................................................................. } // anonymous namespace -//............................................................................. - -//............................................................................. namespace chart { -//............................................................................. DrawCommandDispatch::DrawCommandDispatch( const Reference< uno::XComponentContext >& rxContext, ChartController* pController ) @@ -659,8 +650,6 @@ bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt return bFound; } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index afa6799ab11c..968caa2fcf49 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -26,10 +26,8 @@ class SfxItemSet; class SdrObject; -//............................................................................. namespace chart { -//............................................................................. class ChartController; @@ -77,9 +75,7 @@ private: OUString m_aCustomShapeType; }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_DRAWCOMMANDDISPATCH_HXX #endif diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 601cf82d9e6b..f892f0b497b0 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ElementSelector.hxx" #include "macros.hxx" #include "ObjectNameProvider.hxx" @@ -51,8 +50,6 @@ namespace static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" ); } -//------------------------------------------------------------------------------ - SelectorListBox::SelectorListBox( Window* pParent, WinBits nStyle ) : ListBox( pParent, nStyle ) , m_bReleaseFocus( true ) @@ -251,23 +248,19 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName ); -//------------------------------------------------------------------------------ Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { Sequence< OUString > aServices(1); aServices[ 0 ] = "com.sun.star.frame.ToolbarController"; return aServices; } -// ----------------------------------------------------------------------------- ElementSelectorToolbarController::ElementSelectorToolbarController( const uno::Reference< uno::XComponentContext > & xContext ) : m_xCC( xContext ) { } -// ----------------------------------------------------------------------------- ElementSelectorToolbarController::~ElementSelectorToolbarController() { } -// ----------------------------------------------------------------------------- // XInterface Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException) { @@ -276,22 +269,18 @@ Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rTyp aReturn = ElementSelectorToolbarController_BASE::queryInterface(_rType); return aReturn; } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::acquire() throw () { ToolboxController::acquire(); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException) { ToolboxController::initialize(rArguments); } -// ----------------------------------------------------------------------------- void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) { if( m_apSelectorListBox.get() ) @@ -306,7 +295,6 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } } -// ----------------------------------------------------------------------------- uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) throw (uno::RuntimeException) { @@ -328,8 +316,6 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create return xItemWindow; } -//.......................................................................... } // chart2 -//.......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 025500f9f2ef..e5db87e4d3d5 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -30,10 +30,8 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. struct ListBoxEntryData { @@ -70,9 +68,6 @@ class SelectorListBox : public ListBox bool m_bReleaseFocus; }; -// ------------------------------------------------------------------ -// ------------------------------------------------------------------ - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> ElementSelectorToolbarController_BASE; class ElementSelectorToolbarController : public ::svt::ToolboxController @@ -108,9 +103,7 @@ private: ::std::auto_ptr< SelectorListBox > m_apSelectorListBox; }; -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index c3b3ce7f5f58..f530700f5372 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FeatureCommandDispatchBase.hxx" using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index ebcb60569747..0a8d00fc1322 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ObjectHierarchy.hxx" #include "ObjectIdentifier.hxx" #include "ChartModelHelper.hxx" @@ -621,7 +620,6 @@ ObjectHierarchy::tOID ImplObjectHierarchy::getParent( } // namespace impl - ObjectHierarchy::ObjectHierarchy( const Reference< XChartDocument > & xChartDocument, ExplicitValueProvider * pExplicitValueProvider /* = 0 */, @@ -691,8 +689,6 @@ sal_Int32 ObjectHierarchy::getIndexInParent( return -1; } -// ================================================================================ - ObjectKeyNavigation::ObjectKeyNavigation( const ObjectHierarchy::tOID & rCurrentOID, const Reference< chart2::XChartDocument > & xChartDocument, diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index fa57560005f7..5e4005a9e7a4 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PositionAndSizeHelper.hxx" #include "macros.hxx" #include "ChartModelHelper.hxx" @@ -32,10 +31,8 @@ #include <tools/gen.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -149,8 +146,6 @@ bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID return moveObject( eObjectType, xObjectProp, aNewPositionAndSize, rPageRectangle ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index 950c05df949b..4e118ee37360 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -34,10 +34,8 @@ #include <basegfx/point/b2dpoint.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -334,9 +332,6 @@ bool Selection::isAdditionalShapeSelected() const return m_aSelectedOID.isAdditionalShape(); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject , OUString& rOutName , bool bGivenObjectMayBeResult ) @@ -673,8 +668,6 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index 5a4273a7fb2a..8c966474219b 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -27,15 +27,11 @@ class SdrObject; #include <svx/svdtypes.hxx> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. class ObjectIdentifier; -//----------------------------------------------------------------------------- - class Selection { public: //methods @@ -107,11 +103,9 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - SelectionHelper( SdrObject* pSelectedObj ); virtual ~SelectionHelper(); - //MarkHandleProvider: virtual bool getMarkHandles( SdrHdlList& rHdlList ); virtual bool getFrameDragSingles(); @@ -124,9 +118,7 @@ private: SdrObject* m_pMarkObj;//object that is marked instead to have more pretty handles }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 1e7adfd522d4..999177409985 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ShapeController.hxx" #include "ShapeController.hrc" #include "ChartController.hxx" @@ -51,10 +50,8 @@ using namespace ::com::sun::star::frame; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. ShapeController::ShapeController( const Reference< uno::XComponentContext >& rxContext, ChartController* pController ) @@ -721,8 +718,6 @@ bool ShapeController::isForwardPossible() return false; } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index ff3b5a0afc6b..8cf724e618cf 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -25,10 +25,8 @@ class AbstractSvxNameDialog; class SdrObject; -//............................................................................. namespace chart { -//............................................................................. class ChartController; @@ -84,9 +82,7 @@ private: ChartController* m_pChartController; }; -//............................................................................. } // namespace chart -//............................................................................. // CHART2_SHAPECONTROLLER_HXX #endif diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 7713fbe9045f..695b60cf3090 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ShapeToolbarController.hxx" #include <osl/mutex.hxx> @@ -28,16 +27,13 @@ #include <svx/svxids.hrc> #include <svx/tbxcustomshapes.hxx> - using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException) { @@ -283,8 +279,6 @@ void ShapeToolbarController::updateImage() throw (uno::RuntimeException) } } -//............................................................................. } // namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index d84155ba0c7a..196958ab9b10 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -30,10 +30,8 @@ class SfxToolBoxControl; -//............................................................................. namespace chart { -//............................................................................. typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XSubToolbarController> ShapeToolbarController_Base; @@ -87,9 +85,7 @@ public: virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); }; -//............................................................................. } // namespace chart -//............................................................................. #endif //CHART2_SHAPETOOLBARCONTROLLER_HXX diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index db7cfc9be370..94acd29d7045 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "StatusBarCommandDispatch.hxx" #include "ObjectNameProvider.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index e27276cf18d0..9371233c05ea 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoActions.hxx" #include "DisposeHelper.hxx" #include "CommonFunctors.hxx" @@ -37,7 +36,6 @@ using namespace ::com::sun::star; - namespace chart { namespace impl @@ -61,7 +59,6 @@ namespace impl using ::com::sun::star::chart2::XChartDocument; using ::com::sun::star::document::UndoFailedException; -// --------------------------------------------------------------------------------------------------------------------- UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone ) :UndoElement_MBase() ,UndoElement_TBase( m_aMutex ) @@ -71,12 +68,10 @@ UndoElement::UndoElement( const OUString& i_actionString, const Reference< XMode { } -// --------------------------------------------------------------------------------------------------------------------- UndoElement::~UndoElement() { } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::disposing() { if ( !!m_pModelClone ) @@ -85,13 +80,11 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -// --------------------------------------------------------------------------------------------------------------------- OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) { return m_sActionString; } -// --------------------------------------------------------------------------------------------------------------------- void UndoElement::impl_toggleModelState() { // get a snapshot of the current state of our model @@ -102,23 +95,18 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException) { impl_toggleModelState(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException) { impl_toggleModelState(); } -// ===================================================================================================================== // = ShapeUndoElement -// ===================================================================================================================== -// --------------------------------------------------------------------------------------------------------------------- ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ) :ShapeUndoElement_MBase() ,ShapeUndoElement_TBase( m_aMutex ) @@ -126,12 +114,10 @@ ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ) { } -// --------------------------------------------------------------------------------------------------------------------- ShapeUndoElement::~ShapeUndoElement() { } -// --------------------------------------------------------------------------------------------------------------------- OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) { if ( !m_pAction ) @@ -139,7 +125,6 @@ OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) return m_pAction->GetComment(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) @@ -147,7 +132,6 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce m_pAction->Undo(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) { if ( !m_pAction ) @@ -155,7 +139,6 @@ void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeExce m_pAction->Redo(); } -// --------------------------------------------------------------------------------------------------------------------- void SAL_CALL ShapeUndoElement::disposing() { } diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 7f3687abdfa0..8a11e4dc58de 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -88,7 +88,6 @@ private: ::boost::shared_ptr< ChartModelClone > m_pModelClone; }; - typedef ::cppu::BaseMutex ShapeUndoElement_MBase; typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase; class ShapeUndoElement :public ShapeUndoElement_MBase diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index cf9b537f5478..ffd38e810456 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoCommandDispatch.hxx" #include "ResId.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 01727c88b4a7..3617366e574b 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UndoGuard.hxx" #include "ChartModelClone.hxx" #include "UndoActions.hxx" @@ -34,8 +33,6 @@ using ::com::sun::star::uno::Sequence; namespace chart { -//----------------------------------------------------------------------------- - UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager > & i_undoManager, const ModelFacet i_facet ) :m_xChartModel( i_undoManager->getParent(), uno::UNO_QUERY_THROW ) @@ -47,16 +44,12 @@ UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< docume m_pDocumentSnapshot.reset( new ChartModelClone( m_xChartModel, i_facet ) ); } -//----------------------------------------------------------------------------- - UndoGuard::~UndoGuard() { if ( !!m_pDocumentSnapshot ) discardSnapshot(); } -//----------------------------------------------------------------------------- - void UndoGuard::commit() { if ( !m_bActionPosted && !!m_pDocumentSnapshot ) @@ -75,8 +68,6 @@ void UndoGuard::commit() m_bActionPosted = true; } -//----------------------------------------------------------------------------- - void UndoGuard::rollback() { ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" ); @@ -84,7 +75,6 @@ void UndoGuard::rollback() discardSnapshot(); } -//----------------------------------------------------------------------------- void UndoGuard::discardSnapshot() { ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" ); @@ -92,8 +82,6 @@ void UndoGuard::discardSnapshot() m_pDocumentSnapshot.reset(); } -//----------------------------------------------------------------------------- - UndoLiveUpdateGuard::UndoLiveUpdateGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL ) { @@ -105,8 +93,6 @@ UndoLiveUpdateGuard::~UndoLiveUpdateGuard() rollback(); } -//----------------------------------------------------------------------------- - UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_DATA ) @@ -119,16 +105,12 @@ UndoLiveUpdateGuardWithData::~UndoLiveUpdateGuardWithData() rollback(); } -//----------------------------------------------------------------------------- - UndoGuardWithSelection::UndoGuardWithSelection( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager ) :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_SELECTION ) { } -//----------------------------------------------------------------------------- - UndoGuardWithSelection::~UndoGuardWithSelection() { if ( !isActionPosted() ) @@ -151,8 +133,6 @@ HiddenUndoContext::HiddenUndoContext( const Reference< document::XUndoManager > } } -//----------------------------------------------------------------------------- - HiddenUndoContext::~HiddenUndoContext() { try diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index d4566e60bd2e..f2000b02ce40 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -98,6 +98,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcontroller_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_chart2_controller ); } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 7659aecef3c8..75bc69c1cc67 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -30,12 +30,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -244,9 +241,7 @@ public: static bool isAxisPositioningEnabled(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 3fa9ee7b9034..581dc9f1954e 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -40,7 +40,6 @@ #include <vector> -// ____________________ namespace chart { @@ -179,7 +178,6 @@ private: } // namespace chart - // _CHART_CACHEDDATASEQUENCE_HXX #endif diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 2464ac02c670..903d5c497a49 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -33,12 +33,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -100,9 +97,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index c1165429c2a8..fbe41dcdeb13 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -91,9 +88,7 @@ public: static bool isSupportingOnlyDeepStackingFor3D( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 1c478b4839ba..61ecde01cdb2 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/frame/XModel.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -37,9 +34,7 @@ public: static void setViewToDirtyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index ff3d0c0e8830..247cf2987dbe 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -51,9 +48,7 @@ public: , sal_Int32 nPointIndex ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 32885299aab4..8abfea83acf1 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -40,61 +40,49 @@ #include <vector> #include <algorithm> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** diverse methods for class conversions; e.g. ::basegfx::B3DHomMatrix to HomogenMatrix and operations e.g drawing::Position3D + drawing::Direction3D */ -//----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> HomogenMatrix */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** HomogenMatrix -> ::basegfx::B3DHomMatrix */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM ); -//----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> B2DHomMatrix */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2DHomMatrix IgnoreZ( const ::basegfx::B3DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** B2DHomMatrix <-> HomogenMatrix3 */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** Position3D -> B3DPoint */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition ); -//----------------------------------------------------------------------------- /** B3DVector -> Direction3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); -//----------------------------------------------------------------------------- /** B3DPoint -> Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); -//----------------------------------------------------------------------------- /** Direction3D -> B3DVector */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS @@ -102,105 +90,88 @@ void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly , const com::sun::star::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); -//----------------------------------------------------------------------------- /** get a single Point from a Polygon */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); -//----------------------------------------------------------------------------- OOO_DLLPUBLIC_CHARTTOOLS void addPolygon( com::sun::star::drawing::PolyPolygonShape3D& rRet , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS void appendPoly( com::sun::star::drawing::PolyPolygonShape3D& rRet , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); -//----------------------------------------------------------------------------- /** PolyPolygonBezierCoords -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PolyPolygonShape3D BezierToPoly( const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier ); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D) */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PointSequenceSequence PolyToPointSequence( const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon ); -//----------------------------------------------------------------------------- /** drawing::PointSequenceSequence + drawing::PointSequenceSequence */ OOO_DLLPUBLIC_CHARTTOOLS void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarget , com::sun::star::drawing::PointSequenceSequence& rAdd ); -//----------------------------------------------------------------------------- /** Position3D + Direction3D == Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D operator+( const com::sun::star::drawing::Position3D& rPos , const com::sun::star::drawing::Direction3D& rDirection); -//----------------------------------------------------------------------------- /** Position3D - Position3D == Direction3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator-( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); -//----------------------------------------------------------------------------- /** Position3D == Position3D ? */ OOO_DLLPUBLIC_CHARTTOOLS bool operator==( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); -//----------------------------------------------------------------------------- /** awt::Rect --> awt::Point (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle ); -//----------------------------------------------------------------------------- /** awt::Rect --> awt::Size (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle ); -//----------------------------------------------------------------------------- /** Position3D --> awt::Point (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos ); -//----------------------------------------------------------------------------- /** Direction3D --> awt::Size (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection ); -//----------------------------------------------------------------------------- /** B3DPoint -> Sequence<double> */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); -//----------------------------------------------------------------------------- /** Sequence<double> -> drawing::Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D SequenceToPosition3D( const com::sun::star::uno::Sequence< double >& rSeq ); -//----------------------------------------------------------------------------- /** drawing::Position3D -> Sequence<double> */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition ); -//----------------------------------------------------------------------------- /** chart2::XDataSequence -> uno::Sequence< double > */ @@ -214,7 +185,6 @@ OOO_DLLPUBLIC_CHARTTOOLS const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); -//----------------------------------------------------------------------------- /** uno::Sequence< uno::Sequence< T > > -> uno::Sequence< T > */ template< typename T > @@ -265,9 +235,7 @@ bool replaceParamterInString( OUString & rInOutResourceString, const OUString & rParamToReplace, const OUString & rReplaceWith ); -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 458d29d7177f..31bf3a0c40fc 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -135,8 +135,6 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< } }; -// ================================================================================ - /** can be used to find an element with a specific first element in e.g. a vector of pairs (for searching keys in maps you will of course use map::find) */ diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index e6d5a3686bce..7617f49c5e35 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -30,7 +30,6 @@ #include <memory> - namespace chart { diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index c92803097860..2d166c5643b9 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -130,8 +130,6 @@ template< typename T > return SequenceToSTLContainer< ::std::set< T > >( rSeq ); } -// ---------------------------------------- - /** converts the keys of a Pair Associative Container into a UNO sequence example: diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 02f64f8ee5f3..8bd0a35d129b 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -86,7 +86,6 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > & aSeries ); - /** Get the label of a series (e.g. for the legend) @param rLabelSequenceRole diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index d5ab613b5ada..d3b9ac13de0f 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -32,12 +32,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -150,9 +147,7 @@ public: ::com::sun::star::chart2::data::XDataSource > & xSource ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 5b1bb7bda23f..b89c55516d78 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -36,7 +36,6 @@ #include <utility> #include <vector> - namespace chart { @@ -266,7 +265,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xSecondType ); - /** * Test if a series can be moved. * diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index f9f0ee42edff..8764d1e3027d 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -113,8 +113,6 @@ private: } // namespace impl -// -------------------------------------------------------------------------------- - template< class InterfaceRef > void addListener( const InterfaceRef & xObject, diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index 2cda35fa3622..a0db12cdd707 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -47,7 +47,6 @@ public: // , PROP_FILL_GRADIENT //optional , PROP_FILL_HATCH_NAME // , PROP_FILL_HATCH //optional - //------------------------ // bitmap properties start , PROP_FILL_BITMAP_NAME // , PROP_FILL_BITMAP //optional @@ -62,7 +61,6 @@ public: , PROP_FILL_BITMAP_SIZEY , PROP_FILL_BITMAP_MODE // bitmap properties end - //------------------------ , PROP_FILL_BACKGROUND }; diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index cd24645ddd2c..147b2c417008 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -24,10 +24,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper { @@ -43,9 +41,7 @@ public: ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index cb5c96a4d6e5..f914ce8a2fae 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -64,9 +61,7 @@ public: static bool hasLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 753e80267e7c..9d5cf9189b75 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -123,7 +123,6 @@ protected: } }; -//----------------------------------------------------------------- /* Use this Guard in your apicalls to protect access on resources which will be released in dispose. @@ -185,7 +184,6 @@ your XComponent::dispose method has to be implemented in the following way: } */ -//----------------------------------------------------------------- class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeGuard { @@ -216,7 +214,6 @@ private: LifeTimeGuard& operator= ( const LifeTimeGuard& ); }; - template<class T> class NegativeGuard { diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 48896c7c9003..279c2fc0b496 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -55,7 +55,6 @@ public: ::com::sun::star::beans::PropertyValue > getReducedForModel(); public: - //--------------------- //all properties given in the constructor are stored in the following three sequences ::com::sun::star::uno::Sequence< @@ -70,13 +69,11 @@ public: ::com::sun::star::beans::PropertyValue > m_aAdditionalProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor - //---------------------- //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!) ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor - //@todo define this for debug only, except URL sal_Bool AsTemplate; //document is a template. sal_Bool ISSET_AsTemplate; @@ -110,7 +107,6 @@ public: OUString HierarchicalDocumentName; sal_Bool ISSET_HierarchicalDocumentName; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OutputStream; //a stream to receive the document data for saving sal_Bool ISSET_OutputStream; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 2eee3a819027..935f8b8e8629 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -43,8 +43,6 @@ namespace ModifyListenerHelper OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > createModifyEventForwarder(); -// ================================================================================ - /** This helper class serves as forwarder of modify events. It can be used whenever an object has to send modify events after it gets a modify event of one of its children. @@ -108,8 +106,6 @@ private: tListenerMap m_aListenerMap; }; -// ================================================================================ - namespace impl { @@ -191,9 +187,6 @@ private: } // namespace impl -// -------------------------------------------------------------------------------- - - template< class InterfaceRef > void addListener( const InterfaceRef & xObject, diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 029f4521674e..89f5ac436d2d 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -29,10 +29,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); @@ -90,9 +88,7 @@ private: //member tContentMap m_aMap; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index f15f65150464..4e9620b657ce 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -23,12 +23,9 @@ #include <svl/zforlist.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class FixedNumberFormatter; @@ -54,7 +51,6 @@ private: //private member ::com::sun::star::uno::Any m_aNullDate; }; - class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter { public: @@ -69,9 +65,7 @@ private: sal_uLong m_nNumberFormatKey; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index cc226a5031bd..73cc75dc1f93 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -41,7 +41,6 @@ namespace property namespace impl { class ImplOPropertySet; } - class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet : public ::cppu::OBroadcastHelper, // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet @@ -79,7 +78,6 @@ protected: */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() = 0; - /** Try to convert the value <code>rValue</code> to the type required by the property associated with <code>nHandle</code>. @@ -154,9 +152,7 @@ protected: /// call this when a derived component is disposed virtual void disposePropertySet(); - // ======================================== // Interfaces - // ======================================== // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index b2e127dbb6be..49ef8f67be2d 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -34,12 +34,9 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ enum ObjectType @@ -132,7 +129,6 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static OUString createParticleForCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys @@ -263,9 +259,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx index 6c1d990f9d58..e2cb51bcb44d 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -25,7 +25,6 @@ namespace chart { - class PolynomialRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 10a999047cbe..de5c4d9450ad 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -25,7 +25,6 @@ namespace chart { - class PotentialRegressionCurveCalculator : public RegressionCurveCalculator { diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 9bbcb84c3e01..48a8ccabd110 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -95,8 +95,6 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( ::com::sun::star::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); -// -------------------------------------------------------------------------------- - /** Set a property to a certain value in the given map. This works for properties that are already set, and those which are not yet in the map. @@ -142,11 +140,8 @@ template<> */ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); - } // namespace PropertyHelper -// ================================================================================ - struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess { inline bool operator() ( const ::com::sun::star::beans::Property & first, diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 1a23608c51e2..b1c626808e8c 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -31,7 +31,6 @@ namespace chart2 { } }}} -// ---------------------------------------- namespace chart { @@ -73,7 +72,6 @@ public: */ void toggleAutoResizeState(); - /** Sets the ReferencePageSize according to the internal settings of this class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes is </sal_True>. diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 4efa6f46aabf..6c90f6d49901 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -52,8 +52,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext, OUString aServiceName ); - // ------------------------------------------------------------ - static bool hasMeanValueLine( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); @@ -154,8 +152,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ); - // ------------------------------------------------------------ - /// returns a calculator object for regression curves (used by the view) static com::sun::star::uno::Reference< com::sun::star::chart2::XRegressionCurveCalculator > createRegressionCurveCalculatorByServiceName( OUString aServiceName ); diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 872180be68c6..1a1503d75030 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/awt/Size.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -106,9 +103,7 @@ public: bool bCheck = true ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index ac25d268d8a6..0047af5d0866 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase3.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -73,8 +70,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class ExponentialScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, @@ -114,8 +109,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class LinearScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -155,8 +148,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class PowerScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -195,9 +186,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index ab60ee5a6c04..f1a727b70777 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -27,11 +27,9 @@ static com::sun::star::uno::Sequence< OUString > Class::getSupportedServiceNames_Static(); */ -//========================================================================= // // XServiceInfo decl // -//========================================================================= namespace apphelper { @@ -50,11 +48,9 @@ namespace apphelper static ::com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); -//========================================================================= // // XServiceInfo impl // -//========================================================================= #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ @@ -91,14 +87,12 @@ Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -//========================================================================= // // Service factory helper decl+impl // //to use this macro you need to provide a constructor: //class( Reference< XComponentContext > const & xContext ) //and implement OWeakObject -//========================================================================= #define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ static ::com::sun::star::uno::Reference< \ diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 2586893d2715..342c1d11fe9c 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/drawing/ShadeMode.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -145,9 +142,7 @@ public: , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index ec9db23e2401..c954acfb6633 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -26,10 +26,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/XDiagram.hpp> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS TitleHelper { @@ -87,9 +85,7 @@ public: ::com::sun::star::frame::XModel >& xModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 6dc447be4045..4df0ffc3d845 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -44,7 +44,6 @@ #include <vector> -// ____________________ namespace chart { @@ -193,7 +192,6 @@ private: } // namespace chart - // _CHART_UNCACHEDDATASEQUENCE_HXX #endif diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index c47cf56062f1..779c59558f21 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -28,7 +28,6 @@ namespace chart { -// -------------------------------------------------------------------------------- /** Adapter that enables adding listeners as weak UNO references. Thus, adding an object as listener to a broadcaster does not increase its reference @@ -80,8 +79,6 @@ private: ::com::sun::star::uno::WeakReference< Listener > m_xListener; }; -// -------------------------------------------------------------------------------- - class WeakModifyListenerAdapter : public WeakListenerAdapter< ::com::sun::star::util::XModifyListener > { @@ -96,8 +93,6 @@ protected: throw (::com::sun::star::uno::RuntimeException); }; -// -------------------------------------------------------------------------------- - class WeakSelectionChangeListenerAdapter : public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener > { diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 9d55c8a94025..420a5c489a81 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -24,10 +24,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { @@ -65,9 +63,7 @@ public: SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ); }; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPED_IGNORE_PROPERTY_HXX #endif diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 1410ee1e37e6..11692faea6fc 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -25,10 +25,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty { @@ -66,13 +64,9 @@ protected: OUString m_aInnerName; }; -//............................................................................. - typedef ::std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPEDPROPERTY_HXX #endif diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 6968f319ff9f..911eb625c4e3 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -34,10 +34,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : public MutexContainer @@ -126,9 +124,7 @@ protected: //member //OMultiTypeInterfaceContainerHelperInt32 m_aVetoableListenerContainer; }; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPEDPROPERTYSET_HXX #endif diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index e583f5a67fd2..7148a0ec6e2f 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -58,7 +58,6 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString ); OUString getXMLStringFromCellRange( const CellRange & rRange ); - } // namespace XMLRangeHelper } // namespace chart diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 62b1204f5a58..92582090d992 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -19,9 +19,7 @@ #ifndef CHARTSFXITEMIDS_HXX #define CHARTSFXITEMIDS_HXX -// ============================================================ // SCHATTR -// ============================================================ // can't this be changed to 0? #define SCHATTR_START 1 @@ -65,9 +63,7 @@ #define SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9) #define SCHATTR_STAT_END SCHATTR_STAT_ERRORBAR_TYPE -// -------------------------------------------------------- // these attributes are for replacement of enum eChartStyle -// -------------------------------------------------------- #define SCHATTR_STYLE_START ( SCHATTR_STAT_END +1 ) @@ -88,8 +84,6 @@ #define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) #define SCHATTR_STYLE_END ( SCHATTR_STYLE_SHAPE ) -// -------------------------------------------------------------------------- - #define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Re-mapped: #define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) @@ -177,9 +171,7 @@ #define SCHATTR_END SCHATTR_REGRESSION_END -// ============================================================ // values for Items -// ============================================================ // values for SCHATTR_AXIS_TICKS and SCHATTR_AXIS_HELPTICKS items #define CHAXIS_MARK_BOTH 3 @@ -210,9 +202,6 @@ #define CHART_AXIS_SECONDARY_Y 4 #define CHART_AXIS_SECONDARY_X 5 -// ============================================================ -// ============================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index feb8685ffd80..5ec31eff119a 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/drawing/XShapes.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -45,9 +42,7 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 1872ed49534b..34646a5b3199 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -31,10 +31,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel { @@ -68,7 +66,6 @@ public: getChartRootShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>& xPage ); - SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); @@ -100,9 +97,7 @@ public: static bool removeShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index d945b9e97ee7..bb3bd4b8a624 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/chart2/XScaling.hpp> #include <tools/date.hxx> #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** This structure contains the explicit values for a scale like Minimum and Maximum. See also ::com::sun::star::chart2::ScaleData. */ @@ -151,9 +148,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData ::std::vector< ExplicitSubIncrement > SubIncrements; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index dfe7afccaaad..0f3f8a444ce6 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -32,12 +32,9 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -105,9 +102,7 @@ protected: ~ExplicitValueProvider() {} }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx index 37dea3c8fecb..231dee194c78 100644 --- a/chart2/source/inc/chartview/servicenames_charttypes.hxx +++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx @@ -19,10 +19,8 @@ #ifndef _CHART2_SERVICENAMES_CHARTTYPES_HXX #define _CHART2_SERVICENAMES_CHARTTYPES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.BarChart_Impl" #define CHART2_VIEW_BARCHART_SERVICE_NAME "com.sun.star.chart2.view.BarChart" @@ -33,9 +31,7 @@ namespace chart #define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.AreaChart_Impl" #define CHART2_VIEW_AREACHART_SERVICE_NAME "com.sun.star.chart2.view.AreaChart" -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index 7e024583b453..1444d32098ec 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -19,10 +19,8 @@ #ifndef _CHART_SERVICENAMES_HXX #define _CHART_SERVICENAMES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartModel" ) #define CHART_MODEL_SERVICE_NAME OUString( "com.sun.star.chart2.ChartDocument" ) @@ -52,9 +50,7 @@ namespace chart #define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.AccessibleTextComponent" ) #define CHART_ACCESSIBLE_TEXT_SERVICE_NAME OUString( "com.sun.star.accessibility.AccessibleTextComponent" ) -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 53741e2129fb..2f370a1e29e2 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -19,10 +19,8 @@ #ifndef _CHART2_SERVICENAMES_CHARTTYPES_HXX #define _CHART2_SERVICENAMES_CHARTTYPES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_SERVICE_NAME_CHARTTYPE_AREA OUString( "com.sun.star.chart2.AreaChartType" ) #define CHART2_SERVICE_NAME_CHARTTYPE_BAR OUString( "com.sun.star.chart2.BarChartType" ) @@ -35,9 +33,7 @@ namespace chart #define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK OUString( "com.sun.star.chart2.CandleStickChartType" ) #define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE OUString( "com.sun.star.chart2.BubbleChartType" ) -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx index 5f2f3d5c42f0..4fa10bc3ffbe 100644 --- a/chart2/source/inc/servicenames_coosystems.hxx +++ b/chart2/source/inc/servicenames_coosystems.hxx @@ -19,19 +19,15 @@ #ifndef _CHART2_SERVICENAMES_COOSYSTEMS_HXX #define _CHART2_SERVICENAMES_COOSYSTEMS_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Cartesian" ) #define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.CartesianView" ) #define CHART2_COOSYSTEM_POLAR_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Polar" ) #define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.PolarView" ) -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 7ba2ca95da54..6dc08718f0ea 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLFilter.hxx" #include "macros.hxx" #include "MediaDescriptorHelper.hxx" @@ -59,7 +58,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::osl::MutexGuard; -// ---------------------------------------- namespace { #define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x @@ -204,11 +202,8 @@ uno::Reference< embed::XStorage > lcl_getReadStorage( return xStorage; } - } // anonymous namespace -// ---------------------------------------- - namespace chart { @@ -284,7 +279,6 @@ void SAL_CALL XMLFilter::setTargetDocument( m_xTargetDoc = Document; } - // ____ XExporter ____ void SAL_CALL XMLFilter::setSourceDocument( const Reference< lang::XComponent >& Document ) @@ -297,7 +291,6 @@ void SAL_CALL XMLFilter::setSourceDocument( m_xSourceDoc = Document; } - sal_Int32 XMLFilter::impl_Import( const Reference< lang::XComponent > & xDocumentComp, const Sequence< beans::PropertyValue > & rMediaDescriptor ) @@ -497,7 +490,6 @@ sal_Int32 XMLFilter::impl_ImportStream( xFactory->createInstanceWithArgumentsAndContext( rServiceName, aFilterCompArgs, m_xContext ), uno::UNO_QUERY_THROW ); - Reference< document::XImporter > xImporter( xDocHandler, uno::UNO_QUERY_THROW ); xImporter->setTargetDocument( Reference< lang::XComponent >( m_xTargetDoc, uno::UNO_QUERY_THROW )); @@ -771,8 +763,6 @@ sal_Int32 XMLFilter::impl_ExportStream( return nWarning; } -// -------------------------------------------------------------------------------- - Sequence< OUString > XMLFilter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); @@ -783,7 +773,6 @@ Sequence< OUString > XMLFilter::getSupportedServiceNames_Static() // XInitialization, XNamed return aServices; } -// ----------------------------------------------------------------------------- void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) { @@ -791,15 +780,12 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes if( aMDHelper.ISSET_FilterName ) rOutOASIS = aMDHelper.FilterName == "chart8"; } -// ----------------------------------------------------------------------------- OUString XMLFilter::getMediaType(bool _bOasis) { return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; } -// ----------------------------------------------------------------------------- APPHELPER_XSERVICEINFO_IMPL( XMLFilter, OUString("com.sun.star.comp.chart2.XMLFilter") ); -// ----------------------------------------------------------------------------- void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) { @@ -807,7 +793,6 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > if( aMDHelper.ISSET_FilterName ) rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart"; } -// ----------------------------------------------------------------------------- OUString XMLReportFilterHelper::getMediaType(bool ) { return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART; diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index dda7652e7dad..123f7302399f 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -90,7 +90,6 @@ protected: void Init( const DataSeries & rOther ); // ____ XDataSeries ____ - // _____________________ /// @see ::com::sun::star::chart2::XDataSeries virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) @@ -102,19 +101,16 @@ protected: throw (::com::sun::star::uno::RuntimeException); // ____ XDataSink ____ - // ___________________ /// @see ::com::sun::star::chart2::data::XDataSink virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) throw (::com::sun::star::uno::RuntimeException); // ____ XDataSource ____ - // _____________________ /// @see ::com::sun::star::chart2::data::XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() throw (::com::sun::star::uno::RuntimeException); // ____ OPropertySet ____ - // ______________________ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const throw(::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; @@ -126,7 +122,6 @@ protected: virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // ____ XPropertySet ____ - // ______________________ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() @@ -136,7 +131,6 @@ protected: using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; // ____ XRegressionCurveContainer ____ - // ___________________________________ /// @see ::com::sun::star::chart2::XRegressionCurveContainer virtual void SAL_CALL addRegressionCurve( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 581053df93b0..35e97e5a8159 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -50,7 +50,6 @@ public: explicit StockBar( bool bRisingCourse ); virtual ~StockBar(); - /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -71,7 +70,6 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index ad8e32f35f19..5aae715c19fb 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -158,7 +158,6 @@ private: ::osl::Mutex m_aMutex; }; -// ============================================================================= class XMLReportFilterHelper : public XMLFilter { virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< 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: */ diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 6bd6e5d89e5e..5a2a7d936b43 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -244,9 +244,6 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN return xResult; } - -// ---------------------------------------- - uno::Sequence< OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 3cb469b1c400..29de7c7def07 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -228,7 +228,6 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe return xResult; } - // ____ OPropertySet ____ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -305,7 +304,6 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( DiagramHelper::setVertical( xDiagram, false ); } - void BarChartTypeTemplate::createCoordinateSystems( const Reference< chart2::XCoordinateSystemContainer > & xCooSysCnt ) { @@ -315,8 +313,6 @@ void BarChartTypeTemplate::createCoordinateSystems( DiagramHelper::setVertical( xDiagram, m_eBarDirection == HORIZONTAL ); } -// ---------------------------------------- - Sequence< OUString > BarChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 3fd97691c2f1..c9c3b6aaadc3 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -270,8 +270,6 @@ Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataI return m_xDataInterpreter; } -// ---------------------------------------- - Sequence< OUString > BubbleChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 462da8a22d50..353f59e73735 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BubbleDataInterpreter.hxx" #include "DataSeries.hxx" #include "macros.hxx" diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index f5b723ffcca1..c0aa4507b30c 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CandleStickChartType.hxx" #include "PropertyHelper.hxx" #include "macros.hxx" diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index bf8002dbaa12..65eeff0ddadb 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -307,8 +307,6 @@ void ChartType::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - using impl::ChartType_Base; IMPLEMENT_FORWARD_XINTERFACE2( ChartType, ChartType_Base, ::property::OPropertySet ) diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 187d1c4f2717..c945e588b775 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -52,8 +52,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -// ====================================================================== - namespace { @@ -601,8 +599,6 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() return aServices; } -// ================================================================================ - // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager, OUString("com.sun.star.comp.chart.ChartTypeManager") ); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 2312dc9a0725..b1ac7d22436d 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -48,8 +48,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -// ====================================================================== - namespace { @@ -308,7 +306,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( } #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartTypeTemplate::changeDiagramData: Showing Diagram structure" ); - OSL_TRACE( "---------------------------------------------------------------" ); ::chart::debug::ChartDebugTraceDiagram( xDiagram ); #endif } @@ -528,8 +525,6 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram return m_aServiceName; } -// ________________________________________ - sal_Int32 ChartTypeTemplate::getDimension() const { return 2; @@ -545,8 +540,6 @@ bool ChartTypeTemplate::isSwapXAndY() const return false; } -// ________________________________________ - void ChartTypeTemplate::createCoordinateSystems( const Reference< chart2::XCoordinateSystemContainer > & xOutCooSysCnt ) { @@ -808,7 +801,6 @@ void ChartTypeTemplate::FillDiagram( #if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL OSL_TRACE( "ChartTypeTemplate::FillDiagram: Showing Diagram structure" ); - OSL_TRACE( "---------------------------------------------------------" ); ::chart::debug::ChartDebugTraceDiagram( xDiagram ); #endif } @@ -925,8 +917,6 @@ Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() con return m_xContext; } -// ================================================================================ - // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeTemplate, OUString("com.sun.star.comp.chart.ChartTypeTemplate") ); diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 061647d764ff..305b7b5d5004 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -41,7 +41,6 @@ namespace chart derive from this class. createDiagramByDataSource - ------------------------- This does the following steps using some virtual helper-methods, that may be overloaded by derived classes: @@ -130,7 +129,6 @@ protected: throw (::com::sun::star::uno::RuntimeException); // Methods to overload for automatic creation - // ------------------------------------------ /// returns 2 by default. Supported are 2 and 3 virtual sal_Int32 getDimension() const; @@ -151,7 +149,6 @@ protected: virtual bool isSwapXAndY() const; // Methods for creating the diagram piecewise - // ------------------------------------------ /** Allows derived classes to manipulate the diagramas whole, like changing the wall color. The default implementation is empty. It is called by diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 0427a844967a..cd41ea900ea2 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -28,8 +28,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -//----------------------------------------------------------------------------- - namespace { @@ -177,7 +175,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS return *StaticColumnChartTypeInfo::get(); } - uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 1013c0ef96e1..6db8a268f49d 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -416,8 +416,6 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter return m_xDataInterpreter; } -// ---------------------------------------- - uno::Sequence< OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index a111954387b2..f77dcc17fdc7 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ColumnLineDataInterpreter.hxx" #include "DataSeries.hxx" #include "macros.hxx" diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 5078346a6cc0..3e7a0c944d7f 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DataInterpreter.hxx" #include "DataSeries.hxx" #include "DataSourceHelper.hxx" @@ -386,8 +385,6 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & return bUseCategoriesAsX; } -// ------------------------------------------------------------ - Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index e7616c76a76e..dcb83a36c36a 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -164,7 +164,6 @@ OUString SAL_CALL LineChartType::getChartType() return CHART2_SERVICE_NAME_CHARTTYPE_LINE; } - // ____ OPropertySet ____ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 1b9d635c296d..22838c4d2189 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -375,8 +375,6 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( } } -// ---------------------------------------- - Sequence< OUString > LineChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index fd593daa6b51..8672c837b8fa 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -144,8 +144,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropert return *StaticNetChartTypeInfo::get(); } -//----------------------------------------------------------------------------- - NetChartType::NetChartType( const uno::Reference< uno::XComponentContext > & xContext ) : NetChartType_Base( xContext ) diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index e4b1a25f2d9d..20a63746eec4 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -53,8 +53,6 @@ protected: throw (::com::sun::star::uno::RuntimeException); }; -//------------------------------------------------------------------------------------- - class NetChartType : public NetChartType_Base { public: diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 1672ba23f907..9718c42877ae 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -34,7 +34,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; - namespace { static const OUString lcl_aServiceName( "com.sun.star.chart2.NetChartTypeTemplate" ); @@ -200,8 +199,6 @@ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNe return xResult; } -// ---------------------------------------- - Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index 2462f200a6f0..420d3e9cc203 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -65,7 +65,6 @@ protected: getChartTypeForIndex( sal_Int32 nChartTypeIndex ); virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; - private: StackMode m_eStackMode; bool m_bHasSymbols; diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 2fe296658cdb..c1f05ccc006a 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -540,7 +540,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } } - void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) throw (uno::RuntimeException) { @@ -617,8 +616,6 @@ void PieChartTypeTemplate::adaptDiagram( const uno::Reference< chart2::XDiagram ThreeDHelper::setDefaultRotation( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ), true ); } -// ---------------------------------------- - uno::Sequence< OUString > PieChartTypeTemplate::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index d4dd2014d8a4..b15c067572f9 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -229,7 +229,6 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() return uno::Sequence< OUString >(); } - // ____ OPropertySet ____ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index da73968d3a15..cd68e7ed9878 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -395,8 +395,6 @@ Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getData return m_xDataInterpreter; } -// ---------------------------------------- - Sequence< OUString > ScatterChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 8fb076771ea8..342bcfcecc87 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -48,7 +48,6 @@ using ::com::sun::star::beans::Property; using ::com::sun::star::uno::Any; using ::osl::MutexGuard; -// ---------------------------------------- namespace { @@ -153,7 +152,6 @@ struct StaticStockChartTypeTemplateInfo : public rtl::StaticAggregate< uno::Refe }; } // anonymous namespace -// ---------------------------------------- namespace chart { @@ -346,7 +344,6 @@ void StockChartTypeTemplate::createChartTypes( std::vector< Reference< chart2::XChartType > > aChartTypeVec; // Bars (Volume) - // ------------- if( bHasVolume ) { // chart type @@ -386,7 +383,6 @@ void StockChartTypeTemplate::createChartTypes( ++nSeriesIndex; // Lines (remaining series) - // ------------------------ if( aSeriesSeq.getLength() > nSeriesIndex && aSeriesSeq[ nSeriesIndex ].getLength() > 0 ) { @@ -522,8 +518,6 @@ Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterprete return m_xDataInterpreter; } -// ---------------------------------------- - Sequence< OUString > StockChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index ba55fbd2f79d..e0714857117d 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "StockDataInterpreter.hxx" #include "DataSeries.hxx" #include "macros.hxx" @@ -122,7 +121,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nBarGroupIndex].realloc( nVolumeSeries ); } - // create data sal_Int32 nSourceIndex = 0; // index into aData sequence diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 3876d2a29d9c..ebf9979ad40b 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XYDataInterpreter.hxx" #include "DataSeries.hxx" #include "macros.hxx" diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx index 25eea8b423d0..4d9854d1abe3 100644 --- a/chart2/source/model/template/_serviceregistration_charttypes.cxx +++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "_serviceregistration_charttypes.hxx" #include "AreaChartType.hxx" diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 8a769f808f3a..003795bbcbae 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AxisHelper.hxx" #include "DiagramHelper.hxx" #include "ChartTypeHelper.hxx" @@ -49,10 +48,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -1156,8 +1153,6 @@ bool AxisHelper::isAxisPositioningEnabled() return nCurrentVersion >= SvtSaveOptions::ODFVER_012; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx index 27eb7bc99bb2..df671161df4c 100644 --- a/chart2/source/tools/BaseGFXHelper.cxx +++ b/chart2/source/tools/BaseGFXHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BaseGFXHelper.hxx" #include <com/sun/star/drawing/DoubleSequence.hpp> diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index deada2065cb3..406606c5256d 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CachedDataSequence.hxx" #include "macros.hxx" #include "PropertyHelper.hxx" @@ -57,8 +56,6 @@ enum }; } // anonymous namespace - -// ____________________ namespace chart { @@ -226,8 +223,6 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const return aResult; } -// ================================================================================ - Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); @@ -249,14 +244,12 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet } // ____ ::comphelper::OPropertySetHelper ____ -// __________________________________________ ::cppu::IPropertyArrayHelper& CachedDataSequence::getInfoHelper() { return *getArrayHelper(); } // ____ ::comphelper::OPropertyArrayHelper ____ -// ____________________________________________ ::cppu::IPropertyArrayHelper* CachedDataSequence::createArrayHelper() const { Sequence< beans::Property > aProps; @@ -269,8 +262,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName ) -// ================================================================================ - // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() throw (uno::RuntimeException) diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index ff8b8c9a167c..8f1c3d249042 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -41,7 +41,6 @@ #include <comphelper/InlineContainer.hxx> - // header for struct SvtLinguConfig #include <unotools/lingucfg.hxx> #include <i18nlangtag/mslangid.hxx> @@ -52,7 +51,6 @@ using namespace ::com::sun::star; using ::com::sun::star::beans::Property; - namespace chart { diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx index a1817b0313a9..6c6ddd1f9fb3 100644 --- a/chart2/source/tools/ChartDebugTrace.cxx +++ b/chart2/source/tools/ChartDebugTrace.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartDebugTrace.hxx" #include "macros.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 5c1e78d8e800..b49ca02c8d4b 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -36,10 +36,8 @@ #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -136,7 +134,6 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( return getDataSeries( uno::Reference< chart2::XChartDocument >( xModel, uno::UNO_QUERY )); } - uno::Reference< XChartType > ChartModelHelper::getChartTypeOfSeries( const uno::Reference< frame::XModel >& xModel , const uno::Reference< XDataSeries >& xGivenDataSeries ) @@ -272,8 +269,6 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un return bChanged; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 6cfc333d99a8..f8affac41102 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartTypeHelper.hxx" #include "DiagramHelper.hxx" #include "DataSeriesHelper.hxx" @@ -29,11 +28,9 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart/MissingValueTreatment.hpp> -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//............................................................................. namespace chart { @@ -688,8 +685,6 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X return bRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index cb79d6417201..6814faff973a 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartViewHelper.hxx" #include "macros.hxx" #include "servicenames.hxx" @@ -26,10 +25,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XModifyListener.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -54,8 +51,6 @@ void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel > ASSERT_EXCEPTION( ex ); } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index ad60db5af27a..65e72233c11f 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ColorPerPointHelper.hxx" #include "macros.hxx" #include <com/sun/star/chart2/XDataSeries.hpp> @@ -25,10 +24,8 @@ #include <algorithm> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -80,8 +77,6 @@ bool ColorPerPointHelper::hasPointOwnProperties( return false; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index ca401941da2b..5c6acb285386 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -27,19 +27,12 @@ #include <cstdarg> - -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // diverse methods for class conversions; e.g. ::basegfx::B3DHomMatrix to HomogenMatrix -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ) { @@ -100,7 +93,6 @@ drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatri return aM; } - drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ) { drawing::HomogenMatrix3 aHM; @@ -532,8 +524,6 @@ bool replaceParamterInString( OUString & rInOutResourceString, return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 57743923f172..df8d4fe19ae4 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConfigColorScheme.hxx" #include "ContainerHelper.hxx" #include "macros.hxx" @@ -39,8 +38,6 @@ static const OUString aSeriesPropName( "Series" ); } // anonymous namespace -// -------------------------------------------------------------------------------- - namespace chart { @@ -108,8 +105,6 @@ uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName ) } // namespace impl -// -------------------------------------------------------------------------------- - // explicit ConfigColorScheme::ConfigColorScheme( const Reference< uno::XComponentContext > & xContext ) : @@ -174,8 +169,6 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) m_bNeedsUpdate = true; } -// ================================================================================ - Sequence< OUString > ConfigColorScheme::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); @@ -187,8 +180,6 @@ Sequence< OUString > ConfigColorScheme::getSupportedServiceNames_Static() APPHELPER_XSERVICEINFO_IMPL( ConfigColorScheme, OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ) -// ================================================================================ - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx index ce57ac442428..9487769a7d26 100644 --- a/chart2/source/tools/ControllerLockGuard.cxx +++ b/chart2/source/tools/ControllerLockGuard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ControllerLockGuard.hxx" using namespace ::com::sun::star; @@ -41,8 +40,6 @@ ControllerLockGuard::~ControllerLockGuard() m_xModel->unlockControllers(); } -// ================================================================================ - ControllerLockHelper::ControllerLockHelper( const Reference< frame::XModel > & xModel ) : m_xModel( xModel ) {} @@ -62,8 +59,6 @@ void ControllerLockHelper::unlockControllers() m_xModel->unlockControllers(); } -// ================================================================================ - ControllerLockHelperGuard::ControllerLockHelperGuard( ControllerLockHelper & rHelper ) : m_rHelper( rHelper ) { diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index d7ec4ac688db..1bff4c3a129a 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/drawing/LineStyle.hpp> - #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> @@ -50,7 +49,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// ---------------------------------------- namespace { @@ -185,7 +183,6 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2:: } } // anonymous namespace -// ---------------------------------------- namespace chart { @@ -859,7 +856,6 @@ void deleteDataLabelsFromSeriesAndAllPoints( const Reference< chart2::XDataSerie lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( xSeries, false /*bInsert*/ ); } - void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp ) { try diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 71b6a5cb40fe..505c5335cebd 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DataSource.hxx" #include "LabeledDataSequence.hxx" @@ -63,8 +62,6 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab m_aDataSeq = aData; } -// ================================================================================ - Sequence< OUString > DataSource::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); @@ -72,8 +69,6 @@ Sequence< OUString > DataSource::getSupportedServiceNames_Static() return aServices; } -// ================================================================================ - APPHELPER_XSERVICEINFO_IMPL( DataSource, lcl_aServiceName ); } // namespace chart diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index fab7b55011b8..4c9690fc6054 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DataSourceHelper.hxx" #include "macros.hxx" #include "ChartModelHelper.hxx" @@ -37,10 +36,8 @@ #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -517,8 +514,6 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference< return ContainerHelper::ContainerToSequence( aResult ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 1356237d5515..908ede1aa137 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -1350,7 +1350,6 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( else nNewSeriesIndex++; - if( nNewSeriesIndex >= 0 && nNewSeriesIndex < aSeriesList.getLength() ) { //move series in the same charttype @@ -1439,7 +1438,6 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed( } } // anonymous namespace - bool DiagramHelper::isSeriesMoveable( const Reference< XDiagram >& xDiagram, const Reference< XDataSeries >& xGivenDataSeries, @@ -1454,7 +1452,6 @@ bool DiagramHelper::isSeriesMoveable( return bIsMoveable; } - bool DiagramHelper::moveSeries( const Reference< XDiagram >& xDiagram, const Reference< XDataSeries >& xGivenDataSeries, bool bForward ) { bool bMoved = false; diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 14c88fbbb502..3e305b94506a 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -457,8 +457,6 @@ void SAL_CALL ErrorBar::setParent( m_xParent.set( Parent ); } -// ================================================================================ - uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() { uno::Sequence< OUString > aServices( 2 ); diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 949e18990ade..5c2b9aa48a5f 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ExplicitCategoriesProvider.hxx" #include "DiagramHelper.hxx" #include "ChartTypeHelper.hxx" @@ -33,10 +32,8 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -44,7 +41,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::std::vector; - ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2::XCoordinateSystem >& xCooSysModel , const uno::Reference< frame::XModel >& xChartModel ) : m_bDirty(true) @@ -533,7 +529,6 @@ void ExplicitCategoriesProvider::init() } } - Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories() { if( !m_bIsExplicitCategoriesInited ) @@ -597,8 +592,6 @@ const std::vector< DatePlusIndex >& ExplicitCategoriesProvider::getDateCategori return m_aDateCategories; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index c76138ac809f..876067587211 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; - namespace chart { @@ -131,7 +130,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul return RegressionCurveCalculator::getCurveValues( min, max, nPointCount, xScalingX, xScalingY, bMaySkipPointsInCalculation ); } - OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation( const uno::Reference< util::XNumberFormatter >& xNumFormatter, ::sal_Int32 nNumberFormatKey ) const diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index f70332535489..668c2ef4de4b 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -137,7 +137,6 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( Property( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, @@ -174,7 +173,6 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun: | beans::PropertyAttribute::MAYBEDEFAULT )); } - void lcl_AddDefaultsToMap_without_BitmapProperties( ::chart::tPropertyValueMap & rOutMap ) { @@ -208,7 +206,6 @@ void FillProperties::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { // Fill Properties see service drawing::FillProperties - // --------------- lcl_AddPropertiesToVector_without_BitmapProperties( rOutProperties ); lcl_AddPropertiesToVector_only_BitmapProperties( rOutProperties ); } diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index f3a26442954c..36affff8b6c8 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FormattedStringHelper.hxx" #include "macros.hxx" #include "PropertyHelper.hxx" #include <com/sun/star/chart2/FormattedString.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -61,8 +58,6 @@ Sequence< Reference< chart2::XFormattedString2 > > return Sequence< Reference< XFormattedString2 > >( & xFormStr, 1 ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 27632e1d070d..33b850ea90e4 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -192,7 +192,6 @@ void ImplOPropertySet::cloneInterfaceProperties() lcl_replaceInterfacePropertiesByClones()); } - } // namespace impl } // namespace chart diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 61dfaa96598f..66424a9a0f7a 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "InternalData.hxx" #include "ResId.hxx" #include "Strings.hrc" @@ -34,7 +33,6 @@ using namespace ::std; namespace chart { -// ---------------------------------------- namespace { struct lcl_NumberedStringGenerator @@ -70,7 +68,6 @@ template< typename T > } } // anonymous namespace -// ---------------------------------------- InternalData::InternalData() : m_nColumnCount( 0 ) diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 2def119a8956..8168c266db91 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/math.hxx> #include <valarray> @@ -56,8 +55,6 @@ using ::com::sun::star::uno::Sequence; namespace chart { -// ================================================================================ - namespace { @@ -224,7 +221,6 @@ private: sal_Int32 m_nLevel; }; - struct lcl_setAnyAtLevel : public ::std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > > { public: @@ -309,8 +305,6 @@ private: } // anonymous namespace -// ================================================================================ - InternalDataProvider::InternalDataProvider( const Reference< uno::XComponentContext > & /*_xContext*/) : m_bDataInColumns( true ) {} @@ -1092,7 +1086,6 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere lcl_addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); } - // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, @@ -1464,9 +1457,6 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() return Reference< util::XCloneable >( new InternalDataProvider( *this )); } - -// ================================================================================ - Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); @@ -1474,8 +1464,6 @@ Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static() return aServices; } -// ================================================================================ - APPHELPER_XSERVICEINFO_IMPL( InternalDataProvider, lcl_aServiceName ); } // namespace chart diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 8b8785d5d353..68df3c83520c 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LabeledDataSequence.hxx" #include "ModifyListenerHelper.hxx" #include "macros.hxx" @@ -150,8 +149,6 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } } -// ================================================================================ - Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); @@ -163,8 +160,6 @@ Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() APPHELPER_XSERVICEINFO_IMPL( LabeledDataSequence, OUString("com.sun.star.comp.chart2.LabeledDataSequence") ) -// ================================================================================ - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index f636dc0e3400..9ee10499fe0a 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -29,11 +29,8 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. - Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::XModel >& xModel , const uno::Reference< uno::XComponentContext >& xContext ) @@ -126,8 +123,6 @@ bool LegendHelper::hasLegend( const uno::Reference< chart2::XDiagram > & xDiagra return bReturn; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 6c01913ce9d0..2562f56f2c20 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; namespace apphelper { -//-------------------------- LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable ) : m_aListenerContainer( m_aAccessMutex ) @@ -163,8 +162,6 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert ) //--release all resources and references after calling this method successful } -//----------------------------------------------------------------- - CloseableLifeTimeManager::CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable , ::com::sun::star::lang::XComponent* pComponent , sal_Bool bLongLastingCallsCancelable ) @@ -217,7 +214,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) impl_registerApiCall(sal_False); } - //------------------------------------------------ //no mutex is acquired //only remove listener calls will be worked on until end of tryclose @@ -435,8 +431,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) return sal_True; } -//-------------------------- - sal_Bool LifeTimeGuard ::startApiCall(sal_Bool bLongLastingCall) { diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index a965fc3039d8..b9eb6199d517 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -35,7 +35,6 @@ void LinePropertiesHelper::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { // Line Properties see service drawing::LineProperties - // --------------- rOutProperties.push_back( Property( "LineStyle", PROP_LINE_STYLE, diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index af56a64e19c6..e3b5ab4d80e5 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; - namespace chart { diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 10bebac3c077..e94861456e05 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; - namespace chart { @@ -94,7 +93,6 @@ double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ return m_fMeanValue; } - uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculator::getCurveValues( double min, double max, ::sal_Int32 nPointCount, const uno::Reference< chart2::XScaling >& xScalingX, diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index b777d7fb96ee..2a53343003af 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; namespace apphelper { - const short FLAG_DEPRECATED =1; const short FLAG_MODEL =2; @@ -71,7 +70,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< m_aModelProperties.realloc(rMediaDescriptor.getLength()); sal_Int32 nModelCount = 0; - //read given rMediaDescriptor and store in internal structures: for( sal_Int32 i= rMediaDescriptor.getLength();i--;) { diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index a5ec03d23085..15834b891522 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ModifyListenerCallBack.hxx" #include "MutexContainer.hxx" #include <cppuhelper/compbase1.hxx> @@ -55,7 +54,6 @@ private: Reference< util::XModifyBroadcaster > m_xBroadcaster;//broadcaster to listen at }; - ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link& rCallBack ) : ModifyListenerCallBack_Base( m_aMutex ) , m_aLink( rCallBack ) @@ -98,8 +96,6 @@ void ModifyListenerCallBack_impl::stopListening() } } -//------------------------------------------- - ModifyListenerCallBack::ModifyListenerCallBack( const Link& rCallBack ) : pModifyListener_impl( new ModifyListenerCallBack_impl(rCallBack) ) , m_xModifyListener( pModifyListener_impl ) diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 359017940244..36c62ee7f9ff 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ModifyListenerHelper.hxx" #include "WeakListenerAdapter.hxx" #include "macros.hxx" @@ -85,8 +84,6 @@ private: } // anonymous namespace -// ================================================================================ - namespace chart { namespace ModifyListenerHelper diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index 6ec2757e3a34..10eeaa5f3104 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; - namespace chart { diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 130d277329f6..0a49fb2e6d4d 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "NameContainer.hxx" #include <com/sun/star/uno/Any.hxx> @@ -26,11 +25,8 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; - -//............................................................................. namespace chart { -//............................................................................. uno::Reference< container::XNameContainer > createNameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ) @@ -88,10 +84,6 @@ Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() return aSNS; } -//----------------------------------------------------------------- -//----------------------------------------------------------------- -//----------------------------------------------------------------- - // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) @@ -101,8 +93,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rEl m_aMap.insert( tContentMap::value_type( rName, rElement )); } - - void SAL_CALL NameContainer::removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -169,8 +159,6 @@ uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() return uno::Reference< util::XCloneable >( new NameContainer( *this )); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 9a7db0691e5d..150153283b40 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -28,10 +28,8 @@ #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/util/DateTime.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; FixedNumberFormatter::FixedNumberFormatter( @@ -52,10 +50,6 @@ OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLa m_nNumberFormatKey, fValue, rLabelColor, rbColorChanged ); } -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- -//----------------------------------------------------------------------- - NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNumberFormatsSupplier >& xSupplier ) : m_xNumberFormatsSupplier(xSupplier) , m_pNumberFormatter(NULL) @@ -141,8 +135,6 @@ OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, return aText; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index f244f955a894..db4efffd5057 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -183,7 +183,6 @@ Any SAL_CALL return GetDefaultValue( rPH.getHandleByName( aPropertyName ) ); } - // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the @@ -427,7 +426,6 @@ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& firePropertyChangeEvent(); } - } // namespace property /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 2358057f95c5..9c09aab49727 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ObjectIdentifier.hxx" #include "macros.hxx" #include "TitleHelper.hxx" @@ -39,10 +38,8 @@ #include <rtl/ustrbuf.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -340,7 +337,6 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( OUString aDragMethodServiceName; OUString aDragParameterString; - try { //title @@ -1435,8 +1431,6 @@ Any ObjectIdentifier::getAny() const return aAny; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index ef53b5dc4a55..31b42d8b2f1e 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; - namespace chart { diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 6bbd33975523..96990b881bac 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -212,7 +212,6 @@ OUString addGradientUniqueNameToTable( return OUString(); } - OUString addTransparencyGradientUniqueNameToTable( const Any & rValue, const Reference< lang::XMultiServiceFactory > & xFact, @@ -264,8 +263,6 @@ OUString addBitmapUniqueNameToTable( return OUString(); } -// ---------------------------------------- - void setPropertyValueAny( tPropertyValueMap & rOutMap, tPropertyValueMapKey key, const uno::Any & rAny ) { tPropertyValueMap::iterator aIt( rOutMap.find( key )); @@ -293,7 +290,6 @@ template<> setPropertyValueDefaultAny( rOutMap, key, rAny ); } - void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ) { setPropertyValueDefault( rOutMap, key, uno::Any()); diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 1d1a1d22edf8..bbe879f77ca5 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RangeHighlighter.hxx" #include "WeakListenerAdapter.hxx" #include "ChartModelHelper.hxx" @@ -384,7 +383,6 @@ void RangeHighlighter::stopListening() } } - // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component void SAL_CALL RangeHighlighter::disposing() diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 9e41285f2afc..5e4fbb88e685 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ReferenceSizeProvider.hxx" #include "RelativeSizeHelper.hxx" #include "ChartModelHelper.hxx" @@ -38,8 +37,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -// ================================================================================ - namespace chart { @@ -323,7 +320,6 @@ void ReferenceSizeProvider::toggleAutoResizeState() setAutoResizeState( m_bUseAutoScale ? AUTO_RESIZE_NO : AUTO_RESIZE_YES ); } - /** sets the auto-resize at all objects that support this feature for text. eNewState must be either AUTO_RESIZE_YES or AUTO_RESIZE_NO */ diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx index 4cf49663e678..462555719264 100644 --- a/chart2/source/tools/RegressionCalculationHelper.hxx +++ b/chart2/source/tools/RegressionCalculationHelper.hxx @@ -66,7 +66,6 @@ tDoubleVectorPair return aResult; } - class isValid : public ::std::binary_function< double, double, bool > { public: diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 771cf763f974..d05fd44d6bfc 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RegressionCurveCalculator.hxx" #include "RegressionCalculationHelper.hxx" #include "servicenames_coosystems.hxx" @@ -164,7 +163,6 @@ OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( return ImplGetRepresentation( xNumFormatter, nNumberFormatKey ); } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index a3b3cc806ea1..d93fb6489206 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -80,10 +80,8 @@ OUString lcl_getServiceNameForType( ::chart::RegressionCurveHelper::tRegressionT } } // anonymous namespace -//............................................................................. namespace chart { -//............................................................................. Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine( const Reference< XComponentContext > & xContext ) @@ -127,8 +125,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ return xResult; } -// ------------------------------------------------------------ - Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( OUString aServiceName ) { @@ -240,8 +236,6 @@ void RegressionCurveHelper::initializeCurveCalculator( (nAxisType == AxisType::REALNUMBER) ); } -// ---------------------------------------- - bool RegressionCurveHelper::hasMeanValueLine( const uno::Reference< XRegressionCurveContainer > & xRegCnt ) { @@ -708,8 +702,6 @@ bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCur return bHasEquation; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index c98d59226289..fb182c0a3d6e 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -313,8 +313,6 @@ void RegressionCurveModel::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// ================================================================================ - // ____ OPropertySet ____ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const throw(beans::UnknownPropertyException) @@ -338,20 +336,14 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getProp return *StaticRegressionCurveInfo::get(); } -// ================================================================================ - // needed by MSC compiler using impl::RegressionCurveModel_Base; IMPLEMENT_FORWARD_XINTERFACE2( RegressionCurveModel, RegressionCurveModel_Base, OPropertySet ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( RegressionCurveModel, RegressionCurveModel_Base, OPropertySet ) - - // implementations -// -------------------------------------------------------------------------------- - MeanValueRegressionCurve::MeanValueRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_MEAN_VALUE ) @@ -378,8 +370,6 @@ uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClon return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } -// -------------------------------------------------------------------------------- - LinearRegressionCurve::LinearRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_LINEAR ) @@ -406,8 +396,6 @@ uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } -// -------------------------------------------------------------------------------- - LogarithmicRegressionCurve::LogarithmicRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_LOGARITHM ) @@ -434,8 +422,6 @@ uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createCl return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } -// -------------------------------------------------------------------------------- - ExponentialRegressionCurve::ExponentialRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_EXPONENTIAL ) @@ -462,8 +448,6 @@ uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createCl return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } -// -------------------------------------------------------------------------------- - PotentialRegressionCurve::PotentialRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_POWER ) @@ -490,7 +474,6 @@ uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClon return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } - PolynomialRegressionCurve::PolynomialRegressionCurve( const uno::Reference< uno::XComponentContext > & xContext ) : RegressionCurveModel( xContext, RegressionCurveModel::CURVE_TYPE_POLYNOMIAL ) @@ -543,7 +526,6 @@ uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::create return uno::Reference< util::XCloneable >( new MovingAverageRegressionCurve( *this )); } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index e8bdfe9720d8..2093be4c65b1 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RegressionEquation.hxx" #include "LinePropertiesHelper.hxx" #include "FillProperties.hxx" @@ -42,8 +41,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; using ::osl::MutexGuard; -// ____________________________________________________________ - namespace { @@ -178,8 +175,6 @@ struct StaticRegressionEquationInfo : public rtl::StaticAggregate< uno::Referenc } // anonymous namespace -// ____________________________________________________________ - namespace chart { @@ -200,7 +195,6 @@ RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) : RegressionEquation::~RegressionEquation() {} - // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() throw (uno::RuntimeException) @@ -285,8 +279,6 @@ void RegressionEquation::fireModifyEvent() m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this ))); } -// -------------------------------------------------------------------------------- - // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() throw (uno::RuntimeException) @@ -307,8 +299,6 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< fireModifyEvent(); } -// ================================================================================ - uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static() { const sal_Int32 nNumServices( 5 ); diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index f3afbb6766cd..958504f484c8 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -78,7 +78,6 @@ protected: getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index 19506047a876..f195c837a841 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RelativePositionHelper.hxx" #include <rtl/math.hxx> @@ -120,7 +119,6 @@ chart2::RelativePosition RelativePositionHelper::getReanchoredPosition( return aResult; } - awt::Point RelativePositionHelper::getUpperLeftCornerOfAnchoredObject( awt::Point aPoint , awt::Size aObjectSize diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index ed4c80e41c8f..72a7b21ba21d 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ResId.hxx" #include "ResourceManager.hxx" #include <tools/string.hxx> diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index db7ea9d18dda..5016e14bef63 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ResourceManager.hxx" #include <tools/resmgr.hxx> diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 5dc408359749..7b710ceeeb7a 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -31,10 +31,8 @@ static const OUString lcl_aServiceName_Power( "com.sun.star.chart2.PowerScaling" } -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -89,8 +87,6 @@ uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LogarithmicScaling, lcl_aServiceName_Logarithmic ) -// ---------------------------------------- - ExponentialScaling::ExponentialScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fBase( 10.0 ), m_xContext( xContext ) @@ -140,8 +136,6 @@ uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ExponentialScaling, lcl_aServiceName_Exponential ) -// ---------------------------------------- - LinearScaling::LinearScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fSlope( 1.0 ), m_fOffset( 0.0 ), @@ -193,8 +187,6 @@ uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LinearScaling, lcl_aServiceName_Linear ) -// ---------------------------------------- - PowerScaling::PowerScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fExponent( 10.0 ), m_xContext( xContext ) @@ -244,8 +236,6 @@ uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PowerScaling, lcl_aServiceName_Power ) -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 8e86976501e8..3ab714c0cc26 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "SceneProperties.hxx" #include "macros.hxx" #include "ChartTypeHelper.hxx" @@ -123,9 +122,7 @@ void SceneProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::MAYBEDEFAULT )); - // Light Sources - // ------------- // light source 1 rOutProperties.push_back( Property( "D3DSceneLightColor1", @@ -337,7 +334,6 @@ void SceneProperties::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_PERSPECTIVE, drawing::ProjectionMode_PERSPECTIVE ); // Light Sources - // ------------- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_1, false ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_2, true ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_ON_3, false ); diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 32406a57770b..47502c826e43 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ThreeDHelper.hxx" #include "macros.hxx" #include "DiagramHelper.hxx" @@ -31,10 +30,8 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -295,7 +292,6 @@ void lcl_setSimpleScheme( drawing::ShadeMode& rShadeMode } //end anonymous namespace - drawing::CameraGeometry ThreeDHelper::getDefaultCameraGeometry( bool bPie ) { // ViewReferencePoint (Point on the View plane) @@ -1498,8 +1494,6 @@ CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBott return eRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index a8a0b0074990..d55837e81ba0 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -26,10 +26,8 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <rtl/ustrbuf.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -53,7 +51,6 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram( nTitleIndex = bIsVertical ? TitleHelper::Y_AXIS_TITLE : TitleHelper::X_AXIS_TITLE; } - switch( nTitleIndex ) { case TitleHelper::SUB_TITLE: @@ -358,8 +355,6 @@ bool TitleHelper::getTitleType( eTitleType& rType return false; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx index 15fee52d0ef4..f8cb799897ae 100644 --- a/chart2/source/tools/TrueGuard.cxx +++ b/chart2/source/tools/TrueGuard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TrueGuard.hxx" namespace chart diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 33c99e554f2c..aff3f2a13093 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UncachedDataSequence.hxx" #include "macros.hxx" #include "PropertyHelper.hxx" @@ -51,8 +50,6 @@ enum }; } // anonymous namespace - -// ____________________ namespace chart { @@ -122,8 +119,6 @@ void UncachedDataSequence::registerProperties() ::getCppuType( & m_aXMLRange ) ); } -// ================================================================================ - Sequence< OUString > UncachedDataSequence::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 4 ); @@ -145,14 +140,12 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS } // ____ ::comphelper::OPropertySetHelper ____ -// __________________________________________ ::cppu::IPropertyArrayHelper& UncachedDataSequence::getInfoHelper() { return *getArrayHelper(); } // ____ ::comphelper::OPropertyArrayHelper ____ -// ____________________________________________ ::cppu::IPropertyArrayHelper* UncachedDataSequence::createArrayHelper() const { Sequence< beans::Property > aProps; @@ -165,8 +158,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, lcl_aServiceName ) -// ================================================================================ - // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() throw (uno::RuntimeException) @@ -215,7 +206,6 @@ OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() return getName(); } - Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) throw (uno::RuntimeException) { @@ -294,8 +284,6 @@ void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) fireModifyEvent(); } - - Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() throw (uno::RuntimeException) { @@ -303,7 +291,6 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() return Reference< util::XCloneable >( pNewSeq ); } - // ____ XModifiable ____ ::sal_Bool SAL_CALL UncachedDataSequence::isModified() throw (uno::RuntimeException) diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index c145cb48edfe..9dc9093060e5 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -51,7 +51,6 @@ void UserDefinedProperties::AddPropertiesToVector( beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); // UserDefinedAttributesSupplier - // ---------------------------- rOutProperties.push_back( Property( "UserDefinedAttributes", PROP_XML_USERDEF, diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 0c8b9736c6aa..fc5429337d80 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WeakListenerAdapter.hxx" using namespace ::com::sun::star; @@ -44,8 +43,6 @@ void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEve xModListener->modified( aEvent ); } -// -------------------------------------------------------------------------------- - WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter( const Reference< view::XSelectionChangeListener > & xListener ) : WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener ) diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 6304660930e2..3d3f02f932e5 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedDefaultProperty.hxx" #include "macros.hxx" diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index 7ba667b355bf..edfbdafbf8e7 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedDirectStateProperty.hxx" #include "macros.hxx" diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 101fd03bd3fe..f01a70692323 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedIgnoreProperty.hxx" #include "macros.hxx" #include <com/sun/star/awt/Gradient.hpp> @@ -33,11 +32,8 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. - WrappedIgnoreProperty::WrappedIgnoreProperty( const OUString& rOuterName, const Any& rDefaultValue ) : WrappedProperty( rOuterName, OUString() ) @@ -127,8 +123,6 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::s rList.push_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::makeAny( drawing::BitmapMode_REPEAT ) ) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index dd4d6e93a5ec..4a8f94b7912b 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedProperty.hxx" #include "macros.hxx" #include <com/sun/star/drawing/LineStyle.hpp> @@ -26,11 +25,8 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; - -//............................................................................. namespace chart { -//............................................................................. WrappedProperty::WrappedProperty( const OUString& rOuterName, const OUString& rInnerName) : m_aOuterName( rOuterName ) @@ -133,8 +129,6 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans:: return aState; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 07a0cdfc6147..b967bd128f69 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "WrappedPropertySet.hxx" #include "macros.hxx" // header for define DELETEZ #include <tools/solar.h> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -422,9 +419,6 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence return aRetSeq; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - ::cppu::IPropertyArrayHelper& WrappedPropertySet::getInfoHelper() { ::cppu::OPropertyArrayHelper* p = m_pPropertyArrayHelper; @@ -446,8 +440,6 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence return *m_pPropertyArrayHelper; } -//----------------------------------------------------------------------------- - tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() { tWrappedPropertyMap* p = m_pWrappedPropertyMap; @@ -494,8 +486,6 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap() return *m_pWrappedPropertyMap; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 387bfd0fa4c1..1f11eedb96a1 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLRangeHelper.hxx" #include <unotools/charclass.hxx> #include <rtl/ustrbuf.hxx> @@ -25,9 +24,6 @@ #include <algorithm> #include <functional> - -// ================================================================================ - namespace { /** unary function that escapes backslashes and single quotes in a sal_Unicode @@ -53,8 +49,6 @@ private: OUStringBuffer & m_aResultBuffer; }; -// ---------------------------------------- - /** unary function that removes backslash escapes in a sal_Unicode array (which you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR @@ -75,8 +69,6 @@ private: OUStringBuffer & m_aResultBuffer; }; -// ---------------------------------------- - void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { OSL_ASSERT(output != 0); @@ -291,8 +283,6 @@ bool lcl_getCellRangeAddressFromXMLString( } // anonymous namespace -// ================================================================================ - namespace chart { namespace XMLRangeHelper diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 80d52057c68c..42c38d6495b3 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -189,6 +189,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_chart2_tools ); } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx index 9a8da15cdcd6..5e5267de5b9e 100644 --- a/chart2/source/view/axes/DateHelper.cxx +++ b/chart2/source/view/axes/DateHelper.cxx @@ -22,10 +22,8 @@ #include <rtl/math.hxx> #include <com/sun/star/chart/TimeUnit.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; bool DateHelper::IsInSameYear( const Date& rD1, const Date& rD2 ) @@ -102,8 +100,6 @@ double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, lon return aDate - rNullDate; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 934a01f85e60..685a5690c48a 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -31,10 +31,8 @@ static const OUString lcl_aServiceName_InverseDateScaling( "com.sun.star.chart2. static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic } -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::chart::TimeUnit::DAY; @@ -113,8 +111,6 @@ uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( DateScaling, lcl_aServiceName_DateScaling ) -// ---------------------------------------- - InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted ) : m_aNullDate( rNullDate ) , m_nTimeUnit( nTimeUnit ) @@ -194,8 +190,6 @@ uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, lcl_aServiceName_InverseDateScaling ) -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 1ef6b448ca55..7f99f805626d 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -26,12 +26,9 @@ #include <cppuhelper/implbase3.hxx> #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -99,9 +96,7 @@ private: const bool m_bShifted; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index e9b289f4d8d6..8d8e7a872d8c 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "MinimumAndMaximumSupplier.hxx" #include <com/sun/star/chart/TimeUnit.hpp> @@ -25,10 +24,8 @@ #include <rtl/math.hxx> #include <com/sun/star/awt/Size.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; MergedMinimumAndMaximumSupplier::MergedMinimumAndMaximumSupplier() @@ -207,8 +204,6 @@ void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( long nTimeResolu (*aIt)->setTimeResolutionOnXAxis( nTimeResolution, rNullDate ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 5cc8d50e8001..6802a0bb0843 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -28,10 +28,8 @@ #include <rtl/math.hxx> #include <limits> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::chart::TimeUnit::DAY; @@ -60,9 +58,6 @@ void lcl_ensureMaximumSubIncrementCount( sal_Int32& rnSubIntervalCount ) }//end anonymous namespace - -//............................................................................. - ExplicitScaleData::ExplicitScaleData() : Minimum(0.0) , Maximum(10.0) @@ -82,7 +77,6 @@ ExplicitSubIncrement::ExplicitSubIncrement() { } - ExplicitIncrementData::ExplicitIncrementData() : MajorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) , MinorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) @@ -93,8 +87,6 @@ ExplicitIncrementData::ExplicitIncrementData() { } -//............................................................................. - ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale, const Date& rNullDate ) : m_aSourceScale( rSourceScale ) , m_fValueMinimum( 0.0 ) @@ -202,7 +194,6 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement( rExplicitScale.Maximum = m_fValueMaximum; } - //--------------------------------------------------------------- //fill explicit increment rExplicitScale.ShiftedCategoryPosition = m_aSourceScale.ShiftedCategoryPosition; @@ -247,8 +238,6 @@ Date ScaleAutomatism::getNullDate() const return m_aNullDate; } -// private -------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -284,7 +273,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( rExplicitIncrement.Distance = ::rtl::math::approxCeil( (fMaximumCeil - fMinimumFloor) / MAXIMUM_MANUAL_INCREMENT_COUNT ); } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -307,8 +295,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( } } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -548,7 +534,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( ::std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum ); } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -571,8 +556,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( } } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -641,7 +624,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( if( nMaxMainIncrementCount > 1 ) nMaxMainIncrementCount--; - //choose major time interval: long nDayCount = (aMaxDate-aMinDate); long nMainIncrementCount = 1; @@ -766,8 +748,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -996,7 +976,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( bAutoDistance = true; } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -1019,8 +998,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx index b82f0f5645e8..3c82ca2505f1 100644 --- a/chart2/source/view/axes/TickmarkProperties.hxx +++ b/chart2/source/view/axes/TickmarkProperties.hxx @@ -22,12 +22,9 @@ #include "VLineProperties.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -39,9 +36,7 @@ struct TickmarkProperties VLineProperties aLineProperties; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 296fe0bdb058..2973cdc911d9 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -24,10 +24,8 @@ #include <rtl/math.hxx> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -89,10 +87,6 @@ TickInfo* PureTickIter::nextInfo() return 0; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - TickFactory::TickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) @@ -141,9 +135,7 @@ void TickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > > EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos ); } -//----------------------------------------------------------------------------- // ___TickFactory_2D___ -//----------------------------------------------------------------------------- TickFactory_2D::TickFactory_2D( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement //, double fStrech_SceneToScreen, double fOffset_SceneToScreen ) @@ -317,8 +309,6 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 79c831480606..ea61a948b664 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -29,10 +29,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. struct TickInfo { @@ -147,9 +145,7 @@ private: //member double m_fOffset_LogicToScreen; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx index e4e7e55dc9c8..3b51061e6240 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.cxx +++ b/chart2/source/view/axes/Tickmarks_Dates.cxx @@ -22,10 +22,8 @@ #include <rtl/math.hxx> #include "DateHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -155,8 +153,6 @@ void DateTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo getAllTicks( rAllTickInfos, true ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx index 567664c7bd0a..775c7a6947c7 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.hxx +++ b/chart2/source/view/axes/Tickmarks_Dates.hxx @@ -21,10 +21,8 @@ #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. class DateTickFactory { @@ -51,9 +49,7 @@ private: //member double m_fScaledVisibleMax; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index ce6b834c4508..5a464c3d87f6 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -24,10 +24,8 @@ #include <limits> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -182,7 +180,6 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno:: addSubTicks( nDepth+1, rParentTicks ); } - sal_Int32 EquidistantTickFactory::getMaxTickCount( sal_Int32 nDepth ) const { //return the maximum amount of ticks @@ -420,10 +417,6 @@ void EquidistantTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< T EquidistantTickFactory( m_rScale, aShiftedIncrement ).getAllTicks(rAllTickInfos); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) @@ -638,8 +631,6 @@ TickInfo* EquidistantTickIter::nextInfo() return NULL; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index f171b2ff2d1d..464aae682279 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -21,10 +21,8 @@ #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. class EquidistantTickIter : public TickIter { @@ -56,7 +54,6 @@ private: //methods bool gotoFirst(); bool gotoNext(); - double getTickValue(sal_Int32 nDepth, sal_Int32 nIndex) const { if(m_pSimpleTicks) @@ -140,9 +137,7 @@ private: //member double m_fOuterMajorTickBorderMax_Scaled; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 48b4f6698004..0bb4af907087 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VAxisBase.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" @@ -27,10 +26,8 @@ #include <memory> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -174,7 +171,6 @@ bool VAxisBase::prepareShapeCreation() if( m_bReCreateAllTickInfos ) { - //----------------------------------------- //create all scaled tickmark values removeTextShapesFromTicks(); @@ -185,7 +181,6 @@ bool VAxisBase::prepareShapeCreation() if( m_xGroupShape_Shapes.is() ) return true; - //----------------------------------------- //create named group shape m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); @@ -248,8 +243,6 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index c037ff5cf67b..912da21455b7 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -24,12 +24,9 @@ #include "Tickmarks.hxx" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -63,8 +60,6 @@ public: void setExrtaLinePositionAtOtherAxis( const double& fCrossingAt ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- protected: //methods sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels ); void removeTextShapesFromTicks(); @@ -96,9 +91,7 @@ protected: //member sal_Int32 m_nMaximumTextHeightSoFar; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index 088882cb8d7f..507deb431ce6 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VAxisOrGridBase.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -71,8 +68,6 @@ TickFactory* VAxisOrGridBase::createTickFactory() return new TickFactory( m_aScale, m_aIncrement ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 6827905fa487..ed98304cf5d0 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -28,12 +28,9 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <basegfx/matrix/b3dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- class TickFactory; class VAxisOrGridBase : public PlotterBase @@ -51,8 +48,6 @@ public: virtual TickFactory* createTickFactory(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- protected: //member ExplicitScaleData m_aScale; ExplicitIncrementData m_aIncrement; @@ -65,9 +60,7 @@ protected: //member CuboidPlanePosition m_eBottomPos; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 3a7c866fbfb8..8cf540b057b9 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -30,10 +30,8 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/text/WritingMode2.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -156,8 +154,6 @@ TickmarkProperties AxisProperties::getBiggestTickmarkProperties() return aTickmarkProperties; } -//-------------------------------------------------------------------------- - AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , ExplicitCategoriesProvider* pExplicitCategoriesProvider ) : m_xAxisModel(xAxisModel) @@ -375,8 +371,6 @@ void AxisProperties::init( bool bCartesian ) } } -//----------------------------------------------------------------------------- - AxisLabelProperties::AxisLabelProperties() : m_aFontReferenceSize( ChartModelHelper::getDefaultPageSize() ) , m_aMaximumSpaceForLabels( 0 , 0, m_aFontReferenceSize.Width, m_aFontReferenceSize.Height ) @@ -435,8 +429,6 @@ bool AxisLabelProperties::getIsStaggered() const return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index eda2862bb2ee..38291055043c 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -38,12 +38,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -153,9 +150,7 @@ protected: VLineProperties makeLinePropertiesForDepth( sal_Int32 nDepth ) const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 6d0e7b6ba68d..b022fdf2fa39 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -49,10 +49,8 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -61,10 +59,6 @@ using ::com::sun::star::uno::Reference; using ::basegfx::B2DPolygon; using ::basegfx::B2DPolyPolygon; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - VCartesianAxis::VCartesianAxis( const AxisProperties& rAxisProperties , const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount @@ -664,7 +658,6 @@ bool VCartesianAxis::createTextShapes( TickInfo* pPREPreviousVisibleTickInfo = NULL; TickInfo* pLastVisibleNeighbourTickInfo = NULL; - //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence aPropNames; tAnySequence aPropValues; @@ -683,7 +676,6 @@ bool VCartesianAxis::createTextShapes( *pColorAny >>= nColor; uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); - //------------------------------------------------ sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() @@ -1401,7 +1393,6 @@ void VCartesianAxis::createLabels() if( !prepareShapeCreation() ) return; - //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1410,10 +1401,8 @@ void VCartesianAxis::createLabels() if( !pTickFactory2D ) return; - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos pTickFactory2D->updateScreenValues( m_aAllTickInfos ); - //----------------------------------------- //'hide' tickmarks with identical screen values in aAllTickInfos hideIdenticalScreenValues( m_aAllTickInfos ); @@ -1458,7 +1447,6 @@ void VCartesianAxis::createMaximumLabels() if( !prepareShapeCreation() ) return; - //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1467,7 +1455,6 @@ void VCartesianAxis::createMaximumLabels() if( !pTickFactory2D ) return; - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos pTickFactory2D->updateScreenValues( m_aAllTickInfos ); @@ -1496,7 +1483,6 @@ void VCartesianAxis::createMaximumLabels() void VCartesianAxis::updatePositions() { - //----------------------------------------- //update positions of labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1505,7 +1491,6 @@ void VCartesianAxis::updatePositions() if( !pTickFactory2D ) return; - //----------------------------------------- //update positions of all existing text shapes pTickFactory2D->updateScreenValues( m_aAllTickInfos ); @@ -1608,11 +1593,9 @@ void VCartesianAxis::createShapes() if( !pTickFactory2D ) return; - //----------------------------------------- //create line shapes if(2==m_nDimension) { - //----------------------------------------- //create extra long ticks to separate complex categories (create them only there where the labels are) if( isComplexCategoryAxis() ) { @@ -1648,7 +1631,6 @@ void VCartesianAxis::createShapes() createTickMarkLineShapes( *aDepthIter, aTickmarkPropertiesList[nDepth], *pTickFactory2D, true /*bOnlyAtLabels*/ ); } } - //----------------------------------------- //create normal ticks for major and minor intervals { ::std::vector< ::std::vector< TickInfo > > aUnshiftedTickInfos; @@ -1669,7 +1651,6 @@ void VCartesianAxis::createShapes() for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; ++aDepthIter, nDepth++ ) createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickFactory2D, false /*bOnlyAtLabels*/ ); } - //----------------------------------------- //create axis main lines //it serves also as the handle shape for the axis selection { @@ -1681,7 +1662,6 @@ void VCartesianAxis::createShapes() //because of this name this line will be used for marking the axis m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } - //----------------------------------------- //create an additional line at NULL if( !AxisHelper::isAxisPositioningEnabled() ) { @@ -1700,8 +1680,6 @@ void VCartesianAxis::createShapes() //createLabels(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index aaa17183e805..0d619e4bd1b5 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -24,16 +24,12 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. class VCartesianAxis : public VAxisBase { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: VCartesianAxis( const AxisProperties& rAxisProperties , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier @@ -57,16 +53,13 @@ public: TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); sal_Int32 getTextLevelCount() const; - //------------------------------------------------------------------------- virtual TickFactory* createTickFactory(); - //------------------------------------------------------------------------- double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; bool getLogicValueWhereExtraLineCrossesOtherAxis( double& fCrossesOtherAxis) const; void get2DAxisMainLine( ::basegfx::B2DVector& rStart, ::basegfx::B2DVector& rEnd, double fCrossesOtherAxis ); - //------------------------------------------------------------------------- //Layout interface for cartesian axes: //the returned value describes the minimum size that is necessary @@ -83,10 +76,6 @@ public: //(this is e.g. true if the parameters allow for labels parallel to the axis.) // sal_bool canQuicklyCalculateMinimumOrthogonalSize(); - - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - struct ScreenPosAndLogicPos { double fLogicX; @@ -119,9 +108,7 @@ protected: //methods ScreenPosAndLogicPos getScreenPosAndLogicPos( double fLogicX, double fLogicY, double fLogicZ ) const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index c79a1a16b3ad..6c63d09bfa78 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -28,16 +28,12 @@ //for auto_ptr #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//............................................................................. - class TextualDataProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::chart2::data::XTextualDataSequence > @@ -62,8 +58,6 @@ private: //member uno::Sequence< OUString > m_aTextSequence; }; -//............................................................................. - VCartesianCoordinateSystem::VCartesianCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) { @@ -215,8 +209,6 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index bf753888522e..474966f6234c 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -21,12 +21,9 @@ #include "VCoordinateSystem.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VCartesianCoordinateSystem : public VCoordinateSystem @@ -50,9 +47,7 @@ private: VCartesianCoordinateSystem(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 2c7ca4b4ba48..ebff751bfb94 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -31,10 +31,8 @@ #include <vector> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -163,11 +161,6 @@ void addLine3D( drawing::PolyPolygonShape3D& rPoints, sal_Int32 nIndex AddPointToPoly( rPoints, aPoint, nIndex ); } -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- - VCartesianGrid::VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList ) : VAxisOrGridBase( nDimensionIndex, nDimensionCount ) @@ -206,26 +199,22 @@ void VCartesianGrid::createShapes() return; //somehow equal to axis tickmarks - //----------------------------------------- //create named group shape Reference< drawing::XShapes > xGroupShape_Shapes( this->createGroupShape( m_xLogicTarget, m_aCID ) ); if(!xGroupShape_Shapes.is()) return; - //----------------------------------------- ::std::vector<VLineProperties> aLinePropertiesList; fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); - //----------------------------------------- //create all scaled tickmark values boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); TickFactory& aTickFactory = *apTickFactory.get(); ::std::vector< ::std::vector< TickInfo > > aAllTickInfos; aTickFactory.getAllTicks( aAllTickInfos ); - //----------------------------------------- //create tick mark line shapes ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aAllTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aAllTickInfos.end(); @@ -233,7 +222,6 @@ void VCartesianGrid::createShapes() if(aDepthIter == aDepthEnd)//no tickmarks at all return; - sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount @@ -288,7 +276,6 @@ void VCartesianGrid::createShapes() m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); m_pShapeFactory->setShapeName( xHandleShape, "HandlesOnly" ); } - //----------------------------------------- else //if(2!=m_nDimension) { GridLinePoints aGridLinePoints( m_pPosHelper, m_nDimensionIndex, m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); @@ -320,8 +307,6 @@ void VCartesianGrid::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 7d092adccdf3..97bdbdcad6eb 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -22,20 +22,15 @@ #include "VAxisOrGridBase.hxx" #include "VLineProperties.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VCartesianGrid : public VAxisOrGridBase { -//------------------------------------------------------------------------- // public methods -//------------------------------------------------------------------------- public: VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const ::com::sun::star::uno::Sequence< @@ -57,9 +52,7 @@ private: ::com::sun::star::beans::XPropertySet > > m_aGridPropertiesList; //main grid, subgrid, subsubgrid etc }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 314d8121e4ef..521e58aab737 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -41,10 +41,8 @@ #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -587,8 +585,6 @@ sal_Int32 VCoordinateSystem::getNumberFormatKeyForAxis( xAxis, m_xCooSysModel, xNumberFormatsSupplier ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 64688b4f7907..fb89a0b9967a 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -29,10 +29,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -63,7 +61,6 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( FixedNumberFormatter aFixedNumberFormatter( m_xNumberFormatsSupplier, rAxisLabelProperties.nNumberFormatKey ); - //------------------------------------------------ //prepare text properties for multipropertyset-interface of shape tNameSequence aPropNames; tAnySequence aPropValues; @@ -80,8 +77,6 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; - //------------------------------------------------ - //TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; @@ -171,7 +166,6 @@ void VPolarAngleAxis::createLabels() if( m_aAxisProperties.m_bDisplayLabels ) { - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); @@ -205,7 +199,6 @@ void VPolarAngleAxis::createShapes() double fLogicRadius = m_pPosHelper->getOuterLogicRadius(); double fLogicZ = 1.0;//as defined - //----------------------------------------- //create axis main lines drawing::PointSequenceSequence aPoints(1); VPolarGrid::createLinePointSequence_ForAngleAxis( aPoints, m_aAllTickInfos, m_aIncrement, m_aScale, m_pPosHelper, fLogicRadius, fLogicZ ); @@ -214,13 +207,10 @@ void VPolarAngleAxis::createShapes() //because of this name this line will be used for marking the axis m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); - //----------------------------------------- //create labels createLabels(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index 080ccc96f401..086e5f706e4d 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -22,12 +22,9 @@ #include "VPolarAxis.hxx" #include "Tickmarks_Equidistant.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -53,9 +50,7 @@ private: //methods , double fLogicRadius, double fLogicZ ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index 881f0592da43..f6256931ef83 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -26,10 +26,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -68,8 +66,6 @@ sal_Bool VPolarAxis::isAnythingToDraw() return ( 2==m_nDimension && VAxisBase::isAnythingToDraw() ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index 88f6f852a9bb..552d760bb0dd 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -21,12 +21,9 @@ #include "VAxisBase.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -55,9 +52,7 @@ protected: //member ::std::vector< ExplicitIncrementData > m_aIncrements; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 4f259e0b3e45..50a8ce538633 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -23,10 +23,8 @@ #include "AxisIndexDefines.hxx" #include "AxisHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -181,8 +179,6 @@ void VPolarCoordinateSystem::createGridShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 74f9853ce540..6b96df26df4f 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -21,12 +21,9 @@ #include "VCoordinateSystem.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VPolarCoordinateSystem : public VCoordinateSystem @@ -54,9 +51,7 @@ private: VPolarCoordinateSystem(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index fb485e3623bb..ca74ceba06b8 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -31,10 +31,8 @@ #include <vector> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -230,18 +228,15 @@ void VPolarGrid::createShapes() if(!m_aGridPropertiesList.getLength()) return; - //----------------------------------------- //create all scaled tickmark values ::std::vector< ::std::vector< TickInfo > > aAngleTickInfos; ::std::vector< ::std::vector< TickInfo > > aRadiusTickInfos; getAllTickInfos( 0, aAngleTickInfos ); getAllTickInfos( 1, aRadiusTickInfos ); - //----------------------------------------- ::std::vector<VLineProperties> aLinePropertiesList; VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); - //----------------------------------------- //create tick mark line shapes if(2==m_nDimension) { @@ -252,8 +247,6 @@ void VPolarGrid::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 1f8dd68fc142..703b1b335c15 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -24,21 +24,16 @@ #include "VLineProperties.hxx" #include <com/sun/star/drawing/PointSequenceSequence.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PolarPlottingPositionHelper; class VPolarGrid : public VAxisOrGridBase { -//------------------------------------------------------------------------- // public methods -//------------------------------------------------------------------------- public: VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const ::com::sun::star::uno::Sequence< @@ -74,9 +69,7 @@ private: //member , const ::std::vector<VLineProperties>& rLinePropertiesList ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 67f2dc5715dd..0a2133ce52cf 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VPolarRadiusAxis.hxx" #include "VCartesianAxis.hxx" #include "PlottingPositionHelper.hxx" @@ -25,10 +24,8 @@ #include "Tickmarks_Equidistant.hxx" #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -158,7 +155,6 @@ void VPolarRadiusAxis::createShapes() aAxisProperties.m_pfMainLinePositionAtOtherAxis = new double( pTickInfo->getUnscaledTickValue() ); aAxisProperties.m_bDisplayLabels=false; - //------------------- VCartesianAxis aAxis(aAxisProperties,m_xNumberFormatsSupplier ,1,2,new PolarPlottingPositionHelper()); aAxis.setExplicitScaleAndIncrement( m_aScale, m_aIncrement ); @@ -170,8 +166,6 @@ void VPolarRadiusAxis::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index 6114a46f3689..7d16ffba9f2a 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -23,12 +23,9 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -80,9 +77,7 @@ private: //member std::auto_ptr<VCartesianAxis> m_apAxisWithLabels; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 025441cc2cb4..2eb90db819c7 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -43,18 +43,12 @@ #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/lang/XServiceName.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis @@ -135,8 +129,6 @@ bool AreaChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex return false; } -//----------------------------------------------------------------- - LegendSymbolStyle AreaChart::getLegendSymbolStyle() { if( m_bArea || m_nDimension == 3 ) @@ -610,20 +602,17 @@ void AreaChart::impl_createSeriesShapes() //iterate through all series again to create the series shapes ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); - //============================================================================= for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex drawing::PolyPolygonShape3D* pSeriesPoly = NULL; @@ -727,7 +716,6 @@ void AreaChart::createShapes() m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? //update/create information for current group @@ -747,7 +735,6 @@ void AreaChart::createShapes() bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis()); -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { @@ -792,7 +779,6 @@ void AreaChart::createShapes() } } -//============================================================================= aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { @@ -808,7 +794,6 @@ void AreaChart::createShapes() const std::vector<VDataSeries*>::const_iterator aSeriesEnd = rSeriesList.end(); std::map< sal_Int32, double > aLogicYForNextSeriesMap;//one for each different nAttachedAxisIndex - //============================================================================= //iterate through all series for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex ) { @@ -1102,9 +1087,6 @@ void AreaChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= impl_createSeriesShapes(); @@ -1124,8 +1106,6 @@ void AreaChart::createShapes() OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index f177b0b04cf4..9f1d78bbf2d4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -23,16 +23,12 @@ #include "VSeriesPlotter.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. class AreaChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: AreaChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -49,25 +45,17 @@ public: virtual void createShapes(); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual double getMaximumX(); virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor AreaChart(); @@ -112,9 +100,7 @@ private: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xRegressionCurveEquationTarget; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9caca6e7d23a..ef9e1a19a38c 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -33,10 +33,8 @@ #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; @@ -68,8 +66,6 @@ BarChart::~BarChart() delete m_pMainPosHelper; } -//------------------------------------------------------------------------- - PlottingPositionHelper& BarChart::getPlottingPositionHelper( sal_Int32 nAxisIndex ) const { PlottingPositionHelper& rPosHelper = VSeriesPlotter::getPlottingPositionHelper( nAxisIndex ); @@ -425,8 +421,6 @@ void BarChart::createShapes() uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - - //--------------------------------------------- uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -448,7 +442,6 @@ void BarChart::createShapes() sal_Int32 nStartIndex = 0; sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); -//============================================================================= //iterate through all x values per indices for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ ) { @@ -479,14 +472,12 @@ void BarChart::createShapes() } } -//============================================================================= aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); -//============================================================================= //iterate through all x slots in this category double fSlotX=0; for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) @@ -553,7 +544,6 @@ void BarChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -582,8 +572,6 @@ void BarChart::createShapes() bDrawConnectionLinesInited = true; } - //------------ - uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); @@ -807,7 +795,6 @@ void BarChart::createShapes() //create error bar createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nPointIndex, m_xLogicTarget, &fLogicX ); - //------------ //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nPointIndex) ) { @@ -849,14 +836,10 @@ void BarChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= if( bDrawConnectionLines ) { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); @@ -873,7 +856,6 @@ void BarChart::createShapes() } PlotterBase::m_pPosHelper = pPosHelper; -//============================================================================= //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { @@ -881,7 +863,6 @@ void BarChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); -//============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -918,8 +899,6 @@ void BarChart::createShapes() OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< bar chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index c419e24b0022..48f251f68c6a 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -22,17 +22,13 @@ #include "VSeriesPlotter.hxx" -//............................................................................. namespace chart { -//............................................................................. class BarPositionHelper; class BarChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: BarChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -42,14 +38,9 @@ public: virtual void createShapes(); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - private: //methods //no default constructor BarChart(); @@ -80,9 +71,7 @@ private: //member ::com::sun::star::uno::Sequence< sal_Int32 > m_aOverlapSequence; ::com::sun::star::uno::Sequence< sal_Int32 > m_aGapwidthSequence; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index 72760431dbd2..58aa7786e87f 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BarPositionHelper.hxx" #include "Linear3DTransformation.hxx" #include "ViewDefines.hxx" @@ -25,10 +24,8 @@ #include "DateHelper.hxx" #include <com/sun/star/chart/TimeUnit.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -76,8 +73,6 @@ void BarPositionHelper::setScaledCategoryWidth( double fScaledCategoryWidth ) m_fScaledCategoryWidth = fScaledCategoryWidth; CategoryPositionHelper::setCategoryWidth( m_fScaledCategoryWidth ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 1b3a046770bf..8a43dae38a00 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -23,12 +23,9 @@ #include "PlottingPositionHelper.hxx" #include "CategoryPositionHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -47,9 +44,7 @@ public: virtual void setScaledCategoryWidth( double fScaledCategoryWidth ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index a87a2ef9d919..fbd81cb88f1b 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BubbleChart.hxx" #include "PlottingPositionHelper.hxx" #include "ShapeFactory.hxx" @@ -38,18 +37,12 @@ #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/lang/XServiceName.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount ) : VSeriesPlotter( xChartTypeModel, nDimensionCount, false ) @@ -159,8 +152,6 @@ bool BubbleChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionInd return false; } -//----------------------------------------------------------------- - LegendSymbolStyle BubbleChart::getLegendSymbolStyle() { return LegendSymbolStyle_CIRCLE; @@ -230,7 +221,6 @@ void BubbleChart::createShapes() if( m_fMaxLogicBubbleSize <= 0 || m_fBubbleSizeFactorToScreen <= 0 ) return; -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { @@ -248,7 +238,6 @@ void BubbleChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex ) { @@ -373,7 +362,6 @@ void BubbleChart::createShapes() break; } - awt::Point aScreenPosition2D( LabelPositionHelper(pPosHelper,m_nDimension,m_xLogicTarget,m_pShapeFactory) .transformSceneToScreenPosition( aScenePosition3D ) ); sal_Int32 nOffset = 0; @@ -392,14 +380,9 @@ void BubbleChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 23b34edc269e..08a859c9e46c 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -22,16 +22,12 @@ #include "VSeriesPlotter.hxx" #include <com/sun/star/drawing/Direction3D.hpp> -//............................................................................. namespace chart { -//............................................................................. class BubbleChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: BubbleChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -42,22 +38,14 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor BubbleChart(); @@ -76,9 +64,7 @@ private: //member double m_fMaxLogicBubbleSize;//calculated values double m_fBubbleSizeFactorToScreen;//calculated values }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 1973e05bab22..88cb2c2c9035 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CandleStickChart.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" @@ -32,19 +31,13 @@ #include <rtl/math.hxx> #include <editeng/unoprnms.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - CandleStickChart::CandleStickChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount ) : VSeriesPlotter( xChartTypeModel, nDimensionCount ) @@ -59,19 +52,13 @@ CandleStickChart::~CandleStickChart() delete m_pMainPosHelper; } -//------------------------------------------------------------------------- // MinimumAndMaximumSupplier -//------------------------------------------------------------------------- bool CandleStickChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) { return false; } -//----------------------------------------------------------------- -//----------------------------------------------------------------- -//----------------------------------------------------------------- - LegendSymbolStyle CandleStickChart::getLegendSymbolStyle() { return LegendSymbolStyle_LINE; @@ -115,7 +102,6 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? bool bJapaneseStyle=true;//@todo is this the correct default? @@ -152,13 +138,11 @@ void CandleStickChart::createShapes() sal_Int32 nStartIndex = 0; sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); double fLogicZ = 1.5;//as defined -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); @@ -178,7 +162,6 @@ void CandleStickChart::createShapes() //update/create information for current group pPosHelper->updateSeriesCount( aZSlotIter->size() ); -//============================================================================= //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { @@ -186,7 +169,6 @@ void CandleStickChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -343,9 +325,6 @@ void CandleStickChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= /* @todo remove series shapes if empty //remove and delete point-group-shape if empty if(!xSeriesGroupShape_Shapes->getCount()) @@ -360,8 +339,6 @@ void CandleStickChart::createShapes() //... todo } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index cac36dca3bee..101044ad4b2d 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -22,17 +22,13 @@ #include "VSeriesPlotter.hxx" -//............................................................................. namespace chart { -//............................................................................. class BarPositionHelper; class CandleStickChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: CandleStickChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -44,19 +40,11 @@ public: virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - private: //methods //no default constructor CandleStickChart(); @@ -64,9 +52,7 @@ private: //methods private: //member BarPositionHelper* m_pMainPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index e37c0287f347..1e6ef85b81ef 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CategoryPositionHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth ) : m_fSeriesCount(fSeriesCount) @@ -88,8 +85,6 @@ void CategoryPositionHelper::setCategoryWidth( double fCategoryWidth ) m_fCategoryWidth = fCategoryWidth; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index b759f511253b..a17ec26027ed 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -20,12 +20,9 @@ #ifndef _CHART2_CATEGORYPOSITIONHELPER_HXX #define _CHART2_CATEGORYPOSITIONHELPER_HXX -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -55,9 +52,7 @@ protected: double m_fOuterDistance; //>=0 m_fOuterDistance=1 --> distance == width }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index ddfbc364a724..48a97f14a362 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -34,10 +34,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -102,10 +100,6 @@ bool PiePositionHelper::getInnerAndOuterRadius( double fCategoryX return bIsVisible; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount , bool bExcludingPositioning ) @@ -143,16 +137,12 @@ PieChart::~PieChart() delete m_pPosHelper; } -//----------------------------------------------------------------- - void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool /* bSwapXAndYAxis */ ) { OSL_ENSURE(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence"); m_pPosHelper->setScales( rScales, true ); } -//----------------------------------------------------------------- - drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const { if( m_nDimension == 3 ) @@ -180,7 +170,6 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( , double fLogicZ, double fDepth, double fExplodePercentage , tPropertyNameValueMap* pOverwritePropertiesMap ) { - //--------------------------- //transform position: drawing::Direction3D aOffset; if( !::rtl::math::approxEqual( fExplodePercentage, 0.0 ) ) @@ -192,7 +181,6 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( aOffset = aNewOrigin - aOrigin; } - //--------------------------- //create point uno::Reference< drawing::XShape > xShape(0); if(m_nDimension==3) @@ -327,10 +315,8 @@ void PieChart::createShapes() createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? -//============================================================================= ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end(); @@ -352,7 +338,6 @@ void PieChart::createShapes() catch (const uno::Exception&) { } } -//============================================================================= for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); ++aXSlotIter, fSlotX+=1.0 ) { ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); @@ -422,14 +407,12 @@ void PieChart::createShapes() ASSERT_EXCEPTION( e ); } - //--------------------------- //transforme to unit circle: double fUnitCircleWidthAngleDegree = m_pPosHelper->getWidthAngleDegree( fLogicStartAngleValue, fLogicEndAngleValue ); double fUnitCircleStartAngleDegree = m_pPosHelper->transformToAngleDegree( fLogicStartAngleValue ); double fUnitCircleInnerRadius = m_pPosHelper->transformToRadius( fLogicInnerRadius ); double fUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius ); - //--------------------------- //point color: boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL); { @@ -548,9 +531,6 @@ void PieChart::createShapes() }//next series in x slot (next y slot) }//next category }//next x slot -//============================================================================= -//============================================================================= -//============================================================================= /* @todo remove series shapes if empty //remove and delete point-group-shape if empty if(!xSeriesGroupShape_Shapes->getCount()) @@ -783,7 +763,6 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondB void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSize ) { - //------------------------------------------------------------------ //check whether there are any labels that should be moved std::vector< PieLabelInfo >::iterator aIt1 = m_aLabelInfoList.begin(); std::vector< PieLabelInfo >::const_iterator aEnd = m_aLabelInfoList.end(); @@ -803,7 +782,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi if( ::rtl::math::approxEqual( fPageDiagonaleLength, 0.0 ) ) return; - //------------------------------------------------------------------ //init next and previous aIt1 = m_aLabelInfoList.begin(); std::vector< PieLabelInfo >::iterator aIt2 = aIt1; @@ -820,14 +798,11 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi } aIt1->pNext = &(*(m_aLabelInfoList.begin())); - - //------------------------------------------------------------------ //detect overlaps and move sal_Int32 nMaxIterations = 50; while( detectLabelOverlapsAndMove( rPageSize ) && nMaxIterations > 0 ) nMaxIterations--; - //------------------------------------------------------------------ //create connection lines for the moved labels aEnd = m_aLabelInfoList.end(); VLineProperties aVLineProperties; @@ -851,7 +826,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi else if( nY1 > aRect.getMaxY() ) nY2 = aRect.getMaxY(); - //when the line is very short compared to the page size don't create one ::basegfx::B2DVector aLength(nX1-nX2, nY1-nY2); if( (aLength.getLength()/fPageDiagonaleLength) < 0.01 ) @@ -877,8 +851,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index b6346aa9b794..73efe3782840 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -24,17 +24,13 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/range/b2irectangle.hxx> -//............................................................................. namespace chart { -//............................................................................. class PiePositionHelper; class PieChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: PieChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -47,7 +43,6 @@ public: virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; virtual bool shouldSnapRectToUsedArea(); @@ -64,9 +59,6 @@ public: virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor PieChart(); @@ -117,9 +109,7 @@ private: //member double m_fMaxOffset; /// cached max offset value (init'ed to NaN) }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 20714d485008..8c5963276df5 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -26,10 +26,8 @@ #define MAX_BSPLINE_DEGREE 15 -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -57,7 +55,6 @@ public: double fY1FirstDerivation, double fYnFirstDerivation ); - /** @descr creates an object that calculates cublic splines on construction for the special case of periodic cubic spline @@ -66,7 +63,6 @@ public: */ lcl_SplineCalculation( const tPointVecType & rSortedPoints); - /** @descr this function corresponds to the function splint in [1]. [1] Numerical Recipies in C, 2nd edition @@ -115,8 +111,6 @@ private: void CalculatePeriodic(); }; -//----------------------------------------------------------------------------- - lcl_SplineCalculation::lcl_SplineCalculation( const tPointVecType & rSortedPoints, double fY1FirstDerivation, @@ -132,8 +126,6 @@ lcl_SplineCalculation::lcl_SplineCalculation( Calculate(); } -//----------------------------------------------------------------------------- - lcl_SplineCalculation::lcl_SplineCalculation( const tPointVecType & rSortedPoints) : m_aPoints( rSortedPoints ), @@ -146,8 +138,6 @@ lcl_SplineCalculation::lcl_SplineCalculation( ::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False ); CalculatePeriodic(); } -//----------------------------------------------------------------------------- - void lcl_SplineCalculation::Calculate() { @@ -412,8 +402,6 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x ) ( h*h ) / 6.0 ); } -//----------------------------------------------------------------------------- - // helper methods for B-spline // Create parameter t_0 to t_n using the centripetal method with a power of 0.5 @@ -543,8 +531,6 @@ void applyNtoParameterT(const lcl_tSizeType i,const double tk,const sal_uInt32 p } // anonymous namespace -//----------------------------------------------------------------------------- - // Calculates uniform parametric splines with subinterval length 1, // according ODF1.2 part 1, chapter 'chart interpolation'. void SplineCalculater::CalculateCubicSplines( @@ -675,7 +661,6 @@ void SplineCalculater::CalculateCubicSplines( } } - // The implementation follows closely ODF1.2 spec, chapter chart:interpolation // using the same names as in spec as far as possible, without prefix. // More details can be found on @@ -968,8 +953,6 @@ void SplineCalculater::CalculateBSplines( } // next piece of the series } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index fdf0fa75450a..541abc2d8fd5 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -46,10 +43,7 @@ public: , sal_uInt32 nSplineDepth ); }; - -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 40bf94cab050..35c7a562aa83 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -80,8 +80,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//----------------------------------------------------------------------------- - VDataSeriesGroup::CachedYValues::CachedYValues() : m_bValuesDirty(true) , m_fMinimumY(0.0) @@ -132,8 +130,6 @@ sal_Int32 VDataSeriesGroup::getSeriesCount() const return m_aSeriesVector.size(); } -//----------------------------------------------------------------------------- - VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount, bool bCategoryXAxis ) : PlotterBase( nDimensionCount ) @@ -446,7 +442,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re if( !pLabel ) return xTextShape; - //------------------------------------------------ //prepare legend symbol float fViewFontSize( 10.0 ); @@ -540,7 +535,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } } } - //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence* pPropNames; tAnySequence* pPropValues; @@ -548,7 +542,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re return xTextShape; LabelPositionHelper::changeTextAdjustment( *pPropValues, *pPropNames, eAlignment ); - //------------------------------------------------ //create text shape xTextShape = ShapeFactory(m_xShapeFactory). createText( xTarget_, aText.makeStringAndClear() @@ -738,7 +731,6 @@ void lcl_AddErrorBottomLine( const drawing::Position3D& rPosition, ::basegfx::B2 double MaxY = pPosHelper->getLogicMaxY(); double fZ = pPosHelper->getLogicMinZ(); - if( bYError ) { //main direction has constant x value @@ -1221,7 +1213,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( } } - void VSeriesPlotter::setMappedProperties( const uno::Reference< drawing::XShape >& xTargetShape , const uno::Reference< beans::XPropertySet >& xSource @@ -1238,9 +1229,7 @@ void VSeriesPlotter::setTimeResolutionOnXAxis( long TimeResolution, const Date& m_aNullDate = rNullDate; } -//------------------------------------------------------------------------- // MinimumAndMaximumSupplier -//------------------------------------------------------------------------- long VSeriesPlotter::calculateTimeResolutionOnXAxis() { long nRet = ::com::sun::star::chart::TimeUnit::YEAR; @@ -2456,8 +2445,6 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( return pRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 5b018c5235c8..c8efd6a5b9b6 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -42,10 +42,8 @@ #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -175,7 +173,6 @@ void VDiagram::createShapes_2d() m_xCoordinateRegionShape = uno::Reference<drawing::XShape>( xShapes, uno::UNO_QUERY ); } - //--------------------------- bool bAddFloorAndWall = DiagramHelper::isSupportingFloorAndWall( m_xDiagram ); //add back wall @@ -218,7 +215,6 @@ void VDiagram::createShapes_2d() } - //--------------------------- //position and size for diagram adjustPosAndSize_2d( m_aAvailablePosIncludingAxes, m_aAvailableSizeIncludingAxes ); } @@ -496,15 +492,11 @@ void VDiagram::createShapes_3d() uno::Reference< drawing::XShapes > xOuterGroup_Shapes = uno::Reference<drawing::XShapes>( m_xOuterGroupShape, uno::UNO_QUERY ); - - //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() ); m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY ); - //--------------------------- - bool bAddFloorAndWall = DiagramHelper::isSupportingFloorAndWall( m_xDiagram ); const bool bDoubleSided = false; @@ -661,7 +653,6 @@ void VDiagram::createShapes_3d() ShapeFactory::setShapeName( xShape, aFloorCID ); } } - //--------------------------- //create an additional scene for the smaller inner coordinate region: { @@ -774,8 +765,6 @@ void VDiagram::reduceToMimimumSize() return adjustPosAndSize( aNewPos, aNewSize ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index 56d8df60ab66..5243ec452196 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -23,12 +23,9 @@ #include <basegfx/range/b2drectangle.hxx> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -56,9 +53,7 @@ public: , bool bSplitPiecesToDifferentPolygons = true ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx index 90c50f5a74b6..f34f1ca71642 100644 --- a/chart2/source/view/inc/DateHelper.hxx +++ b/chart2/source/view/inc/DateHelper.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/chart2/XScaling.hpp> #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -45,9 +42,7 @@ public: static double RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index f67e4b4969c8..af2a2a030a74 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -26,12 +26,9 @@ #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/XShapes.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PlottingPositionHelper; @@ -72,9 +69,7 @@ private: ShapeFactory* m_pShapeFactory; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index b32855ab2258..fc54ca47c819 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -24,12 +24,9 @@ #include <tools/date.hxx> #include <set> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -96,9 +93,7 @@ private: inline MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); } }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index cb04561deac1..3deb8e42df24 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -32,10 +32,8 @@ #include <cppuhelper/implbase1.hxx> #include <vector> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; class PlottingPositionHelper; @@ -88,9 +86,7 @@ protected: //member // needs to be created and deleted by the derived class PlottingPositionHelper* m_pPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 5dd6dae8059d..4e2962647ac3 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -32,10 +32,8 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <basegfx/matrix/b3dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; @@ -406,9 +404,7 @@ inline bool PlottingPositionHelper::maySkipPointsInRegressionCalculation() const return m_bMaySkipPointsInRegressionCalculation; } -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index 7ffa3b1628ec..00a4e0929492 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -24,12 +24,9 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/Position3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PolarPlottingPositionHelper; @@ -62,9 +59,7 @@ private: PolarPlottingPositionHelper* m_pPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 04159ed9b588..eeae772af9b0 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -119,9 +116,7 @@ public: , tAnySequence& rPropValues ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 4fa108e6a66b..b25b414669d5 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -24,12 +24,8 @@ #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. - -//----------------------------------------------------------------------------- /** This class implements the calculation of automatic axis limits. */ @@ -120,9 +116,7 @@ private: Date m_aNullDate; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 83ee1a89ca45..c08361107dac 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -33,10 +33,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -//............................................................................. namespace chart { -//............................................................................. class Stripe; class ShapeFactory @@ -51,7 +49,6 @@ public: ::com::sun::star::drawing::XShapes >& xTarget , OUString aName = OUString() ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< @@ -159,8 +156,6 @@ public: , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize ); - //------------------- create 2D elements: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D , const OUString& rText @@ -240,9 +235,7 @@ private: m_xShapeFactory; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 22886f0780f1..f14ad44f369f 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/uno/Any.h> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** A Stripe represents a 2 dimensional foursquare plane in a 3 dimaensional room. @todo could: it is not necessary to have 4 point members here; it would be sufficient to have one point and 2 directions @@ -75,9 +72,7 @@ private: ::com::sun::star::drawing::Direction3D m_aManualNormal; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 6c33b3719015..3fc781b3e509 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -38,12 +38,9 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VAxisBase; @@ -196,9 +193,7 @@ private: boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index b7a5116b4317..224c54f4676b 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -51,7 +51,6 @@ public: sal_Int32 detectNumberFormatKey( sal_Int32 index ) const; sal_Int32 getLength() const; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > Model; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index eeadfcbf51bc..cc4603bd2bf3 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -25,14 +25,11 @@ #include "ShapeFactory.hxx" #include <basegfx/range/b2irectangle.hxx> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; -//----------------------------------------------------------------------------- /** The VDiagram is responsible to generate the visible parts of the Diagram that is wall, floor, axes and data series. The axes and data series are subobjects which are created and managed by the @@ -117,10 +114,7 @@ private: //members ::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes; }; -//............................................................................. } //namespace chart -//............................................................................. #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 0f061e0919a3..494aee1b16c0 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -47,9 +44,7 @@ struct VLineProperties bool isLineVisible() const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index d14306d80976..970bc1b9823e 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/drawing/Direction3D.hpp> - namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; @@ -157,9 +156,7 @@ public: virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual double getMinimumX(); virtual double getMaximumX(); @@ -184,9 +181,6 @@ public: void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const; void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const; - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - virtual std::vector< ViewLegendEntry > createLegendEntries( const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion, @@ -200,7 +194,6 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); - virtual LegendSymbolStyle getLegendSymbolStyle(); virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio(); diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index 5a38fcd6bce8..b391c9b7b72b 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -22,9 +22,7 @@ namespace chart { -//========================================================================= // -//========================================================================= #define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32) //There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls #define GRID_TO_WALL_DISTANCE (1.0) @@ -33,7 +31,6 @@ const double ZDIRECTION = 1.0; const sal_Int32 AXIS2D_TICKLENGTH = 150;//value like in old chart const sal_Int32 AXIS2D_TICKLABELSPACING = 100;//value like in old chart - }//end namespace chart #endif diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 6057d0f262d2..c2c6507ce798 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartItemPool.hxx" #include "macros.hxx" #include "chartview/ChartSfxItemIds.hxx" diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index a19a4130914e..f783e2444473 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -230,8 +230,6 @@ void ChartView::impl_deleteCoordinateSystems() aVectorToDeleteObjects.clear(); } - -//----------------------------------------------------------------- // datatransfer::XTransferable namespace { @@ -352,7 +350,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); } -//----------------------------------------------------------------- // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) throw( uno::RuntimeException) @@ -366,7 +363,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return 0; } -//----------------------------------------------------------------- // lang::XServiceInfo APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) @@ -379,9 +375,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) return aSNS; } -//----------------------------------------------------------------- -//----------------------------------------------------------------- - ::basegfx::B3DHomMatrix createTransformationSceneToScreen( const ::basegfx::B2IRectangle& rDiagramRectangleWithoutAxes ) { @@ -528,8 +521,6 @@ sal_Int32 AxisUsage::getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex ) return nRet; } -//----------------------------------------------------- - class SeriesPlotterContainer { public: @@ -594,7 +585,6 @@ std::vector< LegendEntryProvider* > SeriesPlotterContainer::getLegendEntryProvid void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( const uno::Reference< frame::XModel >& xChartModel ) { - //------------ get model series from model sal_Int32 nDiagramIndex = 0;//todo if more than one diagram is supported uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if( !xDiagram.is()) @@ -638,7 +628,6 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( ASSERT_EXCEPTION( ex ); } - //--------------------------------------------------------------------- //prepare for autoscaling and shape creation // - create plotter for charttypes (for each first scale group at each plotter, as they are independent) // - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling) @@ -700,7 +689,6 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( if(pVCooSys) pVCooSys->addMinimumAndMaximumSupplier(pPlotter); - //------------ add series to plotter and thus prepare him(it) for providing minimum and maximum values uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) @@ -1181,8 +1169,6 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio() return aPreferredAspectRatio; } -//----------------------------------------------------- - namespace { @@ -1343,8 +1329,6 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp } //end anonymous namespace -//------------ create complete diagram shape (inclusive axis and series) - awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer , const uno::Reference< drawing::XShapes>& xDiagramPlusAxes_Shapes , const awt::Point& rAvailablePos @@ -1394,7 +1378,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ); } - // - prepare list of all axis and how they are used Date aNullDate = NumberFormatterWrapper( uno::Reference< util::XNumberFormatsSupplier >( m_xChartModel, uno::UNO_QUERY ) ).getNullDate(); rSeriesPlotterContainer.initAxisUsageList(aNullDate); @@ -1402,10 +1385,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer.setScalesFromCooSysToPlotter(); rSeriesPlotterContainer.setNumberFormatsFromAxes(); - //--------------------------------------------------------------------- //create shapes - //------------ create diagram shapes //aspect ratio drawing::Direction3D aPreferredAspectRatio( rSeriesPlotterContainer.getPreferredAspectRatio() ); @@ -1503,7 +1484,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = rSeriesPlotterList.end(); for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter ) { - //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; OUString aCID; //III uno::Reference< drawing::XShapes > xSeriesTarget(0); @@ -1563,7 +1543,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& // - create data series for all charttypes for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter ) { - //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter ); if(2==nDimensionCount) @@ -1635,10 +1614,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& return aUsedOuterRect; } -//------------------------------------------------------------- -//------------------------------------------------------------- -//------------------------------------------------------------- - sal_Bool ChartView::getExplicitValuesForAxis( uno::Reference< XAxis > xAxis , ExplicitScaleData& rExplicitScale @@ -2325,7 +2300,6 @@ void formatPage( if( ! xModelPage.is()) return; - if( !xShapeFactory.is() ) return; @@ -2468,7 +2442,6 @@ void ChartView::createShapes() { SolarMutexGuard aSolarGuard; - //------------ apply fill properties to page // todo: it would be nicer to just pass the page m_xDrawPage and format it, // but the draw page does not support XPropertySet formatPage( m_xChartModel, aPageSize, xPageShapes, m_xShapeFactory ); @@ -2493,24 +2466,19 @@ void ChartView::createShapes() bool bAutoPositionDummy = true; - //------------ create main title shape lcl_createTitle( TitleHelper::MAIN_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel , aRemainingSpace, aPageSize, ALIGN_TOP, bAutoPositionDummy ); if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create sub title shape lcl_createTitle( TitleHelper::SUB_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel , aRemainingSpace, aPageSize, ALIGN_TOP, bAutoPositionDummy ); if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - - //------------ prepare series to give input to the legend (create categories and symbols etc.) SeriesPlotterContainer aSeriesPlotterContainer( m_aVCooSysList ); aSeriesPlotterContainer.initializeCooSysAndSeriesPlotter( m_xChartModel ); - //------------ create legend lcl_createLegend( LegendHelper::getLegend( m_xChartModel ), xPageShapes, m_xShapeFactory, m_xCC , aRemainingSpace, aPageSize, m_xChartModel, aSeriesPlotterContainer.getLegendEntryProviderList() , lcl_getDefaultWritingModeFromPool( m_pDrawModelWrapper ) ); @@ -2520,7 +2488,6 @@ void ChartView::createShapes() Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); sal_Int32 nDimension = DiagramHelper::getDimension( xDiagram ); - //------------ create x axis title bool bAutoPosition_XTitle = true; boost::shared_ptr<VTitle> apVTitle_X; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 0 ) ) @@ -2529,7 +2496,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create y axis title bool bAutoPosition_YTitle = true; boost::shared_ptr<VTitle> apVTitle_Y; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 1 ) ) @@ -2538,7 +2504,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create z axis title bool bAutoPosition_ZTitle = true; boost::shared_ptr<VTitle> apVTitle_Z; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 2 ) ) @@ -2550,7 +2515,6 @@ void ChartView::createShapes() bool bDummy = false; bool bIsVertical = DiagramHelper::getVertical( xDiagram, bDummy, bDummy ); - //------------ create secondary x axis title bool bAutoPosition_SecondXTitle = true; boost::shared_ptr<VTitle> apVTitle_SecondX; if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 0 ) ) @@ -2559,7 +2523,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create secondary y axis title bool bAutoPosition_SecondYTitle = true; boost::shared_ptr<VTitle> apVTitle_SecondY; if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 1 ) ) @@ -2568,7 +2531,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create complete diagram shape (inclusive axis and series) awt::Point aAvailablePosDia; awt::Size aAvailableSizeForDiagram; bool bUseFixedInnerSize = false; @@ -2618,9 +2580,7 @@ void ChartView::createShapes() #endif } -//----------------------------------------------------------------- // util::XEventListener (base of XCloseListener) -//----------------------------------------------------------------- void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) throw(uno::RuntimeException) { @@ -3032,8 +2992,6 @@ OUString ChartView::dump() throw (uno::RuntimeException) } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index a6e9e916807c..c57dcfbae3b1 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -112,16 +112,12 @@ public: virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------- // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) - //------------------------------------------------------------------------------------- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifyListener - //----------------------------------------------------------------- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); @@ -129,23 +125,17 @@ public: //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - //----------------------------------------------------------------- // ::com::sun::star::util::XModeChangeBroadcaster - //----------------------------------------------------------------- virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XUpdatable - //----------------------------------------------------------------- virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::beans::XPropertySet - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -154,9 +144,7 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( @@ -198,7 +186,6 @@ private: //methods , bool bUseFixedInnerSize , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xDiagram_MarkHandles ); - private: //member ::osl::Mutex m_aMutex; diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index 00b424427128..65deaa52c9a5 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -24,18 +24,12 @@ #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::basegfx::B2DRectangle; using ::basegfx::B2DTuple; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - namespace{ /** @descr This is a supporting function for lcl_clip2d. It computes a new parametric value for an entering (dTE) or leaving (dTL) intersection point with one @@ -287,8 +281,6 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index cdd80540093a..5ce3f65f9932 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chartview/DataPointSymbolSupplier.hxx" #include "ShapeFactory.hxx" #include "macros.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( @@ -50,8 +47,6 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( return xGroupShapes; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 2a2bc1838db1..2a0abf188ce1 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chartview/DrawModelWrapper.hxx" #include "macros.hxx" #include "ShapeFactory.hxx" @@ -59,7 +58,6 @@ using namespace ::com::sun::star; -//............................................................................. namespace { // this code is copied from sfx2/source/doc/objembed.cxx @@ -101,10 +99,8 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x } // anonymous namespace -//.. ........................................................................... namespace chart { -//............................................................................. DrawModelWrapper::DrawModelWrapper( uno::Reference<uno::XComponentContext> const & xContext ) @@ -394,8 +390,6 @@ bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xSh return false; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 2ef17307407b..fd2c9b4add9a 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LabelPositionHelper.hxx" #include "PlottingPositionHelper.hxx" #include "CommonConverters.hxx" @@ -28,10 +27,8 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -102,7 +99,6 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues , const awt::Size& rNewReferenceSize ) { - //------------------------- //handle dynamic font resize: awt::Size aOldReferenceSize; if( xAxisModelProps->getPropertyValue( "ReferencePageSize") >>= aOldReferenceSize ) @@ -470,8 +466,6 @@ void LabelPositionHelper::correctPositionForRotation( const uno::Reference< draw , static_cast<sal_Int32>(aOldPos.Y + fYCorrection ) ) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index 914e0a4b52d9..c909d24cdfa2 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -93,7 +93,6 @@ sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() return 3; } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 0067632842b8..f079d90da7fe 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -23,17 +23,11 @@ #include <rtl/math.hxx> #include <com/sun/star/chart2/DataPointLabel.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) : m_xLogicTarget(NULL) , m_xFinalTarget(NULL) @@ -71,7 +65,6 @@ void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bo m_pPosHelper->setScales( rScales, bSwapXAndYAxis ); } - void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) { OSL_PRECOND(m_nDimension==2,"Set this transformation only in case of 2D"); @@ -116,8 +109,6 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos ) return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 76c2bc9ac78c..1269536bb43a 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -34,10 +34,8 @@ #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -247,7 +245,6 @@ void PlottingPositionHelper::transformScaledLogicToScene( drawing::PolyPolygonSh } } - void PlottingPositionHelper::clipScaledLogicValues( double* pX, double* pY, double* pZ ) const { //get logic clip values: @@ -323,10 +320,6 @@ drawing::Direction3D PlottingPositionHelper::getScaledLogicWidth() const return aRet; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PolarPlottingPositionHelper::PolarPlottingPositionHelper( NormalAxis eNormalAxis ) : m_fRadiusOffset(0.0) , m_fAngleDegreeOffset(90.0) diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 23d5194d2f1e..f620f18da0bf 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PolarLabelPositionHelper.hxx" #include "PlottingPositionHelper.hxx" #include "CommonConverters.hxx" @@ -26,10 +25,8 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -122,7 +119,6 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi fAngleDegree = 270.0; } } - //------------------------------ //set LabelAlignment if( !bCenter ) { @@ -173,8 +169,6 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi return aRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 18339acfea38..b4c276c17299 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -27,10 +27,8 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/LineJoint.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -461,8 +459,6 @@ void PropertyMapper::getPreparedTextShapePropertyLists( PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 5ce6f7290597..c3629da6f1b3 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Any.hxx> - #include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <svx/svdocirc.hxx> @@ -55,16 +54,10 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // set a name/CID at a shape (is used for selection handling) -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape , const OUString& rName ) @@ -87,8 +80,6 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape } } -//----------------------------------------------------------------------------- - OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) { OUString aRet; @@ -110,8 +101,6 @@ OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xS return aRet; } -//----------------------------------------------------------------------------- - uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( const uno::Reference< drawing::XDrawPage>& xDrawPage ) { @@ -136,8 +125,6 @@ uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( return xRet; } -//----------------------------------------------------------------------------- - uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( const uno::Reference< drawing::XDrawPage>& xDrawPage ) { @@ -152,11 +139,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( return xRet; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // diverse PolyPolygon create methods -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- uno::Any createPolyPolygon_Cube( const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded = true ) @@ -179,7 +162,6 @@ uno::Any createPolyPolygon_Cube( const bool bRoundEdges = fRoundedEdge && fOffset < fWidthH && 2.0 * fOffset < fHeightSign*fHeight; const sal_Int32 nPointCount = bRoundEdges ? 13 : 5; - //-------------------------------------- drawing::PolyPolygonShape3D aPP; aPP.SequenceX.realloc(1); @@ -256,7 +238,6 @@ uno::Any createPolyPolygon_Cylinder( //fHeight may be negative OSL_PRECOND(fRadius>0, "The radius of a cylinder needs to be > 0"); - //-------------------------------------- drawing::PolyPolygonShape3D aPP; nVerticalSegmentCount=1; @@ -283,7 +264,6 @@ uno::Any createPolyPolygon_Cylinder( if( fHeight<0.0 ) ::std::swap(fY1,fY2); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -292,7 +272,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = fRadius; *pInnerSequenceY++ = fY1; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -303,7 +282,6 @@ uno::Any createPolyPolygon_Cylinder( pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -312,7 +290,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = fRadius; *pInnerSequenceY++ = fY2; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -323,7 +300,6 @@ uno::Any createPolyPolygon_Cylinder( pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -332,7 +308,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = fY2; - //---------------------------- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } @@ -384,7 +359,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig ::std::swap(fY1,fY3); } - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -393,7 +367,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig *pInnerSequenceY++ = fY2; *pInnerSequenceX++ = fX2; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -404,7 +377,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -413,16 +385,11 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig *pInnerSequenceY++ = fY3; *pInnerSequenceX++ = fX3; - //---------------------------- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // methods for 3D shape creation -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- uno::Reference<drawing::XShape> ShapeFactory::createCube( @@ -769,10 +736,6 @@ uno::Reference<drawing::XShape> return xShape; } -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ - void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, const drawing::PolyPolygonBezierCoords& rAdd, sal_Bool bAppendInverse ) { if(!rAdd.Coordinates.getLength()) @@ -798,8 +761,6 @@ void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, cons rReturn.Flags[0][nOldCount+nAddCount] = rReturn.Flags[0][0]; } -//------------------------------------------------------------------------------------------------------------ - drawing::PolyPolygonBezierCoords getCircularArcBezierCoords( double fStartAngleRadian, double fWidthAngleRadian, double fUnitRadius , const ::basegfx::B2DHomMatrix& rTransformationFromUnitCircle @@ -913,8 +874,6 @@ drawing::PolyPolygonBezierCoords getCircularArcBezierCoords( return aReturn; } -//------------------------------------------------------------------------------------------------------------ - drawing::PolyPolygonBezierCoords getRingBezierCoords( double fUnitCircleInnerRadius , double fUnitCircleOuterRadius @@ -939,8 +898,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords( return aReturn; } -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createPieSegment2D( const uno::Reference< drawing::XShapes >& xTarget @@ -991,8 +948,6 @@ uno::Reference< drawing::XShape > return xShape; } -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createPieSegment( const uno::Reference< drawing::XShapes >& xTarget @@ -1074,10 +1029,6 @@ uno::Reference< drawing::XShape > return xShape; } -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createStripe( const uno::Reference< drawing::XShapes >& xTarget , const Stripe& rStripe @@ -1315,7 +1266,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& break; } - //-------------------------------------- drawing::PolyPolygonShape3D aPP; aPP.SequenceX.realloc(1); @@ -1446,7 +1396,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX-fWidthH; *pInnerSequenceY++ = fY-fHeightH; - *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY-fHeightH; @@ -1480,7 +1429,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY-0.2*fHeightH; - *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY+0.2*fHeightH; @@ -1499,7 +1447,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX+0.2*fWidthH; *pInnerSequenceY++ = fY-fHeightH; - *pInnerSequenceX++ = fX+0.2*fWidthH; *pInnerSequenceY++ = fY+fHeightH; @@ -2366,8 +2313,6 @@ void ShapeFactory::removeSubShapes( const uno::Reference< drawing::XShapes >& xS } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index bc6a0846943f..2d99143152b0 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -26,10 +26,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. Stripe::Stripe( const drawing::Position3D& rPoint1 , const drawing::Direction3D& rDirectionToPoint2 @@ -345,8 +343,6 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 6296c0151482..b4b17382a6be 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -48,10 +48,8 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -796,8 +794,6 @@ VLegend::VLegend( { } -// ---------------------------------------- - void VLegend::init( const Reference< drawing::XShapes >& xTargetPage, const Reference< lang::XMultiServiceFactory >& xFactory, @@ -808,15 +804,11 @@ void VLegend::init( m_xModel = xModel; } -// ---------------------------------------- - void VLegend::setDefaultWritingMode( sal_Int16 nDefaultWritingMode ) { m_nDefaultWritingMode = nDefaultWritingMode; } -// ---------------------------------------- - bool VLegend::isVisible( const Reference< XLegend > & xLegend ) { if( ! xLegend.is()) @@ -836,8 +828,6 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend ) return bShow; } -// ---------------------------------------- - void VLegend::createShapes( const awt::Size & rAvailableSpace, const awt::Size & rPageSize ) @@ -960,8 +950,6 @@ void VLegend::createShapes( } } -// ---------------------------------------- - void VLegend::changePosition( awt::Rectangle & rOutAvailableSpace, const awt::Size & rPageSize ) @@ -1014,8 +1002,6 @@ void VLegend::changePosition( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 4fb7d98ba364..f3117237147d 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -28,14 +28,11 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class LegendEntryProvider; -//----------------------------------------------------------------------------- /** */ @@ -96,9 +93,7 @@ private: sal_Int16 m_nDefaultWritingMode;//to be used when writing mode is set to page }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 22c4155811d9..8cf06e6913bf 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -17,22 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VLineProperties.hxx" #include "macros.hxx" #include <com/sun/star/drawing/LineStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // get line properties from a propertyset -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- VLineProperties::VLineProperties() { @@ -94,8 +87,6 @@ bool VLineProperties::isLineVisible() const return bRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index d82a5aa4fe91..856509c2c878 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VPolarTransformation.hxx" #include "ViewDefines.hxx" #include "CommonConverters.hxx" @@ -31,7 +30,6 @@ using ::com::sun::star::uno::RuntimeException; namespace chart { - VPolarTransformation::VPolarTransformation( const PolarPlottingPositionHelper& rPositionHelper ) : m_aPositionHelper(rPositionHelper) , m_aUnitCartesianToScene( rPositionHelper.getUnitCartesianToScene() ) @@ -80,7 +78,6 @@ sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() return 3; } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 0fb341b1ef18..81b1be50e79d 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -32,10 +32,8 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -276,8 +274,6 @@ void VTitle::createShapes( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index f9699cd85548..97e630d1ebc5 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -68,9 +65,7 @@ private: sal_Int32 m_nYPos; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index ae434a46ed90..e15fedb747fc 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -44,6 +44,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartview_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_chart2_view ); } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 726e9b20d3fa..7fe53ae1c02d 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; - // code for creating instances of SampleAddIn extern "C" { @@ -89,10 +88,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } // extern C - -// -------------------- // class SampleAddIn -// -------------------- SampleAddIn::SampleAddIn() { @@ -102,7 +98,6 @@ SampleAddIn::SampleAddIn() SampleAddIn::~SampleAddIn() {} - // this functionality should be provided by the chart API some day sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAxis, double fValue, @@ -255,8 +250,6 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) // now we have the page to insert objects // add a horizontal line at the middle value of the first series - // ------------------------------------------------------------- - // get the logical position from the coordinate // get x- and y-axis @@ -320,7 +313,6 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException ) } } - // position line and text // get the array. Note: the first dimension is the length |