[Libreoffice-commits] core.git: connectivity/qa connectivity/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 15 07:44:20 UTC 2020 

 connectivity/qa/connectivity/commontools/FValue_test.cxx           |    4 +-
 connectivity/qa/connectivity/mork/DriverTest.cxx                   |    4 +-
 connectivity/source/commontools/paramwrapper.cxx                   |    6 +--
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx           |    5 ---
 connectivity/source/drivers/evoab2/NResultSet.cxx                  |    4 +-
 connectivity/source/drivers/evoab2/NStatement.cxx                  |    4 +-
 connectivity/source/drivers/file/FStatement.cxx                    |    8 +----
 connectivity/source/drivers/firebird/Driver.cxx                    |   12 +------
 connectivity/source/drivers/hsqldb/HConnection.cxx                 |    4 +-
 connectivity/source/drivers/hsqldb/HStorageMap.cxx                 |   10 +-----
 connectivity/source/drivers/hsqldb/HTools.cxx                      |    4 +-
 connectivity/source/drivers/hsqldb/HView.cxx                       |    4 +-
 connectivity/source/drivers/jdbc/ConnectionLog.cxx                 |    8 ++---
 connectivity/source/drivers/jdbc/ContextClassLoader.cxx            |    4 +-
 connectivity/source/drivers/mork/MConnection.cxx                   |    4 +-
 connectivity/source/drivers/mork/MDatabaseMetaData.cxx             |    5 ---
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |    5 ---
 connectivity/source/drivers/mysql_jdbc/YTable.cxx                  |    5 ---
 connectivity/source/drivers/mysqlc/mysqlc_driver.cxx               |    5 ---
 connectivity/source/drivers/odbc/ORealDriver.cxx                   |    5 ---
 connectivity/source/drivers/writer/WCatalog.cxx                    |    5 ---
 connectivity/source/drivers/writer/WConnection.cxx                 |    5 ---
 connectivity/source/drivers/writer/WDatabaseMetaData.cxx           |    5 ---
 connectivity/source/drivers/writer/WDriver.cxx                     |    5 ---
 connectivity/source/drivers/writer/WTable.cxx                      |   16 +---------
 connectivity/source/drivers/writer/WTables.cxx                     |    5 ---
 connectivity/source/sdbcx/VDescriptor.cxx                          |    5 ---
 27 files changed, 45 insertions(+), 111 deletions(-)

New commits:
commit b43f64f430bc19c07f6b5d457a9168de5fb9de69
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 15 08:45:55 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 15 08:43:46 2020 +0100

    clang-tidy modernize-concat-nested-namespace in connectivity
    
    Change-Id: Id18966cc44c012730a872ebfa93f2b468cefff38
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86823
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/connectivity/qa/connectivity/commontools/FValue_test.cxx b/connectivity/qa/connectivity/commontools/FValue_test.cxx
index 036fbbc3ca5f..b6f0e36588ad 100644
--- a/connectivity/qa/connectivity/commontools/FValue_test.cxx
+++ b/connectivity/qa/connectivity/commontools/FValue_test.cxx
@@ -24,7 +24,7 @@
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 
-namespace connectivity { namespace commontools {
+namespace connectivity::commontools {
 
 class FValueTest: public test::BootstrapFixture
 {
@@ -359,7 +359,7 @@ void FValueTest::test_bool_creation()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FValueTest);
 
-}}
+}
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx
index 1ce3b981a238..e2f2849ffff4 100644
--- a/connectivity/qa/connectivity/mork/DriverTest.cxx
+++ b/connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -16,7 +16,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 
-namespace connectivity { namespace mork {
+namespace connectivity::mork {
 
 
 class MorkDriverTest: public test::BootstrapFixture
@@ -194,6 +194,6 @@ void MorkDriverTest::test_select_list_table_joe_doe_5()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MorkDriverTest);
 
-}}
+}
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 92c78e319276..e56cf9e24f01 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -33,9 +33,7 @@
 #define PROPERTY_ID_VALUE   1000
 
 
