summaryrefslogtreecommitdiff
path: root/dbaccess/source/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-15 10:11:27 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-15 10:11:27 +0100
commit2b86f17f0538519d468aaa9811f2f1cdfb270134 (patch)
treee51be191978c32fec72efe2f283a4697e47fca25 /dbaccess/source/inc
parenta5179f0cf8ee8c244d5cef2781c78755804a23ba (diff)
dbaccess: Use appropriate OUString functions on string constants
Change-Id: Iea28ad5e1a469830e002471517197365fd6de3ee
Diffstat (limited to 'dbaccess/source/inc')
-rw-r--r--dbaccess/source/inc/apitools.hxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index b57741836cd5..9075c8d98a51 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -64,7 +64,7 @@ public:
#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \
- return OUString::createFromAscii(implasciiname); \
+ return OUString(implasciiname); \
} \
#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
@@ -74,7 +74,7 @@ public:
} \
OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \
{ \
- return OUString::createFromAscii(implasciiname); \
+ return OUString(implasciiname); \
} \
#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
@@ -93,7 +93,7 @@ public:
::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
{ \
::com::sun::star::uno::Sequence< OUString > aSupported(1); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname); \
+ aSupported[0] = serviceasciiname; \
return aSupported; \
} \
@@ -105,7 +105,7 @@ public:
::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
::com::sun::star::uno::Sequence< OUString > aSupported(1); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname); \
+ aSupported[0] = serviceasciiname; \
return aSupported; \
} \
@@ -117,8 +117,8 @@ public:
::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
{ \
::com::sun::star::uno::Sequence< OUString > aSupported(2); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
+ aSupported[0] = serviceasciiname1; \
+ aSupported[1] = serviceasciiname2; \
return aSupported; \
} \
@@ -126,8 +126,8 @@ public:
::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
{ \
::com::sun::star::uno::Sequence< OUString > aSupported(2); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
+ aSupported[0] = serviceasciiname1; \
+ aSupported[1] = serviceasciiname2; \
return aSupported; \
} \
@@ -135,9 +135,9 @@ public:
::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
{ \
::com::sun::star::uno::Sequence< OUString > aSupported(3); \
- aSupported[0] = OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = OUString::createFromAscii(serviceasciiname2); \
- aSupported[2] = OUString::createFromAscii(serviceasciiname3); \
+ aSupported[0] = serviceasciiname1; \
+ aSupported[1] = serviceasciiname2; \
+ aSupported[2] = serviceasciiname3; \
return aSupported; \
} \