diff options
Diffstat (limited to 'chart2/source/controller')
59 files changed, 79 insertions, 189 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 9948a284eb18..83728eb4c993 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -68,9 +68,7 @@ struct StaticAreaWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { AreaWrapper::AreaWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -174,7 +172,6 @@ css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() "com.sun.star.drawing.LineProperties" }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index fd28c36a4ff7..3516d7a29ba2 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -356,9 +356,7 @@ struct StaticAxisWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { AxisWrapper::AxisWrapper( @@ -660,7 +658,6 @@ css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 00f7bd590fd0..6747d743f4b4 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -35,9 +35,7 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { Chart2ModelContact::Chart2ModelContact( @@ -296,7 +294,6 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< css::chart return aPoint; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 73811542998d..2ba9fd16d211 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -85,9 +85,7 @@ uno::Sequence< uno::Sequence< double > > lcl_getDBL_MINInsteadNAN( const uno::Se } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { struct lcl_Operator @@ -692,7 +690,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNam }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 7a732225d6de..74b0bf7bb65c 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -243,9 +243,7 @@ struct StaticChartDocumentWrapperPropertyArray : public rtl::StaticAggregate< Se } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace { @@ -1444,7 +1442,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic }; } -} // namespace wrapper } // namespace chart extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 09ccd200521f..db8fd95abea7 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -416,9 +416,7 @@ void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPr } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -852,7 +850,6 @@ css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServ }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 07d48ff4eb9d..03cea203ea26 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -567,9 +567,7 @@ OUString lcl_getOldChartTypeName( const OUString & rNewChartTypeName ) } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { DiagramWrapper::DiagramWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -1927,7 +1925,6 @@ css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index aee6ad0aa672..a08df2d94f0e 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -68,9 +68,7 @@ struct StaticGridWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { GridWrapper::GridWrapper(tGridType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -184,7 +182,6 @@ css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 21da1f1c6ceb..e4059c6d4b74 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -258,9 +258,7 @@ struct StaticLegendWrapperPropertyArray : public rtl::StaticAggregate< Sequence< } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { LegendWrapper::LegendWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -420,7 +418,6 @@ css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames( }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index f38ff93c9bef..606c98caead1 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -113,9 +113,7 @@ struct StaticMinMaxLineWrapperInfo : public rtl::StaticAggregate< uno::Reference } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { MinMaxLineWrapper::MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -394,7 +392,6 @@ css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNa }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 20495fc8e7e5..cffd22e4d56b 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -186,9 +186,7 @@ struct StaticTitleWrapperPropertyArray : public rtl::StaticAggregate< Sequence< } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { TitleWrapper::TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType, @@ -508,7 +506,6 @@ css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 0343c29530a8..cf41c0066406 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -119,9 +119,7 @@ struct StaticUpDownBarWrapperDefaults : public rtl::StaticAggregate< ::chart::tP } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { UpDownBarWrapper::UpDownBarWrapper( @@ -362,7 +360,6 @@ css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNam }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index b95872fb4146..e3e5f3b5ab3c 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -70,9 +70,7 @@ struct StaticWallFloorWrapperPropertyArray : public rtl::StaticAggregate< Sequen } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WallFloorWrapper::WallFloorWrapper( bool bWall, @@ -166,7 +164,6 @@ css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNam }; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 7a554a245745..3468b2cf317e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -25,9 +25,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using namespace ::com::sun::star; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WrappedAddInProperty::WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ) @@ -118,8 +116,6 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() ); } -} //namespace wrapper - } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 58e89e439b00..d402cf7b3eda 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -30,9 +30,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace { @@ -120,7 +118,6 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< std: rList.emplace_back( new WrappedAutomaticPositionProperty() ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 3949037a8a93..ef438c8a1e86 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -29,9 +29,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace { @@ -398,7 +396,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean return aRet; } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 91ea634ebaf2..ed24809c04f6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -28,9 +28,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WrappedCharacterHeightProperty_Base::WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName @@ -135,7 +133,6 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty() { } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 4d9b77f29eb3..b36e1db06038 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -31,9 +31,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace @@ -147,7 +145,6 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index faffb951077d..0184f879e05b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -26,9 +26,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { const sal_Int32 DEFAULT_GAPWIDTH = 100; @@ -168,7 +166,6 @@ 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 437c97f07b43..28cf4de86522 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -28,9 +28,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WrappedNumberFormatProperty::WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) @@ -118,7 +116,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans: return uno::Any( true ); // bLink } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 73f2fbc61ec1..d9ad4a3e6bb4 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -34,9 +34,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::chart::TimeIncrement; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WrappedScaleProperty::WrappedScaleProperty(tScaleProperty eScaleProperty @@ -581,7 +579,6 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const return aRet; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 047ad10740f1..1799f83e7fea 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -32,9 +32,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace { @@ -135,7 +133,6 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< std::unique_ rList.emplace_back( new WrappedScaleTextProperty( spChart2ModelContact ) ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 1f5b011c3538..d65b42cd4808 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -26,9 +26,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { void WrappedSceneProperty::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList @@ -98,7 +96,6 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans: return WrappedProperty::getPropertyValue( xInnerPropertySet ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx index ee5cdbf05061..127d6b4def67 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx @@ -20,9 +20,7 @@ #include "WrappedSeriesAreaOrLineProperty.hxx" #include "DataSeriesPointWrapper.hxx" -namespace chart -{ -namespace wrapper +namespace chart::wrapper { WrappedSeriesAreaOrLineProperty::WrappedSeriesAreaOrLineProperty( @@ -48,7 +46,6 @@ OUString WrappedSeriesAreaOrLineProperty::getInnerName() const return m_aInnerAreaTypeName; } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 15645fa0c174..bdb38b8e7ad0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -35,9 +35,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace @@ -288,7 +286,6 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue return uno::Any(aInnerValue); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index d5508eccef44..843d7efd2f8a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -36,16 +36,14 @@ #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <utility> -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } } +namespace com::sun::star::chart2::data { class XDataProvider; } using namespace ::com::sun::star; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace @@ -1069,7 +1067,6 @@ void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< st lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 3155a969102f..1331e482292a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -32,9 +32,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace { @@ -278,7 +276,6 @@ void WrappedStockProperties::addWrappedProperties( std::vector< std::unique_ptr< rList.emplace_back( new WrappedUpDownProperty( spChart2ModelContact ) ); } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 79ed7047331c..2b599040dced 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -38,9 +38,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::beans::Property; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { namespace @@ -526,7 +524,6 @@ beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Refe return beans::PropertyState_DEFAULT_VALUE; } -} //namespace wrapper } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 81fa4775a83f..c35a75e31a54 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -19,7 +19,7 @@ #include "WrappedTextRotationProperty.hxx" -namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } } +namespace com::sun::star::beans { class XPropertyState; } using namespace ::com::sun::star; using ::com::sun::star::uno::Any; diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 51a3fa06ff3d..1a34d47b4f9c 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -24,7 +24,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/frame/XModel.hpp> -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } +namespace com::sun::star::awt { class XWindow; } namespace chart { diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 6a8b618b3c8b..6c45249b284e 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -63,8 +63,8 @@ #include <svl/cjkoptions.hxx> #include <tools/diagnose_ex.h> -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XDataSeries; } namespace chart { diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 855a4b8d7253..59ebe40c27fd 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -54,7 +54,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::chart::TimeInterval; using ::com::sun::star::chart::TimeIncrement; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -967,6 +967,6 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet return (bSetScale || bChangedOtherwise); } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index f6f8961d21d6..49945b2f5803 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -551,6 +551,6 @@ const uno::Reference<beans::XPropertySet>& CharacterPropertyItemConverter::GetRe return m_xRefSizePropSet; } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 0d592f4733a8..43721c24502a 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -707,6 +707,6 @@ void DataPointItemConverter::FillSpecialItem( } } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index d159932af642..580b81e11190 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -74,9 +74,7 @@ void lcl_getErrorIndicatorValues( } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { ErrorBarItemConverter::ErrorBarItemConverter( @@ -430,7 +428,6 @@ void ErrorBarItemConverter::FillSpecialItem( } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 0676134808e0..ffa8c29a5b77 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -745,7 +745,6 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( return bChanged; } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 0a27a52392da..c50ca18c53f4 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { ItemConverter::ItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, @@ -218,6 +218,6 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem } } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 58251f381628..a16f9094210d 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -33,9 +33,7 @@ using namespace ::com::sun::star; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { LegendItemConverter::LegendItemConverter( @@ -181,7 +179,6 @@ void LegendItemConverter::FillSpecialItem( } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index af20548504b8..c48b8b2b460a 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -namespace chart { namespace wrapper { +namespace chart::wrapper { AllAxisItemConverter::AllAxisItemConverter( const uno::Reference< frame::XModel > & xChartModel, @@ -188,6 +188,6 @@ const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const return nStatWhichPairs; } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index c060d64decf5..5937575cc775 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool ) : ItemConverter( nullptr, rItemPool ) @@ -67,6 +67,6 @@ bool MultipleItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropert return false; } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 2173620bf37b..f2ee1d4cbfce 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -80,9 +80,7 @@ void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { RegressionCurveItemConverter::RegressionCurveItemConverter( @@ -332,7 +330,6 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 5958b362a3fb..234d2b5ba47f 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -144,6 +144,6 @@ void RegressionEquationItemConverter::FillSpecialItem( } } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 69145126e4c8..e4952bbc0329 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -37,9 +37,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -namespace chart -{ -namespace wrapper +namespace chart::wrapper { SeriesOptionsItemConverter::SeriesOptionsItemConverter( @@ -435,7 +433,6 @@ void SeriesOptionsItemConverter::FillSpecialItem( } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 6d6a9f6788bd..b4c4405ff88b 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -209,9 +209,7 @@ void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const } // anonymous namespace -namespace chart -{ -namespace wrapper +namespace chart::wrapper { StatisticsItemConverter::StatisticsItemConverter( @@ -846,7 +844,6 @@ void StatisticsItemConverter::FillSpecialItem( } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index 81c7c8fcd9a0..70dc31a46b92 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; using namespace com::sun::star::chart2; using com::sun::star::uno::Reference; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -652,6 +652,6 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r } } -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index bbe54492cbd9..29538c0a371c 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; -namespace chart { namespace wrapper { +namespace chart::wrapper { namespace { @@ -205,7 +205,6 @@ void TitleItemConverter::FillSpecialItem( } } -} // namespace wrapper } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index 174e3964692c..b985558a3a0b 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -15,7 +15,7 @@ #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 301bef28279c..62ac3a90bc77 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -28,9 +28,7 @@ using namespace ::com::sun::star; -namespace chart -{ -namespace impl +namespace chart::impl { using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XModel; @@ -120,7 +118,6 @@ void SAL_CALL ShapeUndoElement::disposing() { } -} // namespace impl } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index a4235233f1bb..3ae73588075c 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -38,7 +38,7 @@ using namespace css::uno; -namespace chart { namespace sidebar { +namespace chart::sidebar { ChartPanelFactory::ChartPanelFactory() : PanelFactoryInterfaceBase(m_aMutex) @@ -143,7 +143,7 @@ css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames() return { "com.sun.star.ui.UIElementFactory" }; } -} } // end of namespace chart::sidebar +} // end of namespace chart::sidebar extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* org_libreoffice_comp_chart2_sidebar_ChartPanelFactory(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &) diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 1260b36fe397..b2e134dcde88 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -26,7 +26,7 @@ #include <svx/tbcontrl.hxx> -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -525,6 +525,6 @@ void ChartAreaPanel::updateModel( } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index a6fd71c96d44..2c08410847e0 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -30,7 +30,7 @@ using namespace css; using namespace css::uno; -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -372,6 +372,6 @@ IMPL_LINK(ChartAxisPanel, TextRotationHdl, weld::MetricSpinButton&, rMetricField setAxisRotation(mxModel, aCID, nVal); } -}} // end of namespace ::chart::sidebar +} // end of namespace ::chart::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index 5b0654b2d86b..189b55059492 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -16,7 +16,7 @@ #include <svx/tbcontrl.hxx> -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -104,6 +104,6 @@ void ChartColorWrapper::updateData() mpControl->statusChanged(aEvent); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index bb7835cb71bd..f60d9eeb398c 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -38,7 +38,7 @@ using namespace css; using namespace css::uno; -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -588,6 +588,6 @@ void ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV } } -}} // end of namespace ::chart::sidebar +} // end of namespace ::chart::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index eb9f622d2012..58a024bbe90d 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -28,7 +28,7 @@ using namespace css; using namespace css::uno; -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -419,6 +419,6 @@ IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, weld::SpinButton&, rMetricField, setValue(mxModel, aCID, nVal, ErrorBarDirection::NEGATIVE); } -}} // end of namespace ::chart::sidebar +} // end of namespace ::chart::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index b31c6362e234..2e410084466d 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/chart2/XDiagram.hpp> -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -324,6 +324,6 @@ void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem) xPropSet->setPropertyValue("LineWidth", css::uno::Any(rItem.GetValue())); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 33f0e1663585..e4dbdebdb2d2 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -37,7 +37,7 @@ using namespace css; using namespace css::uno; -namespace chart { namespace sidebar { +namespace chart::sidebar { namespace { @@ -465,6 +465,6 @@ IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, weld::ComboBox&, void) setDataLabelPlacement(mxModel, aCID, nPos); } -}} // end of namespace ::chart::sidebar +} // end of namespace ::chart::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx index 0fa0b793b5b6..5cc6b5beac99 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx @@ -9,8 +9,7 @@ #include "ChartSidebarModifyListener.hxx" -namespace chart { -namespace sidebar { +namespace chart::sidebar { ChartSidebarModifyListenerParent::~ChartSidebarModifyListenerParent() { @@ -40,6 +39,6 @@ void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEven mpParent = nullptr; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx index e7d74c656a55..0c8018eb09c3 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx @@ -14,8 +14,7 @@ #include <ObjectIdentifier.hxx> -namespace chart { -namespace sidebar { +namespace chart::sidebar { ChartSidebarSelectionListenerParent::~ChartSidebarSelectionListenerParent() { @@ -80,6 +79,6 @@ void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectTyp maTypes = aTypes; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index 5042fd184b34..846dbed13570 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -38,9 +38,7 @@ using namespace css; using namespace css::uno; -namespace chart -{ -namespace sidebar +namespace chart::sidebar { ChartTypePanel::ChartTypePanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -436,7 +434,6 @@ void ChartTypePanel::selectMainType() m_pCurrentMainType->fillExtraControls(m_xChartModel, xTemplateProps); } } -} } // end of namespace ::chart::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |