Kaydet (Commit) 67467b93 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

vcl: remove using namespace from headers

Change-Id: I57439b09e95bf385436501921ca8db1469758105
üst 1aae91fb
...@@ -33,17 +33,17 @@ namespace x11 { ...@@ -33,17 +33,17 @@ namespace x11 {
class X11Clipboard : class X11Clipboard :
public ::cppu::WeakComponentImplHelper2 < public ::cppu::WeakComponentImplHelper2 <
::com::sun::star::datatransfer::clipboard::XSystemClipboard, css::datatransfer::clipboard::XSystemClipboard,
::com::sun::star::lang::XServiceInfo css::lang::XServiceInfo
>, >,
public SelectionAdaptor public SelectionAdaptor
{ {
com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; css::uno::Reference< css::datatransfer::XTransferable > m_aContents;
com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
SelectionManager& m_rSelectionManager; SelectionManager& m_rSelectionManager;
com::sun::star::uno::Reference< ::com::sun::star::lang::XInitialization > m_xSelectionManager; css::uno::Reference< css::lang::XInitialization > m_xSelectionManager;
::std::list< com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener > > m_aListeners; ::std::list< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
Atom m_aSelection; Atom m_aSelection;
protected: protected:
...@@ -65,59 +65,59 @@ namespace x11 { ...@@ -65,59 +65,59 @@ namespace x11 {
*/ */
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* /*
* XClipboard * XClipboard
*/ */
virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setContents( virtual void SAL_CALL setContents(
const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans,
const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getName() virtual OUString SAL_CALL getName()
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* /*
* XClipboardEx * XClipboardEx
*/ */
virtual sal_Int8 SAL_CALL getRenderingCapabilities() virtual sal_Int8 SAL_CALL getRenderingCapabilities()
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* /*
* XClipboardNotifier * XClipboardNotifier
*/ */
virtual void SAL_CALL addClipboardListener( virtual void SAL_CALL addClipboardListener(
const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeClipboardListener( virtual void SAL_CALL removeClipboardListener(
const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* /*
* SelectionAdaptor * SelectionAdaptor
*/ */
virtual com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > getTransferable() SAL_OVERRIDE; virtual css::uno::Reference< css::datatransfer::XTransferable > getTransferable() SAL_OVERRIDE;
virtual void clearTransferable() SAL_OVERRIDE; virtual void clearTransferable() SAL_OVERRIDE;
virtual void fireContentsChanged() SAL_OVERRIDE; virtual void fireContentsChanged() SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > getReference() throw() SAL_OVERRIDE;
}; };
Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); css::uno::Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( css::uno::Reference< css::uno::XInterface > SAL_CALL X11Clipboard_createInstance(
const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); const css::uno::Reference< css::lang::XMultiServiceFactory > & xMultiServiceFactory);
} // namepspace } // namepspace
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <postx.h> #include <postx.h>
using namespace com::sun::star::uno;
namespace x11 { namespace x11 {
class SelectionManager; class SelectionManager;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <X11_selection.hxx> #include <X11_selection.hxx>
using namespace x11; using namespace x11;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
using namespace com::sun::star::awt; using namespace com::sun::star::awt;
using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase1.hxx>
using namespace cppu; using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::awt; using namespace com::sun::star::awt;
......
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