-namespace dbtools
-{
-namespace param
+namespace dbtools::param
 {
 
 
@@ -349,7 +347,7 @@ namespace param
     }
 
 
-} } // namespace dbtools::param
+} // namespace dbtools::param
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 85673db40afe..6045b0f3123c 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -44,9 +44,7 @@ namespace
     }
 }
 
-namespace connectivity
-{
-    namespace evoab
+namespace connectivity::evoab
     {
         static sal_Int32    const s_nCOLUMN_SIZE = 256;
         static sal_Int32    const s_nDECIMAL_DIGITS = 0;
@@ -239,7 +237,6 @@ namespace connectivity
 
 
     }
-}
 
 
 OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon)
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 3768c09dd3ad..77d53939c1aa 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -43,7 +43,7 @@
 
 #include <cstring>
 
-namespace connectivity { namespace evoab {
+namespace connectivity::evoab {
 
 using namespace ::comphelper;
 using namespace com::sun::star;
@@ -1137,6 +1137,6 @@ OEvoabResultSet::getPropertySetInfo(  )
 }
 
 
-} } // connectivity::evoab
+} // connectivity::evoab
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 94f50e7177c1..1616f9fb1f1f 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -35,7 +35,7 @@
 #include <connectivity/dbexception.hxx>
 #include <tools/diagnose_ex.h>
 
-namespace connectivity { namespace evoab {
+namespace connectivity::evoab {
 
 
 using namespace com::sun::star::uno;
@@ -627,6 +627,6 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ )
     return 0;
 }
 
-} } // namespace ::connectivity::evoab
+} // namespace ::connectivity::evoab
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 24e176d140c2..8e25a34dac88 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -35,9 +35,7 @@
 #include <strings.hrc>
 #include <algorithm>
 
-namespace connectivity
-{
-    namespace file
+namespace connectivity::file
     {
 
 
@@ -703,9 +701,7 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar
     // do nothing here
 }
 
-    } // namespace file
-
-}// namespace connectivity
+    }// namespace connectivity
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 94335a17d4c7..823c76ef3f6e 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -44,9 +44,7 @@ using namespace ::osl;
 
 using namespace connectivity::firebird;
 
-namespace connectivity
-{
-    namespace firebird
+namespace connectivity::firebird
     {
         Reference< XInterface > FirebirdDriver_CreateInstance(
             const Reference< XMultiServiceFactory >& _rxFactory)
@@ -55,7 +53,6 @@ namespace connectivity
             return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory)));
         }
     }
-}
 
 // Static const variables
 namespace {
@@ -230,9 +227,7 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByUR
     return getDataDefinitionByConnection(xConnection);
 }
 
-namespace connectivity
-{
-    namespace firebird
+namespace connectivity::firebird
     {
         void checkDisposed(bool _bThrow)
         {
@@ -241,8 +236,7 @@ namespace connectivity
 
         }
 
-    }
-} // namespace connectivity
+    } // namespace connectivity
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 497b2cec2fa1..b6cbc1e4879c 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -69,7 +69,7 @@ using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
 using ::com::sun::star::beans::PropertyValue;
 
 
-namespace connectivity { namespace hsqldb
+namespace connectivity::hsqldb
 {
     void SAL_CALL OHsqlConnection::disposing()
     {
@@ -335,6 +335,6 @@ namespace connectivity { namespace hsqldb
         return xGraphic;
     }
 
-} } // namespace connectivity::hsqldb
+} // namespace connectivity::hsqldb
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 3d6afc05b310..4d79ba80f21a 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -28,10 +28,7 @@
 #include <uno/mapping.hxx>
 #include <algorithm>
 
-namespace connectivity
-{
-
-    namespace hsqldb
+namespace connectivity::hsqldb
     {
 
         using namespace ::com::sun::star::uno;
@@ -357,10 +354,7 @@ namespace connectivity
             env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr());
         }
 
