compact namespace in sal..svgio

Change-Id: I7e70614ea5a1cb1a1dc0ef8e9fb6fd48e85c3562
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93904
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

24 files changed, 45 insertions, 45 deletions

diff --git a/sal/inc/backtraceasstring.hxx b/sal/inc/backtraceasstring.hxx
index cd9ce494f789..d49aa2690ea5 100644
--- a/sal/inc/backtraceasstring.hxx
+++ b/sal/inc/backtraceasstring.hxx
@@ -15,12 +15,12 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace osl { namespace detail {
+namespace osl::detail {
 
 /// Build a debugging backtrace from current PC location.
 OUString backtraceAsString(sal_uInt32 maxDepth);
 
-} }
+}
 
 #endif // INCLUDED_SAL_INC_INTERNAL_MISC_H
 
diff --git a/sal/osl/unx/createfilehandlefromfd.hxx b/sal/osl/unx/createfilehandlefromfd.hxx
index 415fda061978..daf20e847d6f 100644
--- a/sal/osl/unx/createfilehandlefromfd.hxx
+++ b/sal/osl/unx/createfilehandlefromfd.hxx
@@ -14,11 +14,11 @@
 
 #include <osl/file.h>
 
-namespace osl { namespace detail {
+namespace osl::detail {
 
 oslFileHandle createFileHandleFromFD(int fd); // defined in file.cxx
 
-} }
+}
 
 #endif
 
