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

sal_Char->char in idlc..linguistic

Browse Source 
Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2
Reviewed-on: https://gerrit.libreoffice.org/85477
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-12-19 09:46:58 +02:00
parent 02b24d7747
commit c1a4554c67
38 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idlc/inc/astdeclaration.hxx
View File

@@ -70,7 +70,7 @@ public:
{ return m_scopedName; } { return m_scopedName; }
const OString& getFullName() const const OString& getFullName() const
{ return m_fullName; } { return m_fullName; }
virtual const sal_Char* getRelativName() const virtual const char* getRelativName() const
{ return m_fullName.getStr()+1; } { return m_fullName.getStr()+1; }
AstScope* getScope() AstScope* getScope()
{ return m_pScope; } { return m_pScope; }

2
idlc/inc/astexpression.hxx
View File

@@ -85,7 +85,7 @@ struct AstExprValue
ExprType et; ExprType et;
}; };
const sal_Char* exprTypeToString(ExprType t); const char* exprTypeToString(ExprType t);
class AstExpression final class AstExpression final
{ {

2
idlc/inc/astsequence.hxx
View File

@@ -35,7 +35,7 @@ public:
virtual bool isUnsigned() const override virtual bool isUnsigned() const override
{ return m_pMemberType != nullptr && m_pMemberType->isUnsigned(); } { return m_pMemberType != nullptr && m_pMemberType->isUnsigned(); }
virtual const sal_Char* getRelativName() const override; virtual const char* getRelativName() const override;
private: private:
AstType const * m_pMemberType; AstType const * m_pMemberType;
mutable o3tl::optional<OString> m_xRelativName; mutable o3tl::optional<OString> m_xRelativName;

4
idlc/inc/errorhandler.hxx
View File

@@ -83,10 +83,10 @@ public:
static void error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2, AstDeclaration const * d3); static void error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration const * d2, AstDeclaration const * d3);
// Warning // Warning
static void warning0(WarningCode e, const sal_Char* warningmsg); static void warning0(WarningCode e, const char* warningmsg);
// Report a syntax error in IDL input // Report a syntax error in IDL input
static void syntaxError(ParseState state, sal_Int32 lineNumber, const sal_Char* errmsg); static void syntaxError(ParseState state, sal_Int32 lineNumber, const char* errmsg);
// Report an unsuccessful coercion attempt // Report an unsuccessful coercion attempt
static void coercionError(AstExpression *pExpr, ExprType et); static void coercionError(AstExpression *pExpr, ExprType et);

2
idlc/source/astdump.cxx
View File

