diff options
-rw-r--r-- | cppcanvas/source/uno/uno_mtfrenderer.cxx | 2 | ||||
-rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 2 | ||||
-rw-r--r-- | cppu/source/typelib/static_types.cxx | 14 | ||||
-rw-r--r-- | cppu/source/typelib/typelib.cxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/lbenv.cxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/implementationentry.cxx | 2 | ||||
-rw-r--r-- | cpputools/source/unoexe/unoexe.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hlinettp.cxx | 4 | ||||
-rw-r--r-- | cui/source/inc/macropg.hxx | 4 | ||||
-rw-r--r-- | cui/source/options/optasian.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 |
14 files changed, 32 insertions, 32 deletions
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx index 9dd906699bd6..2e33d3e972f2 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.cxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx @@ -53,7 +53,7 @@ namespace sdecl = comphelper::service_decl; // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* mtfrenderer_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* mtfrenderer_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&MtfRendererDecl} ); diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index a39fbad6f0ff..c0dc02c243ad 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -139,7 +139,7 @@ bool LogBridge::v_isValid(OUString * pReason) SAL_INFO("cppu.log", "" << *static_cast<sal_Int8*>(pArg)); break; case typelib_TypeClass_CHAR: - SAL_INFO("cppu.log", "" << *static_cast<sal_Char*>(pArg)); + SAL_INFO("cppu.log", "" << *static_cast<char*>(pArg)); break; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index b2638979936a..622b52e2d020 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -273,7 +273,7 @@ typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_getByTypeClass( void SAL_CALL typelib_static_type_init( typelib_TypeDescriptionReference ** ppRef, - typelib_TypeClass eTypeClass, const sal_Char * pTypeName ) + typelib_TypeClass eTypeClass, const char * pTypeName ) SAL_THROW_EXTERN_C() { if (! *ppRef) @@ -326,7 +326,7 @@ namespace { void init( typelib_TypeDescriptionReference ** ppRef, - typelib_TypeClass eTypeClass, const sal_Char * pTypeName, + typelib_TypeClass eTypeClass, const char * pTypeName, typelib_TypeDescriptionReference * pBaseType, sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers, sal_Bool const * pParameterizedTypes) @@ -408,7 +408,7 @@ void init( void SAL_CALL typelib_static_compound_type_init( typelib_TypeDescriptionReference ** ppRef, - typelib_TypeClass eTypeClass, const sal_Char * pTypeName, + typelib_TypeClass eTypeClass, const char * pTypeName, typelib_TypeDescriptionReference * pBaseType, sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers ) SAL_THROW_EXTERN_C() @@ -417,7 +417,7 @@ void SAL_CALL typelib_static_compound_type_init( } void SAL_CALL typelib_static_struct_type_init( - typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, + typelib_TypeDescriptionReference ** ppRef, const char * pTypeName, typelib_TypeDescriptionReference * pBaseType, sal_Int32 nMembers, typelib_TypeDescriptionReference ** ppMembers, sal_Bool const * pParameterizedTypes ) @@ -430,7 +430,7 @@ void SAL_CALL typelib_static_struct_type_init( void SAL_CALL typelib_static_interface_type_init( typelib_TypeDescriptionReference ** ppRef, - const sal_Char * pTypeName, + const char * pTypeName, typelib_TypeDescriptionReference * pBaseType ) SAL_THROW_EXTERN_C() { @@ -441,7 +441,7 @@ void SAL_CALL typelib_static_interface_type_init( void SAL_CALL typelib_static_mi_interface_type_init( typelib_TypeDescriptionReference ** ppRef, - const sal_Char * pTypeName, + const char * pTypeName, sal_Int32 nBaseTypes, typelib_TypeDescriptionReference ** ppBaseTypes ) SAL_THROW_EXTERN_C() @@ -505,7 +505,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( void SAL_CALL typelib_static_enum_type_init( typelib_TypeDescriptionReference ** ppRef, - const sal_Char * pTypeName, + const char * pTypeName, sal_Int32 nDefaultValue ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 02ae4cc6e932..cd2ad047c721 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -2002,7 +2002,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName( extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, - const sal_Char * pTypeName ) + const char * pTypeName ) SAL_THROW_EXTERN_C() { OUString aTypeName( OUString::createFromAscii( pTypeName ) ); diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 10995e7ad3e0..8bbd71891247 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -626,7 +626,7 @@ uno_DefaultEnvironment::~uno_DefaultEnvironment() void writeLine( - void * stream, const sal_Char * pLine, const sal_Char * pFilter ) + void * stream, const char * pLine, const char * pFilter ) { if (pFilter && *pFilter) { @@ -670,7 +670,7 @@ void writeLine( void writeLine( - void * stream, const OUString & rLine, const sal_Char * pFilter ) + void * stream, const OUString & rLine, const char * pFilter ) { OString aLine( OUStringToOString( rLine, RTL_TEXTENCODING_ASCII_US ) ); @@ -680,7 +680,7 @@ void writeLine( } extern "C" void SAL_CALL uno_dumpEnvironment( - void * stream, uno_Environment * pEnv, const sal_Char * pFilter ) + void * stream, uno_Environment * pEnv, const char * pFilter ) SAL_THROW_EXTERN_C() { OSL_ENSURE( pEnv, "### null ptr!" ); @@ -762,7 +762,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment( extern "C" void SAL_CALL uno_dumpEnvironmentByName( - void * stream, rtl_uString * pEnvDcp, const sal_Char * pFilter ) + void * stream, rtl_uString * pEnvDcp, const char * pFilter ) SAL_THROW_EXTERN_C() { uno_Environment * pEnv = nullptr; diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index ba4e72833f4a..f28547dfacc2 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -61,7 +61,7 @@ sal_Bool component_writeInfoHelper( void * component_getFactoryHelper( - sal_Char const * pImplName, SAL_UNUSED_PARAMETER void *, + char const * pImplName, SAL_UNUSED_PARAMETER void *, SAL_UNUSED_PARAMETER void *, const struct ImplementationEntry entries[]) { diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 98f437482d94..70a05803902a 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -62,7 +62,7 @@ namespace unoexe static bool s_quiet = false; -static void out( const sal_Char * pText ) +static void out( const char * pText ) { if (! s_quiet) fprintf( stderr, "%s", pText ); @@ -86,7 +86,7 @@ static const char arUsingText[] = " [-- Argument1 Argument2 ...]\n"; /// @throws RuntimeException -static bool readOption( OUString * pValue, const sal_Char * pOpt, +static bool readOption( OUString * pValue, const char * pOpt, sal_uInt32 * pnIndex, const OUString & aArg) { const OUString dash("-"); @@ -123,7 +123,7 @@ static bool readOption( OUString * pValue, const sal_Char * pOpt, return false; } -static bool readOption( bool * pbOpt, const sal_Char * pOpt, +static bool readOption( bool * pbOpt, const char * pOpt, sal_uInt32 * pnIndex, const OUString & aArg) { OUString aOpt = OUString::createFromAscii(pOpt); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index a68388d83031..f800edba1cea 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, weld::Button&, void) DisableClose( false ); if( ExecutableDialogResults::OK == nResult ) { - sal_Char const sSlash[] = "/"; + char const sSlash[] = "/"; INetURLObject aURL( aStrURL, INetProtocol::File ); OUString aStrName; diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 55548e99835a..3ac1ee03318d 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -25,8 +25,8 @@ #include <hldoctp.hxx> #include <hlmarkwn_def.hxx> -sal_Char const sHash[] = "#"; -sal_Char const sFileScheme[] = INET_FILE_SCHEME; +char const sHash[] = "#"; +char const sFileScheme[] = INET_FILE_SCHEME; /************************************************************************* |* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index fda37be4a3cd..f2deeb9b3c78 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -23,8 +23,8 @@ #include <hlinettp.hxx> #include <hlmarkwn_def.hxx> -sal_Char const sAnonymous[] = "anonymous"; -sal_Char const sFTPScheme[] = INET_FTP_SCHEME; +char const sAnonymous[] = "anonymous"; +char const sFTPScheme[] = INET_FTP_SCHEME; /************************************************************************* |* diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 002cea21ed32..5017aeeabfe8 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -34,9 +34,9 @@ typedef std::unordered_map< OUString, std::pair< OUString, OUString > > EventsHa struct EventDisplayName { - const sal_Char* pAsciiEventName; + const char* pAsciiEventName; const char* pEventResourceID; - EventDisplayName(const sal_Char* pAsciiName, const char* pResId) + EventDisplayName(const char* pAsciiName, const char* pResId) : pAsciiEventName(pAsciiName) , pEventResourceID(pResId) { diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 07d68df2dd65..9dfba2928e7b 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -41,8 +41,8 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::frame; using namespace com::sun::star::beans; -const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation"; -const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; +const char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation"; +const char cCharacterCompressionType[] = "CharacterCompressionType"; namespace { diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index dca1b491932f..cda33995205b 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -64,10 +64,10 @@ using namespace css::uno; using namespace css::linguistic2; using namespace css::beans; -static const sal_Char cSpell[] = SN_SPELLCHECKER; -static const sal_Char cGrammar[] = SN_GRAMMARCHECKER; -static const sal_Char cHyph[] = SN_HYPHENATOR; -static const sal_Char cThes[] = SN_THESAURUS; +static const char cSpell[] = SN_SPELLCHECKER; +static const char cGrammar[] = SN_GRAMMARCHECKER; +static const char cHyph[] = SN_HYPHENATOR; +static const char cThes[] = SN_THESAURUS; // static ---------------------------------------------------------------- diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 263b9f08b70e..fb2da5a00b31 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -537,7 +537,7 @@ void SvxCharNamePage::FillStyleBox_Impl(const weld::Widget& rNameBox) // additional entries for the search: // "not bold" and "not italic" OUString aEntry = m_pImpl->m_aNoStyleText; - const sal_Char sS[] = "%1"; + const char sS[] = "%1"; aEntry = aEntry.replaceFirst( sS, pFontList->GetBoldStr() ); m_pImpl->m_nExtraEntryPos = pStyleBox->get_count(); pStyleBox->append_text( aEntry ); |