diff --git a/sal/osl/unx/file_url.hxx b/sal/osl/unx/file_url.hxx
index 4b45d7f52aad..f9f31eb2056a 100644
--- a/sal/osl/unx/file_url.hxx
+++ b/sal/osl/unx/file_url.hxx
@@ -35,7 +35,7 @@ int UnicodeToText(char * buffer, size_t bufLen, const sal_Unicode * uniText, sal
 
 int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
 
-namespace osl { namespace detail {
+namespace osl::detail {
 
 oslFileError convertUrlToPathname(rtl::OUString const & url, rtl::OString * pathname);
 
@@ -43,7 +43,7 @@ oslFileError convertPathnameToUrl(rtl::OString const & pathname, rtl::OUString *
 
 bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result);
 
-} }
+}
 
 #endif
 
diff --git a/sal/osl/w32/filetime.hxx b/sal/osl/w32/filetime.hxx
index cb7dd5d3a31e..db21c4ca34b8 100644
--- a/sal/osl/w32/filetime.hxx
+++ b/sal/osl/w32/filetime.hxx
@@ -21,7 +21,7 @@ BOOL TimeValueToFileTime(TimeValue const * cpTimeVal, FILETIME * pFTime);
 
 BOOL FileTimeToTimeValue(FILETIME const * cpFTime, TimeValue * pTimeVal);
 
-namespace osl { namespace detail {
+namespace osl::detail {
 
 inline __int64 getFiletime(FILETIME const & ft) {
     return (DWORD64(ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
@@ -32,7 +32,7 @@ inline void setFiletime(FILETIME & ft, __int64 value) {
     ft.dwLowDateTime = value & 0xFFFFFFFF;
 }
 
-} }
+}
 
 #endif
 
diff --git a/sal/textenc/converter.hxx b/sal/textenc/converter.hxx
index 41b0642370b6..189f2048afaa 100644
--- a/sal/textenc/converter.hxx
+++ b/sal/textenc/converter.hxx
@@ -26,7 +26,7 @@
 
 // Internal, non-stable ABI
 
-namespace sal { namespace detail { namespace textenc {
+namespace sal::detail::textenc {
 
 enum BadInputConversionAction
 {
@@ -46,7 +46,7 @@ handleBadInputUnicodeToTextConversion(
     const char * pDestBufEnd, sal_uInt32 * pInfo, char const * pPrefix,
     sal_Size nPrefixLen, bool * pPrefixWritten);
 
-} } }
+}
 
 #endif
 
diff --git a/sal/textenc/convertsimple.hxx b/sal/textenc/convertsimple.hxx
index b6b3d0625eb3..f7154989af3f 100644
--- a/sal/textenc/convertsimple.hxx
+++ b/sal/textenc/convertsimple.hxx
@@ -17,7 +17,7 @@
 
 // Internal, non-stable ABI
 
-namespace sal { namespace detail { namespace textenc {
+namespace sal::detail::textenc {
 
 sal_Size SAL_DLLPUBLIC convertCharToUnicode(
     void const * pData, void * pContext, char const * pSrcBuf,
@@ -29,6 +29,6 @@ sal_Size SAL_DLLPUBLIC convertUnicodeToChar(
     sal_Size nSrcChars, char * pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags,
     sal_uInt32 * pInfo, sal_Size * pSrcCvtChars);
 
-} } }
+}
 
 #endif
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index 7673228a4615..bd657bbca723 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -29,7 +29,7 @@
 
 /// @HTML
 
-namespace rtl { namespace textenc {
+namespace rtl::textenc {
 
 /**
    Maps a range of BMP Unicode code points to individual bytes.
@@ -93,7 +93,7 @@ struct BmpUnicodeToSingleByteConverterData {
     BmpUnicodeToSingleByteRange const * unicodeToByte;
 };
 
-} }
+}
 
 /**
    Function to convert from a single-byte character set to BMP Unicode.
diff --git a/sal/textenc/handleundefinedunicodetotextchar.hxx b/sal/textenc/handleundefinedunicodetotextchar.hxx
index b7121c598bb5..106ad8a43b57 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.hxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.hxx
@@ -17,7 +17,7 @@
 
 // Internal, non-stable ABI
 
-namespace sal { namespace detail { namespace textenc {
+namespace sal::detail::textenc {
 
 // True means "continue," false means "break:"
 bool SAL_DLLPUBLIC handleUndefinedUnicodeToTextChar(
@@ -25,6 +25,6 @@ bool SAL_DLLPUBLIC handleUndefinedUnicodeToTextChar(
     char ** ppDestBuf, char const * pEndDestBuf, sal_uInt32 nFlags,
     sal_uInt32 * pInfo);
 
-} } }
+}
 
 #endif
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index f6fc943a1fe9..26c9a668ed49 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -31,7 +31,7 @@ namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XNumberFormatter2; }
 
-namespace sca { namespace analysis {
+namespace sca::analysis {
 
 class ScaAnyConverter;
 
@@ -904,7 +904,7 @@ public:
                                     sal_Int32 nDefault );
 };
 
-} }
+}
 
 #endif
 
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 825f5ab75379..f23531a53fe4 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/script/provider/XScriptProvider.hpp>
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
 
     namespace document {
         class XScriptInvocationContext;
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star {
     namespace util {
         struct URL;
     }
-} } }
+}
 
 namespace scripting_protocolhandler
 {
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 72b17ba468cc..0db9a1d8e93e 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -15,7 +15,7 @@
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
 #include <cppuhelper/implbase.hxx>
 
-namespace shell { namespace sessioninstall
+namespace shell::sessioninstall
 {
     class SyncDbusSessionHelper : public ::cppu::WeakImplHelper< ::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
     {
@@ -54,7 +54,7 @@ namespace shell { namespace sessioninstall
             SyncDbusSessionHelper( const SyncDbusSessionHelper& ) = delete;
             SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) = delete;
     };
-}}
+}
 
 #endif // INCLUDED_SHELL_SOURCE_SESSIONINSTALL_SYNCDBUSSESSIONHELPER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index cc09c2ea0c9b..3fedfb13db17 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -42,7 +42,7 @@ class SfxPrinter;
 class Printer;
 class SmCursor;
 
-namespace oox { namespace formulaimport { class XmlStream; } }
+namespace oox::formulaimport { class XmlStream; }
 
 #define STAROFFICE_XML  "StarOffice XML (Math)"
 #define MATHML_XML      "MathML XML (Math)"
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index e6f968583c1e..8fa101187297 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -31,7 +31,7 @@
 #include <types.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SmSym;
 class SmSymbolManager;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index dda259310b78..376365842640 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -26,12 +26,12 @@
 class SfxMedium;
 class SmNode;
 class SmVerticalBraceNode;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io {
         class XOutputStream; }
     namespace beans {
         class XPropertySet; }
-} } }
+}
 
 
 class SmXMLExportWrapper
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 84ef80a14b09..d4266842bfdd 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -28,10 +28,10 @@
 
 class SmNode;
 class SfxMedium;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet; }
-} } }
+}
 
 
 typedef std::deque<std::unique_ptr<SmNode>> SmNodeStack;
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index 026870bfa5cf..5fc7a6a335e8 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -12,7 +12,7 @@
 
 #include <rtl/ustring.hxx>
 
-namespace oox { namespace formulaimport { class XmlStream; } }
+namespace oox::formulaimport { class XmlStream; }
 /**
  Class implementing reading of formulas from OOXML. The toplevel element is expected
  to be oMath (handle oMathPara outside of this code).
diff --git a/stoc/source/implementationregistration/mergekeys.hxx b/stoc/source/implementationregistration/mergekeys.hxx
index f8bf8e42d65d..3f54e571241f 100644
--- a/stoc/source/implementationregistration/mergekeys.hxx
+++ b/stoc/source/implementationregistration/mergekeys.hxx
@@ -23,9 +23,9 @@
 #include <sal/config.h>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace registry {
+namespace com::sun::star::registry {
     class XRegistryKey;
-} } } }
+}
 namespace com::sun::star::uno { template <typename > class Reference; }
 
 namespace stoc_impreg {
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index da0ae985e3db..35aa97b97b76 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -26,9 +26,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace task {
+namespace com::sun::star::task {
     class XInteractionContinuation;
-} } } }
+}
 
 namespace stoc_javavm {
 
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index 63a9c55d1cf4..13418c30011c 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -34,10 +34,10 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XContainer; }
     namespace uno { class XComponentContext; }
-} } }
+}
 namespace jvmaccess {
     class UnoVirtualMachine;
     class VirtualMachine;
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index 9ce7d150e23d..4a88c414f567 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -25,7 +25,7 @@
 #include <sal/types.h>
 #include <rtl/ustrbuf.hxx>
 
-namespace stoc { namespace uriproc {
+namespace stoc::uriproc {
 
 class UriReference {
 public:
@@ -104,7 +104,7 @@ private:
     void appendSchemeSpecificPart(OUStringBuffer & buffer) const;
 };
 
-} }
+}
 
 #endif
 
diff --git a/svgio/inc/svgcharacternode.hxx b/svgio/inc/svgcharacternode.hxx
index 20d6eec7b0da..647d327494ee 100644
--- a/svgio/inc/svgcharacternode.hxx
+++ b/svgio/inc/svgcharacternode.hxx
@@ -22,7 +22,7 @@
 
 #include "svgnode.hxx"
 
-namespace drawinglayer { namespace primitive2d { class TextSimplePortionPrimitive2D; }}
+namespace drawinglayer::primitive2d { class TextSimplePortionPrimitive2D; }
 
 namespace svgio
 {
diff --git a/svgio/inc/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx
index c6b657207d54..2fd7c1db28d8 100644
--- a/svgio/inc/svgdocumenthandler.hxx
+++ b/svgio/inc/svgdocumenthandler.hxx
@@ -24,7 +24,7 @@
 #include "svgdocument.hxx"
 #include <cppuhelper/implbase.hxx>
 
-namespace svgio { namespace svgreader { class SvgCharacterNode; }}
+namespace svgio::svgreader { class SvgCharacterNode; }
 
 namespace svgio
 {
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index bc668de1a5fb..dc0a86a88fe6 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -29,13 +29,13 @@
 
 // predefines
 
-namespace svgio { namespace svgreader {
+namespace svgio::svgreader {
     class SvgGradientNode;
     class SvgPatternNode;
     class SvgMarkerNode;
     class SvgClipPathNode;
     class SvgMaskNode;
-}}
+}
 
 
 namespace svgio
diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx
index f7e0185b671a..158b3dd137c6 100644
--- a/svgio/source/svguno/xsvgparser.hxx
+++ b/svgio/source/svguno/xsvgparser.hxx
@@ -25,14 +25,14 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XComponentContext;
         class XInterface;
     }
-} } }
+}
 
-namespace svgio { namespace svgreader {
+namespace svgio::svgreader {
 
 css::uno::Reference< css::uno::XInterface >
 XSvgParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &);
@@ -42,7 +42,7 @@ OUString XSvgParser_getImplementationName();
 css::uno::Sequence< OUString >
 XSvgParser_getSupportedServiceNames();
 
-} }
+}
 
 #endif