@@ -404,7 +404,7 @@ void AstAttribute::dumpExceptions(
} }
} }
const sal_Char* AstSequence::getRelativName() const const char* AstSequence::getRelativName() const
{ {
if ( !m_xRelativName ) if ( !m_xRelativName )
{ {

2
idlc/source/astexpression.cxx
View File

@@ -1277,7 +1277,7 @@ OString AstExpression::toString()
} }
// Convert the type of an AST_Expression to a char * // Convert the type of an AST_Expression to a char *
const sal_Char* exprTypeToString(ExprType t) const char* exprTypeToString(ExprType t)
{ {
switch (t) switch (t)
{ {

10
idlc/source/errorhandler.cxx
View File

@@ -20,7 +20,7 @@
#include <errorhandler.hxx> #include <errorhandler.hxx>
#include <astinterface.hxx> #include <astinterface.hxx>
static const sal_Char* errorCodeToMessage(ErrorCode eCode) static const char* errorCodeToMessage(ErrorCode eCode)
{ {
switch (eCode) switch (eCode)
{ {
@@ -121,7 +121,7 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "unknown error"; return "unknown error";
} }
static const sal_Char* warningCodeToMessage(WarningCode wCode) static const char* warningCodeToMessage(WarningCode wCode)
{ {
switch (wCode) switch (wCode)
{ {
@@ -131,7 +131,7 @@ static const sal_Char* warningCodeToMessage(WarningCode wCode)
return "unknown warning"; return "unknown warning";
} }
static const sal_Char* parseStateToMessage(ParseState state) static const char* parseStateToMessage(ParseState state)
{ {
switch (state) switch (state)
{ {
@@ -452,7 +452,7 @@ void ErrorHandler::error3(ErrorCode e, AstDeclaration const * d1, AstDeclaration
idlc()->incErrorCount(); idlc()->incErrorCount();
} }
void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg) void ErrorHandler::warning0(WarningCode w, const char* warningmsg)
{ {
if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) { if ( idlc()->getOptions()->isValid("-w") || idlc()->getOptions()->isValid("-we") ) {
warningHeader(w); warningHeader(w);
@@ -465,7 +465,7 @@ void ErrorHandler::warning0(WarningCode w, const sal_Char* warningmsg)
idlc()->incWarningCount(); idlc()->incWarningCount();
} }
void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const sal_Char* errmsg) void ErrorHandler::syntaxError(ParseState ps, sal_Int32 lineNumber, const char* errmsg)
{ {
errorHeader(ErrorCode::SyntaxError, lineNumber); errorHeader(ErrorCode::SyntaxError, lineNumber);
fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg); fprintf(stderr, "%s: %s\n", parseStateToMessage(ps), errmsg);

2
idlc/source/idlccompile.cxx
View File

@@ -49,7 +49,7 @@ extern int yyparse();
extern FILE* yyin; extern FILE* yyin;
extern int yydebug; extern int yydebug;
static sal_Char tmpFilePattern[512]; static char tmpFilePattern[512];
bool isFileUrl(const OString& fileName) bool isFileUrl(const OString& fileName)
{ {

2
idlc/source/parser.y
View File

@@ -213,7 +213,7 @@ static bool includes(AstDeclaration const * type1, AstDeclaration const * type2)
FeInheritanceHeader* ihval; /* inheritance header value */ FeInheritanceHeader* ihval; /* inheritance header value */
OString* sval; /* OString value */ OString* sval; /* OString value */
std::vector< OString > * svals; std::vector< OString > * svals;
sal_Char* strval; /* sal_Char* value */ char* strval; /* char* value */
bool bval; /* sal_Boolean* value */ bool bval; /* sal_Boolean* value */
sal_Int64 ival; /* sal_Int64 value */ sal_Int64 ival; /* sal_Int64 value */
sal_uInt64 uval; /* sal_uInt64 value */ sal_uInt64 uval; /* sal_uInt64 value */

14
idlc/source/scanner.l
View File

@@ -146,7 +146,7 @@ static int asciiToInteger(char const * s, sal_Int64 * sval, sal_uInt64 * uval)
} }
} }
static double asciiToFloat(const sal_Char *s) static double asciiToFloat(const char *s)
{ {
double d = 0.0; double d = 0.0;
double e, k; double e, k;
@@ -201,21 +201,21 @@ static double asciiToFloat(const sal_Char *s)
return d; return d;
} }
static void idlParsePragma(sal_Char* pPragma) static void idlParsePragma(char* pPragma)
{ {
OString pragma(pPragma); OString pragma(pPragma);
sal_Int32 index = pragma.indexOf("include"); sal_Int32 index = pragma.indexOf("include");
sal_Char* begin = pPragma + index + 8; char* begin = pPragma + index + 8;
sal_Char* offset = begin; char* offset = begin;
while (*offset != ',') offset++; while (*offset != ',') offset++;
//OString include = pragma.copy(index + 8, offset - begin); //OString include = pragma.copy(index + 8, offset - begin);
//unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin))); //unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin)));
} }
static void parseLineAndFile(sal_Char* pBuf) static void parseLineAndFile(char* pBuf)
{ {
sal_Char *r = pBuf; char *r = pBuf;
sal_Char *h; char *h;
bool bIsInMain = false; bool bIsInMain = false;
/* Skip initial '#' */ /* Skip initial '#' */

2
io/source/TextOutputStream/TextOutputStream.cxx
View File

@@ -120,7 +120,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
sal_Int32 nSeqSize = nSourceSize * 3; sal_Int32 nSeqSize = nSourceSize * 3;
Sequence<sal_Int8> seqText( nSeqSize ); Sequence<sal_Int8> seqText( nSeqSize );
sal_Char *pTarget = reinterpret_cast<char *>(seqText.getArray()); char *pTarget = reinterpret_cast<char *>(seqText.getArray());
while( true ) while( true )
{ {
nTargetCount += rtl_convertUnicodeToText( nTargetCount += rtl_convertUnicodeToText(

2
io/source/services.cxx
View File

@@ -93,7 +93,7 @@ static const struct ImplementationEntry g_entries[] =
}; };
extern "C" SAL_DLLPUBLIC_EXPORT void * io_component_getFactory( extern "C" SAL_DLLPUBLIC_EXPORT void * io_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
} }

2
io/test/stm/testfactreg.cxx
View File

@@ -110,7 +110,7 @@ sal_Bool SAL_CALL component_writeInfo(
} }
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
void * pRet = 0; void * pRet = 0;

2
io/test/testcomponent.cxx
View File

@@ -67,7 +67,7 @@ int main (int argc, char **argv)
exit(1); exit(1);
} }
sal_Char szBuf[1024]; char szBuf[1024];
OString sTestName; OString sTestName;
try try

4
javaunohelper/source/javaunohelper.cxx
View File

@@ -74,7 +74,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
{ {
Environment java_env, loader_env; Environment java_env, loader_env;
const sal_Char * pEnvTypeName = nullptr; const char * pEnvTypeName = nullptr;
(*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))( (*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))(
&pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) ); &pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) );
if (! loader_env.is()) if (! loader_env.is())
@@ -163,7 +163,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
{ {
Environment java_env, loader_env; Environment java_env, loader_env;
const sal_Char * pEnvTypeName = nullptr; const char * pEnvTypeName = nullptr;
(*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))( (*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))(
&pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) ); &pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) );

2
jvmfwk/inc/libxmlutil.hxx
View File

@@ -89,7 +89,7 @@ public:
CXmlCharPtr & operator = (xmlChar* pObj); CXmlCharPtr & operator = (xmlChar* pObj);
operator xmlChar* () const { return _object;} operator xmlChar* () const { return _object;}
operator OUString (); operator OUString ();
operator OString () { return reinterpret_cast<sal_Char*>(_object);} operator OString () { return reinterpret_cast<char*>(_object);}
}; };

10
jvmfwk/plugins/sunmajor/pluginlib/util.cxx
View File

@@ -201,7 +201,7 @@ public:
private: private:
enum { BUFFER_SIZE = 1024 }; enum { BUFFER_SIZE = 1024 };
sal_Char m_aBuffer[BUFFER_SIZE]; char m_aBuffer[BUFFER_SIZE];
FileHandleGuard m_aGuard; FileHandleGuard m_aGuard;
int m_nSize; int m_nSize;
int m_nIndex; int m_nIndex;
@@ -271,7 +271,7 @@ namespace {
class AsynchReader: public salhelper::Thread class AsynchReader: public salhelper::Thread
{ {
size_t m_nDataSize; size_t m_nDataSize;
std::unique_ptr<sal_Char[]> m_arData; std::unique_ptr<char[]> m_arData;
FileHandleGuard m_aGuard; FileHandleGuard m_aGuard;
@@ -306,7 +306,7 @@ OString AsynchReader::getData()
void AsynchReader::execute() void AsynchReader::execute()
{ {
const sal_uInt64 BUFFER_SIZE = 4096; const sal_uInt64 BUFFER_SIZE = 4096;
sal_Char aBuffer[BUFFER_SIZE]; char aBuffer[BUFFER_SIZE];
while (true) while (true)
{ {
sal_uInt64 nRead; sal_uInt64 nRead;
@@ -330,12 +330,12 @@ void AsynchReader::execute()
else if (nRead <= BUFFER_SIZE) else if (nRead <= BUFFER_SIZE)
{ {
//Save the data we have in m_arData into a temporary array //Save the data we have in m_arData into a temporary array
std::unique_ptr<sal_Char[]> arTmp( new sal_Char[m_nDataSize]); std::unique_ptr<char[]> arTmp( new char[m_nDataSize]);
if (m_nDataSize != 0) { if (m_nDataSize != 0) {
memcpy(arTmp.get(), m_arData.get(), m_nDataSize); memcpy(arTmp.get(), m_arData.get(), m_nDataSize);
} }
//Enlarge m_arData to hold the newly read data //Enlarge m_arData to hold the newly read data
m_arData.reset(new sal_Char[static_cast<size_t>(m_nDataSize + nRead)]); m_arData.reset(new char[static_cast<size_t>(m_nDataSize + nRead)]);
//Copy back the data that was already in m_arData //Copy back the data that was already in m_arData
memcpy(m_arData.get(), arTmp.get(), m_nDataSize); memcpy(m_arData.get(), arTmp.get(), m_nDataSize);
//Add the newly read data to m_arData //Add the newly read data to m_arData

2
jvmfwk/source/elements.cxx
View File

@@ -72,7 +72,7 @@ static OString getElement(OString const & docPath,
JFW_E_ERROR, JFW_E_ERROR,
"[Java framework] Error in function getElement (elements.cxx)"); "[Java framework] Error in function getElement (elements.cxx)");
} }
sValue = reinterpret_cast<sal_Char*>(pathObj->nodesetval->nodeTab[0]->content); sValue = reinterpret_cast<char*>(pathObj->nodesetval->nodeTab[0]->content);
return sValue; return sValue;
} }

2
jvmfwk/source/framework.cxx
View File

@@ -246,7 +246,7 @@ javaFrameworkError jfw_startVM(
//add the options set by options dialog //add the options set by options dialog
for (auto const & vmParam : vmParams) for (auto const & vmParam : vmParams)
{ {
arOpt[index].optionString = const_cast<sal_Char*>(vmParam.getStr()); arOpt[index].optionString = const_cast<char*>(vmParam.getStr());
arOpt[index].extraInfo = nullptr; arOpt[index].extraInfo = nullptr;
index ++; index ++;
} }

2
l10ntools/source/helper.cxx
View File

@@ -137,7 +137,7 @@ bool isWellFormedXML( OString const & text )
OString xmlStrToOString( const xmlChar* pString ) OString xmlStrToOString( const xmlChar* pString )
{ {
xmlChar* pTemp = xmlStrdup( pString ); xmlChar* pTemp = xmlStrdup( pString );
OString sResult = reinterpret_cast<sal_Char*>( pTemp ); OString sResult = reinterpret_cast<char*>( pTemp );
xmlFree( pTemp ); xmlFree( pTemp );
return sResult; return sResult;
} }

2
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
View File

@@ -818,7 +818,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * hyphen_component_getFactory( SAL_DLLPUBLIC_EXPORT void * hyphen_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = nullptr; void * pRet = nullptr;
if ( Hyphenator::getImplementationName_Static().equalsAscii( pImplName ) ) if ( Hyphenator::getImplementationName_Static().equalsAscii( pImplName ) )

2
lingucomponent/source/languageguessing/guesslang.cxx
View File

@@ -348,7 +348,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * guesslang_component_getFactory( SAL_DLLPUBLIC_EXPORT void * guesslang_component_getFactory(
sal_Char const * implName, void * xMgr, char const * implName, void * xMgr,
void * xRegistry ) void * xRegistry )
{ {
return ::cppu::component_getFactoryHelper( return ::cppu::component_getFactoryHelper(

2
lingucomponent/source/lingutil/lingutil.cxx
View File

@@ -272,7 +272,7 @@ void MergeNewStyleDicsAndOldStyleDics(
} }
} }
rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset) rtl_TextEncoding getTextEncodingFromCharset(const char* pCharset)
{ {
// default result: used to indicate that we failed to get the proper encoding // default result: used to indicate that we failed to get the proper encoding
rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW; rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW;

2
lingucomponent/source/lingutil/lingutil.hxx
View File

@@ -50,7 +50,7 @@ void MergeNewStyleDicsAndOldStyleDics( std::vector< SvtLinguConfigDictionaryEntr
//rtl_getTextEncodingFromUnixCharset with the addition of //rtl_getTextEncodingFromUnixCharset with the addition of
//ISCII-DEVANAGARI. On failure will return final fallback of //ISCII-DEVANAGARI. On failure will return final fallback of
//RTL_TEXTENCODING_ISO_8859_1 //RTL_TEXTENCODING_ISO_8859_1
rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset); rtl_TextEncoding getTextEncodingFromCharset(const char* pCharset);
#endif #endif

2
lingucomponent/source/numbertext/numbertext.cxx
View File

@@ -187,7 +187,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries[]
extern "C" { extern "C" {
SAL_DLLPUBLIC_EXPORT void* numbertext_component_getFactory(sal_Char const* implName, void* xMgr, SAL_DLLPUBLIC_EXPORT void* numbertext_component_getFactory(char const* implName, void* xMgr,
void* xRegistry) void* xRegistry)
{ {
return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries); return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries);

2
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
View File

@@ -651,7 +651,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * MacOSXSpell_component_getFactory( SAL_DLLPUBLIC_EXPORT void * MacOSXSpell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = nullptr; void * pRet = nullptr;
if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) )

2
lingucomponent/source/spellcheck/spell/sspellimp.cxx
View File

@@ -651,7 +651,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * spell_component_getFactory( SAL_DLLPUBLIC_EXPORT void * spell_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = nullptr; void * pRet = nullptr;
if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) )

2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx
View File

@@ -581,7 +581,7 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static()
extern "C" extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * lnth_component_getFactory( SAL_DLLPUBLIC_EXPORT void * lnth_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = nullptr; void * pRet = nullptr;
if ( Thesaurus::getImplementationName_Static().equalsAscii( pImplName ) ) if ( Thesaurus::getImplementationName_Static().equalsAscii( pImplName ) )

2
linguistic/source/convdiclist.cxx
View File

@@ -548,7 +548,7 @@ static uno::Reference< uno::XInterface > ConvDicList_CreateInstance(
} }
void * ConvDicList_getFactory( void * ConvDicList_getFactory(
const sal_Char * pImplName, const char * pImplName,
XMultiServiceFactory * pServiceManager ) XMultiServiceFactory * pServiceManager )
{ {
void * pRet = nullptr; void * pRet = nullptr;

14
linguistic/source/dicimp.cxx
View File

@@ -76,10 +76,10 @@ using namespace linguistic;
// text stripping and dictionary saving. // text stripping and dictionary saving.
#define EXTENSION_FOR_TITLE_TEXT "." #define EXTENSION_FOR_TITLE_TEXT "."
static const sal_Char* const pVerStr2 = "WBSWG2"; static const char* const pVerStr2 = "WBSWG2";
static const sal_Char* const pVerStr5 = "WBSWG5"; static const char* const pVerStr5 = "WBSWG5";
static const sal_Char* const pVerStr6 = "WBSWG6"; static const char* const pVerStr6 = "WBSWG6";
static const sal_Char* const pVerOOo7 = "OOoUserDict1"; static const char* const pVerOOo7 = "OOoUserDict1";
static const sal_Int16 DIC_VERSION_DONTKNOW = -1; static const sal_Int16 DIC_VERSION_DONTKNOW = -1;
static const sal_Int16 DIC_VERSION_2 = 2; static const sal_Int16 DIC_VERSION_2 = 2;
@@ -94,7 +94,7 @@ static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl()
return xRes; return xRes;
} }
static bool getTag(const OString &rLine, const sal_Char *pTagName, static bool getTag(const OString &rLine, const char *pTagName,
OString &rTagValue) OString &rTagValue)
{ {
sal_Int32 nPos = rLine.indexOf(pTagName); sal_Int32 nPos = rLine.indexOf(pTagName);
@@ -111,7 +111,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool
{ {
// Sniff the header // Sniff the header
sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW; sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW;
sal_Char pMagicHeader[MAX_HEADER_LENGTH]; char pMagicHeader[MAX_HEADER_LENGTH];
nLng = LANGUAGE_NONE; nLng = LANGUAGE_NONE;
bNeg = false; bNeg = false;
@@ -314,7 +314,7 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL)
DIC_VERSION_2 == nDicVersion) DIC_VERSION_2 == nDicVersion)
{ {
sal_uInt16 nLen = 0; sal_uInt16 nLen = 0;
sal_Char aWordBuf[ BUFSIZE ]; char aWordBuf[ BUFSIZE ];
// Read the first word // Read the first word
if (!pStream->eof()) if (!pStream->eof())

2
linguistic/source/dlistimp.cxx
View File

@@ -688,7 +688,7 @@ uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw()
return { "com.sun.star.linguistic2.DictionaryList" }; return { "com.sun.star.linguistic2.DictionaryList" };
} }
void * DicList_getFactory( const sal_Char * pImplName, void * DicList_getFactory( const char * pImplName,
XMultiServiceFactory * pServiceManager ) XMultiServiceFactory * pServiceManager )
{ {
void * pRet = nullptr; void * pRet = nullptr;

2
linguistic/source/gciterator.cxx
View File

@@ -1186,7 +1186,7 @@ static uno::Reference< uno::XInterface > GrammarCheckingIterator_createInstance(
void * GrammarCheckingIterator_getFactory( void * GrammarCheckingIterator_getFactory(
const sal_Char *pImplName, const char *pImplName,
lang::XMultiServiceFactory *pServiceManager ) lang::XMultiServiceFactory *pServiceManager )
{ {
void * pRet = nullptr; void * pRet = nullptr;

2
linguistic/source/lngopt.cxx
View File

@@ -438,7 +438,7 @@ Locale LinguProps::getPropertyLocale(const OUString& aPropertyName)
return b; return b;
} }
void * LinguProps_getFactory( const sal_Char * pImplName, void * LinguProps_getFactory( const char * pImplName,
XMultiServiceFactory *pServiceManager ) XMultiServiceFactory *pServiceManager )
{ {
void * pRet = nullptr; void * pRet = nullptr;

2
linguistic/source/lngreg.cxx
View File

@@ -29,7 +29,7 @@ extern "C"
{ {
SAL_DLLPUBLIC_EXPORT void * lng_component_getFactory( SAL_DLLPUBLIC_EXPORT void * lng_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
void * pRet = void * pRet =
LngSvcMgr_getFactory( LngSvcMgr_getFactory(

10
linguistic/source/lngreg.hxx
View File

@@ -30,31 +30,31 @@ namespace com { namespace sun { namespace star { namespace lang {
extern void * LngSvcMgr_getFactory extern void * LngSvcMgr_getFactory
( (
const sal_Char * pImplName, const char * pImplName,
css::lang::XMultiServiceFactory * pServiceManager css::lang::XMultiServiceFactory * pServiceManager
); );
extern void * DicList_getFactory extern void * DicList_getFactory
( (
const sal_Char * pImplName, const char * pImplName,
css::lang::XMultiServiceFactory * pServiceManager css::lang::XMultiServiceFactory * pServiceManager
); );
void * LinguProps_getFactory void * LinguProps_getFactory
( (
const sal_Char * pImplName, const char * pImplName,
css::lang::XMultiServiceFactory * pServiceManager css::lang::XMultiServiceFactory * pServiceManager
); );
extern void * ConvDicList_getFactory extern void * ConvDicList_getFactory
( (
const sal_Char * pImplName, const char * pImplName,
css::lang::XMultiServiceFactory * pServiceManager css::lang::XMultiServiceFactory * pServiceManager
); );
extern void * GrammarCheckingIterator_getFactory extern void * GrammarCheckingIterator_getFactory
( (
const sal_Char * pImplName, const char * pImplName,
css::lang::XMultiServiceFactory * pServiceManager css::lang::XMultiServiceFactory * pServiceManager
); );

10
linguistic/source/lngsvcmgr.cxx
View File

@@ -620,9 +620,9 @@ void LngSvcMgr::UpdateAll()
SvtLinguConfig aCfg; SvtLinguConfig aCfg;
const int nNumServices = 4; const int nNumServices = 4;
const sal_Char * const apServices[nNumServices] = { SN_SPELLCHECKER, SN_GRAMMARCHECKER, SN_HYPHENATOR, SN_THESAURUS }; const char * const apServices[nNumServices] = { SN_SPELLCHECKER, SN_GRAMMARCHECKER, SN_HYPHENATOR, SN_THESAURUS };
const sal_Char * const apCurLists[nNumServices] = { "ServiceManager/SpellCheckerList", "ServiceManager/GrammarCheckerList", "ServiceManager/HyphenatorList", "ServiceManager/ThesaurusList" }; const char * const apCurLists[nNumServices] = { "ServiceManager/SpellCheckerList", "ServiceManager/GrammarCheckerList", "ServiceManager/HyphenatorList", "ServiceManager/ThesaurusList" };
const sal_Char * const apLastFoundLists[nNumServices] = { "ServiceManager/LastFoundSpellCheckers", "ServiceManager/LastFoundGrammarCheckers", "ServiceManager/LastFoundHyphenators", "ServiceManager/LastFoundThesauri" }; const char * const apLastFoundLists[nNumServices] = { "ServiceManager/LastFoundSpellCheckers", "ServiceManager/LastFoundGrammarCheckers", "ServiceManager/LastFoundHyphenators", "ServiceManager/LastFoundThesauri" };
// usage of indices as above: 0 = spell checker, 1 = grammar checker, 2 = hyphenator, 3 = thesaurus // usage of indices as above: 0 = spell checker, 1 = grammar checker, 2 = hyphenator, 3 = thesaurus
std::vector< list_entry_map_t > aLastFoundSvcs(nNumServices); std::vector< list_entry_map_t > aLastFoundSvcs(nNumServices);
@@ -684,7 +684,7 @@ void LngSvcMgr::UpdateAll()
{ {
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
{ {
const sal_Char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k]; const char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k];
OUString aSubNodeName( OUString::createFromAscii(pSubNodeName) ); OUString aSubNodeName( OUString::createFromAscii(pSubNodeName) );
list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k]; list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k];
@@ -1845,7 +1845,7 @@ static uno::Reference< uno::XInterface > LngSvcMgr_CreateInstance(
} }
void * LngSvcMgr_getFactory( void * LngSvcMgr_getFactory(
const sal_Char * pImplName, const char * pImplName,
lang::XMultiServiceFactory * pServiceManager ) lang::XMultiServiceFactory * pServiceManager )
{ {

4
linguistic/workben/sreg.cxx
View File

@@ -31,7 +31,7 @@ extern sal_Bool SAL_CALL SpellChecker_writeInfo(
void * /*pServiceManager*/, XRegistryKey * pRegistryKey ); void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
extern void * SAL_CALL SpellChecker_getFactory( extern void * SAL_CALL SpellChecker_getFactory(
const sal_Char * pImplName, const char * pImplName,
XMultiServiceFactory * pServiceManager, XMultiServiceFactory * pServiceManager,
void * /*pRegistryKey*/ ); void * /*pRegistryKey*/ );
@@ -47,7 +47,7 @@ sal_Bool SAL_CALL component_writeInfo(
} }
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
void * pRet = SpellChecker_getFactory( void * pRet = SpellChecker_getFactory(
pImplName, pImplName,

2
linguistic/workben/sspellimp.cxx
View File

@@ -453,7 +453,7 @@ sal_Bool SAL_CALL SpellChecker_writeInfo(
} }
void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, void * SAL_CALL SpellChecker_getFactory( const char * pImplName,
XMultiServiceFactory * pServiceManager, void * ) XMultiServiceFactory * pServiceManager, void * )
{ {
void * pRet = 0; void * pRet = 0;