diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 17:51:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-12 17:51:11 +0100 |
| commit | bca00da68640bb052c1628270ce3924b7228d7b8 (patch) | |
| tree | d03f7763ed89ffd94256e2bf0fb5b352de9b0711 /include | |
| parent | 77d844c9a92fdc1b8ffa043f46ea50bc1cfa7e05 (diff) | |
connectivity: Use appropriate OUString functions on string constants
Change-Id: I10b2ddf9dcc83219fea8eb55783507eed52702e8
Diffstat (limited to 'include')
| -rw-r--r-- | include/connectivity/CommonTools.hxx | 4 | ||||
| -rw-r--r-- | include/connectivity/sqlnode.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index cda2f65df144..4680d99a63f7 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -162,12 +162,12 @@ namespace connectivity #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ - return OUString::createFromAscii(implasciiname); \ + return OUString(implasciiname); \ } \ ::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; \ } \ sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 389bd8865aca..bf7f476d27fb 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -464,7 +464,7 @@ namespace connectivity #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISTOKENOR2(pParseNode, tok0, tok1) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 )) #define SQL_ISTOKENOR3(pParseNode, tok0, tok1, tok2) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok2 )) - #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && (pParseNode)->getTokenValue().equalsAscii(aString)) + #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && (pParseNode)->getTokenValue() == (aString)) } #endif // INCLUDED_CONNECTIVITY_SQLNODE_HXX |