diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /dtrans/source/generic | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'dtrans/source/generic')
-rw-r--r-- | dtrans/source/generic/clipboardmanager.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/generic/clipboardmanager.hxx | 18 | ||||
-rw-r--r-- | dtrans/source/generic/dtrans.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/generic/generic_clipboard.cxx | 1 | ||||
-rw-r--r-- | dtrans/source/generic/generic_clipboard.hxx | 12 |
5 files changed, 15 insertions, 18 deletions
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx index 7793826bb0bc..696ca9ca030a 100644 --- a/dtrans/source/generic/clipboardmanager.cxx +++ b/dtrans/source/generic/clipboardmanager.cxx @@ -30,7 +30,6 @@ using namespace osl; using namespace std; using ::dtrans::ClipboardManager; -using ::rtl::OUString; // ------------------------------------------------------------------------ diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 7da462dbd4bc..8429996c0364 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -33,7 +33,7 @@ // ------------------------------------------------------------------------ -typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap; +typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap; // ------------------------------------------------------------------------ @@ -48,7 +48,7 @@ namespace dtrans ClipboardMap m_aClipboardMap; ::osl::Mutex m_aMutex; - const ::rtl::OUString m_aDefaultName; + const OUString m_aDefaultName; virtual ~ClipboardManager(); protected: @@ -61,13 +61,13 @@ namespace dtrans * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); /* @@ -88,7 +88,7 @@ namespace dtrans * XClipboardManager */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -97,10 +97,10 @@ namespace dtrans ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeClipboard( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeClipboard( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL listClipboardNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL listClipboardNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ namespace dtrans // ------------------------------------------------------------------------ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index e89b6fa3d7a5..61ec37a3b996 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::uno; using namespace cppu; -using ::rtl::OUString; extern "C" { diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 88621630ccc2..04e813542087 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -29,7 +29,6 @@ using namespace cppu; using namespace osl; using ::dtrans::GenericClipboard; -using ::rtl::OUString; GenericClipboard::GenericClipboard() : WeakComponentImplHelper4< XClipboardEx, XClipboardNotifier, XServiceInfo, XInitialization > (m_aMutex), diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index 1f6a86be4d0f..c307e279cac7 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -44,7 +44,7 @@ namespace dtrans ::com::sun::star::lang::XInitialization > { ::osl::Mutex m_aMutex; - ::rtl::OUString m_aName; + OUString m_aName; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > m_aContents; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner > m_aOwner; @@ -67,13 +67,13 @@ namespace dtrans * XServiceInfo */ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); /* @@ -88,7 +88,7 @@ namespace dtrans const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); /* @@ -116,7 +116,7 @@ namespace dtrans // ------------------------------------------------------------------------ -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); +::com::sun::star::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); |