[Libreoffice-commits] .: 2 commits - connectivity/source desktop/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Nov 15 22:50:34 PST 2010
connectivity/source/drivers/adabas/BFunctions.cxx | 116 +++++++----------
connectivity/source/drivers/adabas/BGroup.cxx | 2
connectivity/source/drivers/adabas/BIndexColumns.cxx | 2
connectivity/source/drivers/adabas/BIndexes.cxx | 20 +--
connectivity/source/drivers/adabas/BKeys.cxx | 24 +--
connectivity/source/drivers/adabas/BTable.cxx | 22 +--
connectivity/source/drivers/adabas/BTables.cxx | 124 +++++++++----------
connectivity/source/drivers/adabas/BUser.cxx | 53 +++-----
connectivity/source/drivers/adabas/BUsers.cxx | 6
connectivity/source/drivers/adabas/BViews.cxx | 10 -
connectivity/source/drivers/adabas/Bservices.cxx | 4
desktop/source/deployment/misc/dp_dependencies.cxx | 44 +++---
12 files changed, 205 insertions(+), 222 deletions(-)
New commits:
commit 60fcb5759db7bc56ba29abe8d783614774fddfe5
Author: David Tardon <dtardon at redhat.com>
Date: Tue Nov 16 07:09:11 2010 +0100
refactor to remove some redundancy
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 345e4c2..5322f7f 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -57,13 +57,25 @@ namespace css = ::com::sun::star;
static char const xmlNamespace[] =
"http://openoffice.org/extensions/description/2006";
-bool satisfiesMinimalVersion(::rtl::OUString const & version) {
- ::rtl::OUString v(
+bool
+lcl_versionIsNot(dp_misc::Order i_eOrder, ::rtl::OUString const& i_rVersion)
+{
+ ::rtl::OUString aVersion(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:OOOPackageVersion}"));
- ::rtl::Bootstrap::expandMacros(v);
- return ::dp_misc::compareVersions(v, version) != ::dp_misc::LESS;
+ ::rtl::Bootstrap::expandMacros(aVersion);
+ return ::dp_misc::compareVersions(aVersion, i_rVersion) != i_eOrder;
+}
+
+bool satisfiesMinimalVersion(::rtl::OUString const& i_rVersion)
+{
+ return lcl_versionIsNot(dp_misc::LESS, i_rVersion);
+}
+
+bool satisfiesMaximalVersion(::rtl::OUString const& i_rVersion)
+{
+ return lcl_versionIsNot(dp_misc::GREATER, i_rVersion);
}
}
@@ -81,14 +93,14 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
unsatisfied(n);
::sal_Int32 unsat = 0;
for (::sal_Int32 i = 0; i < n; ++i) {
- static char const minimalVersion[] = "OpenOffice.org-minimal-version";
+ static rtl::OUString const minimalVersion(
+ RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org-minimal-version"));
css::uno::Reference< css::xml::dom::XElement > e(
deps->item(i), css::uno::UNO_QUERY_THROW);
bool sat = false;
if (e->getNamespaceURI().equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(xmlNamespace))
- && e->getTagName().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM(minimalVersion)))
+ && (e->getTagName() == minimalVersion))
{
sat = satisfiesMinimalVersion(
e->getAttribute(
@@ -99,28 +111,18 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
RTL_CONSTASCII_STRINGPARAM(
"OpenOffice.org-maximal-version")))
{
- ::rtl::OUString v(
- RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
- ":Version:OOOBaseVersion}"));
- ::rtl::Bootstrap::expandMacros(v);
- sat =
- ::dp_misc::compareVersions(
- v,
+ sat = satisfiesMaximalVersion(
e->getAttribute(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))))
- != ::dp_misc::GREATER;
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
} else if (e->hasAttributeNS(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(minimalVersion))))
+ minimalVersion))
{
sat = satisfiesMinimalVersion(
e->getAttributeNS(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(minimalVersion))));
+ minimalVersion));
}
if (!sat) {
unsatisfied[unsat++] = e;
commit 8f227afd949a62a65b3e277ce8c0946bce518bca
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Nov 15 06:59:57 2010 +0100
RTL_CONSTASCII_USTRINGPARAM for libs-core/connectivity/source/drivers/adabas
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index 0bdb258..351c47b 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -119,7 +119,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
#if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX)
_rPath = ::rtl::OUString(pPath);
- _rPath += ::rtl::OUString::createFromAscii("/lib/");
+ _rPath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/lib/"));
#endif
rtl_uString_release(pPath);
}
@@ -153,119 +153,105 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
sal_Bool LoadFunctions(oslModule pODBCso)
{
- if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL )
+ if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLAllocHandle")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL )
+ if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLConnect")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL )
+ if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDriverConnect")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBrowseConnect").pData )) == NULL )
+ if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBrowseConnect")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL )
+ if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetInfo")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL )
+ if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetTypeInfo")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL )
+ if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetConnectAttr")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL )
+ if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetConnectAttr")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL )
+ if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetEnvAttr")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL )
+ if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetEnvAttr")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL )
+ if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetStmtAttr")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL )
+ if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetStmtAttr")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL )
+ if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrepare")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL )
- return sal_False;*/
- /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL )
+ if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindParameter")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL )
- return sal_False;*/
- if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL )
+ if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetCursorName")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL )
+ if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecute")).pData )) == NULL )
return sal_False;
-// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
-// return sal_False;
- if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL )
+ if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecDirect")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL )
+ if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeParam")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL )
+ if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumParams")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
- return sal_False;*/
- if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeParam").pData )) == NULL )
+ if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLParamData")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL )
+ if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPutData")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL )
+ if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLRowCount")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL )
+ if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumResultCols")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL )
+ if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeCol")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL )
+ if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColAttribute")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL )
+ if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindCol")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL )
+ if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetch")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL )
- return sal_False;
- if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL )
- return sal_False;
- if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL )
+ if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetchScroll")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL )
+ if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetData")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL )
+ if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetPos")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL )
+ if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLMoreResults")).pData )) == NULL )
return sal_False;
- /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL )
- return sal_False;*/
- if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL )
+ if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagRec")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumnPrivileges").pData )) == NULL )
+ if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumnPrivileges")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL )
+ if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumns")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL )
+ if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLForeignKeys")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL )
+ if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrimaryKeys")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedureColumns").pData )) == NULL )
+ if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedureColumns")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL )
+ if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedures")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSpecialColumns").pData )) == NULL )
+ if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSpecialColumns")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL )
+ if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLStatistics")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL )
+ if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTablePrivileges")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL )
+ if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTables")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL )
+ if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeStmt")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL )
+ if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCloseCursor")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL )
+ if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCancel")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL )
+ if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLEndTran")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL )
+ if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDisconnect")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL )
+ if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeHandle")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
+ if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetCursorName")).pData )) == NULL )
return sal_False;
- if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
+ if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNativeSql")).pData )) == NULL )
return sal_False;
return sal_True;
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 4f8a8b1..47c0dc2 100644
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
@@ -72,7 +72,7 @@ void OAdabasGroup::refreshUsers()
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT USERNAME FROM DOMAIN.USERS WHERE USERNAME IS NOT NULL AND USERNAME <> ' ' AND USERNAME <> 'CONTROL' AND GROUPNAME = '" ));
aSql += getName( );
- aSql += ::rtl::OUString::createFromAscii("'");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
Reference< XResultSet > xResult = xStmt->executeQuery(aSql);
if(xResult.is())
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 2ca6873..4c91343 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -59,7 +59,7 @@ ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
if(xResult.is())
{
Reference< XRow > xRow(xResult,UNO_QUERY);
- ::rtl::OUString aD(::rtl::OUString::createFromAscii("D"));
+ ::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D"));
while(xResult->next())
{
if(xRow->getString(9) == _rName)
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index ff94ee2..62563cb 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -77,7 +77,7 @@ sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName)
if(xRow->getString(6) == aName && (!aQualifier.getLength() || xRow->getString(5) == aQualifier ))
{
OAdabasIndex* pRet = new OAdabasIndex(m_pTable,aName,aQualifier,!xRow->getBoolean(4),
- aName == ::rtl::OUString::createFromAscii("SYSPRIMARYKEYINDEX"),
+ aName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYSPRIMARYKEYINDEX")),
xRow->getShort(7) == IndexType::CLUSTERED);
xRet = pRet;
break;
@@ -110,17 +110,17 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons
const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
if(getBOOL(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
- aSql = aSql + ::rtl::OUString::createFromAscii("UNIQUE ");
- aSql = aSql + ::rtl::OUString::createFromAscii("INDEX ");
+ aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNIQUE "));
+ aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX "));
if(_rForName.getLength())
{
aSql = aSql + aQuote + _rForName + aQuote
- + ::rtl::OUString::createFromAscii(" ON ")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "))
+ aQuote + m_pTable->getSchema() + aQuote + sDot
+ aQuote + m_pTable->getTableName() + aQuote
- + ::rtl::OUString::createFromAscii(" ( ");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( "));
Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
@@ -132,12 +132,12 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons
aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
aSql = aSql + (getBOOL(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING)))
?
- ::rtl::OUString::createFromAscii(" ASC")
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ASC"))
:
- ::rtl::OUString::createFromAscii(" DESC"))
- + ::rtl::OUString::createFromAscii(",");
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DESC")))
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
}
else
{
@@ -178,7 +178,7 @@ void OIndexes::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementNam
if (aSchema.getLength())
(((aSql += aQuote) += aSchema) += aQuote) += sDot;
- (((aSql += aQuote) += aName) += aQuote) += ::rtl::OUString::createFromAscii(" ON ");
+ (((aSql += aQuote) += aName) += aQuote) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
(((aSql += aQuote) += m_pTable->getSchema()) += aQuote) += sDot;
((aSql += aQuote) += m_pTable->getTableName()) += aQuote;
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 6162b4f..d6a6586 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -73,11 +73,11 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
if(nKeyType == KeyType::PRIMARY)
{
- aSql = aSql + ::rtl::OUString::createFromAscii(" ALTER PRIMARY KEY (");
+ aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER PRIMARY KEY ("));
}
else if(nKeyType == KeyType::FOREIGN)
{
- aSql = aSql + ::rtl::OUString::createFromAscii(" FOREIGN KEY (");
+ aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY ("));
}
else
throw SQLException();
@@ -90,9 +90,9 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
Reference< XPropertySet > xColProp;
xColumns->getByIndex(i) >>= xColProp;
aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(",");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
sal_Int32 nUpdateRule = 0, nDeleteRule = 0;
::rtl::OUString sReferencedName;
@@ -106,32 +106,32 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
sal_Int32 nLen = sReferencedName.indexOf('.');
aSchema = sReferencedName.copy(0,nLen);
aName = sReferencedName.copy(nLen+1);
- aSql += ::rtl::OUString::createFromAscii(" REFERENCES ")
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" REFERENCES "))
+ aQuote + aSchema + aQuote + sDot + aQuote + aName + aQuote;
- aSql += ::rtl::OUString::createFromAscii(" (");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
for(sal_Int32 i=0;i<xColumns->getCount();++i)
{
Reference< XPropertySet > xColProp;
xColumns->getByIndex(i) >>= xColProp;
aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))) + aQuote
- + ::rtl::OUString::createFromAscii(",");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
switch(nDeleteRule)
{
case KeyRule::CASCADE:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE CASCADE ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "));
break;
case KeyRule::RESTRICT:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE RESTRICT ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "));
break;
case KeyRule::SET_NULL:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET NULL ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "));
break;
case KeyRule::SET_DEFAULT:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET DEFAULT ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "));
break;
default:
;
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index 3a39993..3f9ad2e 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -196,7 +196,7 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "RENAME COLUMN " )) ;
sSql += ::dbtools::quoteName(sQuote,m_SchemaName) + sDot + ::dbtools::quoteName(sQuote,m_Name);
sSql += sDot + ::dbtools::quoteName(sQuote,colName);
- sSql += ::rtl::OUString::createFromAscii(" TO ");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
sSql += ::dbtools::quoteName(sQuote,sNewColumnName);
Reference< XStatement > xStmt = m_pConnection->createStatement( );
@@ -241,7 +241,7 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
void OAdabasTable::alterColumnType(const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
{
::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
- sSql += ::rtl::OUString::createFromAscii(" ");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
sSql += OTables::getColumnSqlType(_xDescriptor);
Reference< XStatement > xStmt = m_pConnection->createStatement( );
@@ -258,11 +258,11 @@ void OAdabasTable::alterNotNullValue(sal_Int32 _nNewNullable,const ::rtl::OUStri
if(_nNewNullable == ColumnValue::NO_NULLS)
{
- sSql += ::rtl::OUString::createFromAscii(" NOT NULL");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"));
}
else
{
- sSql += ::rtl::OUString::createFromAscii(" DEFAULT NULL");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT NULL"));
}
Reference< XStatement > xStmt = m_pConnection->createStatement();
@@ -276,7 +276,7 @@ void OAdabasTable::alterNotNullValue(sal_Int32 _nNewNullable,const ::rtl::OUStri
void OAdabasTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName)
{
::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
- sSql += ::rtl::OUString::createFromAscii(" ALTER ") + _sNewDefault;
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")) + _sNewDefault;
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
@@ -289,7 +289,7 @@ void OAdabasTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const :
void OAdabasTable::dropDefaultValue(const ::rtl::OUString& _rColName)
{
::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
- sSql += ::rtl::OUString::createFromAscii(" DROP DEFAULT");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP DEFAULT"));
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
@@ -302,7 +302,7 @@ void OAdabasTable::dropDefaultValue(const ::rtl::OUString& _rColName)
void OAdabasTable::addDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName)
{
::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
- sSql += ::rtl::OUString::createFromAscii(" ADD ") + _sNewDefault;
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD ")) + _sNewDefault;
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
@@ -319,7 +319,7 @@ void OAdabasTable::beginTransAction()
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
{
- xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS BEGIN") );
+ xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS BEGIN")) );
::comphelper::disposeComponent(xStmt);
}
}
@@ -335,7 +335,7 @@ void OAdabasTable::endTransAction()
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
{
- xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS END") );
+ xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS END")) );
::comphelper::disposeComponent(xStmt);
}
}
@@ -351,7 +351,7 @@ void OAdabasTable::rollbackTransAction()
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
{
- xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS ROLLBACK") );
+ xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS ROLLBACK")) );
::comphelper::disposeComponent(xStmt);
}
}
@@ -367,7 +367,7 @@ void OAdabasTable::rollbackTransAction()
const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
sSql += ::dbtools::quoteName(sQuote,m_SchemaName) + sDot + ::dbtools::quoteName(sQuote,m_Name)
- + ::rtl::OUString::createFromAscii(" COLUMN ")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" COLUMN "))
+ ::dbtools::quoteName(sQuote,_rsColumnName);
return sSql;
}
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index fdade6a..302e9b4 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -65,9 +65,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
aName = _rName.copy(nLen+1);
Sequence< ::rtl::OUString > aTypes(1);
- aTypes[0] = ::rtl::OUString::createFromAscii("%");
- // aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
- // aTypes[1] = ::rtl::OUString::createFromAscii("SYSTEMTABLE");
+ aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
@@ -118,16 +116,16 @@ void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQ
OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
Reference< XStatement > xStmt = pConnection->createStatement( );
- aSql = ::rtl::OUString::createFromAscii("COMMENT ON TABLE ");
+ aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENT ON TABLE "));
::rtl::OUString sSchema;
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema;
if(sSchema.getLength())
aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot;
aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(" '")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" '"))
+ getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
- + ::rtl::OUString::createFromAscii("'");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
xStmt->execute(aSql);
// columns
@@ -135,7 +133,7 @@ void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQ
Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
Reference< XPropertySet > xColProp;
- aSql = ::rtl::OUString::createFromAscii("COMMENT ON COLUMN ");
+ aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENT ON COLUMN "));
if(sSchema.getLength())
aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot;
aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote + sDot
@@ -150,9 +148,9 @@ void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQ
if(aDescription.getLength())
{
::rtl::OUString aCom = aSql + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(" '")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" '"))
+ aDescription
- + ::rtl::OUString::createFromAscii("'");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
xStmt->execute(aSql);
::comphelper::disposeComponent(xStmt);
}
@@ -180,10 +178,10 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
Reference<XPropertySet> xProp(xObject,UNO_QUERY);
sal_Bool bIsView;
- if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString::createFromAscii("VIEW")))) // here we have a view
- aSql += ::rtl::OUString::createFromAscii("VIEW ");
+ if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))) // here we have a view
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
else
- aSql += ::rtl::OUString::createFromAscii("TABLE ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE "));
aSql += m_xMetaData->getIdentifierQuoteString( ) + aSchema + m_xMetaData->getIdentifierQuoteString( );
aSql += sDot;
@@ -216,7 +214,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
));
aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))))
- + ::rtl::OUString::createFromAscii(" (");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
// columns
Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -235,10 +233,10 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
- aSql += ::rtl::OUString::createFromAscii(" ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
aSql += OTables::getColumnSqlType(xColProp);
aSql += OTables::getColumnSqlNotNullDefault(xColProp);
- aSql += ::rtl::OUString::createFromAscii(",");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
}
@@ -268,15 +266,15 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
if(!xColumns->getCount())
throw SQLException();
- aSql += ::rtl::OUString::createFromAscii(" PRIMARY KEY (");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY ("));
for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
{
if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(",");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
}
else if(nKeyType == KeyType::UNIQUE)
{
@@ -285,15 +283,15 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
if(!xColumns->getCount())
throw SQLException();
- aSql += ::rtl::OUString::createFromAscii(" UNIQUE (");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE ("));
for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
{
if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(",");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
}
else if(nKeyType == KeyType::FOREIGN)
{
@@ -304,7 +302,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
if(!xColumns->getCount())
throw SQLException();
- aSql += ::rtl::OUString::createFromAscii(" FOREIGN KEY ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY "));
::rtl::OUString aName,aSchema,aRefTable = getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
sal_Int32 nLen = aRefTable.indexOf('.');
aSchema = aRefTable.copy(0,nLen);
@@ -312,30 +310,30 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
aSql += aQuote + aSchema + aQuote + sDot
+ aQuote + aName + aQuote
- + ::rtl::OUString::createFromAscii(" (");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
for ( sal_Int32 column=0; column<xColumns->getCount(); ++column )
{
if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
- + ::rtl::OUString::createFromAscii(",");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
switch(nDeleteRule)
{
case KeyRule::CASCADE:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE CASCADE ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "));
break;
case KeyRule::RESTRICT:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE RESTRICT ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "));
break;
case KeyRule::SET_NULL:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET NULL ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "));
break;
case KeyRule::SET_DEFAULT:
- aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET DEFAULT ");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "));
break;
default:
;
@@ -346,9 +344,9 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
}
if(aSql.lastIndexOf(',') == (aSql.getLength()-1))
- aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
else
- aSql += ::rtl::OUString::createFromAscii(")");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
Reference< XStatement > xStmt = pConnection->createStatement( );
@@ -378,10 +376,10 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
switch(nDataType)
{
case DataType::VARBINARY:
- sSql += ::rtl::OUString::createFromAscii("VAR");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VAR"));
/* run through*/
case DataType::BINARY:
- sSql += ::rtl::OUString::createFromAscii("CHAR");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"));
break;
default:
{
@@ -389,7 +387,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
if(aTypeName.hasValue() && getString(aTypeName).getLength())
sSql += getString(aTypeName);
else
- sSql += OTables::getTypeString(_rxColProp) + ::rtl::OUString::createFromAscii(" ");
+ sSql += OTables::getTypeString(_rxColProp) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
}
}
@@ -399,24 +397,24 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
case DataType::VARCHAR:
case DataType::FLOAT:
case DataType::REAL:
- sSql += ::rtl::OUString::createFromAscii("(")
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
+ ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
- + ::rtl::OUString::createFromAscii(")");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
break;
case DataType::DECIMAL:
case DataType::NUMERIC:
- sSql += ::rtl::OUString::createFromAscii("(")
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
+ ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
- + ::rtl::OUString::createFromAscii(",")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
+ ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))))
- + ::rtl::OUString::createFromAscii(")");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
break;
case DataType::BINARY:
case DataType::VARBINARY:
- sSql += ::rtl::OUString::createFromAscii("(")
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
+ ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
- + ::rtl::OUString::createFromAscii(") BYTE");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") BYTE"));
break;
}
return sSql;
@@ -429,14 +427,14 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
::rtl::OUString aDefault = getString(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
if(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
{
- sSql += ::rtl::OUString::createFromAscii(" NOT NULL");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"));
if(aDefault.getLength())
- sSql += ::rtl::OUString::createFromAscii(" WITH DEFAULT");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WITH DEFAULT"));
}
else if(aDefault.getLength())
{
- sSql +=::rtl::OUString::createFromAscii(" DEFAULT '") + aDefault;
- sSql += ::rtl::OUString::createFromAscii("'");
+ sSql +=::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT '")) + aDefault;
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
}
return sSql;
}
@@ -447,58 +445,58 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
switch(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
case DataType::BIT:
- aValue = ::rtl::OUString::createFromAscii("BOOLEAN");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOLEAN"));
break;
case DataType::TINYINT:
- aValue = ::rtl::OUString::createFromAscii("SMALLINT");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SMALLINT"));
break;
case DataType::SMALLINT:
- aValue = ::rtl::OUString::createFromAscii("SMALLINT");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SMALLINT"));
break;
case DataType::INTEGER:
- aValue = ::rtl::OUString::createFromAscii("INT");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT"));
break;
case DataType::FLOAT:
- aValue = ::rtl::OUString::createFromAscii("FLOAT");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FLOAT"));
break;
case DataType::REAL:
- aValue = ::rtl::OUString::createFromAscii("REAL");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REAL"));
break;
case DataType::DOUBLE:
- aValue = ::rtl::OUString::createFromAscii("DOUBLE");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
break;
case DataType::NUMERIC:
- aValue = ::rtl::OUString::createFromAscii("DECIMAL");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
break;
case DataType::DECIMAL:
- aValue = ::rtl::OUString::createFromAscii("DECIMAL");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
break;
case DataType::CHAR:
- aValue = ::rtl::OUString::createFromAscii("CHAR");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"));
break;
case DataType::VARCHAR:
- aValue = ::rtl::OUString::createFromAscii("VARCHAR");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
break;
case DataType::LONGVARCHAR:
- aValue = ::rtl::OUString::createFromAscii("LONG VARCHAR");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONG VARCHAR"));
break;
case DataType::DATE:
- aValue = ::rtl::OUString::createFromAscii("DATE");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
break;
case DataType::TIME:
- aValue = ::rtl::OUString::createFromAscii("TIME");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
break;
case DataType::TIMESTAMP:
- aValue = ::rtl::OUString::createFromAscii("TIMESTAMP");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
break;
case DataType::BINARY:
- aValue = ::rtl::OUString::createFromAscii("CHAR () BYTE");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR () BYTE"));
break;
case DataType::VARBINARY:
- aValue = ::rtl::OUString::createFromAscii("VARCHAR () BYTE");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR () BYTE"));
break;
case DataType::LONGVARBINARY:
- aValue = ::rtl::OUString::createFromAscii("LONG BYTE");
+ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONG BYTE"));
break;
}
return aValue;
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index c956554..67cec1e 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -72,7 +72,7 @@ void OAdabasUser::refreshGroups()
Reference< XStatement > xStmt = m_pConnection->createStatement( );
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT GROUPNAME FROM DOMAIN.USERS WHERE GROUPNAME IS NOT NULL AND GROUPNAME <> ' ' AND USERNAME = '" ));
aSql += getName( );
- aSql += ::rtl::OUString::createFromAscii("'");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
Reference< XResultSet > xResult = xStmt->executeQuery(aSql);
if(xResult.is())
@@ -138,9 +138,9 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3
Reference<XStatement> xStmt = m_pConnection->createStatement();
::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT REFTABLENAME,PRIVILEGES FROM DOMAIN.USR_USES_TAB WHERE REFOBJTYPE <> 'SYSTEM' AND DEFUSERNAME = '" ));
sSql += m_Name;
- sSql += ::rtl::OUString::createFromAscii("' AND REFTABLENAME = '");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' AND REFTABLENAME = '"));
sSql += sTable;
- sSql += ::rtl::OUString::createFromAscii("'");
+ sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
if(xStmt.is())
{
Reference<XResultSet> xRes = xStmt->executeQuery(sSql);
@@ -203,13 +203,12 @@ void SAL_CALL OAdabasUser::grantPrivileges( const ::rtl::OUString& objName, sal_
::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
if(sPrivs.getLength())
{
- ::rtl::OUString sGrant;
- sGrant += ::rtl::OUString::createFromAscii("GRANT ");
+ ::rtl::OUString sGrant(RTL_CONSTASCII_USTRINGPARAM("GRANT "));
sGrant += sPrivs;
- sGrant += ::rtl::OUString::createFromAscii(" ON ");
+ sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
Reference<XDatabaseMetaData> xMeta = m_pConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString::createFromAscii(" TO ");
+ sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
sGrant += m_Name;
Reference<XStatement> xStmt = m_pConnection->createStatement();
@@ -229,13 +228,12 @@ void SAL_CALL OAdabasUser::revokePrivileges( const ::rtl::OUString& objName, sal
::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
if(sPrivs.getLength())
{
- ::rtl::OUString sGrant;
- sGrant += ::rtl::OUString::createFromAscii("REVOKE ");
+ ::rtl::OUString sGrant(RTL_CONSTASCII_USTRINGPARAM("REVOKE "));
sGrant += sPrivs;
- sGrant += ::rtl::OUString::createFromAscii(" ON ");
+ sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
Reference<XDatabaseMetaData> xMeta = m_pConnection->getMetaData();
sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
- sGrant += ::rtl::OUString::createFromAscii(" FROM ");
+ sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
sGrant += m_Name;
Reference<XStatement> xStmt = m_pConnection->createStatement();
@@ -250,12 +248,11 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
- ::rtl::OUString sAlterPwd;
- sAlterPwd = ::rtl::OUString::createFromAscii("ALTER PASSWORD \"");
+ ::rtl::OUString sAlterPwd(RTL_CONSTASCII_USTRINGPARAM("ALTER PASSWORD \""));
sAlterPwd += objPassword.toAsciiUpperCase();
- sAlterPwd += ::rtl::OUString::createFromAscii("\" TO \"") ;
+ sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\" TO \"")) ;
sAlterPwd += newPassword.toAsciiUpperCase();
- sAlterPwd += ::rtl::OUString::createFromAscii("\"") ;
+ sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")) ;
sal_Bool bDisposeConnection = sal_False;
Reference<XConnection> xConnection = m_pConnection;
@@ -266,9 +263,9 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
if(pNewConnection)
{
Sequence< PropertyValue> aSeq(2);
- aSeq.getArray()[0].Name = ::rtl::OUString::createFromAscii("user") ;
+ aSeq.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) ;
aSeq.getArray()[0].Value <<= m_Name;
- aSeq.getArray()[1].Name = ::rtl::OUString::createFromAscii("password") ;
+ aSeq.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")) ;
aSeq.getArray()[1].Value <<= objPassword;
pNewConnection->Construct(m_pConnection->getMetaData()->getURL(),aSeq);
}
@@ -291,41 +288,41 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
{
::rtl::OUString sPrivs;
if((nRights & Privilege::INSERT) == Privilege::INSERT)
- sPrivs += ::rtl::OUString::createFromAscii("INSERT");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"));
if((nRights & Privilege::DELETE) == Privilege::DELETE)
{
if(sPrivs.getLength())
- sPrivs += ::rtl::OUString::createFromAscii(",");
- sPrivs += ::rtl::OUString::createFromAscii("DELETE");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"));
}
if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
{
if(sPrivs.getLength())
- sPrivs += ::rtl::OUString::createFromAscii(",");
- sPrivs += ::rtl::OUString::createFromAscii("UPDATE");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"));
}
if((nRights & Privilege::ALTER) == Privilege::ALTER)
{
if(sPrivs.getLength())
- sPrivs += ::rtl::OUString::createFromAscii(",");
- sPrivs += ::rtl::OUString::createFromAscii("ALTER");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"));
}
if((nRights & Privilege::SELECT) == Privilege::SELECT)
{
if(sPrivs.getLength())
- sPrivs += ::rtl::OUString::createFromAscii(",");
- sPrivs += ::rtl::OUString::createFromAscii("SELECT");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
}
if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
{
if(sPrivs.getLength())
- sPrivs += ::rtl::OUString::createFromAscii(",");
- sPrivs += ::rtl::OUString::createFromAscii("REFERENCES");
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES"));
}
return sPrivs;
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index f3b75d2..0611889 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -76,9 +76,9 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
sUserName = sUserName.toAsciiUpperCase();
descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sUserName));
aSql += ::dbtools::quoteName(aQuote,sUserName)
- + ::rtl::OUString::createFromAscii(" PASSWORD ")
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PASSWORD "))
+ getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)));
- aSql += ::rtl::OUString::createFromAscii(" RESOURCE NOT EXCLUSIVE");
+ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" RESOURCE NOT EXCLUSIVE"));
Reference< XStatement > xStmt = m_pConnection->createStatement( );
if(xStmt.is())
@@ -95,7 +95,7 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
// first we have to check if this user is live relevaant for the database
// which means with out these users the database will miss more than one important system table
::rtl::OUString sUsers( RTL_CONSTASCII_USTRINGPARAM( "SELECT USERMODE,USERNAME FROM DOMAIN.USERS WHERE USERNAME = '" ));
- sUsers += _sElementName + ::rtl::OUString::createFromAscii("'");
+ sUsers += _sElementName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
Reference< XStatement > xStmt = m_pConnection->createStatement();
if(xStmt.is())
{
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index a4be7eb..f15ff86 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -69,13 +69,13 @@ sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName)
::rtl::OUString sStmt( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT * FROM DOMAIN.SHOW_VIEW WHERE " ));
if(aSchema.getLength())
{
- sStmt += ::rtl::OUString::createFromAscii("OWNER = '");
+ sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OWNER = '"));
sStmt += aSchema;
- sStmt += ::rtl::OUString::createFromAscii("' AND ");
+ sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' AND "));
}
- sStmt += ::rtl::OUString::createFromAscii("VIEWNAME = '");
+ sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEWNAME = '"));
sStmt += aName;
- sStmt += ::rtl::OUString::createFromAscii("'");
+ sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
Reference<XConnection> xConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
Reference< XStatement > xStmt = xConnection->createStatement( );
Reference< XResultSet > xResult = xStmt->executeQuery(sStmt);
@@ -174,7 +174,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),makeAny(sSchema = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getUserName()));
aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))))
- + ::rtl::OUString::createFromAscii(" AS ");
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS "));
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
aSql += sCommand;
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index a1f26ca..2857166 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
{
OUString aMainKeyName;
- aMainKeyName = OUString::createFromAscii("/");
+ aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aMainKeyName += aServiceImplName;
- aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+ aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
More information about the Libreoffice-commits
mailing list