namespacing cleanup

Change-Id: I1384bf53a29e174bb97db4c0644f9dce39c0e36d

9 files changed, 60 insertions, 75 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index f53f08cf3422..d94930441836 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -37,10 +37,6 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
-using namespace com::sun::star::task;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-
 namespace desktop
 {
 
@@ -49,7 +45,7 @@ namespace desktop
  --------------------------------------------------------------------*/
 class CommandLineArgs;
 class Lockfile;
-class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
+class AcceptorMap : public std::map< OUString, css::uno::Reference<css::lang::XInitialization> > {};
 struct ConvertData;
 class Desktop : public Application
 {
@@ -137,8 +133,8 @@ class Desktop : public Application
 
     private:
         void RegisterServices(
-            com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext > const & context);
+            css::uno::Reference<
+                css::uno::XComponentContext > const & context);
         void                    DeregisterServices();
 
         void                    CreateTemporaryDirectory();
@@ -148,7 +144,7 @@ class Desktop : public Application
         bool                    InitializeConfiguration();
         void                    FlushConfiguration();
         static sal_Bool         shouldLaunchQuickstart();
-        sal_Bool                InitializeQuickstartMode( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
+        sal_Bool                InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
         void                    HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
         void                    StartSetup( const OUString& aParameters );
@@ -160,7 +156,7 @@ class Desktop : public Application
         static void             PreloadModuleData( const CommandLineArgs& );
         static void             PreloadConfigurationData();
 
-        Reference<XStatusIndicator> m_rSplashScreen;
+        css::uno::Reference<css::task::XStatusIndicator> m_rSplashScreen;
         void                    OpenSplashScreen();
         void                    CloseSplashScreen();
 
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index af9eb0516bdc..97ca6e149e6d 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -33,6 +33,8 @@
 using namespace ::desktop;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
 
 static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess";
 
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 42f2b6b72205..05b3b300df1c 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/XCurrentContext.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
-
-
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/ucb/XUniversalContentBroker.hpp>
@@ -55,7 +53,6 @@
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
 
-
 using namespace desktop;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -63,7 +60,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::ucb;
 
-
 namespace desktop
 {
 
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 2ea7f84dc85a..bb9aadb31477 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -57,6 +57,9 @@
 
 using namespace desktop;
 using namespace com::sun::star;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::task;
+using namespace com::sun::star::uno;
 
 namespace
 {
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 8dc0f2c908bc..24cfae66a7d4 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -27,17 +27,13 @@
 
 #include "boost/bind.hpp"
 
-using namespace ::dp_misc;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
 namespace dp_gui {
 
 class LicenseDialog
-    : public ::cppu::WeakImplHelper1<ui::dialogs::XExecutableDialog>
+    : public ::cppu::WeakImplHelper1<css::ui::dialogs::XExecutableDialog>
 {
-    Reference<XComponentContext> const m_xComponentContext;
-    Reference<awt::XWindow> /* const */ m_parent;
+    css::uno::Reference<css::uno::XComponentContext> const m_xComponentContext;
+    css::uno::Reference<css::awt::XWindow> /* const */ m_parent;
     OUString m_sExtensionName;
     OUString /* const */ m_sLicenseText;
     OUString m_initialTitle;
@@ -45,13 +41,13 @@ class LicenseDialog
     sal_Int16 solar_execute();
 
 public:
-    LicenseDialog( Sequence<Any> const & args,
-                 Reference<XComponentContext> const & xComponentContext );
+    LicenseDialog( css::uno::Sequence<css::uno::Any> const & args,
+                 css::uno::Reference<css::uno::XComponentContext> const & xComponentContext );
 
     // XExecutableDialog
     virtual void SAL_CALL setTitle( OUString const & title )
-        throw (RuntimeException);
-    virtual sal_Int16 SAL_CALL execute() throw (RuntimeException);
+        throw (css::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException);
 };
 }
 #endif
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 21b97f4ad7b4..a9b08f476d3a 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -25,6 +25,13 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
+using namespace ::osl;
+using namespace css::bridge;
+using namespace css::connection;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::uno;
+
 namespace desktop
 {
 
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 0cb2dd3f6472..76d08a45ed07 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -37,38 +37,27 @@
 #include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 
-
-using namespace ::rtl;
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::bridge;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::connection;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::registry;
-
 namespace desktop {
 
 class  Acceptor
-    : public ::cppu::WeakImplHelper2<XServiceInfo, XInitialization>
+    : public ::cppu::WeakImplHelper2<css::lang::XServiceInfo, css::lang::XInitialization>
 {
 private:
     static const sal_Char *serviceName;
     static const sal_Char *implementationName;
     static const sal_Char *supportedServiceNames[];
 
-    static Mutex m_aMutex;
+    static ::osl::Mutex m_aMutex;
 
     oslThread m_thread;
     comphelper::WeakBag< com::sun::star::bridge::XBridge > m_bridges;
 
-    Condition m_cEnable;
+    ::osl::Condition m_cEnable;
 
-    Reference< XMultiServiceFactory > m_rSMgr;
-    Reference< XComponentContext >    m_rContext;
-    Reference< XAcceptor >            m_rAcceptor;
-    Reference< XBridgeFactory2 >      m_rBridgeFactory;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_rSMgr;
+    css::uno::Reference< css::uno::XComponentContext >     m_rContext;
+    css::uno::Reference< css::connection::XAcceptor >      m_rAcceptor;
+    css::uno::Reference< css::bridge::XBridgeFactory2 >    m_rBridgeFactory;
 
     OUString m_aAcceptString;
     OUString m_aConnectString;
@@ -78,42 +67,42 @@ private:
     bool m_bDying;
 
 public:
-    Acceptor( const Reference< XMultiServiceFactory >& aFactory );
+    Acceptor( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
     virtual ~Acceptor();
 
     void SAL_CALL run();
 
     // XService info
-    static  OUString                    impl_getImplementationName();
-    virtual OUString           SAL_CALL getImplementationName()
-        throw (RuntimeException);
-    static  Sequence<OUString>          impl_getSupportedServiceNames();
-    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException);
-    virtual sal_Bool           SAL_CALL supportsService( const OUString& aName )
-        throw (RuntimeException);
+    static OUString impl_getImplementationName();
+    virtual OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException);
+    static css::uno::Sequence<OUString> impl_getSupportedServiceNames();
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
+        throw (css::uno::RuntimeException);
 
     // XInitialize
-    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments )
-        throw ( Exception );
+    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
+        throw ( css::uno::Exception );
 
-    static  Reference<XInterface> impl_getInstance( const Reference< XMultiServiceFactory >& aFactory );
+    static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
 };
 
-class AccInstanceProvider : public ::cppu::WeakImplHelper1<XInstanceProvider>
+class AccInstanceProvider : public ::cppu::WeakImplHelper1<css::bridge::XInstanceProvider>
 {
 private:
-    Reference<XMultiServiceFactory> m_rSMgr;
-    Reference<XConnection> m_rConnection;
+    css::uno::Reference<css::lang::XMultiServiceFactory> m_rSMgr;
+    css::uno::Reference<css::connection::XConnection> m_rConnection;
 
 public:
-    AccInstanceProvider(const Reference< XMultiServiceFactory >& aFactory,
-                        const Reference< XConnection >& rConnection);
+    AccInstanceProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory,
+                        const css::uno::Reference< css::connection::XConnection >& rConnection);
     virtual ~AccInstanceProvider();
 
     // XInstanceProvider
-    virtual Reference<XInterface> SAL_CALL getInstance (const OUString& aName )
-        throw ( NoSuchElementException );
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName )
+        throw ( css::container::NoSuchElementException );
 };
 
 
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 812cc00fc2b6..35c20b1a8c55 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -31,6 +31,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::registry;
+using namespace ::com::sun::star::uno;
 
 namespace desktop
 {
diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx
index b25e858d9bac..04586e180157 100644
--- a/desktop/unx/splash/unxsplash.hxx
+++ b/desktop/unx/splash/unxsplash.hxx
@@ -40,14 +40,9 @@
 #include <osl/mutex.hxx>
 #include <rtl/bootstrap.hxx>
 
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::task;
-
 namespace desktop {
 
-class  UnxSplashScreen : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
+class  UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization >
 {
 private:
     // don't allow anybody but ourselves to create instances of this class
@@ -60,22 +55,22 @@ private:
     static  UnxSplashScreen *m_pINSTANCE;
 
     static osl::Mutex m_aMutex;
-    Reference< XComponentContext > m_xCtx;
+    css::uno::Reference< css::uno::XComponentContext > m_xCtx;
 
     FILE *m_pOutFd;
 
 public:
-    UnxSplashScreen( const Reference< XComponentContext >& xCtx );
+    UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx );
 
     // XStatusIndicator
-    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( RuntimeException );
-    virtual void SAL_CALL end() throw ( RuntimeException );
-    virtual void SAL_CALL reset() throw ( RuntimeException );
-    virtual void SAL_CALL setText( const OUString& aText ) throw ( RuntimeException );
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( RuntimeException );
+    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL end() throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException );
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException );
 
     // XInitialize
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw ( RuntimeException );
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
 };
 
 }