mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sal_Char->char in comphelper

Browse Source 
Change-Id: I63488463f2255a013cb80a9318d22207cb0ed532
Reviewed-on: https://gerrit.libreoffice.org/85395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-12-18 12:02:07 +02:00
parent 4ea1f7363d
commit feb5df31d4
14 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/source/misc/backupfilehelper.cxx
View File

@@ -166,7 +166,7 @@ namespace
if (nLength > nRemainingSize) if (nLength > nRemainingSize)
return false; return false;
std::vector<sal_Char> aTarget(nLength); std::vector<char> aTarget(nLength);
sal_uInt64 nBaseRead(0); sal_uInt64 nBaseRead(0);
// read rTarget // read rTarget

8
comphelper/source/misc/base64.cxx
View File

@@ -28,7 +28,7 @@ using namespace com::sun::star;
namespace comphelper { namespace comphelper {
const const
sal_Char aBase64EncodeTable[] = char aBase64EncodeTable[] =
{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
@@ -56,7 +56,7 @@ const
// p q r s t u v w x y z // p q r s t u v w x y z
static void ThreeByteToFourByte(const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, sal_Char* aCharBuffer) static void ThreeByteToFourByte(const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, char* aCharBuffer)
{ {
sal_Int32 nLen(nFullLen - nStart); sal_Int32 nLen(nFullLen - nStart);
if (nLen > 3) if (nLen > 3)
@@ -115,7 +115,7 @@ void Base64::encode(OStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& aP
const sal_Int8* pBuffer = aPass.getConstArray(); const sal_Int8* pBuffer = aPass.getConstArray();
while (i < nBufferLength) while (i < nBufferLength)
{ {
sal_Char aCharBuffer[4]; char aCharBuffer[4];
ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer); ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer);
aStrBuffer.append(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer)); aStrBuffer.append(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer));
i += 3; i += 3;
@@ -129,7 +129,7 @@ void Base64::encode(OUStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& a
const sal_Int8* pBuffer = aPass.getConstArray(); const sal_Int8* pBuffer = aPass.getConstArray();
while (i < nBufferLength) while (i < nBufferLength)
{ {
sal_Char aCharBuffer[4]; char aCharBuffer[4];
ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer); ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer);
aStrBuffer.appendAscii(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer)); aStrBuffer.appendAscii(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer));
i += 3; i += 3;

2
comphelper/source/misc/comphelper_services.cxx
View File

@@ -52,7 +52,7 @@ namespace comphelper { namespace module
extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory( extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory(
const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, const char* pImplementationName, SAL_UNUSED_PARAMETER void*,
SAL_UNUSED_PARAMETER void* ) SAL_UNUSED_PARAMETER void* )
{ {
::comphelper::module::initializeModule(); ::comphelper::module::initializeModule();

2
comphelper/source/misc/componentmodule.cxx
View File

@@ -71,7 +71,7 @@ namespace comphelper
registerImplementation( aComponent ); registerImplementation( aComponent );
} }
void* OModule::getComponentFactory( const sal_Char* _pImplementationName ) void* OModule::getComponentFactory( const char* _pImplementationName )
{ {
Reference< XInterface > xFactory( getComponentFactory( Reference< XInterface > xFactory( getComponentFactory(
OUString::createFromAscii( _pImplementationName ) ) ); OUString::createFromAscii( _pImplementationName ) ) );

4
comphelper/source/misc/logging.cxx
View File

@@ -64,7 +64,7 @@ namespace comphelper
} }
} }
EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName ) EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const char* _pAsciiLoggerName )
:m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) ) :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) )
{ {
} }
@@ -107,7 +107,7 @@ namespace comphelper
void EventLogger::impl_log( const sal_Int32 _nLogLevel, void EventLogger::impl_log( const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage,
const OptionalString& _rArgument1, const OptionalString& _rArgument2, const OptionalString& _rArgument1, const OptionalString& _rArgument2,
const OptionalString& _rArgument3, const OptionalString& _rArgument4, const OptionalString& _rArgument3, const OptionalString& _rArgument4,
const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const

2
comphelper/source/misc/mimeconfighelper.cxx
View File

@@ -68,7 +68,7 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
} }
static sal_uInt8 GetDigit_Impl( sal_Char aChar ) static sal_uInt8 GetDigit_Impl( char aChar )
{ {
if ( aChar >= '0' && aChar <= '9' ) if ( aChar >= '0' && aChar <= '9' )
return aChar - '0'; return aChar - '0';

4
comphelper/source/misc/servicedecl.cxx
View File

@@ -99,7 +99,7 @@ ServiceDecl::Factory::createInstanceWithArgumentsAndContext(
m_rServiceDecl, args, xContext ); m_rServiceDecl, args, xContext );
} }
void * ServiceDecl::getFactory( sal_Char const* pImplName ) const void * ServiceDecl::getFactory( char const* pImplName ) const
{ {
if (rtl_str_compare(m_pImplName, pImplName) == 0) { if (rtl_str_compare(m_pImplName, pImplName) == 0) {
lang::XSingleComponentFactory * const pFac( new Factory(*this) ); lang::XSingleComponentFactory * const pFac( new Factory(*this) );
@@ -143,7 +143,7 @@ OUString ServiceDecl::getImplementationName() const
return OUString::createFromAscii(m_pImplName); return OUString::createFromAscii(m_pImplName);
} }
void* component_getFactoryHelper( const sal_Char* pImplName, void* component_getFactoryHelper( const char* pImplName,
std::initializer_list<ServiceDecl const *> args ) std::initializer_list<ServiceDecl const *> args )
{ {
for (auto const i: args) { for (auto const i: args) {

14
comphelper/source/misc/string.cxx
View File

@@ -63,9 +63,9 @@ namespace
} }
} }
OString stripStart(const OString &rIn, sal_Char c) OString stripStart(const OString &rIn, char c)
{ {
return tmpl_stripStart<OString, sal_Char>(rIn, c); return tmpl_stripStart<OString, char>(rIn, c);
} }
OUString stripStart(const OUString &rIn, sal_Unicode c) OUString stripStart(const OUString &rIn, sal_Unicode c)
@@ -94,9 +94,9 @@ namespace
} }
} }
OString stripEnd(const OString &rIn, sal_Char c) OString stripEnd(const OString &rIn, char c)
{ {
return tmpl_stripEnd<OString, sal_Char>(rIn, c); return tmpl_stripEnd<OString, char>(rIn, c);
} }
OUString stripEnd(const OUString &rIn, sal_Unicode c) OUString stripEnd(const OUString &rIn, sal_Unicode c)
@@ -104,7 +104,7 @@ OUString stripEnd(const OUString &rIn, sal_Unicode c)
return tmpl_stripEnd<OUString, sal_Unicode>(rIn, c); return tmpl_stripEnd<OUString, sal_Unicode>(rIn, c);
} }
OString strip(const OString &rIn, sal_Char c) OString strip(const OString &rIn, char c)
{ {
return stripEnd(stripStart(rIn, c), c); return stripEnd(stripStart(rIn, c), c);
} }
@@ -133,9 +133,9 @@ namespace
} }
} }
sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok) sal_Int32 getTokenCount(const OString &rIn, char cTok)
{ {
return tmpl_getTokenCount<OString, sal_Char>(rIn, cTok); return tmpl_getTokenCount<OString, char>(rIn, cTok);
} }
sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok) sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok)