-    }   // namespace hsqldb
-
-
-}
+    }
 // namespace connectivity
 
 
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 9a31ace4602b..b9854c01ce67 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -20,7 +20,7 @@
 #include <hsqldb/HTools.hxx>
 
 
-namespace connectivity { namespace hsqldb
+namespace connectivity::hsqldb
 {
 
     void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
@@ -47,7 +47,7 @@ namespace connectivity { namespace hsqldb
     }
 
 
-} } // namespace connectivity::hsqldb
+} // namespace connectivity::hsqldb
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index f0e53e8534fd..0a09ec0d201b 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -35,7 +35,7 @@
 #include <unotools/sharedunocomponent.hxx>
 
 
-namespace connectivity { namespace hsqldb
+namespace connectivity::hsqldb
 {
 
 
@@ -211,7 +211,7 @@ namespace connectivity { namespace hsqldb
         return sCommand;
     }
 
-} } // namespace connectivity::hsqldb
+} // namespace connectivity::hsqldb
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 07c60b102cd3..96a82fb61c5f 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 
-namespace connectivity { namespace java { namespace sql {
+namespace connectivity::java::sql {
 
 
     namespace
@@ -60,10 +60,10 @@ namespace connectivity { namespace java { namespace sql {
     }
 
 
-} } } // namespace connectivity::java::sql
+} // namespace connectivity::java::sql
 
 
-namespace comphelper { namespace log { namespace convert
+namespace comphelper::log::convert
 {
 
 
@@ -104,7 +104,7 @@ namespace comphelper { namespace log { namespace convert
     }
 
 
-} } }   // comphelper::log::convert
+}   // comphelper::log::convert
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 7572c1db7bae..50e6bc632bc2 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -21,7 +21,7 @@
 #include <java/lang/Object.hxx>
 
 
-namespace connectivity { namespace jdbc
+namespace connectivity::jdbc
 {
 
 
@@ -105,7 +105,7 @@ namespace connectivity { namespace jdbc
         }
     }
 
-} } // namespace connectivity::jdbc
+} // namespace connectivity::jdbc
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 954812fe9242..e6658b6dc4b3 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
 
-namespace connectivity { namespace mork {
+namespace connectivity::mork {
 
 static const int defaultScope = 0x80;
 
@@ -372,6 +372,6 @@ void OConnection::throwSQLException( const char* pErrorResourceId, const Referen
     throwSQLException(aError, _rxContext);
 }
 
-} } // namespace connectivity::mork
+} // namespace connectivity::mork
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index d832533ec07b..4ecf06640096 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -24,16 +24,13 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::sdbc;
 
 
-namespace connectivity
-{
-    namespace mork
+namespace connectivity::mork
     {
         static sal_Int32 const s_nCOLUMN_SIZE = 256;
         static sal_Int32 const s_nDECIMAL_DIGITS = 0;
         static sal_Int32 const s_nNULLABLE = 1;
         static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
     }
-}
 
 ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
                         : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo())
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 6f17ab137177..ab9f370989e0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -22,9 +22,7 @@
 #include "MNSFolders.hxx"
 #include "MNSINIParser.hxx"
 
-namespace connectivity
-{
-    namespace mozab
+namespace connectivity::mozab
     {
         ProfileStruct::ProfileStruct()
         {
@@ -206,7 +204,6 @@ namespace connectivity
             return rProduct.mProfileList.find(profileName) != rProduct.mProfileList.end();
         }
     }
-}
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 6603238ea6dc..c5e9f9a5891f 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -42,9 +42,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-namespace connectivity
-{
-namespace mysql
+namespace connectivity::mysql
 {
 namespace
 {
@@ -62,7 +60,6 @@ public:
 };
 }
 }
-}
 
 OMySQLTable::OMySQLTable(sdbcx::OCollection* _pTables, const Reference<XConnection>& _xConnection)
     : OTableHelper(_pTables, _xConnection, true)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
