diff options
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
29 files changed, 30 insertions, 115 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; |