2
comphelper/source/xml/xmltools.cxx
View File

@@ -89,7 +89,7 @@ namespace comphelper
encodeChaff(aChaff); encodeChaff(aChaff);
return OString(reinterpret_cast<const sal_Char*>(aChaff.data()), nLength); return OString(reinterpret_cast<const char*>(aChaff.data()), nLength);
} }
OString generateGUIDString() OString generateGUIDString()

2
include/comphelper/componentmodule.hxx
View File

@@ -120,7 +120,7 @@ namespace comphelper
/** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call
*/ */
void* getComponentFactory( const sal_Char* _pImplementationName ); void* getComponentFactory( const char* _pImplementationName );
private: private:
OModule( const OModule& ) = delete; OModule( const OModule& ) = delete;

44
include/comphelper/logging.hxx
View File

@@ -45,7 +45,7 @@ namespace comphelper
return _rValue; return _rValue;
} }
inline OUString convertLogArgToString( const sal_Char* _pAsciiValue ) inline OUString convertLogArgToString( const char* _pAsciiValue )
{ {
return OUString::createFromAscii( _pAsciiValue ); return OUString::createFromAscii( _pAsciiValue );
} }
@@ -106,7 +106,7 @@ namespace comphelper
*/ */
EventLogger( EventLogger(
const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
const sal_Char* _pAsciiLoggerName const char* _pAsciiLoggerName
); );
public: public:
@@ -213,7 +213,7 @@ namespace comphelper
is searched in the message string, and replaced with the argument string. is searched in the message string, and replaced with the argument string.
*/ */
template< typename ARGTYPE1 > template< typename ARGTYPE1 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -222,7 +222,7 @@ namespace comphelper
/// logs a given message, replacing 2 placeholders in the message with respective values /// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 > template< typename ARGTYPE1, typename ARGTYPE2 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -232,7 +232,7 @@ namespace comphelper
/// logs a given message, replacing 3 placeholders in the message with respective values /// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -243,7 +243,7 @@ namespace comphelper
/// logs a given message, replacing 4 placeholders in the message with respective values /// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -255,7 +255,7 @@ namespace comphelper
/// logs a given message, replacing 5 placeholders in the message with respective values /// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -268,7 +268,7 @@ namespace comphelper
/// logs a given message, replacing 6 placeholders in the message with respective values /// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const void log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ), impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -292,7 +292,7 @@ namespace comphelper
is searched in the message string, and replaced with the argument string. is searched in the message string, and replaced with the argument string.
*/ */
template< typename ARGTYPE1 > template< typename ARGTYPE1 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -301,7 +301,7 @@ namespace comphelper
/// logs a given message, replacing 2 placeholders in the message with respective values /// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 > template< typename ARGTYPE1, typename ARGTYPE2 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -311,7 +311,7 @@ namespace comphelper
/// logs a given message, replacing 3 placeholders in the message with respective values /// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -322,7 +322,7 @@ namespace comphelper
/// logs a given message, replacing 4 placeholders in the message with respective values /// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -334,7 +334,7 @@ namespace comphelper
/// logs a given message, replacing 5 placeholders in the message with respective values /// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -347,7 +347,7 @@ namespace comphelper
/// logs a given message, replacing 6 placeholders in the message with respective values /// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage, impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -371,7 +371,7 @@ namespace comphelper
is searched in the message string, and replaced with the argument string. is searched in the message string, and replaced with the argument string.
*/ */
template< typename ARGTYPE1 > template< typename ARGTYPE1 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -380,7 +380,7 @@ namespace comphelper
/// logs a given ASCII message, replacing 2 placeholders in the message with respective values /// logs a given ASCII message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 > template< typename ARGTYPE1, typename ARGTYPE2 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -390,7 +390,7 @@ namespace comphelper
/// logs a given ASCII message, replacing 3 placeholders in the message with respective values /// logs a given ASCII message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -401,7 +401,7 @@ namespace comphelper
/// logs a given ASCII message, replacing 4 placeholders in the message with respective values /// logs a given ASCII message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -413,7 +413,7 @@ namespace comphelper
/// logs a given ASCII message, replacing 5 placeholders in the message with respective values /// logs a given ASCII message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -426,7 +426,7 @@ namespace comphelper
/// logs a given ASCII message, replacing 6 placeholders in the message with respective values /// logs a given ASCII message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 > template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const void logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{ {
if ( isLoggable( _nLogLevel ) ) if ( isLoggable( _nLogLevel ) )
impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ), impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -441,8 +441,8 @@ namespace comphelper
protected: protected:
void impl_log( void impl_log(
const sal_Int32 _nLogLevel, const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass, const char* _pSourceClass,
const sal_Char* _pSourceMethod, const char* _pSourceMethod,
const OUString& _rMessage, const OUString& _rMessage,
const OptionalString& _rArgument1 = OptionalString(), const OptionalString& _rArgument1 = OptionalString(),
const OptionalString& _rArgument2 = OptionalString(), const OptionalString& _rArgument2 = OptionalString(),

14
include/comphelper/namedvaluecollection.hxx
View File

@@ -146,7 +146,7 @@ namespace comphelper
_out_rValue. _out_rValue.
*/ */
template < typename VALUE_TYPE > template < typename VALUE_TYPE >
bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const bool get_ensureType( const char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const
{ {
return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() ); return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
} }
@@ -161,7 +161,7 @@ namespace comphelper
in the collection in the collection
*/ */
template < typename VALUE_TYPE > template < typename VALUE_TYPE >
VALUE_TYPE getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const VALUE_TYPE getOrDefault( const char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const
{ {
return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault ); return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault );
} }
@@ -179,7 +179,7 @@ namespace comphelper
If the collection does not contain a value with the given name, an empty If the collection does not contain a value with the given name, an empty
Any is returned. Any is returned.
*/ */
const css::uno::Any& get( const sal_Char* _pAsciiValueName ) const const css::uno::Any& get( const char* _pAsciiValueName ) const
{ {
return get( OUString::createFromAscii( _pAsciiValueName ) ); return get( OUString::createFromAscii( _pAsciiValueName ) );
} }
@@ -195,7 +195,7 @@ namespace comphelper
} }
/// determines whether a value with a given name is present in the collection /// determines whether a value with a given name is present in the collection
bool has( const sal_Char* _pAsciiValueName ) const bool has( const char* _pAsciiValueName ) const
{ {
return impl_has( OUString::createFromAscii( _pAsciiValueName ) ); return impl_has( OUString::createFromAscii( _pAsciiValueName ) );
} }
@@ -212,7 +212,7 @@ namespace comphelper
which case it has been overwritten. which case it has been overwritten.
*/ */
template < typename VALUE_TYPE > template < typename VALUE_TYPE >
bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue ) bool put( const char* _pAsciiValueName, const VALUE_TYPE& _rValue )
{ {
return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) ); return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) );
} }
@@ -228,7 +228,7 @@ namespace comphelper
return impl_put( _rValueName, css::uno::makeAny( _rValue ) ); return impl_put( _rValueName, css::uno::makeAny( _rValue ) );
} }
bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue ) bool put( const char* _pAsciiValueName, const css::uno::Any& _rValue )
{ {
return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue ); return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue );
} }
@@ -242,7 +242,7 @@ namespace comphelper
@return true if and only if a value with the given name existed in the collection. @return true if and only if a value with the given name existed in the collection.
*/ */
bool remove( const sal_Char* _pAsciiValueName ) bool remove( const char* _pAsciiValueName )
{ {
return impl_remove( OUString::createFromAscii( _pAsciiValueName ) ); return impl_remove( OUString::createFromAscii( _pAsciiValueName ) );
} }