index 10ca352eb10f..d58ac07d55ca 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
@@ -120,9 +120,7 @@ sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion() { return MARIADBC_VERSION_MAJ
 
 sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion() { return MARIADBC_VERSION_MINOR; }
 
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
 {
 Reference<XInterface> MysqlCDriver_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
@@ -137,7 +135,6 @@ void checkDisposed(bool _bThrow)
     }
 }
 
-} /* mysqlc */
 } /* connectivity */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 1c7bc80ae203..4654a150d793 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -22,9 +22,7 @@
 #include <odbc/OTools.hxx>
 #include <odbc/OFunctions.hxx>
 
-namespace connectivity
-{
-    namespace odbc
+namespace connectivity::odbc
     {
         namespace {
 
@@ -290,6 +288,5 @@ SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath)
 
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx
index 87978f592fe9..5f9ba6b36f75 100644
--- a/connectivity/source/drivers/writer/WCatalog.cxx
+++ b/connectivity/source/drivers/writer/WCatalog.cxx
@@ -29,9 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 OWriterCatalog::OWriterCatalog(OWriterConnection* pConnection)
     : file::OFileCatalog(pConnection)
@@ -57,7 +55,6 @@ void OWriterCatalog::refreshTables()
         m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector);
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 55517c51f3de..7940d231bbf7 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -38,9 +38,7 @@ using namespace ::com::sun::star;
 
 using OConnection_BASE = connectivity::file::OConnection;
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 OWriterConnection::OWriterConnection(ODriver* _pDriver)
     : OConnection(_pDriver)
@@ -245,7 +243,6 @@ uno::Reference<sdbc::XPreparedStatement>
     return nullptr;
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
index 8dfe3b9ea96c..32bec31e5ec4 100644
--- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
@@ -24,9 +24,7 @@
 
 using namespace ::com::sun::star;
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 OWriterDatabaseMetaData::OWriterDatabaseMetaData(file::OConnection* pConnection)
     : OComponentDatabaseMetaData(pConnection)
@@ -108,7 +106,6 @@ uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getTables(
     return xRef;
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index 75cae7f33200..fd285ff9bff2 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -28,9 +28,7 @@
 using namespace connectivity::file;
 using namespace ::com::sun::star;
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 OUString ODriver::getImplementationName_Static() { return "com.sun.star.comp.sdbc.writer.ODriver"; }
 
@@ -77,7 +75,6 @@ ODriver::getPropertyInfo(const OUString& url, const uno::Sequence<beans::Propert
     return uno::Sequence<sdbc::DriverPropertyInfo>();
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 1919d835f40c..1c0b5d501699 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -32,19 +32,10 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace text
+namespace com::sun::star::text
 {
 class XTextDocument;
 }
-}
-}
-}
 
 using namespace ::com::sun::star;
 
@@ -108,9 +99,7 @@ static void lcl_SetValue(connectivity::ORowSetValue& rValue,
     }
 }
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 void OWriterTable::fillColumns()
 {
@@ -262,7 +251,6 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool
     return true;
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx
index 6e3e4dcab3ce..bfbe6f82c134 100644
--- a/connectivity/source/drivers/writer/WTables.cxx
+++ b/connectivity/source/drivers/writer/WTables.cxx
@@ -27,9 +27,7 @@
 
 using namespace ::com::sun::star;
 
-namespace connectivity
-{
-namespace writer
+namespace connectivity::writer
 {
 sdbcx::ObjectType OWriterTables::createObject(const OUString& rName)
 {
@@ -42,7 +40,6 @@ sdbcx::ObjectType OWriterTables::createObject(const OUString& rName)
     return xRet;
 }
 
-} // namespace writer
 } // namespace connectivity
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index b7d9411bbce1..a8c409f6081f 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -25,9 +25,7 @@
 
 #include <algorithm>
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
         using namespace ::com::sun::star::uno;
         using namespace ::com::sun::star::lang;
@@ -125,7 +123,6 @@ namespace connectivity
         }
 
     }
-}
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list