diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 14:23:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 17:40:23 +0100 |
commit | 685c9642c190c8d2585f46c058e950d279e0aa8f (patch) | |
tree | ede574ce54d62fcda3ae12a81c9dd3b7c64e7172 /cui/source | |
parent | 9e5cbcf90f15f46f84900a58bcaee437b98587f6 (diff) |
sal_Char->char in cppcanvas..cui
Change-Id: I7e9fa7011f1e0bf143f86055718c772caebf8ee6
Reviewed-on: https://gerrit.libreoffice.org/85397
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source')
-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 |
7 files changed, 14 insertions, 14 deletions
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 ); |