From aa3e3efbfe8ce7b25bcbda6020bd3f6b8712c61e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 8 May 2020 14:03:34 +0200
Subject: compact namespace in editeng..extensions

Change-Id: Ie93ac69592c3625b8e2e5db3619ce24597a07a7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93722
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 editeng/inc/edtspell.hxx                            | 4 ++--
 embeddedobj/source/inc/commonembobj.hxx             | 4 ++--
 embeddedobj/source/inc/dummyobject.hxx              | 4 ++--
 embeddedobj/source/msole/graphconvert.hxx           | 4 +---
 embeddedobj/source/msole/olepersist.hxx             | 4 ++--
 embedserv/source/inc/common.h                       | 4 ++--
 emfio/source/emfuno/xemfparser.hxx                  | 8 ++++----
 extensions/source/abpilot/datasourcehandling.hxx    | 4 ++--
 extensions/source/abpilot/fieldmappingimpl.hxx      | 4 ++--
 extensions/source/bibliography/bibview.hxx          | 2 +-
 extensions/source/bibliography/framectr.hxx         | 8 ++++----
 extensions/source/config/ldap/ldapaccess.hxx        | 4 ++--
 extensions/source/config/ldap/ldapuserprofilebe.hxx | 8 ++++----
 extensions/source/propctrlr/browserline.hxx         | 4 ++--
 extensions/source/propctrlr/handlerhelper.hxx       | 4 ++--
 extensions/source/propctrlr/propertyhandler.hxx     | 4 ++--
 extensions/source/propctrlr/xsddatatypes.hxx        | 4 ++--
 17 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 2c90f39374b1..43edeadd9213 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -25,9 +25,9 @@
 #include <editeng/svxenum.hxx>
 #include <editeng/misspellrange.hxx>
 
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
     class XSpellChecker1;
-}}}}
+}
 
 
 class EditView;
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 0246e7f3f3bc..61e939a0c62f 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -37,7 +37,7 @@
 #include <rtl/ref.hxx>
 #include <map>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed {
         class XStorage;
     }
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star {
         struct PropertyValue;
         struct NamedValue;
     }
-}}}
+}
 
 namespace cppu {
     class OMultiTypeInterfaceContainerHelper;
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 67795190a27a..60bca914b636 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -31,7 +31,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace embed {
         class XStorage;
     }
@@ -42,7 +42,7 @@ namespace com { namespace sun { namespace star {
         struct PropertyValue;
         struct NamedValue;
     }
-}}}
+}
 
 namespace cppu {
     class OMultiTypeInterfaceContainerHelper;
diff --git a/embeddedobj/source/msole/graphconvert.hxx b/embeddedobj/source/msole/graphconvert.hxx
index b86c8e840ea5..39e627888765 100644
--- a/embeddedobj/source/msole/graphconvert.hxx
+++ b/embeddedobj/source/msole/graphconvert.hxx
@@ -25,9 +25,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class Any;
-} } } }
+namespace com::sun::star::uno { class Any; }
 
 bool ConvertBufferToFormat(
     void * pBuf, sal_uInt32 nBufSize, OUString const & aFormatShortName,
diff --git a/embeddedobj/source/msole/olepersist.hxx b/embeddedobj/source/msole/olepersist.hxx
index d9607a1c3836..111e34e31004 100644
--- a/embeddedobj/source/msole/olepersist.hxx
+++ b/embeddedobj/source/msole/olepersist.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace io { class XInputStream; }
     namespace lang { class XMultiServiceFactory; }
-} } }
+}
 
 OUString GetNewTempFileURL_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
 
diff --git a/embedserv/source/inc/common.h b/embedserv/source/inc/common.h
index 4f223e919a73..3fcc6712d408 100644
--- a/embedserv/source/inc/common.h
+++ b/embedserv/source/inc/common.h
@@ -29,7 +29,7 @@
 
 #include "embservconst.h"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XMultiServiceFactory;
     }
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star {
         class XInputStream;
         class XOutputStream;
     }
-} } }
+}
 
 #endif
 
diff --git a/emfio/source/emfuno/xemfparser.hxx b/emfio/source/emfuno/xemfparser.hxx
index e4d1b53fa055..426231d362fc 100644
--- a/emfio/source/emfuno/xemfparser.hxx
+++ b/emfio/source/emfuno/xemfparser.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 emfio { namespace emfreader {
+namespace emfio::emfreader {
 
 css::uno::Reference< css::uno::XInterface >
 XEmfParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &);
@@ -42,7 +42,7 @@ OUString XEmfParser_getImplementationName();
 css::uno::Sequence< OUString >
 XEmfParser_getSupportedServiceNames();
 
-} }
+}
 
 #endif
 
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 98e62e90ef3b..b6fbfc2c8f3b 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -27,11 +27,11 @@
 #include "abptypes.hxx"
 
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
-} } }
+}
 
 namespace weld { class Window; }
 
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index 4d0b26e9c166..d95fe14faa1c 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include "addresssettings.hxx"
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XMultiServiceFactory;
     }
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
     namespace beans {
         class XPropertySet;
     }
-} } }
+}
 namespace weld { class Window; }
 
 namespace abp
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index cd6d77633346..4198dac03987 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -26,7 +26,7 @@
 class   BibGeneralPage;
 class   BibDataManager;
 
-namespace com{ namespace sun{ namespace star{ namespace awt{ class XFocusListener;}}}}
+namespace com::sun::star::awt{ class XFocusListener;}
 
 
 namespace bib
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 22a0900f707d..50bf20cfd057 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -34,11 +34,11 @@
 #include "bibmod.hxx"
 class BibDataManager;
 class BibFrameCtrl_Impl;
-namespace com{namespace sun{namespace star{
-    namespace form { namespace runtime {
+namespace com::sun::star{
+    namespace form::runtime {
         class XFormController;
-    } }
-}}}
+    }
+}
 class BibStatusDispatch
 {
 public:
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index a0e6bce3b569..34ba5a04f625 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -38,7 +38,7 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
 
 namespace uno = css::uno ;
 namespace lang = css::lang ;
@@ -128,7 +128,7 @@ private:
 } ;
 
 
-}} }
+}
 
 #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_
 
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 88f14eabc474..aaefcd8344e6 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -27,11 +27,11 @@
 
 #include "ldapaccess.hxx"
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
-} } } }
+}
 
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
 
 namespace uno = css::uno ;
 namespace lang = css::lang ;
@@ -121,7 +121,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
     LdapData data_;
 } ;
 
-}}}
+}
 
 #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_
 
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index cbe577e58da6..346904415682 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <vcl/weld.hxx>
 
-namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement
+namespace com::sun::star::inspection::PropertyLineElement
 {
     const sal_Int16 CompleteLine = 0x4000;
-} } } } }
+}
 
 
 namespace pcr
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 6d61cd12e10a..127082536430 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -30,11 +30,11 @@
 #include <vector>
 
 namespace weld { class Builder; class Widget; class Window; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace inspection {
         struct LineDescriptor;
     }
-} } }
+}
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index b667a50a8f38..f09e8bf523b9 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -44,12 +44,12 @@
 #include <memory>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace inspection {
         struct LineDescriptor;
         class XPropertyControlFactory;
     }
-} } }
+}
 
 namespace vcl { class Window; }
 namespace weld { class Window; }
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index d6470a1809cd..aff845cbed95 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -24,14 +24,14 @@
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace xsd {
         class XDataType;
     }
     namespace beans {
         class XPropertySetInfo;
     }
-} } }
+}
 
 
 namespace pcr
-- 
cgit