compact namespace in filter..framework

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

13 files changed, 28 insertions, 35 deletions

diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 383d537b2efe..3d23e9aaac16 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -69,9 +69,7 @@
 #include <cppuhelper/implbase7.hxx>
 #include <rtl/ref.hxx>
 
-namespace com { namespace sun { namespace star { namespace sdbc {
-    class SQLException;
-} } } }
+namespace com::sun::star::sdbc { class SQLException; }
 
 class Timer;
 class INetMIMEMessage;
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 6b53d58d0e71..eff824b90ea8 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -31,10 +31,7 @@
 
 class SvStream;
 class Graphic;
-
-namespace com { namespace sun { namespace star { namespace io {
-    class XInputStream;
-}}}}
+namespace com::sun::star::io { class XInputStream; }
 
 
 class ImageProducer :   public css::awt::XImageProducer,
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 4e3c1326ca72..690b93d49da6 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -41,9 +41,7 @@
 #include <cppuhelper/implbase8.hxx>
 #include <unordered_map>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 using namespace comphelper;
 
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 5a3abe669a6f..464e1aeb4d4a 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -44,7 +44,7 @@ namespace xforms
     class Model;
     class EvaluationContext;
 }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace xml {
         namespace xpath { class XXPathAPI; }
         namespace dom
@@ -56,7 +56,7 @@ namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
     namespace xforms { class XModel; }
     namespace xsd { class XDataType; }
-} } }
+}
 
 
 namespace xforms
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index 374acef95584..e4511b4c1873 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 // forward declaractions
-namespace com { namespace sun { namespace star
+namespace com::sun::star
 {
     namespace xml
     {
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star
         namespace xpath { class XXPathObject; }
     }
     namespace container { class XNameContainer; }
-} } }
+}
 namespace xforms { class EvaluationContext; }
 
 
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index cba7611a9216..8d4555d580ec 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -23,11 +23,11 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace uno
+namespace com::sun::star::uno
 {
     class Any;
     class Type;
-} } } }
+}
 
 namespace xforms
 {
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index f5cc97ae0dd5..f790f17bc65c 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -25,13 +25,13 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace container { class XIndexAccess; }
     namespace uno { class Any; }
     namespace container { class NoSuchElementException; }
     namespace lang { class WrappedTargetException; }
     namespace uno { class RuntimeException; }
-} } }
+}
 
 /** implement XEnumeration based on container::XIndexAccess */
 class Enumeration
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index a56554c0888f..af7075e072ab 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -34,10 +34,10 @@
 
 
 // forward declaractions
-namespace com { namespace sun { namespace star
+namespace com::sun::star
 {
-    namespace xml { namespace dom { class XDocument; } }
-    namespace xml { namespace dom { class XNode; } }
+    namespace xml::dom { class XDocument; }
+    namespace xml::dom { class XNode; }
     namespace uno { template<typename T> class Sequence; }
     namespace lang { class IndexOutOfBoundsException; }
     namespace lang { class IllegalArgumentException; }
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star
     namespace container { class XSet; }
     namespace container { class XNameContainer; }
     namespace frame { class XModel; }
-} } }
+}
 namespace xforms
 {
     class BindingCollection;
diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx
index 2d1743837198..7f01c673ce72 100644
--- a/forms/source/xforms/pathexpression.hxx
+++ b/forms/source/xforms/pathexpression.hxx
@@ -25,14 +25,14 @@
 #include <vector>
 
 // forward declaractions
-namespace com { namespace sun { namespace star
+namespace com::sun::star
 {
-    namespace xml { namespace dom
+    namespace xml::dom
     {
         class XNodeList;
         namespace events { class XEventListener; }
-    } }
-} } }
+    }
+}
 
 
 namespace xforms
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 630934270a79..d6ba2efda2eb 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -28,11 +28,11 @@
 
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
         class Any;
         class RuntimeException;
         template<class T> class Sequence;
-} } } }
+}
 
 /** base class which encapsulates accessing (reading/writing) concrete property values
 */
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index c8f833e7c516..d6283034c226 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -33,14 +33,14 @@
 #include "computedexpression.hxx"
 
 // forward declaractions
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace xforms { class XModel; }
     namespace uno { class Any; }
     namespace beans { class UnknownPropertyException;
                       class PropertyVetoException; }
     namespace lang { class IllegalArgumentException;
                      class WrappedTargetException; }
-} } }
+}
 namespace xforms { class Model; }
 
 
diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx
index d3bf9b730922..a2e6bd8b4ac4 100644
--- a/forms/source/xforms/unohelper.hxx
+++ b/forms/source/xforms/unohelper.hxx
@@ -21,7 +21,7 @@
 
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XInterface;
         template<class T> class Reference;
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
     namespace beans {
         class XPropertySet;
     }
-} } }
+}
 
 namespace xforms
 {
diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx
index 076fe1ab6648..8a2286bb9239 100644
--- a/forms/source/xforms/xmlhelper.hxx
+++ b/forms/source/xforms/xmlhelper.hxx
@@ -22,11 +22,11 @@
 
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { template<typename T> class Reference; }
     namespace container { class XNameContainer; }
-    namespace xml { namespace dom { class XDocumentBuilder; } }
-} } }
+    namespace xml::dom { class XDocumentBuilder; }
+}
 
 
 bool isValidQName( const OUString& sName,