summaryrefslogtreecommitdiff
path: root/oox/inc
diff options
context:
space:
mode:
Diffstat (limited to 'oox/inc')
-rw-r--r--oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx6
-rw-r--r--oox/inc/drawingml/chart/axiscontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/axisconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/axismodel.hxx8
-rw-r--r--oox/inc/drawingml/chart/chartcontextbase.hxx8
-rw-r--r--oox/inc/drawingml/chart/chartdrawingfragment.hxx8
-rw-r--r--oox/inc/drawingml/chart/chartspaceconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/chartspacefragment.hxx8
-rw-r--r--oox/inc/drawingml/chart/chartspacemodel.hxx8
-rw-r--r--oox/inc/drawingml/chart/converterbase.hxx8
-rw-r--r--oox/inc/drawingml/chart/datasourcecontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/datasourceconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/objectformatter.hxx8
-rw-r--r--oox/inc/drawingml/chart/plotareacontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/plotareaconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/plotareamodel.hxx8
-rw-r--r--oox/inc/drawingml/chart/seriescontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/seriesconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/seriesmodel.hxx8
-rw-r--r--oox/inc/drawingml/chart/titlecontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/titleconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/titlemodel.hxx8
-rw-r--r--oox/inc/drawingml/chart/typegroupcontext.hxx8
-rw-r--r--oox/inc/drawingml/chart/typegroupconverter.hxx8
-rw-r--r--oox/inc/drawingml/chart/typegroupmodel.hxx8
-rw-r--r--oox/inc/drawingml/colorchoicecontext.hxx6
-rw-r--r--oox/inc/drawingml/fillproperties.hxx6
-rw-r--r--oox/inc/drawingml/graphicproperties.hxx6
-rw-r--r--oox/inc/drawingml/lineproperties.hxx6
-rw-r--r--oox/inc/drawingml/misccontexts.hxx6
-rw-r--r--oox/inc/drawingml/shape3dproperties.hxx6
-rw-r--r--oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx8
-rw-r--r--oox/inc/drawingml/textbody.hxx6
-rw-r--r--oox/inc/drawingml/textbodyproperties.hxx6
-rw-r--r--oox/inc/drawingml/textcharacterproperties.hxx6
-rw-r--r--oox/inc/drawingml/textfont.hxx6
-rw-r--r--oox/inc/drawingml/themeelementscontext.hxx6
-rw-r--r--oox/inc/drawingml/transform2dcontext.hxx6
38 files changed, 77 insertions, 201 deletions
diff --git a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
index dc5ce5a61366..1582ea819d95 100644
--- a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
+++ b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
@@ -12,8 +12,7 @@
#include <oox/core/fragmenthandler2.hxx>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class Theme;
@@ -32,8 +31,7 @@ private:
Theme& mrTheme;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/chart/axiscontext.hxx b/oox/inc/drawingml/chart/axiscontext.hxx
index 5db36b914131..ad240a4a76ab 100644
--- a/oox/inc/drawingml/chart/axiscontext.hxx
+++ b/oox/inc/drawingml/chart/axiscontext.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct AxisDispUnitsModel;
@@ -104,9 +102,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx
index f647cc560c23..6cebc008c3fd 100644
--- a/oox/inc/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/drawingml/chart/axisconverter.hxx
@@ -27,9 +27,7 @@ namespace com::sun::star {
namespace chart2 { class XCoordinateSystem; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct AxisDispUnitsModel;
@@ -66,9 +64,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx
index afa097d72e11..6ecd411e1ed1 100644
--- a/oox/inc/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -23,9 +23,7 @@
#include <oox/drawingml/shape.hxx>
#include <drawingml/chart/titlemodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct AxisDispUnitsModel
{
@@ -90,9 +88,7 @@ struct AxisModel
~AxisModel();
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx
index 6669536d3524..b91692f9bcf2 100644
--- a/oox/inc/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/drawingml/chart/chartcontextbase.hxx
@@ -24,9 +24,7 @@
namespace oox::drawingml { class Shape; }
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
template< typename ModelType >
class ContextBase : public ::oox::core::ContextHandler2
@@ -74,9 +72,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override;
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index 8392999fa798..1613b5ee2d5b 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -23,9 +23,7 @@
#include <oox/core/fragmenthandler2.hxx>
#include <oox/drawingml/shape.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
/** Relative shape position in a chart object. */
@@ -98,9 +96,7 @@ private:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx
index 82f848374a9a..32f13bb0e5ad 100644
--- a/oox/inc/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx
@@ -26,9 +26,7 @@ namespace com::sun::star {
namespace drawing { class XShapes; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct ChartSpaceModel;
@@ -46,9 +44,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx
index 503848d48fe1..8d29fecb5144 100644
--- a/oox/inc/drawingml/chart/chartspacefragment.hxx
+++ b/oox/inc/drawingml/chart/chartspacefragment.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct ChartSpaceModel;
@@ -44,9 +42,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/chartspacemodel.hxx b/oox/inc/drawingml/chart/chartspacemodel.hxx
index f559d5339fff..0aa564fefd7e 100644
--- a/oox/inc/drawingml/chart/chartspacemodel.hxx
+++ b/oox/inc/drawingml/chart/chartspacemodel.hxx
@@ -24,9 +24,7 @@
#include <drawingml/chart/plotareamodel.hxx>
#include <drawingml/chart/titlemodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct ChartSpaceModel
@@ -62,9 +60,7 @@ struct ChartSpaceModel
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index 252c5314cdfc..8fe637d95d34 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -32,9 +32,7 @@ namespace com::sun::star {
}
namespace oox::core { class XmlFilterBase; }
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
class ChartConverter;
struct ChartSpaceModel;
@@ -143,9 +141,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx
index 3894b545d390..8c893c1973a8 100644
--- a/oox/inc/drawingml/chart/datasourcecontext.hxx
+++ b/oox/inc/drawingml/chart/datasourcecontext.hxx
@@ -24,9 +24,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
#include <svl/zforlist.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct DataSequenceModel;
@@ -87,9 +85,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx
index 67e1ac0c739c..eb404e046389 100644
--- a/oox/inc/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/drawingml/chart/datasourceconverter.hxx
@@ -26,9 +26,7 @@ namespace com::sun::star {
namespace chart2::data { class XDataSequence; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct DataSequenceModel;
@@ -59,9 +57,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx
index 9ccf5e437d87..06cece4fe02c 100644
--- a/oox/inc/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/drawingml/chart/objectformatter.hxx
@@ -30,9 +30,7 @@ namespace com::sun::star {
namespace oox::core { class XmlFilterBase; }
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
/** Enumerates different object types for specific automatic formatting behaviour. */
enum ObjectType
@@ -153,9 +151,7 @@ private:
std::shared_ptr< ObjectFormatterData > mxData;
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/plotareacontext.hxx b/oox/inc/drawingml/chart/plotareacontext.hxx
index 7664c05eb56f..05984449f9d0 100644
--- a/oox/inc/drawingml/chart/plotareacontext.hxx
+++ b/oox/inc/drawingml/chart/plotareacontext.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct View3DModel;
@@ -84,9 +82,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index 5c9a938726e1..0b389c0fdc78 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -26,9 +26,7 @@ namespace com::sun::star {
namespace chart2 { class XDiagram; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct View3DModel;
@@ -102,9 +100,7 @@ private:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/plotareamodel.hxx b/oox/inc/drawingml/chart/plotareamodel.hxx
index 00d1a31cc7bc..eea7d14d89a9 100644
--- a/oox/inc/drawingml/chart/plotareamodel.hxx
+++ b/oox/inc/drawingml/chart/plotareamodel.hxx
@@ -25,9 +25,7 @@
#include <drawingml/chart/seriesmodel.hxx>
#include <drawingml/chart/typegroupmodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct View3DModel
{
@@ -81,9 +79,7 @@ struct PlotAreaModel
~PlotAreaModel();
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx
index f56d51329b6d..d3fe3bb05128 100644
--- a/oox/inc/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/drawingml/chart/seriescontext.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct DataLabelModel;
@@ -240,9 +238,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx
index afa5127f6635..c8cca31d5e3e 100644
--- a/oox/inc/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/drawingml/chart/seriesconverter.hxx
@@ -28,9 +28,7 @@ namespace com::sun::star {
namespace chart2::data { class XLabeledDataSequence; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
class TypeGroupConverter;
@@ -142,9 +140,7 @@ private:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/seriesmodel.hxx b/oox/inc/drawingml/chart/seriesmodel.hxx
index d2fa53a5e50c..c4fb557d282d 100644
--- a/oox/inc/drawingml/chart/seriesmodel.hxx
+++ b/oox/inc/drawingml/chart/seriesmodel.hxx
@@ -23,9 +23,7 @@
#include <oox/drawingml/chart/datasourcemodel.hxx>
#include <drawingml/chart/titlemodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct DataLabelModelBase
{
@@ -208,9 +206,7 @@ struct SeriesModel
~SeriesModel();
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/titlecontext.hxx b/oox/inc/drawingml/chart/titlecontext.hxx
index 5a991109f6ac..cb7383a7eb19 100644
--- a/oox/inc/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/drawingml/chart/titlecontext.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct TextModel;
@@ -82,9 +80,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx
index 78e671b61637..d25aec653c7a 100644
--- a/oox/inc/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/drawingml/chart/titleconverter.hxx
@@ -31,9 +31,7 @@ namespace com::sun::star {
namespace oox::drawingml { struct TextCharacterProperties; }
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct TextModel;
@@ -96,9 +94,7 @@ private:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/titlemodel.hxx b/oox/inc/drawingml/chart/titlemodel.hxx
index 4b693e2e60e0..dd5b6756e757 100644
--- a/oox/inc/drawingml/chart/titlemodel.hxx
+++ b/oox/inc/drawingml/chart/titlemodel.hxx
@@ -23,9 +23,7 @@
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/chart/datasourcemodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct TextModel
{
@@ -84,9 +82,7 @@ struct LegendModel
~LegendModel();
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx
index 0d23267a9b7b..5d5306d31fe0 100644
--- a/oox/inc/drawingml/chart/typegroupcontext.hxx
+++ b/oox/inc/drawingml/chart/typegroupcontext.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/chartcontextbase.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct UpDownBarsModel;
@@ -144,9 +142,7 @@ public:
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index eeddd5fd7eea..2e3aae5a2a10 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -30,9 +30,7 @@ namespace com::sun::star {
namespace chart2::data { class XLabeledDataSequence; }
}
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
/** Enumerates different chart types. */
enum TypeId
@@ -172,9 +170,7 @@ private:
bool mb3dChart; /// True = type is a 3D chart type.
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/chart/typegroupmodel.hxx b/oox/inc/drawingml/chart/typegroupmodel.hxx
index 7da97c39e578..79d55dfd2846 100644
--- a/oox/inc/drawingml/chart/typegroupmodel.hxx
+++ b/oox/inc/drawingml/chart/typegroupmodel.hxx
@@ -22,9 +22,7 @@
#include <drawingml/chart/seriesmodel.hxx>
-namespace oox {
-namespace drawingml {
-namespace chart {
+namespace oox::drawingml::chart {
struct UpDownBarsModel
{
@@ -82,9 +80,7 @@ struct TypeGroupModel
~TypeGroupModel();
};
-} // namespace chart
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::chart
#endif
diff --git a/oox/inc/drawingml/colorchoicecontext.hxx b/oox/inc/drawingml/colorchoicecontext.hxx
index 093c832cb1e6..0e93c704c55c 100644
--- a/oox/inc/drawingml/colorchoicecontext.hxx
+++ b/oox/inc/drawingml/colorchoicecontext.hxx
@@ -24,8 +24,7 @@
#include <vector>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class Color;
@@ -81,8 +80,7 @@ private:
std::vector<Color>& mrColors;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
index 10df9d9d902b..cf26acfc17d6 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -40,8 +40,7 @@ namespace oox {
class GraphicHelper;
}
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class ShapePropertyMap;
@@ -150,8 +149,7 @@ struct FillProperties
bool bFlipV = false ) const;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx
index ee87ce0be74e..85b47dbff593 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -31,8 +31,7 @@ namespace oox {
class PropertyMap;
}
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
struct GraphicProperties
{
@@ -47,8 +46,7 @@ struct GraphicProperties
const GraphicHelper& rGraphicHelper) const;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx
index f9e731ffe656..214aadba12e9 100644
--- a/oox/inc/drawingml/lineproperties.hxx
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -33,8 +33,7 @@
namespace oox { class GraphicHelper; }
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class ShapePropertyMap;
@@ -82,8 +81,7 @@ struct LineProperties
sal_Int32 getLineWidth() const;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx
index f56b59eb9894..495b3bce906c 100644
--- a/oox/inc/drawingml/misccontexts.hxx
+++ b/oox/inc/drawingml/misccontexts.hxx
@@ -24,8 +24,7 @@
#include <drawingml/fillproperties.hxx>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
/** Context handler that imports the a:solidFill element. */
@@ -238,8 +237,7 @@ private:
Color& mrColor;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx
index edddb260a1a9..683a771b8bdc 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -27,8 +27,7 @@ namespace oox { class PropertyMap; }
namespace oox { class PropertySet; }
namespace oox::core { class ModelObjectContainer; }
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
struct RotationProperties
@@ -81,8 +80,7 @@ struct Shape3DProperties
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
index b57eac3e14b5..456877cbba85 100644
--- a/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -23,9 +23,7 @@
#include <drawingml/table/tablestylelist.hxx>
#include <oox/core/fragmenthandler2.hxx>
-namespace oox {
-namespace drawingml {
-namespace table {
+namespace oox::drawingml::table {
class TableStyleListFragmentHandler final : public ::oox::core::FragmentHandler2
{
@@ -43,9 +41,7 @@ private:
TableStyleList& mrTableStyleList;
};
-} // namespace table
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml::table
#endif
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index 51016cd2c677..db4c03c6f702 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -24,9 +24,9 @@
#include <drawingml/textbodyproperties.hxx>
#include <drawingml/textliststyle.hxx>
-namespace com::sun::star {
- namespace text { class XText; }
- namespace text { class XTextCursor; }
+namespace com::sun::star::text {
+ class XText;
+ class XTextCursor;
}
namespace oox::core { class XmlFilterBase; }
diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx
index eddf78a5f97f..6e5e97fb94ba 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -25,8 +25,7 @@
#include <oox/helper/propertymap.hxx>
#include <optional>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
struct TextBodyProperties
@@ -54,8 +53,7 @@ struct TextBodyProperties
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx
index a034121e47d0..90d01ec9cde1 100644
--- a/oox/inc/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/drawingml/textcharacterproperties.hxx
@@ -29,8 +29,7 @@
namespace oox { class PropertySet; }
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
struct TextCharacterProperties
@@ -82,8 +81,7 @@ struct TextCharacterProperties
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/textfont.hxx b/oox/inc/drawingml/textfont.hxx
index d2a4b269c666..6bdf13ab890a 100644
--- a/oox/inc/drawingml/textfont.hxx
+++ b/oox/inc/drawingml/textfont.hxx
@@ -25,8 +25,7 @@
namespace oox { class AttributeList; }
namespace oox::core { class XmlFilterBase; }
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
/** carries a CT_TextFont*/
@@ -66,8 +65,7 @@ private:
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/themeelementscontext.hxx b/oox/inc/drawingml/themeelementscontext.hxx
index c59bf4b484e8..1f292fca7cff 100644
--- a/oox/inc/drawingml/themeelementscontext.hxx
+++ b/oox/inc/drawingml/themeelementscontext.hxx
@@ -22,8 +22,7 @@
#include <oox/core/contexthandler2.hxx>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class Theme;
@@ -38,8 +37,7 @@ private:
Theme& mrTheme;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif
diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx
index eb772ee7419e..7184210f0c56 100644
--- a/oox/inc/drawingml/transform2dcontext.hxx
+++ b/oox/inc/drawingml/transform2dcontext.hxx
@@ -22,8 +22,7 @@
#include <oox/core/contexthandler2.hxx>
-namespace oox {
-namespace drawingml {
+namespace oox::drawingml {
class Shape;
@@ -40,8 +39,7 @@ private:
bool mbtxXfrm;
};
-} // namespace drawingml
-} // namespace oox
+} // namespace oox::drawingml
#endif