diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-28 14:55:43 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 11:34:33 +0000 |
| commit | dd9c97d587d2a295d44e8685d253d30542a2c85a (patch) | |
| tree | 8736a3552ac8c56fc9102a6518072c68295c4a25 /chart2/source/controller | |
| parent | 05bd5b46ea659df95fb6f0c895c090629b541e0f (diff) | |
fdo#62475 removed pointless comments
Change-Id: I3f5e86dba2df950aeb12c895f52d99274c0959aa
Reviewed-on: https://gerrit.libreoffice.org/5148
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/controller')
225 files changed, 0 insertions, 1461 deletions
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: */ |