summaryrefslogtreecommitdiff
path: root/framework/inc/macros
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /framework/inc/macros
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'framework/inc/macros')
-rw-r--r--framework/inc/macros/debug/assertion.hxx8
-rw-r--r--framework/inc/macros/debug/event.hxx4
-rw-r--r--framework/inc/macros/debug/filterdbg.hxx4
-rw-r--r--framework/inc/macros/debug/logmechanism.hxx4
-rw-r--r--framework/inc/macros/debug/mutex.hxx2
-rw-r--r--framework/inc/macros/debug/plugin.hxx8
-rw-r--r--framework/inc/macros/debug/registration.hxx2
-rw-r--r--framework/inc/macros/registration.hxx2
-rw-r--r--framework/inc/macros/xserviceinfo.hxx22
9 files changed, 28 insertions, 28 deletions
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 9e890070d4fe..e650288fa956 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -73,7 +73,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \
if ( ( BCONDITION ) == sal_True ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -104,7 +104,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHODE, STEXT ) \
if ( ( BCONDITION ) == sal_True ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -131,7 +131,7 @@
#define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer( 256 ); \
+ OStringBuffer _sAssertBuffer( 256 ); \
_sAssertBuffer.append( "ASSERT:\n\t" ); \
_sAssertBuffer.append( SMETHOD ); \
_sAssertBuffer.append( "\n\t\"" ); \
@@ -183,7 +183,7 @@
#define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sAssertBuffer2( 256 ); \
+ OStringBuffer _sAssertBuffer2( 256 ); \
_sAssertBuffer2.append( SOWNMESSAGE ); \
_sAssertBuffer2.append( "\n" ); \
_sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 4a7a05f05508..ea79afee426b 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
@@ -48,7 +48,7 @@
#define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "[ " ); \
sBuffer.append( SFRAMETYPE ); \
sBuffer.append( " ] \"" ); \
@@ -90,7 +90,7 @@
#define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "[ " ); \
sBuffer.append( SFRAMETYPE ); \
sBuffer.append( " ] \"" ); \
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index 05790dba03ba..064cefca1ace 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -48,7 +48,7 @@
#define LOG_FILTERDBG( SOPERATION, SMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( SOPERATION ); \
_sBuffer.append( "\t" ); \
_sBuffer.append( SMESSAGE ); \
@@ -64,7 +64,7 @@
#define LOG_FILTERDBG_1_PARAM( SOPERATION, SPARAM, SMESSAGE ) \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( SOPERATION ); \
_sBuffer.append( "\t\"" ); \
_sBuffer.append( SPARAM ); \
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index dd3be0f1a596..b6ad279942cc 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -43,8 +43,8 @@
#define WRITE_LOGFILE( SFILENAME, STEXT ) \
{ \
- ::rtl::OString _swriteLogfileFileName ( SFILENAME ); \
- ::rtl::OString _swriteLogfileText ( STEXT ); \
+ OString _swriteLogfileFileName ( SFILENAME ); \
+ OString _swriteLogfileText ( STEXT ); \
FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" ); \
fprintf( pFile, "%s", _swriteLogfileText.getStr() ); \
fclose ( pFile ); \
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index b7c1b7d5409e..ddaf33283f89 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
@@ -47,7 +47,7 @@
#define LOG_LOCKTYPE( _EFALLBACK, _ECURRENT ) \
/* new scope to prevent us against multiple definitions of variables ... */ \
{ \
- ::rtl::OStringBuffer _sBuffer( 256 ); \
+ OStringBuffer _sBuffer( 256 ); \
_sBuffer.append( "Set framework lock type to fallback: \"" ); \
switch( _EFALLBACK ) \
{ \
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index f4cfb0a5e833..ffebf741378d 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -51,7 +51,7 @@
#define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( SFRAMENAME ); \
sBuffer.append( "\" ] send " ); \
@@ -77,7 +77,7 @@
#define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] receive " ); \
@@ -99,7 +99,7 @@
#define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, sFILTER, AANY ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] called with newURL( \"" ); \
@@ -130,7 +130,7 @@
#define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) \
/* Use new scope to declare local private variables! */ \
{ \
- ::rtl::OStringBuffer sBuffer(1024); \
+ OStringBuffer sBuffer(1024); \
sBuffer.append( "PlugInFrame [ \"" ); \
sBuffer.append( U2B( SFRAMENAME ) ); \
sBuffer.append( "\" ] called with newStream( \""); \
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 1d6fc24cd815..84b71c0260e1 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -41,7 +41,7 @@
#define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \
{ \
- ::rtl::OStringBuffer sOut( 1024 ); \
+ OStringBuffer sOut( 1024 ); \
sOut.append( "fw?_component_getFactory():" ); \
sOut.append( SINFOTEXT ); \
WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 576221a9fda0..bfdc18c8db13 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -44,7 +44,7 @@ ________________________________________________________________________________
#define IFFACTORY( CLASS ) \
/* If searched name found ... */ \
/* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \
- if ( CLASS::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) \
+ if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \
/* ... then create right factory for this service. */ \
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 653fd67ed89c..6bf913af1e14 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -60,7 +60,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- ::rtl::OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \
+ OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticImplementationName(); \
} \
@@ -68,7 +68,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \
+ sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) \
{ \
return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; \
} \
@@ -76,7 +76,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* XServiceInfo */ \
/*===========================================================================================================*/ \
- css::uno::Sequence< ::rtl::OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
+ css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \
{ \
return impl_getStaticSupportedServiceNames(); \
} \
@@ -84,9 +84,9 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* Helper for XServiceInfo */ \
/*===========================================================================================================*/ \
- css::uno::Sequence< ::rtl::OUString > CLASS::impl_getStaticSupportedServiceNames() \
+ css::uno::Sequence< OUString > CLASS::impl_getStaticSupportedServiceNames() \
{ \
- css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); \
+ css::uno::Sequence< OUString > seqServiceNames( 1 ); \
seqServiceNames.getArray() [0] = SERVICENAME ; \
return seqServiceNames; \
} \
@@ -94,7 +94,7 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
/* Helper for XServiceInfo */ \
/*===========================================================================================================*/ \
- ::rtl::OUString CLASS::impl_getStaticImplementationName() \
+ OUString CLASS::impl_getStaticImplementationName() \
{ \
return IMPLEMENTATIONNAME ; \
}
@@ -185,12 +185,12 @@ ________________________________________________________________________________
#define DECLARE_XSERVICEINFO_NOFACTORY \
/* interface XServiceInfo */ \
- virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); \
- virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); \
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); \
+ virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); \
+ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); \
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); \
/* Helper for XServiceInfo */ \
- static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
- static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); \
+ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
+ static OUString SAL_CALL impl_getStaticImplementationName ( ); \
/* Helper for initialization of service by using own reference! */ \
virtual void SAL_CALL impl_initService ( ); \
generated by cgit (git 2.34.1) at 2024-07-20 02:59:27 +0000