summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-18 13:34:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-18 20:38:03 +0100
commit386bb99bf666c341af51df11ce11fa8d7d95a8ed (patch)
tree7af84948a91243fd76f8b1d16bd3cda688b4d375 /connectivity/source/drivers
parentfeb5df31d4c27d53746d0bb25b5ff06c466d9db7 (diff)
sal_Char->char in connectivity
Change-Id: Ie32cbef9b03d69044c401f79bc737cde6dd0ed5d Reviewed-on: https://gerrit.libreoffice.org/85396 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/ado/AColumn.cxx2
-rw-r--r--connectivity/source/drivers/ado/Aservices.cxx4
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx4
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx10
-rw-r--r--connectivity/source/drivers/dbase/Dservices.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NServices.cxx4
-rw-r--r--connectivity/source/drivers/file/FStringFunctions.cxx4
-rw-r--r--connectivity/source/drivers/firebird/Clob.cxx6
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx4
-rw-r--r--connectivity/source/drivers/flat/Eservices.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx8
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.hxx12
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx8
-rw-r--r--connectivity/source/drivers/jdbc/jservices.cxx4
-rw-r--r--connectivity/source/drivers/macab/MacabDriver.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabServices.cxx4
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.cxx2
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.hxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx2
-rw-r--r--connectivity/source/drivers/mysql_jdbc/Yservices.cxx2
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_general.cxx4
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_general.hxx5
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_services.cxx4
-rw-r--r--connectivity/source/drivers/odbc/oservices.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.cxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.cxx2
-rw-r--r--connectivity/source/drivers/writer/Wservices.cxx4
31 files changed, 67 insertions, 68 deletions
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index c7d5a5fce5c2..b7175d54cf1b 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -103,7 +103,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
{
if(m_aColumn.IsValid())
{
- const sal_Char* pAdoPropertyName = nullptr;
+ const char* pAdoPropertyName = nullptr;
switch(nHandle)
{
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index d3228d3ffafc..0ec3ba953fbe 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -77,7 +77,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* ado_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 91f58219cac3..06a516ddc119 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -79,7 +79,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_calc_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index ffd4eb2ab30f..56f9f8d5eee1 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1886,11 +1886,11 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
m_xColumns->getByIndex(i) >>= xCol;
OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
- std::vector< std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
- aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$columnname$", aColName));
- aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
- aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
- aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+ std::vector< std::pair<const char* , OUString > > aStringToSubstitutes;
+ aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$columnname$", aColName));
+ aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$precision$", OUString::number(nLen)));
+ aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$scale$", OUString::number(nScale)));
+ aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
STR_INVALID_COLUMN_DECIMAL_VALUE
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 9e24128912b2..e2d09d6c0478 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -79,7 +79,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* dbase_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index afc6291307cb..0fc8f8d07e98 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -81,7 +81,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* evoab2_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 06e62a1a4cc2..32f590e310f7 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -69,7 +69,7 @@ ORowSetValue OOp_Char::operate(const std::vector<ORowSetValue>& lhs) const
{
if ( !aIter->isNull() )
{
- sal_Char c = static_cast<sal_Char>(static_cast<sal_Int32>(*aIter));
+ char c = static_cast<char>(static_cast<sal_Int32>(*aIter));
sRet.appendAscii(&c, 1);
}
@@ -150,7 +150,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
if ( lhs.isNull() )
return lhs;
- const sal_Char c = ' ';
+ const char c = ' ';
OUStringBuffer sRet;
sal_Int32 nCount = lhs;
for (sal_Int32 i=0; i < nCount; ++i)
diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx
index 6fb7092457d7..5f73f8150727 100644
--- a/connectivity/source/drivers/firebird/Clob.cxx
+++ b/connectivity/source/drivers/firebird/Clob.cxx
@@ -60,7 +60,7 @@ sal_Int64 SAL_CALL Clob::length()
{
uno::Sequence < sal_Int8 > aSegmentBytes;
bLastSegmRead = m_aBlob->readOneSegment( aSegmentBytes );
- OUString sSegment ( reinterpret_cast< sal_Char *>( aSegmentBytes.getArray() ),
+ OUString sSegment ( reinterpret_cast< char *>( aSegmentBytes.getArray() ),
aSegmentBytes.getLength(),
RTL_TEXTENCODING_UTF8 );
@@ -92,7 +92,7 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition,
if( bLastRead )
throw lang::IllegalArgumentException("nPosition out of range", *this, 0);
- OUString sSegment ( reinterpret_cast< sal_Char *>( aSegmentBytes.getArray() ),
+ OUString sSegment ( reinterpret_cast< char *>( aSegmentBytes.getArray() ),
aSegmentBytes.getLength(),
RTL_TEXTENCODING_UTF8 );
sal_Int32 nStrLen = sSegment.getLength();
@@ -114,7 +114,7 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition,
uno::Sequence < sal_Int8 > aSegmentBytes;
bool bLastRead = m_aBlob->readOneSegment( aSegmentBytes );
- OUString sSegment ( reinterpret_cast< sal_Char *>( aSegmentBytes.getArray() ),
+ OUString sSegment ( reinterpret_cast< char *>( aSegmentBytes.getArray() ),
aSegmentBytes.getLength(),
RTL_TEXTENCODING_UTF8 );
sal_Int32 nStrLen = sSegment.getLength();
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index f85d5dbb48d5..e72133692f07 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -48,7 +48,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -81,7 +81,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* firebird_sdbc_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void*)
{
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 4b8b6c4b2879..e74db8791843 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -79,7 +79,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* flat_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index de76ecbba29d..159856a5583b 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -667,9 +667,9 @@ namespace connectivity
namespace
{
- const sal_Char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false )
+ const char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false )
{
- static const sal_Char* pTranslations[] =
+ static const char* pTranslations[] =
{
"af-ZA", "Afrikaans",
"am-ET", "Amharic",
@@ -768,7 +768,7 @@ namespace connectivity
};
OUString sLocaleString( _rLocaleString );
- sal_Char nCompareTermination = 0;
+ char nCompareTermination = 0;
if ( _bAcceptCountryMismatch )
{
@@ -782,7 +782,7 @@ namespace connectivity
nCompareTermination = '-';
}
- const sal_Char** pLookup = pTranslations;
+ const char** pLookup = pTranslations;
for ( ; *pLookup; pLookup +=2 )
{
sal_Int32 nCompareUntil = 0;
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index b41389a6d118..5ca8a0962636 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -80,7 +80,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* hsqldb_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index bc5a2c3de81e..a5978cdae051 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -38,7 +38,7 @@ namespace connectivity { namespace hsqldb
}
- LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
+ LogFile::LogFile( JNIEnv* env, jstring streamName, const char* _pAsciiSuffix )
: m_sFileName(StorageContainer::jstring2ustring(env,streamName) +
"." + OUString::createFromAscii( _pAsciiSuffix ) )
{
@@ -57,7 +57,7 @@ namespace connectivity { namespace hsqldb
}
- void LogFile::writeString( const sal_Char* _pString, bool _bEndLine )
+ void LogFile::writeString( const char* _pString, bool _bEndLine )
{
FILE* pLogFile = getLogFile();
fwrite( _pString, sizeof( *_pString ), strlen( _pString ), pLogFile );
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index bf34d9ffc190..304e3cb5c6a1 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
@@ -34,10 +34,10 @@ namespace connectivity { namespace hsqldb
OUString m_sFileName;
public:
- LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix );
+ LogFile( JNIEnv* env, jstring streamName, const char* _pAsciiSuffix );
public:
- void writeString( const sal_Char* _pString, bool _bEndLine = true );
+ void writeString( const char* _pString, bool _bEndLine = true );
void create() { getLogFile(); }
virtual void close();
@@ -48,17 +48,17 @@ namespace connectivity { namespace hsqldb
class OperationLogFile : public LogFile
{
public:
- OperationLogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
+ OperationLogFile( JNIEnv* env, jstring streamName, const char* _pAsciiSuffix )
:LogFile( env, streamName, ( OString( _pAsciiSuffix ) += ".op" ).getStr() )
{
}
- void logOperation( const sal_Char* _pOp )
+ void logOperation( const char* _pOp )
{
writeString( _pOp, true );
}
- void logOperation( const sal_Char* _pOp, jlong _nLongArg )
+ void logOperation( const char* _pOp, jlong _nLongArg )
{
OString sLine( _pOp );
sLine += "( ";
@@ -92,7 +92,7 @@ namespace connectivity { namespace hsqldb
class DataLogFile : public LogFile
{
public:
- DataLogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
+ DataLogFile( JNIEnv* env, jstring streamName, const char* _pAsciiSuffix )
:LogFile( env, streamName, _pAsciiSuffix )
{
}
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index c88bc2f5093b..28ca22893e62 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -538,7 +538,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethodName
{
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
bool out( java_lang_Object::callBooleanMethod(_pMethodName,_inout_MethodID) );
- m_aLogger.log< const sal_Char*, bool>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
+ m_aLogger.log< const char*, bool>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
return out;
}
@@ -581,7 +581,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethodWithIntArg( const char* _p
bool out( callBooleanMethodWithIntArg(_pMethodName,_inout_MethodID,_nArgument) );
- m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
+ m_aLogger.log< const char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
return out;
}
@@ -1001,7 +1001,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
- m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
+ m_aLogger.log< const char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
return out;
}
@@ -1343,7 +1343,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
- m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
+ m_aLogger.log< const char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
return out;
}
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 3044724735db..63ae84c8ebfb 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -79,7 +79,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* jdbc_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index bebef5591d11..7a130f364f85 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -85,7 +85,7 @@ bool MacabImplModule::isMacOSPresent()
namespace
{
template< typename FUNCTION >
- void lcl_getFunctionFromModuleOrUnload( oslModule& _rModule, const sal_Char* _pAsciiSymbolName, FUNCTION& _rFunction )
+ void lcl_getFunctionFromModuleOrUnload( oslModule& _rModule, const char* _pAsciiSymbolName, FUNCTION& _rFunction )
{
_rFunction = nullptr;
if ( _rModule )
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index a550fcb94f58..a1cfc340c51a 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -78,7 +78,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* macab_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void*)
{
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index 1c9badd3280f..9a716e3d7c34 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::container;
OColumnAlias::OColumnAlias( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB )
{
- static const sal_Char* s_pProgrammaticNames[] =
+ static const char* s_pProgrammaticNames[] =
{
"FirstName",
"LastName",
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 5074d4949cbf..3900b324b394 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -42,7 +42,7 @@ namespace connectivity
,columnPosition( 0 )
{
}
- AliasEntry( const sal_Char* _programmaticAsciiName, size_t _columnPosition )
+ AliasEntry( const char* _programmaticAsciiName, size_t _columnPosition )
:programmaticAsciiName( _programmaticAsciiName )
,columnPosition( _columnPosition )
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 615760506b08..a5cffdaa2d3e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -152,7 +152,7 @@ static Reference< XInterface > createInstance( const Reference< XMultiServiceFac
}
extern "C" SAL_DLLPUBLIC_EXPORT void* mozbootstrap_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/mysql_jdbc/Yservices.cxx b/connectivity/source/drivers/mysql_jdbc/Yservices.cxx
index e275cd8d0371..a19e489bd07e 100644
--- a/connectivity/source/drivers/mysql_jdbc/Yservices.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/Yservices.cxx
@@ -33,7 +33,7 @@ typedef Reference<XSingleServiceFactory> (*createFactoryFunc)(
rtl_ModuleCount*);
extern "C" SAL_DLLPUBLIC_EXPORT void*
-mysql_jdbc_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager,
+mysql_jdbc_component_getFactory(const char* pImplementationName, void* pServiceManager,
void* /*pRegistryKey*/)
{
if (!pServiceManager)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
index 4c7c8465c798..ace91d112210 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx
@@ -87,7 +87,7 @@ void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize)
}
}
-void throwFeatureNotImplementedException(const sal_Char* _pAsciiFeatureName,
+void throwFeatureNotImplementedException(const char* _pAsciiFeatureName,
const css::uno::Reference<XInterface>& _rxContext)
{
const OUString sMessage
@@ -95,7 +95,7 @@ void throwFeatureNotImplementedException(const sal_Char* _pAsciiFeatureName,
throw SQLException(sMessage, _rxContext, "HYC00", 0, Any());
}
-void throwInvalidArgumentException(const sal_Char* _pAsciiFeatureName,
+void throwInvalidArgumentException(const char* _pAsciiFeatureName,
const css::uno::Reference<XInterface>& _rxContext)
{
const OUString sMessage
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
index 38852d269ae6..6fc9e46f71f2 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx
@@ -93,10 +93,9 @@ void resetSqlVar(void** target, T* pValue, enum_field_types type, sal_Int32 nSiz
void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize = 0);
void throwFeatureNotImplementedException(
- const sal_Char* _pAsciiFeatureName,
- const css::uno::Reference<css::uno::XInterface>& _rxContext);
+ const char* _pAsciiFeatureName, const css::uno::Reference<css::uno::XInterface>& _rxContext);
-void throwInvalidArgumentException(const sal_Char* _pAsciiFeatureName,
+void throwInvalidArgumentException(const char* _pAsciiFeatureName,
const css::uno::Reference<css::uno::XInterface>& _rxContext);
void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum,
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
index 56a2242e5e50..b0f7d0adc7c1 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
@@ -43,7 +43,7 @@ struct ProviderRequest
Reference<XMultiServiceFactory> const xServiceManager;
OUString const sImplementationName;
- ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName)
+ ProviderRequest(void* pServiceManager, char const* pImplementationName)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
@@ -69,7 +69,7 @@ struct ProviderRequest
};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory(const sal_Char* pImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory(const char* pImplementationName,
void* pServiceManager,
void* /* pRegistryKey */)
{
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 9c4994172422..6461f8dde48f 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
ProviderRequest(
void* pServiceManager,
- sal_Char const* pImplementationName
+ char const* pImplementationName
)
: xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -80,7 +80,7 @@ struct ProviderRequest
}
extern "C" SAL_DLLPUBLIC_EXPORT void* odbc_component_getFactory(
- const sal_Char* pImplementationName,
+ const char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
{
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 868a011584c5..5664a182af31 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -710,7 +710,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_impl_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
}
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index a8e915a5cc67..27eae6a34403 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -278,7 +278,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void * postgresql_sdbc_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * )
+ const char * pImplName, void * pServiceManager, void * )
{
// need to extract the defaultcontext, because the way, sdbc
// bypasses the servicemanager, does not allow to use the
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 1b8c1cc116e3..d320a7c16b52 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -55,10 +55,10 @@ namespace {
struct DefColumnMetaData
{
- const sal_Char * columnName;
- const sal_Char * tableName;
- const sal_Char * schemaTableName;
- const sal_Char * typeName;
+ const char * columnName;
+ const char * tableName;
+ const char * schemaTableName;
+ const char * typeName;
sal_Int32 type;
sal_Int32 precision;
sal_Int32 scale;
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 7bf0d4fd625d..a8c2aa57ea4b 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -483,7 +483,7 @@ void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Se
"pq_preparedstatement.setBytes: Error during converting bytesequence to an SQL conform string",
*this, OUString(), 1, Any() );
}
-// buf.append( (const sal_Char *)escapedString, len -1 );
+// buf.append( (const char *)escapedString, len -1 );
m_updateableField[columnIndex-1].value <<=
OUString( reinterpret_cast<char*>(escapedString), len, RTL_TEXTENCODING_ASCII_US );
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 69f88016231d..7f997d7d110d 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -38,7 +38,7 @@ private:
OUString const sImplementationName;
public:
- ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName)
+ ProviderRequest(void* pServiceManager, char const* pImplementationName)
: xServiceManager(static_cast<lang::XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
@@ -65,7 +65,7 @@ public:
}
extern "C" SAL_DLLPUBLIC_EXPORT void*
-connectivity_writer_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager,
+connectivity_writer_component_getFactory(const char* pImplementationName, void* pServiceManager,
void* /*pRegistryKey*/)
{
void* pRet = nullptr;