7 files changed, 41 insertions, 42 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 8ecbc3269147..1a0ef32a0551 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -61,21 +61,21 @@ namespace connectivity
 {
 
     using namespace hsqldb;
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::sdbc;
-    using namespace ::com::sun::star::sdbcx;
-    using namespace ::com::sun::star::beans;
-    using namespace ::com::sun::star::frame;
-    using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star::embed;
-    using namespace ::com::sun::star::io;
-    using namespace ::com::sun::star::task;
-    using namespace ::com::sun::star::util;
-    using namespace ::com::sun::star::reflection;
+    using namespace css::uno;
+    using namespace css::sdbc;
+    using namespace css::sdbcx;
+    using namespace css::beans;
+    using namespace css::frame;
+    using namespace css::lang;
+    using namespace css::embed;
+    using namespace css::io;
+    using namespace css::task;
+    using namespace css::util;
+    using namespace css::reflection;
 
     namespace hsqldb
     {
-        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFac) throw( Exception )
+        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception )
         {
             return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac)));
         }
@@ -518,7 +518,7 @@ namespace connectivity
         return getSupportedServiceNames_Static();
     }
 
-    void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, css::container::ElementExistException, RuntimeException, std::exception)
     {
         ::dbtools::throwFeatureNotImplementedSQLException( "XCreateCatalog::createCatalog", *this );
     }
@@ -558,7 +558,7 @@ namespace connectivity
             m_aConnections.erase(_aIter);
     }
 
-    void SAL_CALL ODriverDelegator::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         Reference<XConnection> xCon(Source.Source,UNO_QUERY);
@@ -628,7 +628,7 @@ namespace connectivity
         }
     }
 
-    void SAL_CALL ODriverDelegator::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -671,15 +671,15 @@ namespace connectivity
         }
     }
 
-    void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
     {
     }
 
-    void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
     {
     }
 
-    void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
     {
     }
 
@@ -828,7 +828,7 @@ namespace connectivity
             {
 
                 Reference< XMultiServiceFactory > xConfigProvider(
-                    com::sun::star::configuration::theDefaultProvider::get( _rxContext ) );
+                    css::configuration::theDefaultProvider::get( _rxContext ) );
 
 
                 // arguments for creating the config access
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 757f7b9d2cca..4f479a159ceb 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -141,7 +141,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId()
     return pId->getImplementationId();
 }
 
-// com::sun::star::lang::XUnoTunnel
+// css::lang::XUnoTunnel
 
 sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
 {
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 0aa6ebae815c..95dc90980523 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -30,8 +30,7 @@ namespace connectivity
     namespace hsqldb
     {
         class ODriverDelegator;
-        class OConnectionController : public ::cppu::WeakImplHelper<
-                                                    ::com::sun::star::frame::XTerminateListener >
+        class OConnectionController : public ::cppu::WeakImplHelper< css::frame::XTerminateListener >
         {
             ODriverDelegator* m_pDriver;
             protected:
@@ -40,14 +39,14 @@ namespace connectivity
                 explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){}
 
                 // XEventListener
-                virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-                    throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+                    throw( css::uno::RuntimeException, std::exception ) override;
 
                 // XTerminateListener
-                virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
-                    throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-                virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
-                    throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+                virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent )
+                    throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override;
+                virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent )
+                    throw( css::uno::RuntimeException, std::exception ) override;
         };
     }
 
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 59a3b8777447..fe87987fd73e 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -36,13 +36,13 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true)
+OHSQLUser::OHSQLUser(   const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true)
                 ,m_xConnection(_xConnection)
 {
     construct();
 }
 
-OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+OHSQLUser::OHSQLUser(   const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                 const OUString& Name
             ) : connectivity::sdbcx::OUser(Name, true)
                 ,m_xConnection(_xConnection)
@@ -54,7 +54,7 @@ void OHSQLUser::refreshGroups()
 {
 }
 
-OUserExtend::OUserExtend(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection)
+OUserExtend::OUserExtend(   const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection)
 {
     construct();
 }
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 0894a4b06fa7..771645269f9c 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
 OUsers::OUsers( ::cppu::OWeakObject& _rParent,
                 ::osl::Mutex& _rMutex,
                 const TStringVector &_rVector,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+                const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                 connectivity::sdbcx::IRefreshableUsers* _pParent)
     : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
     ,m_xConnection(_xConnection)
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 53c7b20da23b..dc0dd69de886 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -40,12 +40,12 @@ using namespace ::comphelper;
 using namespace ::cppu;
 using namespace connectivity;
 using namespace connectivity::hsqldb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::sdbcx;
+using namespace css::sdbc;
+using namespace css::container;
+using namespace css::lang;
 using namespace dbtools;
 typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 82545c75d47e..54003dba9330 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -22,10 +22,10 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::hsqldb;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::lang::XSingleServiceFactory;
-using ::com::sun::star::lang::XMultiServiceFactory;
+using css::uno::Reference;
+using css::uno::Sequence;
+using css::lang::XSingleServiceFactory;
+using css::lang::XMultiServiceFactory;
 
 typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
         (