[Libreoffice-commits] core.git: desktop/inc desktop/source

[Miklos Vajna]

 desktop/inc/lib/init.hxx            |    9 ++++-----
 desktop/source/splash/unxsplash.cxx |   16 +++++++++-------
 desktop/source/splash/unxsplash.hxx |    6 +-----
 3 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit d77b49f070a562d2ac0df3174cf32d88680ba7a0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Sep 23 07:48:10 2015 +0200

    desktop: avoid 'using' in headers
    
    Change-Id: I9517a982daa48a6eb848360dee7739d15d42a971

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 3f4d680..2d31b57 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -12,16 +12,15 @@
 #include <memory>
 #include "../../source/inc/desktopdllapi.h"
 
-using namespace css;
-using namespace boost;
-
 namespace desktop {
     struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument
     {
-        uno::Reference<css::lang::XComponent> mxComponent;
+        css::uno::Reference<css::lang::XComponent> mxComponent;
         std::shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
 
-        explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent);
+        explicit LibLODocument_Impl(const css::uno::Reference <css::lang::XComponent> &xComponent);
         ~LibLODocument_Impl();
     };
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index cc7ecc5..1170e84b 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -25,9 +25,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 
+using namespace com::sun::star;
+
 namespace desktop
 {
-    UnxSplashScreen::UnxSplashScreen( const Reference< uno::XComponentContext >& xCtx )
+    UnxSplashScreen::UnxSplashScreen( const uno::Reference< uno::XComponentContext >& xCtx )
     : m_xCtx( xCtx ),
       m_pOutFd( NULL )
 {
@@ -47,12 +49,12 @@ UnxSplashScreen::~UnxSplashScreen()
 }
 
 void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ )
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL UnxSplashScreen::end()
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::end()\n" );
@@ -65,7 +67,7 @@ void SAL_CALL UnxSplashScreen::end()
 }
 
 void SAL_CALL UnxSplashScreen::reset()
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "UnxSplashScreen::reset()\n" );
@@ -78,13 +80,13 @@ void SAL_CALL UnxSplashScreen::reset()
 }
 
 void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
     // TODO?
 }
 
 void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
     if ( m_pOutFd )
     {
@@ -96,7 +98,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
 // XInitialize
 void SAL_CALL
 UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& )
-    throw ( RuntimeException, std::exception )
+    throw ( uno::RuntimeException, std::exception )
 {
     for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
     {
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index 8a5294d..318829b 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -26,10 +26,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/bootstrap.hxx>
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::registry;
-using namespace ::com::sun::star::uno;
-
 namespace desktop {
 
 class  UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
@@ -72,7 +68,7 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SAL_CALL UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ) throw( css::uno::Exception );
 OUString UnxSplash_getImplementationName();
 css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();