From 6751a89552f6d739b4e1563143fd3a019478f513 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 May 2020 10:59:40 +0200 Subject: compact namespace in canvas..cui Change-Id: I7bd0c2a55b936896fcfe7e1a374871008a18618f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93706 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/inc/verifyinput.hxx | 8 ++-- canvas/source/directx/dx_impltools.hxx | 8 ++-- canvas/source/directx/dx_textlayout_drawhelper.hxx | 4 +- canvas/source/opengl/ogl_canvastools.hxx | 4 +- canvas/source/opengl/ogl_spritedevicehelper.hxx | 4 +- canvas/source/opengl/ogl_texturecache.hxx | 4 +- canvas/source/vcl/impltools.hxx | 16 ++++---- chart2/inc/ChartModel.hxx | 16 ++++---- chart2/inc/ChartView.hxx | 10 ++--- chart2/qa/extras/charttest.hxx | 8 ++-- .../accessibility/AccessibleChartElement.hxx | 6 +-- .../controller/chartapiwrapper/AxisWrapper.hxx | 2 +- .../chartapiwrapper/Chart2ModelContact.hxx | 20 +++++----- .../chartapiwrapper/DataSeriesPointWrapper.hxx | 2 +- .../controller/chartapiwrapper/DiagramWrapper.hxx | 4 +- .../controller/chartapiwrapper/TitleWrapper.hxx | 4 +- .../chartapiwrapper/WrappedAddInProperty.hxx | 2 +- .../WrappedAutomaticPositionProperties.hxx | 2 +- .../WrappedAxisAndGridExistenceProperties.hxx | 2 +- .../WrappedDataCaptionProperties.hxx | 4 +- .../chartapiwrapper/WrappedGapwidthProperty.hxx | 2 +- .../WrappedNumberFormatProperty.hxx | 2 +- .../chartapiwrapper/WrappedScaleProperty.hxx | 2 +- .../chartapiwrapper/WrappedScaleTextProperties.hxx | 4 +- .../chartapiwrapper/WrappedSceneProperty.hxx | 2 +- .../WrappedSeriesOrDiagramProperty.hxx | 2 +- .../chartapiwrapper/WrappedSplineProperties.hxx | 4 +- .../chartapiwrapper/WrappedStatisticProperties.hxx | 4 +- .../chartapiwrapper/WrappedStockProperties.hxx | 4 +- .../chartapiwrapper/WrappedSymbolProperties.hxx | 4 +- chart2/source/controller/dialogs/DataBrowser.hxx | 6 +-- .../source/controller/dialogs/DataBrowserModel.hxx | 8 ++-- chart2/source/controller/dialogs/DialogModel.hxx | 14 +++---- .../controller/dialogs/tp_3D_SceneAppearance.hxx | 2 +- .../controller/dialogs/tp_3D_SceneGeometry.hxx | 2 +- .../controller/dialogs/tp_3D_SceneIllumination.hxx | 2 +- chart2/source/controller/dialogs/tp_ChartType.hxx | 2 +- chart2/source/controller/dialogs/tp_DataSource.hxx | 4 +- .../source/controller/dialogs/tp_RangeChooser.hxx | 2 +- .../dialogs/tp_Wizard_TitlesAndObjects.hxx | 4 +- chart2/source/controller/inc/AccessibleBase.hxx | 6 +-- .../source/controller/inc/AccessibleChartView.hxx | 8 ++-- chart2/source/controller/inc/AxisItemConverter.hxx | 12 +++--- .../inc/CharacterPropertyItemConverter.hxx | 4 +- chart2/source/controller/inc/ChartController.hxx | 46 +++++++++++----------- .../source/controller/inc/ChartDocumentWrapper.hxx | 4 +- .../controller/inc/ChartToolbarController.hxx | 4 +- .../controller/inc/CommandDispatchContainer.hxx | 12 +++--- .../controller/inc/DataPointItemConverter.hxx | 12 +++--- chart2/source/controller/inc/DrawViewWrapper.hxx | 4 +- .../controller/inc/ErrorBarItemConverter.hxx | 4 +- .../inc/GraphicPropertyItemConverter.hxx | 2 +- chart2/source/controller/inc/ItemConverter.hxx | 8 ++-- chart2/source/controller/inc/ItemPropertyMap.hxx | 4 +- .../source/controller/inc/LegendItemConverter.hxx | 4 +- .../controller/inc/MultipleChartConverters.hxx | 11 +++--- .../controller/inc/MultipleItemConverter.hxx | 4 +- chart2/source/controller/inc/ObjectHierarchy.hxx | 4 +- .../source/controller/inc/ObjectNameProvider.hxx | 4 +- .../controller/inc/PositionAndSizeHelper.hxx | 4 +- .../source/controller/inc/RangeSelectionHelper.hxx | 8 ++-- .../controller/inc/RangeSelectionListener.hxx | 2 +- .../inc/RegressionCurveItemConverter.hxx | 4 +- .../inc/RegressionEquationItemConverter.hxx | 10 ++--- chart2/source/controller/inc/SelectionHelper.hxx | 2 +- .../controller/inc/SeriesOptionsItemConverter.hxx | 6 +-- .../controller/inc/StatisticsItemConverter.hxx | 2 +- .../controller/inc/TextLabelItemConverter.hxx | 10 ++--- .../inc/TimerTriggeredControllerLock.hxx | 2 +- chart2/source/controller/inc/TitleDialogData.hxx | 4 +- .../source/controller/inc/TitleItemConverter.hxx | 8 ++-- chart2/source/controller/inc/dlg_ChartType.hxx | 2 +- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 4 +- .../source/controller/inc/dlg_CreationWizard.hxx | 4 +- .../controller/inc/dlg_CreationWizard_UNO.hxx | 6 +-- chart2/source/controller/inc/dlg_DataEditor.hxx | 6 +-- chart2/source/controller/inc/dlg_DataSource.hxx | 4 +- .../source/controller/inc/dlg_InsertErrorBars.hxx | 2 +- chart2/source/controller/inc/dlg_InsertLegend.hxx | 4 +- .../source/controller/inc/dlg_ObjectProperties.hxx | 2 +- chart2/source/controller/inc/dlg_View3D.hxx | 2 +- chart2/source/controller/inc/res_ErrorBar.hxx | 2 +- .../source/controller/inc/res_LegendPosition.hxx | 4 +- .../controller/main/ChartDropTargetHelper.hxx | 8 ++-- chart2/source/controller/main/ChartFrameloader.hxx | 2 +- chart2/source/controller/main/ChartModelClone.hxx | 4 +- .../source/controller/main/ChartTransferable.hxx | 8 ++-- chart2/source/controller/main/CommandDispatch.hxx | 4 +- .../controller/main/ControllerCommandDispatch.hxx | 2 +- chart2/source/controller/main/DragMethod_Base.hxx | 2 +- .../controller/main/StatusBarCommandDispatch.hxx | 6 +-- chart2/source/controller/main/UndoActions.hxx | 2 +- .../source/controller/main/UndoCommandDispatch.hxx | 4 +- chart2/source/controller/main/UndoGuard.hxx | 4 +- .../controller/sidebar/Chart2PanelFactory.hxx | 4 +- .../source/controller/sidebar/ChartAxisPanel.hxx | 4 +- .../controller/sidebar/ChartColorWrapper.hxx | 6 +-- .../controller/sidebar/ChartElementsPanel.hxx | 2 +- .../controller/sidebar/ChartErrorBarPanel.hxx | 2 +- .../source/controller/sidebar/ChartSeriesPanel.hxx | 4 +- chart2/source/inc/AxisHelper.hxx | 16 ++++---- chart2/source/inc/BaseGFXHelper.hxx | 4 +- chart2/source/inc/CachedDataSequence.hxx | 2 +- chart2/source/inc/CharacterProperties.hxx | 4 +- chart2/source/inc/ChartModelHelper.hxx | 18 ++++----- chart2/source/inc/ChartTypeHelper.hxx | 4 +- chart2/source/inc/ChartViewHelper.hxx | 4 +- chart2/source/inc/ColorPerPointHelper.hxx | 4 +- chart2/source/inc/CommonConverters.hxx | 6 +-- chart2/source/inc/ConfigColorScheme.hxx | 2 +- chart2/source/inc/ControllerLockGuard.hxx | 2 +- chart2/source/inc/DataSeriesHelper.hxx | 20 +++++----- chart2/source/inc/DataSourceHelper.hxx | 14 +++---- chart2/source/inc/DiagramHelper.hxx | 18 ++++----- chart2/source/inc/EventListenerHelper.hxx | 2 +- chart2/source/inc/ExplicitCategoriesProvider.hxx | 8 ++-- chart2/source/inc/FillProperties.hxx | 2 +- chart2/source/inc/FormattedStringHelper.hxx | 8 ++-- chart2/source/inc/InternalDataProvider.hxx | 2 +- chart2/source/inc/LabeledDataSequence.hxx | 6 +-- chart2/source/inc/LegendHelper.hxx | 6 +-- chart2/source/inc/LifeTime.hxx | 8 ++-- chart2/source/inc/LinePropertiesHelper.hxx | 6 +-- chart2/source/inc/MediaDescriptorHelper.hxx | 10 ++--- chart2/source/inc/ModifyListenerHelper.hxx | 4 +- chart2/source/inc/ObjectIdentifier.hxx | 20 +++++----- chart2/source/inc/PropertyHelper.hxx | 2 +- chart2/source/inc/RangeHighlighter.hxx | 18 ++++----- chart2/source/inc/ReferenceSizeProvider.hxx | 18 ++++----- chart2/source/inc/RegressionCurveCalculator.hxx | 4 +- chart2/source/inc/RegressionCurveHelper.hxx | 16 ++++---- chart2/source/inc/RelativePositionHelper.hxx | 4 +- chart2/source/inc/RelativeSizeHelper.hxx | 6 +-- chart2/source/inc/SceneProperties.hxx | 2 +- chart2/source/inc/StatisticsHelper.hxx | 14 +++---- chart2/source/inc/ThreeDHelper.hxx | 4 +- chart2/source/inc/TitleHelper.hxx | 6 +-- chart2/source/inc/UncachedDataSequence.hxx | 4 +- chart2/source/inc/UserDefinedProperties.hxx | 2 +- chart2/source/inc/WrappedProperty.hxx | 6 +-- .../inc/chartview/DataPointSymbolSupplier.hxx | 6 +-- chart2/source/inc/chartview/DrawModelWrapper.hxx | 10 ++--- .../source/inc/chartview/ExplicitScaleValues.hxx | 2 +- .../source/inc/chartview/ExplicitValueProvider.hxx | 22 +++++------ chart2/source/model/inc/ChartTypeManager.hxx | 2 +- chart2/source/model/inc/DataSeries.hxx | 2 +- chart2/source/model/inc/Diagram.hxx | 6 +-- chart2/source/model/inc/XMLFilter.hxx | 33 +++++++--------- chart2/source/model/main/DataPointProperties.hxx | 2 +- chart2/source/model/main/DataSeriesProperties.hxx | 2 +- chart2/source/model/template/ChartTypeTemplate.hxx | 8 ++-- chart2/source/tools/ImplOPropertySet.hxx | 2 +- chart2/source/view/axes/Tickmarks.hxx | 4 +- chart2/source/view/axes/VAxisBase.hxx | 2 +- chart2/source/view/axes/VAxisOrGridBase.hxx | 2 +- chart2/source/view/axes/VAxisProperties.hxx | 6 +-- chart2/source/view/charttypes/Splines.hxx | 2 +- chart2/source/view/inc/Clipping.hxx | 2 +- chart2/source/view/inc/LabelPositionHelper.hxx | 8 ++-- chart2/source/view/inc/LegendEntryProvider.hxx | 12 +++--- chart2/source/view/inc/PlotterBase.hxx | 8 ++-- chart2/source/view/inc/PlottingPositionHelper.hxx | 8 ++-- chart2/source/view/inc/PropertyMapper.hxx | 2 +- chart2/source/view/inc/ShapeFactory.hxx | 22 +++++------ chart2/source/view/inc/VCoordinateSystem.hxx | 16 ++++---- chart2/source/view/inc/VDataSeries.hxx | 14 +++---- chart2/source/view/inc/VDiagram.hxx | 8 ++-- chart2/source/view/inc/VLegendSymbolFactory.hxx | 12 +++--- chart2/source/view/inc/VLineProperties.hxx | 2 +- chart2/source/view/inc/VSeriesPlotter.hxx | 8 ++-- chart2/source/view/main/VButton.hxx | 8 ++-- chart2/source/view/main/VLegend.hxx | 14 +++---- chart2/source/view/main/VTitle.hxx | 10 ++--- codemaker/source/cppumaker/dependencies.hxx | 4 +- codemaker/source/cppumaker/dumputils.hxx | 4 +- codemaker/source/cppumaker/includes.hxx | 4 +- codemaker/source/javamaker/classfile.hxx | 4 +- comphelper/source/inc/comphelper_module.hxx | 4 +- configmgr/source/access.hxx | 4 +- configmgr/source/broadcaster.hxx | 4 +- configmgr/source/childaccess.hxx | 4 +- configmgr/source/components.hxx | 4 +- configmgr/source/configurationprovider.hxx | 8 ++-- configmgr/source/configurationregistry.hxx | 8 ++-- configmgr/source/dconf.hxx | 4 +- configmgr/source/defaultprovider.hxx | 8 ++-- configmgr/source/readonlyaccess.hxx | 8 ++-- configmgr/source/readwriteaccess.hxx | 8 ++-- configmgr/source/rootaccess.hxx | 4 +- configmgr/source/type.hxx | 4 +- configmgr/source/update.hxx | 8 ++-- configmgr/source/valueparser.hxx | 4 +- connectivity/qa/connectivity/ado/DriverTest.cxx | 4 +- connectivity/source/drivers/hsqldb/accesslog.cxx | 2 +- connectivity/source/drivers/hsqldb/accesslog.hxx | 2 +- connectivity/source/drivers/mork/MDriver.hxx | 8 ++-- connectivity/source/drivers/odbc/ORealDriver.hxx | 8 ++-- .../source/drivers/postgresql/pq_xcolumns.hxx | 2 +- connectivity/source/inc/ado/ADriver.hxx | 4 +- connectivity/source/inc/calc/CConnection.hxx | 4 +- connectivity/source/inc/calc/CTable.hxx | 8 ++-- connectivity/source/inc/component/CTable.hxx | 8 ++-- connectivity/source/inc/hsqldb/HStorageAccess.hxx | 4 +- connectivity/source/inc/hsqldb/HTools.hxx | 4 +- connectivity/source/inc/hsqldb/HView.hxx | 4 +- .../source/inc/java/ContextClassLoader.hxx | 4 +- connectivity/source/inc/java/GlobalRef.hxx | 4 +- connectivity/source/inc/java/LocalRef.hxx | 4 +- connectivity/source/inc/java/sql/ConnectionLog.hxx | 12 +++--- cppcanvas/source/inc/canvasgraphichelper.hxx | 4 +- cppcanvas/source/mtfrenderer/mtftools.hxx | 4 +- cppcanvas/source/mtfrenderer/polypolyaction.hxx | 4 +- cppcanvas/source/wrapper/implcanvas.hxx | 4 +- cppcanvas/source/wrapper/implpolypolygon.hxx | 4 +- cppu/source/uno/IdentityMapping.hxx | 4 +- cppu/source/uno/loadmodule.hxx | 4 +- .../qa/propertysetmixin/comp_propertysetmixin.cxx | 2 +- .../qa/propertysetmixin/test_propertysetmixin.cxx | 2 +- .../source/loadsharedlibcomponentfactory.hxx | 8 ++-- cppuhelper/source/macro_expander.hxx | 4 +- cppuhelper/source/servicemanager.hxx | 4 +- cppuhelper/source/typemanager.hxx | 4 +- cui/source/inc/SpellDialog.hxx | 5 +-- cui/source/inc/colorpicker.hxx | 4 +- cui/source/inc/optdict.hxx | 11 +++--- cui/source/inc/optlingu.hxx | 17 ++++---- cui/source/inc/treeopt.hxx | 8 ++-- cui/source/options/optsave.hxx | 5 +-- 228 files changed, 690 insertions(+), 706 deletions(-) diff --git a/canvas/inc/verifyinput.hxx b/canvas/inc/verifyinput.hxx index 91a59d7fc25a..b37468ebbe24 100644 --- a/canvas/inc/verifyinput.hxx +++ b/canvas/inc/verifyinput.hxx @@ -24,7 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace geometry +namespace com::sun::star::geometry { struct RealPoint2D; struct RealSize2D; @@ -35,9 +35,9 @@ namespace com { namespace sun { namespace star { namespace geometry struct IntegerPoint2D; struct IntegerSize2D; struct IntegerRectangle2D; -} } } } +} -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { struct RenderState; struct StrokeAttributes; @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace rendering struct ViewState; struct IntegerBitmapLayout; struct FontRequest; -} } } } +} namespace com::sun::star::uno { template class Sequence; } diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx index f90c49cf5537..4fab5a9e596b 100644 --- a/canvas/source/directx/dx_impltools.hxx +++ b/canvas/source/directx/dx_impltools.hxx @@ -40,18 +40,18 @@ namespace basegfx class B2DPolyPolygon; }; -namespace com { namespace sun { namespace star { namespace geometry +namespace com::sun::star::geometry { struct IntegerRectangle2D; struct RealPoint2D; -} } } } +} -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { class XBitmap; class XPolyPolygon2D; class XCanvasFont; -} } } } +} namespace dxcanvas diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index 897d7eb1c727..0448c39aa8d0 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx @@ -31,9 +31,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace rendering { - class XCanvasFont; -} } } } +namespace com::sun::star::rendering { class XCanvasFont; } namespace Gdiplus { class Graphics; } diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx index 878b586f9c9e..1ee15a9ba989 100644 --- a/canvas/source/opengl/ogl_canvastools.hxx +++ b/canvas/source/opengl/ogl_canvastools.hxx @@ -15,9 +15,9 @@ #include -namespace com { namespace sun { namespace star { namespace rendering { +namespace com::sun::star::rendering { struct ARGBColor; -}}}} +} namespace basegfx { class B2DPolyPolygon; class B2DHomMatrix; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index 4d3664db6eb4..a4dd4d77e095 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -23,10 +23,10 @@ namespace vcl { class Window; } class SystemChildWindow; namespace basegfx{ class B2IVector; class B2DHomMatrix; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt { struct Rectangle; } namespace geometry { struct AffineMatrix2D; } -}}} +} namespace oglcanvas { diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx index 4a8a8de25e64..adef65760e27 100644 --- a/canvas/source/opengl/ogl_texturecache.hxx +++ b/canvas/source/opengl/ogl_texturecache.hxx @@ -13,9 +13,9 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace geometry { struct IntegerSize2D; } -}}} +} namespace oglcanvas { diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index db74b533a7d6..eb4918c68459 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -44,31 +44,31 @@ namespace basegfx } } -namespace com { namespace sun { namespace star { namespace awt +namespace com::sun::star::awt { struct Point; struct Size; struct Rectangle; -} } } } +} -namespace com { namespace sun { namespace star { namespace drawing +namespace com::sun::star::drawing { struct HomogenMatrix3; -} } } } +} -namespace com { namespace sun { namespace star { namespace geometry +namespace com::sun::star::geometry { struct RealPoint2D; struct RealSize2D; struct RealRectangle2D; -} } } } +} -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { struct RenderState; struct ViewState; class XBitmap; -} } } } +} namespace vclcanvas diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index fe9cc2c7fe89..8c9c4ad69344 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -55,14 +55,14 @@ #include -namespace com { namespace sun { namespace star { namespace awt { class XRequestCallback; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } } -namespace com { namespace sun { namespace star { namespace document { class XFilter; } } } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } } +namespace com::sun::star::awt { class XRequestCallback; } +namespace com::sun::star::chart2 { class XChartTypeTemplate; } +namespace com::sun::star::chart2::data { class XDataProvider; } +namespace com::sun::star::document { class XFilter; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { class XAggregation; } class SvNumberFormatter; diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 2be47c84e76e..de9459ed6573 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -40,11 +40,11 @@ #include -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XUpdatable2; } } } } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::io { class XOutputStream; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XUpdatable2; } class SdrPage; diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 89c91ae3905f..ad2802773cf0 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -61,10 +61,10 @@ using namespace css; using namespace css::uno; -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace table { class XTableCharts; } } } } -namespace com { namespace sun { namespace star { namespace table { class XTablePivotCharts; } } } } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::table { class XTableCharts; } +namespace com::sun::star::table { class XTablePivotCharts; } class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index e4b8f9cd3d53..3e42ea78463c 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -22,9 +22,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XFont; } } } } +namespace com::sun::star::accessibility { class XAccessible; } +namespace com::sun::star::accessibility { class XAccessibleContext; } +namespace com::sun::star::awt { class XFont; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 859b9c9a0720..b6770a5a2489 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -31,7 +31,7 @@ #include -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } +namespace com::sun::star::chart2 { class XAxis; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 2c7b2b050738..5f3448edc509 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -28,16 +28,16 @@ namespace chart { struct ExplicitIncrementData; } namespace chart { struct ExplicitScaleData; } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } -namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XUnoTunnel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2 { class XTitle; } +namespace com::sun::star::container { class XNameContainer; } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::lang { class XUnoTunnel; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index e8eed08a0438..98317470c1ea 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -30,7 +30,7 @@ #include -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com::sun::star::chart2 { class XDataSeries; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 45be31f52714..ca7d8ca89acc 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -38,8 +38,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::lang { class XEventListener; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 577b885f0336..e1e7282af13c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -30,8 +30,8 @@ #include -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::chart2 { class XTitle; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index f8f8ae937114..0cf59813467b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -21,7 +21,7 @@ #include -namespace chart { namespace wrapper { class ChartDocumentWrapper; } } +namespace chart::wrapper { class ChartDocumentWrapper; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index 25dbe7b14b84..35a00856c0df 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -25,7 +25,7 @@ #include namespace chart { class WrappedProperty; } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx index 2248bf5c861b..cfc6273454ef 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx @@ -24,7 +24,7 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace chart::wrapper { class Chart2ModelContact; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx index 42b24bf6f544..7180f7e19a43 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 18ada6723146..a20a4bbc32b0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -23,7 +23,7 @@ #include -namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace chart::wrapper { class Chart2ModelContact; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index ba3be4574036..59bb1f3b1dcb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -23,7 +23,7 @@ #include -namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace chart::wrapper { class Chart2ModelContact; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index e2602bbf5bb6..e62b5f7021f8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -24,7 +24,7 @@ #include #include -namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace chart::wrapper { class Chart2ModelContact; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx index 872476a43b62..85748851a651 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 0c410c0d3c39..6b7ae6416d81 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -24,7 +24,7 @@ #include #include -namespace chart { namespace wrapper { class Chart2ModelContact; } } +namespace chart::wrapper { class Chart2ModelContact; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index a57525acca71..84c477678a28 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -26,7 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com::sun::star::chart2 { class XDataSeries; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx index 09cb8e90f621..d52c102c0fca 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx index c2a946394ca6..774d7a6da31b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx index d477b351a5b3..1cc9d579bc1d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx index 653b83110fdc..d8eca1a938f6 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx @@ -24,8 +24,8 @@ #include namespace chart { class WrappedProperty; } -namespace chart { namespace wrapper { class Chart2ModelContact; } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace chart::wrapper { class Chart2ModelContact; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index d3575d2e03e3..8e6372b0b833 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -27,16 +27,16 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt { class XWindow; } namespace chart2 { class XChartDocument; } -}}} +} -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } class OutputDevice; diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index fb497bd563c5..a4ba44987a45 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -24,13 +24,13 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::uno { class XComponentContext; } -namespace com { namespace sun { namespace star { namespace chart2 { +namespace com::sun::star::chart2 { class XDataSeries; class XChartType; -}}}} +} namespace chart { diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index a5acf7f37d50..8b3a2a5c05f3 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -27,13 +27,13 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Sequence; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template class Sequence; } -namespace com { namespace sun { namespace star { namespace chart2 { +namespace com::sun::star::chart2 { class XDataSeriesContainer; class XDataSeries; class XChartType; @@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace chart2 { class XDataProvider; class XLabeledDataSequence; } -}}}} +} namespace chart { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 6a00d3fb71be..00bc4e3f40bb 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -22,7 +22,7 @@ #include namespace chart { class ControllerLockHelper; } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 22c5651d8995..21597d382551 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -22,7 +22,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } namespace chart { class ControllerLockHelper; } namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 78c84f23472e..27606079ec91 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -23,7 +23,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } class ColorListBox; class LightButton; diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index df835f3b325d..405c3c9edf9d 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -28,7 +28,7 @@ #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } namespace weld { class CustomWeld; } class ValueSet; diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 4c3ecf300cc7..3ba36a1cf97f 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -23,8 +23,8 @@ #include -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 { class TabPageNotifiable; } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index c3883e837951..b337910ccbd2 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -25,7 +25,7 @@ #include namespace chart { class TabPageNotifiable; } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } } +namespace com::sun::star::chart2 { class XChartTypeTemplate; } namespace chart { diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index f8cfffdbc619..f6c5bbc4b297 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -28,8 +28,8 @@ namespace chart { class LegendPositionResources; } namespace chart { class TitleResources; } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 96750c37d54e..ef1eab3296fb 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -38,9 +38,9 @@ #include -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::view { class XSelectionSupplier; } namespace utl { class AccessibleStateSetHelper; } diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 0acac0d57e2b..f6e174b53b14 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -27,10 +27,10 @@ #include -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::accessibility { class XAccessible; } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::view { class XSelectionSupplier; } namespace accessibility { diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index b1327ff50040..5bd230bd67d7 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -23,16 +23,16 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } namespace chart { struct ExplicitIncrementData; } namespace chart { struct ExplicitScaleData; } class SdrModel; -namespace chart { namespace wrapper { +namespace chart::wrapper { class AxisItemConverter : public ItemConverter { @@ -69,7 +69,7 @@ private: std::unique_ptr m_pExplicitIncrement; }; -}} +} #endif diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index d89b10d9b197..0cf947d0e953 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -24,7 +24,7 @@ #include -namespace chart { namespace wrapper { +namespace chart::wrapper { class CharacterPropertyItemConverter final : public ItemConverter { @@ -55,7 +55,7 @@ private: std::optional m_pRefSize; }; -}} +} #endif diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index e5ab612c578f..1977e8e169fa 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -42,23 +42,23 @@ #include -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XFocusListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XKeyListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XMouseListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XMouseMotionListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XPaintListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XWindowListener; } } } } -namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } -namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XLayoutManagerEventBroadcaster; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XInitialization; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XCloseable; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::accessibility { class XAccessible; } +namespace com::sun::star::accessibility { class XAccessibleContext; } +namespace com::sun::star::awt { class XFocusListener; } +namespace com::sun::star::awt { class XKeyListener; } +namespace com::sun::star::awt { class XMouseListener; } +namespace com::sun::star::awt { class XMouseMotionListener; } +namespace com::sun::star::awt { class XPaintListener; } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::awt { class XWindowListener; } +namespace com::sun::star::awt { struct Point; } +namespace com::sun::star::document { class XUndoManager; } +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XLayoutManagerEventBroadcaster; } +namespace com::sun::star::lang { class XInitialization; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XCloseable; } +namespace com::sun::star::view { class XSelectionSupplier; } class SdrModel; @@ -68,17 +68,17 @@ namespace svt class AcceleratorExecute; } -namespace svx { namespace sidebar { +namespace svx::sidebar { class SelectionChangeHandler; -}} +} class DropTargetHelper; -namespace com { namespace sun { namespace star { -namespace graphic { - class XGraphic; +namespace com::sun::star { + namespace graphic { + class XGraphic; + } } -}}} namespace chart { diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 0a6a52f2c23f..9f36c42b3a2f 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -30,8 +30,8 @@ #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XRefreshable; } } } } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XRefreshable; } namespace chart { diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx index 37adeb087847..140a62b60a5c 100644 --- a/chart2/source/controller/inc/ChartToolbarController.hxx +++ b/chart2/source/controller/inc/ChartToolbarController.hxx @@ -19,8 +19,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XFramesSupplier; } } } } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XFramesSupplier; } namespace chart { diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx index bcc79758b545..8e6aa4c49c49 100644 --- a/chart2/source/controller/inc/CommandDispatchContainer.hxx +++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx @@ -25,12 +25,12 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XController; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace frame { struct DispatchDescriptor; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { struct URL; } } } } +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame { struct DispatchDescriptor; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { struct URL; } namespace chart { diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 61a70d9e4020..88c2b3a274e2 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -27,14 +27,14 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } class SdrModel; -namespace chart { namespace wrapper { +namespace chart::wrapper { class DataPointItemConverter : public ItemConverter { @@ -84,7 +84,7 @@ private: css::uno::Reference m_xSeries; }; -}} +} #endif diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index c9814bc96026..8bad644101cb 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -22,8 +22,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::frame { class XModel; } class SdrModel; diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index bedb0dc9d6af..691ca508a172 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -22,8 +22,8 @@ #include "ItemConverter.hxx" -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index e65b7be16a14..1fcc4f2244ce 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -21,7 +21,7 @@ #include "ItemConverter.hxx" -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index b8fa2614d6bf..8d00d90426f4 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -24,10 +24,10 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { class XPropertySetInfo; } -namespace chart { namespace wrapper { +namespace chart::wrapper { /** This class serves for conversion between properties of an XPropertySet and @@ -190,7 +190,7 @@ private: SfxItemPool& m_rItemPool; }; -}} +} // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ITEMCONVERTER_HXX #endif diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index 4790bd42dc6a..26cd4e88c5a2 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -25,12 +25,12 @@ #include -namespace chart { namespace wrapper { +namespace chart::wrapper { typedef std::map< ItemConverter::tWhichIdType, std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > ItemPropertyMapType; -}} +} #endif diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index a466a0886fde..74de6cd62cc5 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -23,8 +23,8 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 05e435c3830f..9f5fd399d196 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -21,13 +21,13 @@ #include "MultipleItemConverter.hxx" -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; -namespace chart { namespace wrapper { +namespace chart::wrapper { class AllAxisItemConverter : public MultipleItemConverter { @@ -98,8 +98,7 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; }; -} // namespace wrapper -} // namespace chart +} // namespace chart::wrapper // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLECHARTCONVERTERS_HXX #endif diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index f8defdb60d0b..e2e8f077569a 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -23,7 +23,7 @@ #include -namespace chart { namespace wrapper { +namespace chart::wrapper { /** Note: virtual const sal_uInt16 * GetWhichPairs() const; is still pure virtual */ @@ -44,6 +44,6 @@ protected: std::vector< std::unique_ptr > m_aConverters; }; -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 10b95b951949..a765275c4ef5 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -21,8 +21,8 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct KeyEvent; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::awt { struct KeyEvent; } +namespace com::sun::star::chart2 { class XChartDocument; } #include #include diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 3df39335cd80..ea0f7c4a7349 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -23,8 +23,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 964eebfb03cc..efe94648a1c9 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -22,8 +22,8 @@ #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::awt { struct Rectangle; } namespace chart { diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index e1f69777b6c9..e4669a044858 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -23,15 +23,15 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::chart2 { class XChartDocument; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sheet{ class XRangeSelection; class XRangeSelectionListener; } -}}} +} namespace chart { diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index be064b5e22bc..6f6239a0e95d 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -23,7 +23,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 4b4585e1db61..73e67900ec8d 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -21,8 +21,8 @@ #include "ItemConverter.hxx" -namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::chart2 { class XRegressionCurveContainer; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 25a540ff5aef..237452f6f898 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -23,13 +23,13 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; -namespace chart { namespace wrapper { +namespace chart::wrapper { class RegressionEquationItemConverter : public ItemConverter { @@ -57,7 +57,7 @@ private: std::vector< std::unique_ptr > m_aConverters; }; -}} +} #endif diff --git a/chart2/source/controller/inc/SelectionHelper.hxx b/chart2/source/controller/inc/SelectionHelper.hxx index 09a701fc14a7..570fc60a58be 100644 --- a/chart2/source/controller/inc/SelectionHelper.hxx +++ b/chart2/source/controller/inc/SelectionHelper.hxx @@ -24,7 +24,7 @@ class SdrObject; -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com::sun::star::drawing { class XShape; } namespace chart { diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 378956c47212..2be1490ee997 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -22,9 +22,9 @@ #include "ItemConverter.hxx" #include -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 40fe5e2d7804..00760488fa25 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -21,7 +21,7 @@ #include "ItemConverter.hxx" -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx index 3ca0ca7d7e69..9647793a8df1 100644 --- a/chart2/source/controller/inc/TextLabelItemConverter.hxx +++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx @@ -25,11 +25,11 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::frame { class XModel; } -namespace chart { namespace wrapper { +namespace chart::wrapper { class TextLabelItemConverter : public ItemConverter { @@ -66,7 +66,7 @@ private: bool mbForbidPercentValue:1; }; -}} +} #endif diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 4404c052dc87..e8018ae4370a 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -24,7 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { class ControllerLockGuardUNO; } namespace chart diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 446f71cc8f93..d589dc65df03 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -23,8 +23,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index b49a80269680..59078b5e949e 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -23,12 +23,12 @@ #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::lang { class XMultiServiceFactory; } class SdrModel; -namespace chart { namespace wrapper { +namespace chart::wrapper { class TitleItemConverter : public ItemConverter { @@ -55,7 +55,7 @@ private: std::vector< std::unique_ptr > m_aConverters; }; -}} +} #endif diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 3b01f54b76af..64cab54b8ced 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -21,7 +21,7 @@ #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 6cadcd5e6573..bfa1ce433a42 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -23,8 +23,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::beans { class XPropertySetInfo; } namespace chart { diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index e6051054d257..b44050eefd01 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -27,8 +27,8 @@ #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::uno { class XComponentContext; } using vcl::WizardTypes::WizardState; using vcl::WizardTypes::CommitPageReason; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index c3ebb615db32..33d1dfbf1a69 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -30,9 +30,9 @@ #include "dlg_CreationWizard.hxx" -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } class VclWindowEvent; diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 2d36f38df7bf..878dc9d9cd69 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -22,14 +22,14 @@ #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace comphelper { template class mem_fun1_t; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace chart2 { class XChartDocument; } -}}} +} namespace chart { diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index ca8777568826..272fe1a81813 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -23,8 +23,8 @@ #include "TabPageNotifiable.hxx" -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::uno { class XComponentContext; } #include diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index ff0de594b247..60cbaac65856 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -25,7 +25,7 @@ #include "res_ErrorBar.hxx" -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index a2c8e50d6172..41605db736f7 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -25,8 +25,8 @@ #include "res_LegendPosition.hxx" -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index e4ab483b0ce5..fe9114443508 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -22,7 +22,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::util { class XNumberFormatsSupplier; } class Graphic; namespace chart diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index d386a9f33b94..ad5466e49a37 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -22,7 +22,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 18fc12362663..0514855a2d60 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -25,7 +25,7 @@ #include #include "RangeSelectionListener.hxx" -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } namespace weld { class Builder; } namespace weld { class Button; } namespace weld { class CheckButton; } diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index f5901ef33f41..3701225b66d3 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -22,8 +22,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } namespace weld { class Builder; } namespace weld { class CheckButton; } namespace weld { class RadioButton; } diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index 64a898635b5f..04c390a0070e 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -21,11 +21,11 @@ #include -namespace com { namespace sun { namespace star { -namespace chart2 { - class XChartDocument; +namespace com::sun::star { + namespace chart2 { + class XChartDocument; + } } -}}} namespace chart { diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 9287198aa62b..d1564b46e5fa 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -24,7 +24,7 @@ #include #include -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/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx index 8d1dbb0edc55..eb5a9b0279de 100644 --- a/chart2/source/controller/main/ChartModelClone.hxx +++ b/chart2/source/controller/main/ChartModelClone.hxx @@ -23,8 +23,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::chart2 { class XInternalDataProvider; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index e864054e758f..ebe6df966874 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -21,11 +21,11 @@ #include -namespace com { namespace sun { namespace star { -namespace graphic { - class XGraphic; +namespace com::sun::star { + namespace graphic { + class XGraphic; + } } -}}} class SdrModel; class SdrObject; diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 2265bdbb94dd..00638a6c0e24 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -27,8 +27,8 @@ #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XURLTransformer; } namespace chart { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index b2f2a5e3dc51..67a07514ee45 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -26,7 +26,7 @@ #include -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::view { class XSelectionSupplier; } namespace chart { diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index a558bdfbf533..9ae8090fc963 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -24,7 +24,7 @@ #include namespace chart { class DrawViewWrapper; } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index 6c3734154ecf..8ad9e62aad59 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -24,9 +24,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace util { class XModifiable; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::util { class XModifiable; } +namespace com::sun::star::view { class XSelectionSupplier; } namespace chart { diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index fb7f5f3a07ff..770cb06cf008 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -27,7 +27,7 @@ #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } class SdrUndoAction; diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 60a8273135b4..aa5f5b2e3999 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -21,8 +21,8 @@ #include "CommandDispatch.hxx" -namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::document { class XUndoManager; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index 5f3331ed63c0..0d9fa75386e4 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -25,8 +25,8 @@ #include -namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::document { class XUndoManager; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx index a3292525e6ff..c91c144422ef 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx @@ -25,7 +25,7 @@ #include -namespace chart { namespace sidebar { +namespace chart::sidebar { typedef ::cppu::WeakComponentImplHelper < css::ui::XUIElementFactory, css::lang::XServiceInfo @@ -54,7 +54,7 @@ public: virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; }; -} } // end of namespace sc::sidebar +} // end of namespace chart::sidebar #endif diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 00f313b24783..b510ef8b564c 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -19,8 +19,8 @@ #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } } +namespace com::sun::star::util { class XModifyListener; } +namespace com::sun::star::view { class XSelectionChangeListener; } class Edit; class ListBox; diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 8f16c1b1dd33..425b074f96cb 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -13,12 +13,12 @@ #include #include -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } class SvxColorToolBoxControl; class SvxLineStyleToolBoxControl; -namespace chart { namespace sidebar { +namespace chart::sidebar { class ChartColorWrapper { @@ -61,7 +61,7 @@ private: SvxLineStyleToolBoxControl* mpControl; }; -} } +} #endif diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index abe74a7fdf21..9d3ea7f6d913 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -26,7 +26,7 @@ #include "ChartSidebarModifyListener.hxx" #include -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } +namespace com::sun::star::util { class XModifyListener; } namespace chart { diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index 8d94c4a814f3..ee5a306ba938 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -18,7 +18,7 @@ #include "ChartSidebarModifyListener.hxx" -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } +namespace com::sun::star::util { class XModifyListener; } namespace chart { diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 578a42638308..3197237297f6 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -27,8 +27,8 @@ #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } } +namespace com::sun::star::util { class XModifyListener; } +namespace com::sun::star::view { class XSelectionChangeListener; } namespace chart { diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 2cbe2d82e381..2097d216bc60 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -27,14 +27,14 @@ namespace chart { class ChartModel; } namespace chart { class ExplicitCategoriesProvider; } namespace chart { class ReferenceSizeProvider; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XScaling; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2 { class XScaling; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx index 5ff581fdf9b8..014371bfa20e 100644 --- a/chart2/source/inc/BaseGFXHelper.hxx +++ b/chart2/source/inc/BaseGFXHelper.hxx @@ -31,8 +31,8 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } +namespace com::sun::star::awt { struct Rectangle; } +namespace com::sun::star::drawing { struct PolyPolygonShape3D; } namespace chart { diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 9d8cb6e6ec0d..90acd6dbfa63 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -35,7 +35,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index fe22e7b9a0e5..7385bfe12020 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -26,8 +26,8 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { class XMultiPropertySet; } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 92c8c80ee534..0a8192706ef0 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -25,15 +25,15 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XRangeHighlighter; } } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2::data { class XDataProvider; } +namespace com::sun::star::chart2::data { class XRangeHighlighter; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::view { class XSelectionSupplier; } namespace chart { diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index f9ba155b397e..1a4fc2f8d012 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -23,8 +23,8 @@ #include #include "charttoolsdllapi.hxx" -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/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 9705aa9625f5..48f7c27b6fac 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -21,8 +21,8 @@ #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::uno { template class Reference; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index e98cfe1c654a..6c34693da111 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -22,8 +22,8 @@ #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { template class Reference; } namespace chart { diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index c60a4d301df3..940b95d70502 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -32,9 +32,9 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonBezierCoords; } } } } +namespace com::sun::star::awt { struct Rectangle; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; } namespace chart { diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 2f9dc85a43df..7d0bbf662ed4 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -26,7 +26,7 @@ #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index d6b611da31f5..090becde9343 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -23,7 +23,7 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 2bc605daecc3..c6fba94de6c7 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -26,16 +26,16 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Sequence; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::chart2::data { class XDataSource; } +namespace com::sun::star::chart2::data { class XLabeledDataSequence; } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template class Sequence; } namespace chart { diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index 743638395987..5f159f6a5dac 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -25,13 +25,13 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::chart2::data { class XDataSource; } +namespace com::sun::star::chart2::data { class XLabeledDataSequence; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 7d98375897f0..3fcd9a0af2d3 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -28,15 +28,15 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XNumberFormats; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } namespace chart { diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index 641da3599379..c40fdc49c1e2 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -23,7 +23,7 @@ #include -namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } } +namespace com::sun::star::lang { class XEventListener; } namespace chart { diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 085f348b61d4..13c9a3605cc6 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -27,10 +27,10 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::chart2::data { class XLabeledDataSequence; } +namespace com::sun::star::uno { class Any; } namespace chart { diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index c27cee84ecc2..65a7b221e517 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -25,7 +25,7 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index 91e337248914..9953de31aff5 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -21,10 +21,10 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XFormattedString2; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XFormattedString2; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template class Reference; } namespace chart { diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 48365c9ecb67..7c3491ae17e6 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -33,7 +33,7 @@ #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com::sun::star::chart2 { class XChartDocument; } namespace chart { diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 6117c2ffa322..dd99ac8479b5 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -25,9 +25,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } } -namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::util { class XCloneable; } +namespace com::sun::star::util { class XModifyListener; } namespace chart { diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index 9b1d2546beca..75064f594eb6 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -23,9 +23,9 @@ #include "charttoolsdllapi.hxx" namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XLegend; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2 { class XLegend; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 755227d30a9d..ca1e583f9835 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -24,10 +24,10 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } } -namespace com { namespace sun { namespace star { namespace util { class CloseVetoException; } } } } -namespace com { namespace sun { namespace star { namespace util { class XCloseListener; } } } } -namespace com { namespace sun { namespace star { namespace util { class XCloseable; } } } } +namespace com::sun::star::lang { class XComponent; } +namespace com::sun::star::util { class CloseVetoException; } +namespace com::sun::star::util { class XCloseListener; } +namespace com::sun::star::util { class XCloseable; } namespace apphelper { diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index bcbdf39186a0..11c56b186eaf 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -25,9 +25,9 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { struct Property; } +namespace com::sun::star::uno { template class Reference; } namespace chart { diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 1b1025007949..f44d5d1d038f 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -24,11 +24,11 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } -namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } -namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } } -namespace com { namespace sun { namespace star { namespace io { class XStream; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::io { class XOutputStream; } +namespace com::sun::star::io { class XStream; } /* * This class helps to read and write the properties mentioned in the service description diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 04d044172fba..29c4106f538f 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -29,8 +29,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class WeakReference; } } } } +namespace com::sun::star::uno { class XWeak; } +namespace com::sun::star::uno { template class WeakReference; } namespace chart { diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index 87fb5723e3fc..59248857b91c 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -25,16 +25,16 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } +namespace com::sun::star::awt { struct Point; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XInterface; } namespace chart { diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index ddf941a6d3e5..19ce354c9735 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -25,7 +25,7 @@ #include -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart { diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index acb79c80e302..c1fe2d721b5b 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -24,15 +24,15 @@ #include #include -namespace com { namespace sun { namespace star { -namespace chart2 { - class XDiagram; - class XDataSeries; - class XAxis; -}}}} - -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } +namespace com::sun::star { + namespace chart2 { + class XDiagram; + class XDataSeries; + class XAxis; + } +} +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::view { class XSelectionSupplier; } namespace chart { diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 59b11ead29f5..253ab79fb7b4 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -23,16 +23,16 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { -namespace chart2 { - class XTitle; - class XTitled; - class XChartDocument; +namespace com::sun::star { + namespace chart2 { + class XTitle; + class XTitled; + class XChartDocument; + } + namespace beans { + class XPropertySet; + } } -namespace beans { - class XPropertySet; -} -}}} namespace chart { diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index de38bcd7e725..183db2b65c06 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -24,8 +24,8 @@ #include -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } } +namespace com::sun::star::util { class XNumberFormatsSupplier; } +namespace com::sun::star::util { class XNumberFormatter; } namespace chart { diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index f5b3549df6fc..8fa4071471d0 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -24,14 +24,14 @@ #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurve; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveCalculator; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::chart2 { class XRegressionCurve; } +namespace com::sun::star::chart2 { class XRegressionCurveCalculator; } +namespace com::sun::star::chart2 { class XRegressionCurveContainer; } +namespace com::sun::star::chart2::data { class XDataSource; } +namespace com::sun::star::frame { class XModel; } namespace chart { diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 36933110f059..961a55e99f6e 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -25,8 +25,8 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { struct RelativeSize; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::chart2 { struct RelativeSize; } namespace chart { diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index 22bb89ac7bb4..517804096100 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -21,9 +21,9 @@ #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { template class Reference; } namespace chart { diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index 9553a5a60d4a..9fedd60a643f 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -25,7 +25,7 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 369b41ec5b43..d9793456917f 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -23,13 +23,13 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Sequence; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2::data { class XDataProvider; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::chart2::data { class XDataSource; } +namespace com::sun::star::chart2::data { class XLabeledDataSequence; } +namespace com::sun::star::uno { template class Sequence; } namespace chart { diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index fedf0d0df998..52c97392b5c9 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -23,8 +23,8 @@ #include #include "charttoolsdllapi.hxx" -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XDiagram; } namespace chart { diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 62068c4237a9..e16beda39134 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -25,9 +25,9 @@ namespace chart { class ChartModel; } namespace chart { class ReferenceSizeProvider; } -namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XTitle; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index c9d7e915de72..0829ceffafa0 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -36,8 +36,8 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } } +namespace com::sun::star::beans { class XPropertySetInfo; } +namespace com::sun::star::chart2 { class XInternalDataProvider; } namespace chart { diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index b2f700813311..93d7af9fda42 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -24,7 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 231a0ed3f21f..82b9f3b0cbd9 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -27,9 +27,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { class XPropertyState; } +namespace com::sun::star::uno { template class Reference; } namespace chart { diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index e9ad4f82f372..203c3c390bd1 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -23,9 +23,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct Direction3D; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::drawing { struct Direction3D; } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart { diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index fe2797c7be70..3bc0b4fef2cf 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -23,11 +23,11 @@ #include -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } class SdrObjList; class SdrObject; diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index 6e1f093025f4..731d4c087a91 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -26,7 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XScaling; } } } } +namespace com::sun::star::chart2 { class XScaling; } namespace chart { diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index b300339a21b1..e2ff1e01a334 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -27,17 +27,17 @@ namespace chart { class ChartModel; } namespace chart { struct ExplicitIncrementData; } namespace chart { struct ExplicitScaleData; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Reference; } } } } -namespace com { namespace sun { namespace star { namespace uno { template class Sequence; } } } } -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::uno { class XInterface; } +namespace com::sun::star::uno { template class Reference; } +namespace com::sun::star::uno { template class Sequence; } +namespace com::sun::star::util { class XNumberFormatsSupplier; } namespace chart { diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index dc764ad86c53..176681564344 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -24,7 +24,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index aefab3406606..7a571f1eb423 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -40,7 +40,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } namespace chart { diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index c9690981bfbc..c909f183f174 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -34,9 +34,9 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::chart2::data { class XDataSource; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 2b79999eff40..4f4ba101a24b 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -29,25 +29,22 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XWriter; } } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiComponentFactory; } } } } - -namespace com { namespace sun { namespace star { -namespace embed -{ - class XStorage; -} -namespace xml { namespace sax -{ - class XFastParser; -}} -namespace document -{ - class XGraphicStorageHandler; +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::xml::sax { class XWriter; } +namespace com::sun::star::lang { class XMultiComponentFactory; } + +namespace com::sun::star { + namespace embed { + class XStorage; + } + namespace xml::sax { + class XFastParser; + } + namespace document { + class XGraphicStorageHandler; + } } -}}} namespace chart { diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 259e7a8976eb..0482108b1e6b 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -24,7 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index b0f6283db54c..331396b49f60 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -24,7 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } } +namespace com::sun::star::beans { struct Property; } namespace chart { diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 705bdbd6b3fe..0fe236ce1eb8 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -24,10 +24,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystemContainer; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XCoordinateSystemContainer; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index 9b47641ee13f..98dc53b008b0 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -26,7 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } } +namespace com::sun::star::style { class XStyle; } namespace property { diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 34addbeb45db..cab62aaa4477 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -27,8 +27,8 @@ namespace chart { struct AxisProperties; } namespace chart { struct TickmarkProperties; } -namespace com { namespace sun { namespace star { namespace chart2 { class XScaling; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com::sun::star::chart2 { class XScaling; } +namespace com::sun::star::drawing { class XShape; } namespace chart { diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 488583c10c2d..bddba67f9e5c 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -23,7 +23,7 @@ #include "VAxisProperties.hxx" #include "Tickmarks.hxx" -namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } } +namespace com::sun::star::util { class XNumberFormatsSupplier; } namespace chart { diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 705f298f2ea5..8bcaf898c3eb 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -25,7 +25,7 @@ #include -namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } +namespace com::sun::star::drawing { struct HomogenMatrix; } namespace chart { diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 93c703378f29..d087e5064e37 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -33,9 +33,9 @@ #include namespace chart { class ExplicitCategoriesProvider; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XTextualDataSequence; } } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2::data { class XTextualDataSequence; } namespace chart { diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index 91fbfd7a4a2a..af0d82ea7ce4 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -22,7 +22,7 @@ #include -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } +namespace com::sun::star::drawing { struct PolyPolygonShape3D; } namespace chart { diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index 9241fddd99a8..4f9a33adb55d 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -22,7 +22,7 @@ #include -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } +namespace com::sun::star::drawing { struct PolyPolygonShape3D; } namespace chart { diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index 6ebc36851c26..92b12d8d35f0 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -24,10 +24,10 @@ #include "PropertyMapper.hxx" #include -namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com::sun::star::drawing { struct Position3D; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::drawing { class XShape; } namespace chart { diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index 481583d5a5f8..88693900e8fb 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -26,12 +26,12 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XFormattedString2; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XFormattedString2; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 1ddea6f0396e..7fe205578b21 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -23,10 +23,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::drawing { struct HomogenMatrix; } +namespace com::sun::star::drawing { struct Position3D; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart { struct ExplicitScaleData; } diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index e3d761136fe6..198941330b12 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -29,10 +29,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace chart2 { class XTransformation; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } +namespace com::sun::star::chart2 { class XTransformation; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::drawing { struct HomogenMatrix; } +namespace com::sun::star::drawing { struct PolyPolygonShape3D; } namespace chart { diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 3335c4e795d7..5da914074e1c 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -26,7 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } namespace chart { diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 50f4b39b8532..02faf45b8716 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -28,17 +28,17 @@ #include namespace chart { struct VLineProperties; } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XFormattedString; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } } -namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace drawing { struct Direction3D; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XFormattedString; } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::drawing { struct HomogenMatrix; } +namespace com::sun::star::drawing { struct PolyPolygonShape3D; } +namespace com::sun::star::drawing { struct Position3D; } +namespace com::sun::star::graphic { class XGraphic; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::drawing { struct Direction3D; } namespace chart diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 895ac94f00a6..48f3f4aed0a6 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -31,14 +31,14 @@ namespace chart { class ExplicitCategoriesProvider; } namespace chart { class ScaleAutomatism; } -namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Rectangle; } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XAxis; } +namespace com::sun::star::chart2 { class XChartDocument; } +namespace com::sun::star::chart2 { class XCoordinateSystem; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 853b6757077b..287415c27280 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -29,13 +29,13 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } } -namespace com { namespace sun { namespace star { namespace chart2 { struct DataPointLabel; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { struct Symbol; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XChartType; } +namespace com::sun::star::chart2 { class XDataSeries; } +namespace com::sun::star::chart2::data { class XDataSequence; } +namespace com::sun::star::chart2 { struct DataPointLabel; } +namespace com::sun::star::chart2 { struct Symbol; } +namespace com::sun::star::drawing { class XShapes; } namespace chart { diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 1472b66e8a6a..15ea26434531 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -25,10 +25,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::chart2 { class XDiagram; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::drawing { class XShape; } namespace chart diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index 6690b9464966..96eb58782ec9 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -22,12 +22,12 @@ #include "LegendEntryProvider.hxx" #include -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::uno { class Any; } namespace chart { diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index e2fe6e5e37c3..a255499fd088 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -23,7 +23,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com::sun::star::beans { class XPropertySet; } namespace chart { diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 0d24901e33d1..6d9845bbc1b8 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -27,15 +27,15 @@ #include "LegendEntryProvider.hxx" #include -namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } } +namespace com::sun::star::awt { struct Point; } +namespace com::sun::star::chart2 { class XChartType; } namespace chart { class ExplicitCategoriesProvider; } namespace chart { struct ExplicitScaleData; } namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace util { class XNumberFormatsSupplier; } @@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { class XColorScheme; class XRegressionCurveCalculator; } -}}} +} namespace chart { diff --git a/chart2/source/view/main/VButton.hxx b/chart2/source/view/main/VButton.hxx index 060f09b79747..cb420332631a 100644 --- a/chart2/source/view/main/VButton.hxx +++ b/chart2/source/view/main/VButton.hxx @@ -15,10 +15,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart { diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 9e58c40c601f..e5332c41fb48 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -24,13 +24,13 @@ #include namespace chart { class ChartModel; } -namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } } -namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XLegend; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::awt { struct Rectangle; } +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::chart2 { class XLegend; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::uno { class XComponentContext; } namespace chart { diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 55a6f5e0de8b..45b9a5421324 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -24,11 +24,11 @@ #include #include -namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } -namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } -namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } } -namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com::sun::star::awt { struct Point; } +namespace com::sun::star::chart2 { class XTitle; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace chart { diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx index 3143b4e40483..2116404f60dc 100644 --- a/codemaker/source/cppumaker/dependencies.hxx +++ b/codemaker/source/cppumaker/dependencies.hxx @@ -31,7 +31,7 @@ class TypeManager; /// @HTML -namespace codemaker { namespace cppumaker { +namespace codemaker::cppumaker { /** A simple class to track which other entities a given entity depends on. @@ -121,7 +121,7 @@ private: bool m_sequenceDependency; }; -} } +} #endif diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx index 543427cb41f0..c89b40df994b 100644 --- a/codemaker/source/cppumaker/dumputils.hxx +++ b/codemaker/source/cppumaker/dumputils.hxx @@ -25,7 +25,7 @@ namespace rtl { class OUString; } class FileStream; -namespace codemaker { namespace cppumaker { +namespace codemaker::cppumaker { bool dumpNamespaceOpen( FileStream & out, rtl::OUString const & entityName, bool fullModuleType); @@ -35,7 +35,7 @@ bool dumpNamespaceClose( void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName); -} } +} #endif diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx index 35c3c7877712..0203868374f2 100644 --- a/codemaker/source/cppumaker/includes.hxx +++ b/codemaker/source/cppumaker/includes.hxx @@ -28,7 +28,7 @@ class FileStream; class TypeManager; -namespace codemaker { namespace cppumaker { +namespace codemaker::cppumaker { class Includes { public: @@ -93,7 +93,7 @@ private: bool m_includeTypelibTypedescriptionH; }; -} } +} #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_INCLUDES_HXX diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index db6388a3e958..9b8970748f9d 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -30,7 +30,7 @@ class FileStream; -namespace codemaker { namespace javamaker { +namespace codemaker::javamaker { class ClassFile { public: @@ -235,7 +235,7 @@ private: friend class Code; }; -} } +} #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_CLASSFILE_HXX diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx index 7569eb7ff050..11f5c36dbf37 100644 --- a/comphelper/source/inc/comphelper_module.hxx +++ b/comphelper/source/inc/comphelper_module.hxx @@ -23,7 +23,7 @@ #include -namespace comphelper { namespace module +namespace comphelper::module { @@ -52,7 +52,7 @@ namespace comphelper { namespace module } }; -} } // namespace comphelper::module +} // namespace comphelper::module #endif // INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 5c6075ecbf6d..910df97a50bc 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -53,7 +53,7 @@ #include "modifications.hxx" #include "type.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XHierarchicalPropertySetInfo; class XPropertiesChangeListener; @@ -69,7 +69,7 @@ namespace com { namespace sun { namespace star { class XInterface; } namespace util { struct ElementChange; } -} } } +} namespace configmgr { diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx index e0a5fc4ce962..bdb39adfbcbf 100644 --- a/configmgr/source/broadcaster.hxx +++ b/configmgr/source/broadcaster.hxx @@ -31,7 +31,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertiesChangeListener; class XPropertyChangeListener; @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } namespace lang { class XEventListener; } namespace util { class XChangesListener; } -} } } +} namespace configmgr { diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx index 7a5a692d56a9..bbf4e25e7755 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -34,11 +34,11 @@ #include "access.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; class Type; class XInterface; -} } } } +} namespace configmgr { diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 8db06909b192..87b8116d1d7f 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -33,13 +33,13 @@ #include "data.hxx" #include "modifications.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace uno { class Any; class XComponentContext; } -} } } +} namespace configmgr { diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx index c8e28e11f823..6f9696127374 100644 --- a/configmgr/source/configurationprovider.hxx +++ b/configmgr/source/configurationprovider.hxx @@ -26,15 +26,15 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XSingleComponentFactory; } namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace configuration_provider { +namespace configmgr::configuration_provider { css::uno::Reference< css::uno::XInterface > createDefault( css::uno::Reference< css::uno::XComponentContext > @@ -50,7 +50,7 @@ createFactory( cppu::ComponentFactoryFunc, OUString const &, css::uno::Sequence< OUString > const &, rtl_ModuleCount *); -} } +} #endif diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx index 0477facb3d65..5f74880590aa 100644 --- a/configmgr/source/configurationregistry.hxx +++ b/configmgr/source/configurationregistry.hxx @@ -25,14 +25,14 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace configuration_registry { +namespace configmgr::configuration_registry { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/dconf.hxx b/configmgr/source/dconf.hxx index f7f59703754c..aee033cf50e3 100644 --- a/configmgr/source/dconf.hxx +++ b/configmgr/source/dconf.hxx @@ -17,13 +17,13 @@ namespace configmgr { struct Data; } -namespace configmgr { namespace dconf { +namespace configmgr::dconf { void readLayer(Data & data, int layer); void writeModifications(Components & components, Data & data); -} } +} #endif diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx index 59e4222461d0..da97bc8baa55 100644 --- a/configmgr/source/defaultprovider.hxx +++ b/configmgr/source/defaultprovider.hxx @@ -25,14 +25,14 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace default_provider { +namespace configmgr::default_provider { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx index 48c14946d6f7..7d80c986a3f8 100644 --- a/configmgr/source/readonlyaccess.hxx +++ b/configmgr/source/readonlyaccess.hxx @@ -13,14 +13,14 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace read_only_access { +namespace configmgr::read_only_access { css::uno::Reference< css::uno::XInterface > create( @@ -32,7 +32,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx index 0413af35e60d..8e84a8607069 100644 --- a/configmgr/source/readwriteaccess.hxx +++ b/configmgr/source/readwriteaccess.hxx @@ -13,14 +13,14 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace read_write_access { +namespace configmgr::read_write_access { css::uno::Reference< css::uno::XInterface > create( @@ -32,7 +32,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index 0b2003f64f67..1e97e5f00e5c 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -34,13 +34,13 @@ #include "access.hxx" #include "modifications.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class Any; class Type; } namespace util { class XChangesListener; } -} } } +} namespace configmgr { diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx index eaac26ec1c2e..db49513a0df3 100644 --- a/configmgr/source/type.hxx +++ b/configmgr/source/type.hxx @@ -23,10 +23,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; class Type; -} } } } +} namespace configmgr { diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx index 85d8c895a5b3..7fd9244d9137 100644 --- a/configmgr/source/update.hxx +++ b/configmgr/source/update.hxx @@ -25,14 +25,14 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace update { +namespace configmgr::update { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index ccf2422b78a1..62ff3727d33d 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -32,9 +32,9 @@ #include "type.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; -} } } } +} namespace xmlreader { struct Span; } namespace configmgr { diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index 311ef6f11687..f4dd0ebc2791 100644 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; -namespace connectivity { namespace ado { +namespace connectivity::ado { class AdoDriverTest: public test::BootstrapFixture @@ -136,6 +136,6 @@ void AdoDriverTest::test_select_default_all() CPPUNIT_TEST_SUITE_REGISTRATION(AdoDriverTest); -}} +} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index a5978cdae051..f7e0f10ee1ec 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.cxx @@ -28,7 +28,7 @@ #include -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { typedef std::map TDebugStreamMap; TDebugStreamMap& getStreams() diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx index 304e3cb5c6a1..a4dc41f2d35e 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.hxx +++ b/connectivity/source/drivers/hsqldb/accesslog.hxx @@ -26,7 +26,7 @@ #include #include -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { class LogFile { diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 3d644bbbc805..6f6946af6f5b 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -19,14 +19,14 @@ #define MORK_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MorkDriver" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace connectivity { namespace mork { +namespace connectivity::mork { class ProfileAccess; class MorkDriver: @@ -72,7 +72,7 @@ private: OUString m_sProfilePath; }; -} } +} #endif diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index fac79cc44677..cfecb38936d2 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -24,18 +24,18 @@ #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace uno { class XInterface; } -} } } +} -namespace connectivity { namespace odbc { +namespace connectivity::odbc { /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); -} } +} #endif diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx index fa9f4680ca4e..ab8c47914516 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -40,7 +40,7 @@ #include "pq_xcontainer.hxx" #include "pq_xbase.hxx" -namespace com { namespace sun { namespace star { namespace sdbc { class XRow; } } } } +namespace com::sun::star::sdbc { class XRow; } namespace pq_sdbc_driver { diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 96f9f3ca213d..22b23b4cada7 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -26,9 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -}}}} +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace connectivity { diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index 3cd139635a2c..088f4799452a 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -25,9 +25,9 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sheet { class XSpreadsheetDocument; } -} } } +} namespace utl { class CloseVeto; } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 057ba2a2354d..b9835c222fc4 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -22,13 +22,13 @@ #include #include -namespace com { namespace sun { namespace star { namespace sheet { +namespace com::sun::star::sheet { class XSpreadsheet; -} } } } +} -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormats; -} } } } +} namespace connectivity diff --git a/connectivity/source/inc/component/CTable.hxx b/connectivity/source/inc/component/CTable.hxx index 69f50ad44b43..5068f88d56ee 100644 --- a/connectivity/source/inc/component/CTable.hxx +++ b/connectivity/source/inc/component/CTable.hxx @@ -22,13 +22,13 @@ #include -namespace com { namespace sun { namespace star { namespace sheet { +namespace com::sun::star::sheet { class XSpreadsheet; -} } } } +} -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormats; -} } } } +} namespace connectivity diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx index c0ae65541530..457d1eaffc73 100644 --- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx +++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx @@ -24,10 +24,10 @@ #include -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { class DataLogFile; -} } +} jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key ); jint read_from_storage_stream_into_buffer( JNIEnv * env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ); diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index 1c568ccc30cf..be30e8e281ee 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.hxx @@ -23,7 +23,7 @@ #include -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { class HTools @@ -44,7 +44,7 @@ namespace connectivity { namespace hsqldb }; -} } // namespace connectivity::hsqldb +} // namespace connectivity::hsqldb #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTOOLS_HXX diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index a14d75ccfa44..3e158c753d1b 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -29,7 +29,7 @@ #include -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { typedef ::connectivity::sdbcx::OView HView_Base; @@ -83,7 +83,7 @@ namespace connectivity { namespace hsqldb }; -} } // namespace connectivity::hsqldb +} // namespace connectivity::hsqldb #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index e8fc1ac15725..dea3fb58b50a 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -28,7 +28,7 @@ namespace comphelper } -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { class ContextClassLoaderScope { @@ -74,7 +74,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_CONTEXTCLASSLOADER_HXX diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 5c00ac2562f6..80888cb48810 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -24,7 +24,7 @@ #include -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { /** helper class to hold a local ref to a JNI object */ @@ -97,7 +97,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_GLOBALREF_HXX diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index 3730cf8913d3..5973405acea5 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -23,7 +23,7 @@ #include -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { /** helper class to hold a local ref to a JNI object @@ -84,7 +84,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LOCALREF_HXX diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index ea3033e81612..780b7f27eb2c 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -27,15 +27,15 @@ // Strange enough, GCC requires the following forward declarations of the various // convertLogArgToString flavors to be *before* the inclusion of comphelper/logging.hxx -namespace com { namespace sun { namespace star { namespace util +namespace com::sun::star::util { struct Date; struct Time; struct DateTime; -} } } } +} -namespace comphelper { namespace log { namespace convert +namespace comphelper::log::convert { @@ -45,7 +45,7 @@ namespace comphelper { namespace log { namespace convert OUString convertLogArgToString( const css::util::DateTime& _rDateTime ); -} } } +} #include @@ -56,7 +56,7 @@ namespace connectivity } -namespace connectivity { namespace java { namespace sql { +namespace connectivity::java::sql { typedef ::comphelper::EventLogger ConnectionLog_Base; class ConnectionLog : public ConnectionLog_Base @@ -122,7 +122,7 @@ namespace connectivity { namespace java { namespace sql { }; -} } } // namespace connectivity::java::sql +} // namespace connectivity::java::sql #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CONNECTIONLOG_HXX diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index 15ac6d825d5b..f003ec977d8e 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -27,10 +27,10 @@ #include -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { class XGraphicDevice; -} } } } +} /* Definition of CanvasGraphicHelper class */ diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx index 93857a09c780..13970a51874b 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.hxx +++ b/cppcanvas/source/mtfrenderer/mtftools.hxx @@ -31,10 +31,10 @@ namespace basegfx class B2DVector; class B2DPoint; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { struct RenderState; -} } } } +} namespace cppcanvas diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx index 97362ead0523..6c18e06ea82b 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx @@ -26,11 +26,11 @@ namespace basegfx { class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { struct Texture; struct StrokeAttributes; -} } } } +} /* Definition of internal::PolyPolyActionFactory */ diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index 859f595cb61f..2d20f4a6036c 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -34,10 +34,10 @@ namespace basegfx class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { class XCanvas; -} } } } +} /* Definition of ImplCanvas */ diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index e19b63c5797a..ab924373ff9d 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -27,10 +27,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { struct RealPoint2D; -} } } } +} namespace cppcanvas diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx index ee1fe3b9648d..fe2a644061bd 100644 --- a/cppu/source/uno/IdentityMapping.hxx +++ b/cppu/source/uno/IdentityMapping.hxx @@ -22,9 +22,7 @@ #include -namespace com { namespace sun { namespace star { namespace uno { -class Environment; -}}}} +namespace com::sun::star::uno { class Environment; } uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv); diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index df24890ba3f3..cde33594ce06 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -25,7 +25,7 @@ namespace osl { class Module; } -namespace cppu { namespace detail { +namespace cppu::detail { #ifndef DISABLE_DYNLOADING @@ -41,7 +41,7 @@ bool loadModule(osl::Module & rModule, OUString const & name); #endif -} } +} #endif diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 2447c816522f..4de84ba3a28b 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -48,7 +48,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { class XEventListener; } } } diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 4e0d3a9258bd..d6679dae5392 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -62,7 +62,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { struct EventObject; } } } diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx b/cppuhelper/source/loadsharedlibcomponentfactory.hxx index 9e870f459455..033fc8f3263b 100644 --- a/cppuhelper/source/loadsharedlibcomponentfactory.hxx +++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx @@ -16,15 +16,15 @@ #include "servicemanager.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace uno { class Environment; class XInterface; } -} } } +} -namespace cppuhelper { namespace detail { +namespace cppuhelper::detail { css::uno::Environment getEnvironment( OUString const & name, OUString const & implementation); @@ -37,7 +37,7 @@ void loadSharedLibComponentFactory( WrapperConstructorFn * constructorFunction, css::uno::Reference * factory); -} } +} #endif diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index b0762330c325..4a2740beb965 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.hxx @@ -24,9 +24,7 @@ #include -namespace com { namespace sun { namespace star { namespace lang { - class XSingleComponentFactory; -} } } } +namespace com::sun::star::lang { class XSingleComponentFactory; } namespace cppuhelper { diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index a4363a1b8e63..ceac7c15a698 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -32,9 +32,9 @@ #include #include -namespace com { namespace sun { namespace star { namespace lang { +namespace com::sun::star::lang { class XSingleComponentFactory; -} } } } +} namespace cppu { struct ContextEntry_Init; } namespace com :: sun :: star :: lang { class XSingleServiceFactory; } namespace com :: sun :: star :: uno { class XComponentContext; } diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index 1547a5c0c21d..bc086693a631 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -24,9 +24,9 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace reflection { class XTypeDescription; } -} } } +} namespace unoidl { class ConstantGroupEntity; class Entity; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 61adf31f8afa..b7ab97508d5e 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -37,11 +37,8 @@ namespace svx{ class SpellUndoAction_Impl;} // forward --------------------------------------------------------------- struct SpellDialog_Impl; +namespace com::sun::star::linguistic2 { class XSpellChecker1; } -namespace com{namespace sun{namespace star{ -namespace linguistic2{ - class XSpellChecker1; -}}}} namespace svx{ class SpellDialog; struct SpellErrorDescription; diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index d20f29f87989..7c05ebabcc46 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -26,10 +26,10 @@ #include #include -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; class XInterface; -} } } } +} namespace cui { diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index f6a11212b14a..7d8ffd522c82 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -24,11 +24,12 @@ #include #include -namespace com{namespace sun{namespace star{ -namespace linguistic2{ - class XDictionary; - class XSpellChecker1; -}}}} +namespace com::sun::star{ + namespace linguistic2{ + class XDictionary; + class XSpellChecker1; + } +} // forward --------------------------------------------------------------- diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index d4d568708bea..bc12d3991daa 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -24,15 +24,16 @@ #include #include -namespace com{namespace sun{namespace star{ -namespace beans{ - class XPropertySet; +namespace com::sun::star{ + namespace beans{ + class XPropertySet; + } + namespace linguistic2{ + class XDictionary; + class XDictionaryList; + class XLinguProperties; + } } -namespace linguistic2{ - class XDictionary; - class XDictionaryList; - class XLinguProperties; -}}}} class SvTreeListEntry; class SvxLinguData_Impl; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 6344c23cd96b..c2aac20ee6f6 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -106,8 +106,8 @@ struct LastPageSaver // class OfaTreeOptionsDialog -------------------------------------------- -namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowProvider; } } } } +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::awt { class XContainerWindowProvider; } struct OptionsPageInfo; struct Module; @@ -195,8 +195,8 @@ public: // class ExtensionsTabPage ----------------------------------------------- -namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } -namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowEventHandler; } } } } +namespace com::sun::star::awt { class XWindow; } +namespace com::sun::star::awt { class XContainerWindowEventHandler; } class ExtensionsTabPage { diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 6c9226285972..f916963e4eb8 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -30,10 +30,7 @@ #define APP_MATH 6 #define APP_COUNT 7 -namespace com { namespace sun { namespace star { - namespace beans { - struct PropertyValue; -}}}} +namespace com::sun::star::beans { struct PropertyValue; } // class SvxSaveTabPage -------------------------------------------------- -- cgit