diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /ucb | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/expand/ucpexpand.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index e41e5b2ddfa9..bf6846823f56 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -33,7 +33,6 @@ #include "com/sun/star/ucb/XContentProvider.hpp" #define EXPAND_PROTOCOL "vnd.sun.star.expand" -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define ARLEN(x) sizeof (x) / sizeof *(x) @@ -70,7 +69,7 @@ public: m_xComponentContext( xComponentContext ), m_xMacroExpander( xComponentContext->getValueByName( - OUSTR("/singletons/com.sun.star.util.theMacroExpander") ), + "/singletons/com.sun.star.util.theMacroExpander" ), uno::UNO_QUERY_THROW ) {} virtual ~ExpandContentProviderImpl() throw (); @@ -101,8 +100,8 @@ inline void ExpandContentProviderImpl::check() const if (rBHelper.bInDispose || rBHelper.bDisposed) { throw lang::DisposedException( - OUSTR("expand content provider instance has " - "already been disposed!"), + "expand content provider instance has " + "already been disposed!", static_cast< OWeakObject * >( const_cast< ExpandContentProviderImpl * >(this) ) ); } @@ -130,15 +129,15 @@ static uno::Reference< uno::XInterface > SAL_CALL create( //============================================================================== static OUString SAL_CALL implName() { - return OUSTR("com.sun.star.comp.ucb.ExpandContentProvider"); + return OUString("com.sun.star.comp.ucb.ExpandContentProvider"); } //============================================================================== static uno::Sequence< OUString > SAL_CALL supportedServices() { OUString names [] = { - OUSTR("com.sun.star.ucb.ExpandContentProvider"), - OUSTR("com.sun.star.ucb.ContentProvider") + OUString("com.sun.star.ucb.ExpandContentProvider"), + OUString("com.sun.star.ucb.ContentProvider") }; return uno::Sequence< OUString >( names, ARLEN(names) ); } @@ -185,7 +184,7 @@ OUString ExpandContentProviderImpl::expandUri( RTL_CONSTASCII_STRINGPARAM(EXPAND_PROTOCOL ":") ) != 0) { throw ucb::IllegalIdentifierException( - OUSTR("expected protocol " EXPAND_PROTOCOL "!"), + "expected protocol " EXPAND_PROTOCOL "!", static_cast< OWeakObject * >( const_cast< ExpandContentProviderImpl * >(this) ) ); } |