diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:39:35 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:41:50 -0500 |
commit | df9ecb71c7b2622a082849b556dba5008d271b6a (patch) | |
tree | 3b111d581fdddc854ffb8b28fd86b7561ca16be2 /dtrans/source/generic | |
parent | a30795ce516b273a3a56a136b9b8802a23dd632a (diff) |
targeted string re-work
Change-Id: I44518bb1b464bb0b458c0b5f1c249ef160ea3b26
Diffstat (limited to 'dtrans/source/generic')
-rw-r--r-- | dtrans/source/generic/clipboardmanager.cxx | 14 | ||||
-rw-r--r-- | dtrans/source/generic/generic_clipboard.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx index c8b2ab497a1e..fba3e64820c5 100644 --- a/dtrans/source/generic/clipboardmanager.cxx +++ b/dtrans/source/generic/clipboardmanager.cxx @@ -45,7 +45,7 @@ using ::rtl::OUString; ClipboardManager::ClipboardManager(): WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex), - m_aDefaultName(OUString(RTL_CONSTASCII_USTRINGPARAM("default"))) + m_aDefaultName(OUString("default")) { } @@ -60,7 +60,7 @@ ClipboardManager::~ClipboardManager() OUString SAL_CALL ClipboardManager::getImplementationName( ) throw(RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM(CLIPBOARDMANAGER_IMPLEMENTATION_NAME)); + return OUString(CLIPBOARDMANAGER_IMPLEMENTATION_NAME); } // ------------------------------------------------------------------------ @@ -94,7 +94,7 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& // object is disposed already if (rBHelper.bDisposed) - throw DisposedException(OUString(RTL_CONSTASCII_USTRINGPARAM("object is disposed.")), + throw DisposedException(OUString("object is disposed."), static_cast < XClipboardManager * > (this)); ClipboardMap::iterator iter = @@ -115,13 +115,13 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl // check parameter if (!xClipboard.is()) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")), + throw IllegalArgumentException(OUString("empty reference"), static_cast < XClipboardManager * > (this), 1); // the name "default" is reserved for internal use OUString aName = xClipboard->getName(); if (m_aDefaultName.compareTo(aName) == 0) - throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("name reserved")), + throw IllegalArgumentException(OUString("name reserved"), static_cast < XClipboardManager * > (this), 1); // try to add new clipboard to the list @@ -164,7 +164,7 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames() MutexGuard aGuard(m_aMutex); if (rBHelper.bDisposed) - throw DisposedException(OUString(RTL_CONSTASCII_USTRINGPARAM("object is disposed.")), + throw DisposedException(OUString("object is disposed."), static_cast < XClipboardManager * > (this)); if (rBHelper.bInDispose) @@ -253,7 +253,7 @@ Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames() { Sequence < OUString > SupportedServicesNames( 1 ); SupportedServicesNames[0] = - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.ClipboardManager")); + OUString("com.sun.star.datatransfer.clipboard.ClipboardManager"); return SupportedServicesNames; } diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx index 320ef9390ef6..275e0917d153 100644 --- a/dtrans/source/generic/generic_clipboard.cxx +++ b/dtrans/source/generic/generic_clipboard.cxx @@ -73,7 +73,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments ) OUString SAL_CALL GenericClipboard::getImplementationName( ) throw(RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME)); + return OUString(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME); } // ------------------------------------------------------------------------ @@ -190,7 +190,7 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); - aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")); + aRet[0] = OUString("com.sun.star.datatransfer.clipboard.GenericClipboard"); return aRet; } |