Kaydet (Commit) d77b49f0 authored tarafından Miklos Vajna's avatar Miklos Vajna

desktop: avoid 'using' in headers

Change-Id: I9517a982daa48a6eb848360dee7739d15d42a971
üst 5ca4acf8
...@@ -12,16 +12,15 @@ ...@@ -12,16 +12,15 @@
#include <memory> #include <memory>
#include "../../source/inc/desktopdllapi.h" #include "../../source/inc/desktopdllapi.h"
using namespace css;
using namespace boost;
namespace desktop { namespace desktop {
struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument 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; 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(); ~LibLODocument_Impl();
}; };
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -25,9 +25,11 @@ ...@@ -25,9 +25,11 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
using namespace com::sun::star;
namespace desktop namespace desktop
{ {
UnxSplashScreen::UnxSplashScreen( const Reference< uno::XComponentContext >& xCtx ) UnxSplashScreen::UnxSplashScreen( const uno::Reference< uno::XComponentContext >& xCtx )
: m_xCtx( xCtx ), : m_xCtx( xCtx ),
m_pOutFd( NULL ) m_pOutFd( NULL )
{ {
...@@ -47,12 +49,12 @@ UnxSplashScreen::~UnxSplashScreen() ...@@ -47,12 +49,12 @@ UnxSplashScreen::~UnxSplashScreen()
} }
void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ ) 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() void SAL_CALL UnxSplashScreen::end()
throw ( RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "UnxSplashScreen::end()\n" ); fprintf( stderr, "UnxSplashScreen::end()\n" );
...@@ -65,7 +67,7 @@ void SAL_CALL UnxSplashScreen::end() ...@@ -65,7 +67,7 @@ void SAL_CALL UnxSplashScreen::end()
} }
void SAL_CALL UnxSplashScreen::reset() void SAL_CALL UnxSplashScreen::reset()
throw ( RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "UnxSplashScreen::reset()\n" ); fprintf( stderr, "UnxSplashScreen::reset()\n" );
...@@ -78,13 +80,13 @@ void SAL_CALL UnxSplashScreen::reset() ...@@ -78,13 +80,13 @@ void SAL_CALL UnxSplashScreen::reset()
} }
void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ ) void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
throw ( RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
// TODO? // TODO?
} }
void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue ) void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
throw ( RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
if ( m_pOutFd ) if ( m_pOutFd )
{ {
...@@ -96,7 +98,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue ) ...@@ -96,7 +98,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
// XInitialize // XInitialize
void SAL_CALL void SAL_CALL
UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& ) 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++ ) for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
{ {
......
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/bootstrap.hxx> #include <rtl/bootstrap.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::uno;
namespace desktop { namespace desktop {
class UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo > class UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
...@@ -72,7 +68,7 @@ public: ...@@ -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(); OUString UnxSplash_getImplementationName();
css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw (); css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment