summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/adabas/BUser.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/adabas/BUser.cxx')
-rw-r--r--connectivity/source/drivers/adabas/BUser.cxx64
1 files changed, 32 insertions, 32 deletions
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 7f926900f212..42b72be0138d 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
+#include <sal/macros.h>
#include "adabas/BUser.hxx"
#include "adabas/BGroups.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
@@ -68,9 +70,9 @@ void OAdabasUser::refreshGroups()
TStringVector aVector;
aVector.reserve(7); // we don't know the excatly count of users but this should fit the normal need
Reference< XStatement > xStmt = m_pConnection->createStatement( );
- ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("SELECT DISTINCT GROUPNAME FROM DOMAIN.USERS WHERE GROUPNAME IS NOT NULL AND GROUPNAME <> ' ' AND USERNAME = '");
+ ::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())
@@ -134,11 +136,11 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
Reference<XStatement> xStmt = m_pConnection->createStatement();
- ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("SELECT REFTABLENAME,PRIVILEGES FROM DOMAIN.USR_USES_TAB WHERE REFOBJTYPE <> 'SYSTEM' AND DEFUSERNAME = '");
+ ::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);
@@ -162,14 +164,14 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3
{ "SEL", Privilege::SELECT },
{ "REF", Privilege::REFERENCE }
};
- for ( size_t i = 0; i < sizeof( privileges ) / sizeof( privileges[0] ); ++i )
+ for ( size_t i = 0; i < SAL_N_ELEMENTS( privileges ); ++i )
{
sal_Int32 nIndex = sPrivs.indexOf( ::rtl::OUString::createFromAscii( privileges[i].pAsciiName ) );
if ( nIndex == -1 )
continue;
nRights |= privileges[i].nNumericValue;
- if ( sPrivs.copy( nIndex + 2, 1 ).equalsAscii( "+" ) )
+ if ( sPrivs.copy( nIndex + 2, 1 ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "+" ) ) )
nRightsWithGrant |= privileges[i].nNumericValue;
}
}
@@ -201,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();
@@ -227,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();
@@ -248,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;
@@ -264,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);
}
@@ -289,44 +288,45 @@ 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;
}
// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-07-09 20:35:27 +0000