diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 18:45:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 21:07:36 +0200 |
commit | 1c4c096f7316f4541d57983ad3dee3827748d2f8 (patch) | |
tree | 045e6dbba96704ad038c9c3e41970bc00c286d0a | |
parent | e06cb5853f735e523f740dec82954c54cbe47f48 (diff) |
compact namespace: oox
Change-Id: I9ea016adcec334437da45296ee325453347836ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99002
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
104 files changed, 209 insertions, 501 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index 2318e52a17cc..e7bfbaaa4360 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -31,19 +31,11 @@ namespace com::sun::star { namespace oox { class AttributeList; } -namespace oox { -namespace core { - - -namespace CodecHelper +namespace oox::core::CodecHelper { /** Returns the password hash if it is in the required 16-bit limit. */ OOX_DLLPUBLIC sal_uInt16 getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement ); -} - - -} // namespace core -} // namespace oox +} // namespace oox::core::CodecHelper #endif diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index f9b4ef9a0f5d..5d72e2192cc2 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -39,8 +39,7 @@ namespace com::sun::star { namespace oox { class SequenceInputStream; } -namespace oox { -namespace core { +namespace oox::core { class XmlFilterBase; struct Relation; @@ -108,8 +107,7 @@ private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 02e2cf2a08f1..872a50697ca1 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -40,8 +40,7 @@ namespace oox { class SequenceInputStream; } -namespace oox { -namespace core { +namespace oox::core { const sal_Int32 XML_ROOT_CONTEXT = SAL_MAX_INT32; @@ -268,8 +267,7 @@ public: virtual void onEndRecord() override; }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index fa79aba5d574..058bd344b5e6 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -44,8 +44,7 @@ namespace sax_fastparser { class FastSaxParser; } -namespace oox { -namespace core { +namespace oox::core { /** Wrapper for a fast SAX parser that works on automatically generated OOXML @@ -112,8 +111,7 @@ private: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 9180d7df976c..396474b988a1 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -31,8 +31,7 @@ namespace oox { class TokenMap; } -namespace oox { -namespace core { +namespace oox::core { /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface @@ -62,8 +61,7 @@ private: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 22a15a8eb52d..73b8e2d8e7f2 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -69,8 +69,7 @@ namespace oox::ole { class VbaProject; } -namespace oox { -namespace core { +namespace oox::core { enum OoxmlVersion { @@ -268,8 +267,7 @@ private: std::unique_ptr< FilterBaseImpl > mxImpl; }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index ccb9fe9170b8..59e989c36ea3 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -46,8 +46,7 @@ namespace utl { class MediaDescriptor; } namespace oox { class AttributeList; } -namespace oox { -namespace core { +namespace oox::core { enum class OOXMLVariant { ECMA_Transitional, @@ -166,8 +165,7 @@ private: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index 5983a50c5e7d..a3263ca1f7c5 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -39,8 +39,7 @@ namespace com::sun::star { namespace xml::sax { class XLocator; } } -namespace oox { -namespace core { +namespace oox::core { class XmlFilterBase; @@ -133,8 +132,7 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 93822ceafcca..d5d449847c17 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -41,8 +41,7 @@ namespace oox { class SequenceInputStream; } -namespace oox { -namespace core { +namespace oox::core { class XmlFilterBase; @@ -122,8 +121,7 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index d556d9c8cf93..f36ceaba6d0b 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -27,8 +27,7 @@ #include <oox/dllapi.h> #include <rtl/ustring.hxx> -namespace oox { -namespace core { +namespace oox::core { /** Expands to an OUString containing an 'officeDocument' transitional relation type created @@ -113,8 +112,7 @@ private: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index f35d186058f0..ec8f77e92dad 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -30,8 +30,7 @@ namespace com::sun::star { namespace xml::sax { class XFastContextHandler; } } -namespace oox { -namespace core { +namespace oox::core { class XmlFilterBase; @@ -52,8 +51,7 @@ private: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 4264e54fb3e4..bad90cc0d132 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -64,8 +64,7 @@ namespace sax_fastparser { namespace utl { class MediaDescriptor; } -namespace oox { -namespace core { +namespace oox::core { class FragmentHandler; class FastParser; @@ -273,8 +272,7 @@ protected: bool mbMissingExtDrawing; }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index ac028533d71c..ece492871163 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -24,8 +24,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { struct OOX_DLLPUBLIC AgileEncryptionInfo { @@ -141,8 +140,7 @@ public: bool setupEncryptionKey(OUString const & rPassword); }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index 31d90efcbc49..c8c1420079bd 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -26,8 +26,7 @@ #include <vector> #include <memory> -namespace oox { -namespace crypto { +namespace oox::crypto { /** Rounds up the input to the nearest multiple * @@ -114,8 +113,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx index 72bde8920dfc..49009ac7e2c1 100644 --- a/include/oox/crypto/CryptoEngine.hxx +++ b/include/oox/crypto/CryptoEngine.hxx @@ -24,8 +24,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { class CryptoEngine { @@ -60,8 +59,7 @@ public: virtual bool checkDataIntegrity() = 0; }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx index 2db38b442386..33cab866f40e 100644 --- a/include/oox/crypto/DocumentDecryption.hxx +++ b/include/oox/crypto/DocumentDecryption.hxx @@ -26,8 +26,7 @@ namespace com::sun::star { namespace oox::ole { class OleStorage; } -namespace oox { -namespace crypto { +namespace oox::crypto { class DocumentDecryption { @@ -48,8 +47,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx index 72173f188a07..c2a3bd4ed5c2 100644 --- a/include/oox/crypto/DocumentEncryption.hxx +++ b/include/oox/crypto/DocumentEncryption.hxx @@ -23,8 +23,7 @@ namespace com::sun::star { namespace oox::ole { class OleStorage; } -namespace oox { -namespace crypto { +namespace oox::crypto { class DocumentEncryption { @@ -46,8 +45,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 4a6eaae9e43c..8a7aec3e66af 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -22,8 +22,7 @@ namespace oox { class BinaryXOutputStream; } -namespace oox { -namespace crypto { +namespace oox::crypto { class OOX_DLLPUBLIC Standard2007Engine final : public CryptoEngine { @@ -55,8 +54,7 @@ public: }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx index 40fd6f79e1e0..f3fcff9edaab 100644 --- a/include/oox/crypto/StrongEncryptionDataSpace.hxx +++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx @@ -23,9 +23,7 @@ namespace com::sun::star::uno class XComponentContext; } -namespace oox -{ -namespace crypto +namespace oox::crypto { class StrongEncryptionDataSpace final : public cppu::WeakImplHelper<css::lang::XServiceInfo, css::packages::XPackageEncryption> @@ -68,8 +66,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -} // namespace crypto -} // namespace oox +} // namespace oox::crypto #endif diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index a950cbcb789e..c293c48215bb 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -35,9 +35,7 @@ namespace com::sun::star { namespace oox::core { class XmlFilterBase; } -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { struct ChartSpaceModel; struct DataSequenceModel; @@ -94,9 +92,7 @@ private: }; -} // namespace chart -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml::chart #endif diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index e2d9336bf4b2..dc8d253a7d11 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -27,9 +27,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { struct DataSequenceModel @@ -58,9 +56,7 @@ struct DataSourceModel }; -} // namespace chart -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml::chart #endif diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index f107075c9ff3..cd4e97176736 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -29,9 +29,7 @@ namespace oox { class AttributeList; } -namespace oox { -namespace drawingml { -namespace chart { +namespace oox::drawingml::chart { template< typename ModelType > class ModelRef : public std::shared_ptr< ModelType > @@ -121,9 +119,7 @@ struct LayoutModel ~LayoutModel(); }; -} // namespace chart -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml::chart #endif diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 3f2760babbad..5642b4000fc5 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -32,8 +32,7 @@ namespace oox { class GraphicHelper; } -namespace oox { -namespace drawingml { +namespace oox::drawingml { class OOX_DLLPUBLIC Color @@ -156,8 +155,7 @@ private: maInteropTransformations; /// Unaltered list of transformations for interoperability purposes }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index a0043d36e1b2..5f95471bc9ab 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -40,8 +40,7 @@ namespace com::sun::star { namespace xml::sax { class XFastAttributeList; } } -namespace oox { -namespace drawingml { +namespace oox::drawingml { const sal_Int32 PER_PERCENT = 1000; @@ -233,8 +232,7 @@ struct EmuRectangle : public EmuPoint, public EmuSize }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 4c7f02fb87f0..a9e4ea405273 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -30,8 +30,7 @@ namespace oox { class ModelObjectHelper; } -namespace oox { -namespace drawingml { +namespace oox::drawingml { /** Enumeration for various properties related to drawing shape formatting. @@ -161,8 +160,7 @@ private: }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 3d43cca9af80..6d64649f3a69 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -35,8 +35,7 @@ namespace com::sun::star { namespace xml::dom { class XDocument; } } -namespace oox { -namespace drawingml { +namespace oox::drawingml { struct EffectProperties; struct FillProperties; @@ -115,8 +114,7 @@ private: }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index 56db23f6929c..e433c350de80 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -29,8 +29,7 @@ namespace oox { class AttributeList; } namespace oox::core { class XmlFilterBase; } -namespace oox { -namespace drawingml { +namespace oox::drawingml { class Theme; @@ -51,8 +50,7 @@ private: }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 632650d466a1..e129b0a7f0fa 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -27,8 +27,7 @@ namespace oox { class BinaryInputStream; } -namespace oox { -namespace dump { +namespace oox::dump { class DffStreamObject final : public SequenceRecordObjectBase @@ -57,8 +56,7 @@ private: }; -} // namespace dump -} // namespace oox +} // namespace oox::dump #endif #endif diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 21e88b2fc2c7..d0b954c7be5a 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -57,8 +57,7 @@ namespace oox::core { class FilterBase; } -namespace oox { -namespace dump { +namespace oox::dump { #define OOX_DUMP_UNUSED "unused" @@ -1720,8 +1719,7 @@ protected: }; -} // namespace dump -} // namespace oox +} // namespace oox::dump #define OOX_DUMP_FILE( DumperClassName ) \ do { \ diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index f3cdf0c0ca87..77b3ab14c123 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -38,8 +38,7 @@ namespace com::sun::star { namespace io { class XInputStream; } } -namespace oox { -namespace dump { +namespace oox::dump { class OleInputObjectBase : public InputObjectBase @@ -842,8 +841,7 @@ protected: }; -} // namespace dump -} // namespace oox +} // namespace oox::dump #endif #endif diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 01cda8e6bd0f..9e12ecd4854b 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -33,9 +33,7 @@ namespace com::sun::star { namespace oox::core { class FilterBase; } -namespace oox { -namespace dump { -namespace pptx { +namespace oox::dump::pptx { class RootStorageObject : public StorageObjectBase @@ -67,9 +65,7 @@ protected: }; -} // namespace pptx -} // namespace dump -} // namespace oox +} // namespace oox::dump::pptx #endif #endif diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 7709cf46213f..96acd26168e9 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -39,9 +39,7 @@ namespace oox { namespace oox::core { class FilterBase; } -namespace oox { -namespace dump { -namespace xlsb { +namespace oox::dump::xlsb { class RecordObjectBase final : public SequenceRecordObjectBase @@ -84,9 +82,7 @@ protected: }; -} // namespace xlsb -} // namespace dump -} // namespace oox +} // namespace oox::dmp::xlsb #endif #endif diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index e95af1eff83e..6ac3aa754cc5 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -56,10 +56,9 @@ namespace uno { } } -namespace oox { -namespace core { +namespace oox::core { class XmlFilterBase; -}} +} class Graphic; diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 61185e57d5de..c010436499f9 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -37,12 +37,11 @@ namespace com::sun::star { } } -namespace oox { - namespace drawingml { - class DrawingML; - } +namespace oox::drawingml { + class DrawingML; } + namespace sax_fastparser { class FastAttributeList; } @@ -51,9 +50,7 @@ class Point; namespace tools { class Rectangle; } class SdrObject; -namespace oox { - -namespace vml { +namespace oox::vml { /// Interface to be implemented by the parent exporter that knows how to handle shape text. class OOX_DLLPUBLIC VMLTextExport @@ -194,9 +191,8 @@ private: void AddRectangleDimensions( OStringBuffer& rBuffer, const tools::Rectangle& rRectangle, bool rbAbsolutePos = true ); }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx index 7120acb3948a..07144c4575a0 100644 --- a/include/oox/mathml/importutils.hxx +++ b/include/oox/mathml/importutils.hxx @@ -22,10 +22,7 @@ namespace com::sun::star { namespace xml::sax { class XFastAttributeList; } } -namespace oox -{ - -namespace formulaimport +namespace oox::formulaimport { // used to differentiate between tags that opening or closing @@ -251,7 +248,6 @@ sal_Unicode XmlStream::Tag::attribute( int t, sal_Unicode def ) const } } // namespace -} // namespace #endif diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 5f264fe469a5..43024556bdff 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -32,8 +32,7 @@ namespace oox::ole { struct AxFontData; } -namespace oox { -namespace ole { +namespace oox::ole { /** A wrapper for a binary input stream that supports aligned read operations. @@ -245,8 +244,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index dfde745dd647..89bb4eb9a60c 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -19,8 +19,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace oox { -namespace ole { +namespace oox::ole { /** A wrapper for a binary output stream that supports aligned write operations. @@ -158,8 +157,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index f8e0a5e5a7db..216a10c6d1d2 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -50,8 +50,7 @@ namespace oox { class PropertyMap; } -namespace oox { -namespace ole { +namespace oox::ole { #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" @@ -987,8 +986,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index e3929a8979aa..e6b87b416041 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -29,8 +29,7 @@ namespace oox { class AttributeList; } namespace oox::core { class XmlFilterBase; } -namespace oox { -namespace ole { +namespace oox::ole { class ControlModelBase; class EmbeddedControl; @@ -70,8 +69,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index fa79aef9d1a9..df3503247161 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -43,8 +43,7 @@ namespace o3tl { template<> struct typed_flags<AxFontFlags> : is_typed_flags<AxFontFlags, 0x4000200f> {}; } -namespace oox { -namespace ole { +namespace oox::ole { enum class AxHorizontalAlign { Left = 1, Right = 2, Center = 3 @@ -80,8 +79,7 @@ struct OOX_DLLPUBLIC AxFontData }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 8be904fd3d23..d0b772506815 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -48,10 +48,7 @@ namespace oox { class BinaryOutputStream; } -namespace oox { - - -namespace ole { +namespace oox::ole { class ControlModelBase; class EmbeddedControl; @@ -194,8 +191,7 @@ public: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 1a5b1b67a044..a9d6bfec54bd 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -35,8 +35,7 @@ namespace com::sun::star { namespace oox { class PropertyMap; } -namespace oox { -namespace ole { +namespace oox::ole { /** Contains generic information about an OLE object. */ @@ -80,8 +79,7 @@ OOX_DLLPUBLIC void SaveInteropProperties( OUString const& rProgId, OUString const& rDrawAspect); -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index de40a1395182..b7ac512f11bf 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -36,8 +36,7 @@ namespace com::sun::star { namespace uno { class XComponentContext; } } -namespace oox { -namespace ole { +namespace oox::ole { /** Implements stream access for binary OLE storages. */ @@ -109,8 +108,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 6e40f6a881c9..c0afd6ae7ec5 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -44,8 +44,7 @@ namespace oox { class StorageBase; } -namespace oox { -namespace ole { +namespace oox::ole { /** Common properties for all controls that are part of a VBA user form or of @@ -208,8 +207,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index 9c9c3c3af3ad..89a513d510cf 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -26,8 +26,7 @@ namespace oox { class BinaryInputStream; } -namespace oox { -namespace ole { +namespace oox::ole { // Directory stream record identifiers ======================================== @@ -85,8 +84,7 @@ namespace VbaHelper } -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index e03429ec66f9..4f2f78d81559 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -27,8 +27,7 @@ #include <oox/helper/binarystreambase.hxx> #include <sal/types.h> -namespace oox { -namespace ole { +namespace oox::ole { /** A non-seekable input stream that implements run-length decompression. */ @@ -68,8 +67,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 97034ec8e8f5..85f1f3e37103 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -37,8 +37,7 @@ namespace oox { class StorageBase; } -namespace oox { -namespace ole { +namespace oox::ole { class VbaModule @@ -101,8 +100,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index c3ad3a970c9a..e46db83d337f 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -45,8 +45,7 @@ namespace oox { class StorageBase; } -namespace oox { -namespace ole { +namespace oox::ole { class VbaModule; @@ -204,8 +203,7 @@ private: }; -} // namespace ole -} // namespace oox +} // namespace oox::ole #endif diff --git a/include/oox/shape/ShapeFilterBase.hxx b/include/oox/shape/ShapeFilterBase.hxx index e3f95ccebeeb..fc4c8f7836f7 100644 --- a/include/oox/shape/ShapeFilterBase.hxx +++ b/include/oox/shape/ShapeFilterBase.hxx @@ -33,8 +33,7 @@ typedef std::shared_ptr< TableStyleList > TableStyleListPtr; } -namespace oox { -namespace shape { +namespace oox::shape { class OOX_DLLPUBLIC ShapeFilterBase final : public core::XmlFilterBase { @@ -76,8 +75,7 @@ private: ::oox::drawingml::ThemePtr mpTheme; }; -} // namespace shape -} // namespace oox +} // namespace oox::shape #endif diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index 9181b7356613..a11bfef0d328 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -44,8 +44,7 @@ namespace oox { namespace vml { class ShapeContainer; } } -namespace oox { -namespace vml { +namespace oox::vml { class ShapeBase; @@ -200,8 +199,7 @@ private: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index be20dc2f875e..f7fa4d0bd605 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -34,8 +34,7 @@ namespace com::sun::star { namespace oox { class AttributeList; } namespace oox::core { class XmlFilterBase; } -namespace oox { -namespace vml { +namespace oox::vml { class Drawing; @@ -61,8 +60,7 @@ private: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index f4b6d88c58e1..3ac34a8e5369 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -41,8 +41,7 @@ namespace oox { namespace drawingml { class ShapePropertyMap; } } -namespace oox { -namespace vml { +namespace oox::vml { typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; @@ -263,8 +262,7 @@ struct TextpathModel const GraphicHelper& rGraphicHelper) const; }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index ca2fb68dbb00..df074834f128 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -33,8 +33,7 @@ namespace com::sun::star { namespace uno { class XComponentContext; } } -namespace oox { -namespace vml { +namespace oox::vml { /** An input stream class for VML streams, implementing the UNO interface @@ -89,8 +88,7 @@ private: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 9812bce8cfcf..119f711a4538 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -38,8 +38,7 @@ namespace com::sun::star { namespace graphic { class XGraphic; } } -namespace oox { -namespace vml { +namespace oox::vml { class Drawing; struct ShapeParentAnchor; @@ -448,8 +447,7 @@ private: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index 8a33ef436f07..6f50730bcacc 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -35,8 +35,7 @@ namespace com::sun::star { namespace drawing { class XShapes; } } -namespace oox { -namespace vml { +namespace oox::vml { class Drawing; class ShapeType; @@ -138,8 +137,7 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const } -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index c07bcf12e84f..ddca7b13ad93 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -28,8 +28,7 @@ namespace oox { class AttributeList; } -namespace oox { -namespace vml { +namespace oox::vml { class Drawing; @@ -183,8 +182,7 @@ public: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index 7f7710bcbb76..fb6983315b61 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -33,8 +33,7 @@ namespace com::sun::star { namespace drawing { class XShape; } } -namespace oox { -namespace vml { +namespace oox::vml { struct ShapeTypeModel; @@ -107,8 +106,7 @@ private: }; -} // namespace vml -} // namespace oox +} // namespace oox::vml #endif 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 diff --git a/oox/source/crypto/StrongEncryptionDataSpace.cxx b/oox/source/crypto/StrongEncryptionDataSpace.cxx index 2e21a89158f6..9fd1778aa831 100644 --- a/oox/source/crypto/StrongEncryptionDataSpace.cxx +++ b/oox/source/crypto/StrongEncryptionDataSpace.cxx @@ -25,9 +25,7 @@ using namespace css::io; using namespace css::lang; using namespace css::uno; -namespace oox -{ -namespace crypto +namespace oox::crypto { StrongEncryptionDataSpace::StrongEncryptionDataSpace(const Reference<XComponentContext>& rxContext) : mxContext(rxContext) @@ -193,8 +191,7 @@ css::uno::Sequence<OUString> SAL_CALL StrongEncryptionDataSpace::getSupportedSer return aServices; } -} // namespace crypto -} // namespace oox +} // namespace oox::crypto extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* com_sun_star_comp_oox_crypto_StrongEncryptionDataSpace_get_implementation( diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index d3baa3fd655e..e9b86e3df4fd 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -28,8 +28,7 @@ #include <oox/token/namespaces.hxx> -namespace oox { -namespace docprop { +namespace oox::docprop { #define COREPR_TOKEN( token ) (::oox::NMSP_packageMetaCorePr | XML_##token) #define CUSTPR_TOKEN( token ) (::oox::NMSP_officeCustomPr | XML_##token) @@ -82,8 +81,7 @@ public: }; -} // namespace core -} // namespace oox +} // namespace oox::core #endif diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index cc4301de2158..f76d4feb7b46 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -25,8 +25,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -namespace oox { -namespace docprop { +namespace oox::docprop { class DocumentPropertiesImport : public ::cppu::WeakImplHelper< @@ -51,8 +50,7 @@ private: css::uno::Reference< css::uno::XComponentContext > mxContext; }; -} // namespace docprop -} // namespace oox +} // namespace oox::docprop #endif diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx index a06ac5a05acc..b588b9f7cffa 100644 --- a/oox/source/drawingml/effectproperties.hxx +++ b/oox/source/drawingml/effectproperties.hxx @@ -17,8 +17,7 @@ #include <vector> #include <map> -namespace oox { -namespace drawingml { +namespace oox::drawingml { struct EffectGlowProperties { @@ -82,8 +81,7 @@ struct EffectProperties const GraphicHelper& rGraphicHelper ) const; }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx index 6bd444f22cee..6c7fe6c80ad2 100644 --- a/oox/source/drawingml/hyperlinkcontext.hxx +++ b/oox/source/drawingml/hyperlinkcontext.hxx @@ -24,8 +24,7 @@ namespace oox { class PropertyMap; } -namespace oox { -namespace drawingml { +namespace oox::drawingml { class HyperLinkContext final : public ::oox::core::ContextHandler2 { @@ -42,8 +41,7 @@ private: PropertyMap& maProperties; }; -} // namespace drawingml -} // namespace oox +} // namespace oox::drawingml #endif diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx index e1734422ac8c..70213a731be0 100644 --- a/oox/source/export/ColorPropertySet.hxx +++ b/oox/source/export/ColorPropertySet.hxx @@ -28,9 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -namespace oox -{ -namespace drawingml +namespace oox::drawingml { class ColorPropertySet : public ::cppu::WeakImplHelper< @@ -81,8 +79,7 @@ private: ::Color m_nDefaultColor; }; -} // namespace chart -} // namespace xmloff +} // namespace xmloff::chart // XMLOFF_COLORPROPERTYSET_HXX #endif diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index 68c8e27fad35..bf6766f36b79 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -13,9 +13,7 @@ #include <oox/core/fragmenthandler2.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace oox -{ -namespace shape +namespace oox::shape { /// Locked canvas is kind of a container for drawingml shapes: it can even contain group shapes. class LockedCanvasContext final : public oox::core::FragmentHandler2 @@ -33,7 +31,6 @@ private: oox::drawingml::ShapePtr mpShape; }; } -} #endif diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index 1b85cd4ec885..c4b511a923d3 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -13,9 +13,7 @@ #include <oox/core/fragmenthandler2.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace oox -{ -namespace shape +namespace oox::shape { /// Wpg is the drawingML equivalent of v:group. class WpgContext final : public oox::core::FragmentHandler2 @@ -33,7 +31,6 @@ private: oox::drawingml::ShapePtr mpShape; }; } -} #endif diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index c5a6565a58fc..1cb6106324da 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -14,23 +14,12 @@ #include <oox/drawingml/shapecontext.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace com -{ -namespace sun -{ -namespace star -{ -namespace drawing +namespace com::sun::star::drawing { class XShape; } -} -} -} -namespace oox -{ -namespace shape +namespace oox::shape { /// Wps is the drawingML equivalent of v:shape. class WpsContext final : public oox::drawingml::ShapeContext @@ -49,7 +38,6 @@ private: css::uno::Reference<css::drawing::XShape> mxShape; }; } -} #endif |