4
include/comphelper/servicedecl.hxx
View File

@@ -114,7 +114,7 @@ public:
m_pServiceNames(pSupportedServiceNames) {} m_pServiceNames(pSupportedServiceNames) {}
/// @internal gets called by component_getFactoryHelper() /// @internal gets called by component_getFactoryHelper()
void * getFactory( sal_Char const* pImplName ) const; void * getFactory( char const* pImplName ) const;
/// @return supported service names /// @return supported service names
css::uno::Sequence< OUString> getSupportedServiceNames() const; css::uno::Sequence< OUString> getSupportedServiceNames() const;
@@ -325,7 +325,7 @@ struct inheritingClass_ : public serviceimpl_base< detail::InheritingServiceImpl
}; };
COMPHELPER_DLLPUBLIC COMPHELPER_DLLPUBLIC
void* component_getFactoryHelper( const sal_Char* pImplName, void* component_getFactoryHelper( const char* pImplName,
std::initializer_list<ServiceDecl const *> args ); std::initializer_list<ServiceDecl const *> args );
} // namespace service_decl } // namespace service_decl

10
include/comphelper/string.hxx
View File

@@ -81,7 +81,7 @@ inline OUStringBuffer& remove(OUStringBuffer &rIn,
@return The resulting OString @return The resulting OString
*/ */
COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn, COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn,
sal_Char c); char c);
/** Strips occurrences of a character from the start of the source string /** Strips occurrences of a character from the start of the source string
@@ -101,7 +101,7 @@ COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn,
@return The resulting OString @return The resulting OString
*/ */
COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn, COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn,
sal_Char c); char c);
/** Strips occurrences of a character from the end of the source string /** Strips occurrences of a character from the end of the source string
@@ -121,7 +121,7 @@ COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn,
@return The resulting OString @return The resulting OString
*/ */
COMPHELPER_DLLPUBLIC OString strip(const OString &rIn, COMPHELPER_DLLPUBLIC OString strip(const OString &rIn,
sal_Char c); char c);
/** Strips occurrences of a character from the start and end of the source string /** Strips occurrences of a character from the start and end of the source string
@@ -139,7 +139,7 @@ COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
@param cTok the character which separate the tokens. @param cTok the character which separate the tokens.
@return the number of tokens @return the number of tokens
*/ */
COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok); COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, char cTok);
/** Returns number of tokens in an OUString /** Returns number of tokens in an OUString
@@ -223,7 +223,7 @@ namespace detail
*/ */
inline OStringBuffer& padToLength( inline OStringBuffer& padToLength(
OStringBuffer& rBuffer, sal_Int32 nLength, OStringBuffer& rBuffer, sal_Int32 nLength,
sal_Char cFill = '\0') char cFill = '\0')
{ {
return detail::padToLength(rBuffer, nLength, cFill); return detail::padToLength(rBuffer, nLength, cFill);
} }