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>

8 files changed, 16 insertions, 16 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