6 files changed, 12 insertions, 24 deletions
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index 724b5fb129a0..466e96ece829 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -21,10 +21,8 @@
 
 #include <file/FCatalog.hxx>
 
-namespace connectivity
+namespace connectivity::calc
 {
-    namespace calc
-    {
         class OCalcConnection;
         class OCalcCatalog : public file::OFileCatalog
         {
@@ -34,7 +32,7 @@ namespace connectivity
         public:
             OCalcCatalog(OCalcConnection* _pCon);
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index b0eeb2d4acea..6eabeccef5ff 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -33,9 +33,7 @@ namespace com::sun::star {
 namespace utl { class CloseVeto; }
 
 
-namespace connectivity
-{
-    namespace calc
+namespace connectivity::calc
     {
         class ODriver;
         class OCalcConnection : public file::OConnection
@@ -145,7 +143,7 @@ namespace connectivity
                 const css::uno::Reference< css::sheet::XSpreadsheetDocument>& getDoc() const { return m_xDoc; }
             };
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index a46d09c14b1c..61f9f6aa7ea2 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -21,9 +21,7 @@
 
 #include <component/CDatabaseMetaData.hxx>
 
-namespace connectivity
-{
-    namespace calc
+namespace connectivity::calc
     {
 
         //************ Class: java.sql.DatabaseMetaDataDate
@@ -38,7 +36,7 @@ namespace connectivity
         public:
             OCalcDatabaseMetaData(file::OConnection* _pCon);
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 02d9dea55033..99200d23ee54 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -23,9 +23,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-namespace connectivity
-{
-    namespace calc
+namespace connectivity::calc
     {
         /// @throws css::uno::Exception
         css::uno::Reference< css::uno::XInterface >
@@ -47,7 +45,7 @@ namespace connectivity
             virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
             virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index b9835c222fc4..a8f49b661bc4 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -31,9 +31,7 @@ namespace com::sun::star::util {
 }
 
 
-namespace connectivity
-{
-    namespace calc
+namespace connectivity::calc
     {
         typedef component::OComponentTable OCalcTable_BASE;
         class OCalcConnection;
@@ -72,7 +70,7 @@ namespace connectivity
 
             void construct() override;
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 65c7135f0981..0b88592a2e6a 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -21,9 +21,7 @@
 
 #include <file/FTables.hxx>
 
-namespace connectivity
-{
-    namespace calc
+namespace connectivity::calc
     {
         typedef file::OTables OCalcTables_BASE;
 
@@ -36,7 +34,7 @@ namespace connectivity
                 const ::std::vector< OUString> &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector)
             {}
         };
-    }
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */