summaryrefslogtreecommitdiff
path: root/dbaccess/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/inc')
-rw-r--r--dbaccess/source/inc/OAuthenticationContinuation.hxx16
-rw-r--r--dbaccess/source/inc/apitools.hxx68
-rw-r--r--dbaccess/source/inc/registrationhelper.hxx24
3 files changed, 54 insertions, 54 deletions
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 39236c097644..2228b36b5505 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -41,28 +41,28 @@ class OOO_DLLPUBLIC_DBA OAuthenticationContinuation :
sal_Bool m_bRemberPassword : 1; // remember the password for this session ?
sal_Bool m_bCanSetUserName;
- ::rtl::OUString m_sUser; // the user
- ::rtl::OUString m_sPassword; // the user's password
+ OUString m_sUser; // the user
+ OUString m_sPassword; // the user's password
public:
OAuthenticationContinuation();
sal_Bool SAL_CALL canSetRealm( ) throw(com::sun::star::uno::RuntimeException);
- void SAL_CALL setRealm( const ::rtl::OUString& Realm ) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL setRealm( const OUString& Realm ) throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL canSetUserName( ) throw(com::sun::star::uno::RuntimeException);
- void SAL_CALL setUserName( const ::rtl::OUString& UserName ) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL setUserName( const OUString& UserName ) throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL canSetPassword( ) throw(com::sun::star::uno::RuntimeException);
- void SAL_CALL setPassword( const ::rtl::OUString& Password ) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL setPassword( const OUString& Password ) throw(com::sun::star::uno::RuntimeException);
com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException);
void SAL_CALL setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException);
sal_Bool SAL_CALL canSetAccount( ) throw(com::sun::star::uno::RuntimeException);
- void SAL_CALL setAccount( const ::rtl::OUString& Account ) throw(com::sun::star::uno::RuntimeException);
+ void SAL_CALL setAccount( const OUString& Account ) throw(com::sun::star::uno::RuntimeException);
com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( com::sun::star::ucb::RememberAuthentication& Default ) throw(com::sun::star::uno::RuntimeException);
void SAL_CALL setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember ) throw(com::sun::star::uno::RuntimeException);
void setCanChangeUserName( sal_Bool bVal ) { m_bCanSetUserName = bVal; }
- ::rtl::OUString getUser() const { return m_sUser; }
- ::rtl::OUString getPassword() const { return m_sPassword; }
+ OUString getUser() const { return m_sUser; }
+ OUString getPassword() const { return m_sPassword; }
sal_Bool getRememberPassword() const { return m_bRemberPassword; }
};
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 11fff17bf856..c9e663e170a0 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -68,26 +68,26 @@ public:
//----------------------------------------------------------------------------------
// (internal - not to be used outside - usually)
#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
+ OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
{ \
- return ::rtl::OUString::createFromAscii(implasciiname); \
+ return OUString::createFromAscii(implasciiname); \
} \
#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
+ OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
{ \
return getImplementationName_Static(); \
} \
- ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \
+ OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \
{ \
- return ::rtl::OUString::createFromAscii(implasciiname); \
+ return OUString::createFromAscii(implasciiname); \
} \
#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
+ sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
- const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \
+ const OUString* pSupported = aSupported.getConstArray(); \
for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) \
if (pSupported->equals(_rServiceName)) \
return sal_True; \
@@ -96,54 +96,54 @@ public:
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(1); \
+ aSupported[0] = OUString::createFromAscii(serviceasciiname); \
return aSupported; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
return getSupportedServiceNames_Static(); \
} \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(1); \
+ aSupported[0] = OUString::createFromAscii(serviceasciiname); \
return aSupported; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
return getSupportedServiceNames_Static(); \
} \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(2); \
+ aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
return aSupported; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(2); \
+ aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
return aSupported; \
} \
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
- aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \
+ ::com::sun::star::uno::Sequence< OUString > aSupported(3); \
+ aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
+ aSupported[2] = OUString::createFromAscii(serviceasciiname3); \
return aSupported; \
} \
@@ -157,14 +157,14 @@ public:
//----------------------------------------------------------------------------------
// declare service info methods
#define DECLARE_SERVICE_INFO() \
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
#define DECLARE_SERVICE_INFO_STATIC() \
DECLARE_SERVICE_INFO(); \
- static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \
+ static OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index 8670a9737bbd..f556d9da9971 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -24,18 +24,18 @@
typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation)
(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager,
- const ::rtl::OUString & _rComponentName,
+ const OUString & _rComponentName,
::cppu::ComponentInstantiation _pCreateFunction,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames,
+ const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames,
rtl_ModuleCount* _p
);
//==========================================================================
class OModuleRegistration
{
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+ static ::com::sun::star::uno::Sequence< OUString >*
s_pImplementationNames;
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+ static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >*
s_pSupportedServices;
static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pCreationFunctionPointers;
@@ -54,8 +54,8 @@ public:
@see revokeComponent
*/
static void registerComponent(
- const ::rtl::OUString& _rImplementationName,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames,
+ const OUString& _rImplementationName,
+ const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
::cppu::ComponentInstantiation _pCreateFunction,
FactoryInstantiation _pFactoryFunction);
@@ -63,7 +63,7 @@ public:
@param _rImplementationName the implementation name of the component
*/
static void revokeComponent(
- const ::rtl::OUString& _rImplementationName);
+ const OUString& _rImplementationName);
/** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory.
@param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory
@@ -71,7 +71,7 @@ public:
@return the XInterface access to a factory for the component
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
- const ::rtl::OUString& _rImplementationName,
+ const OUString& _rImplementationName,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager
);
};
@@ -82,8 +82,8 @@ class OMultiInstanceAutoRegistration
{
public:
/** assumed that the template argument has the three methods<BR>
- <code>static ::rtl::OUString getImplementationName_Static()</code><BR>
- <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR>
+ <code>static OUString getImplementationName_Static()</code><BR>
+ <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR>
and<BR>
<code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR>
@@ -118,8 +118,8 @@ class OOneInstanceAutoRegistration
{
public:
/** provided that the template argument has three methods<BR>
- <code>static ::rtl::OUString getImplementationName_Static()</code><BR>
- <code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><BR>
+ <code>static OUString getImplementationName_Static()</code><BR>
+ <code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><BR>
and<BR>
<code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code><BR>