diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 10:36:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 17:28:50 +0100 |
commit | 56063d30628ee2497a7c559d7de42d26e9cfc8ae (patch) | |
tree | 2a48a93cfee5c6d1e7e942361b5d040ac04ce663 /unotools | |
parent | 122598af564082786f01b4eafdb9f09f0cffdf5f (diff) |
sal_Char->char in unoxml
Change-Id: Ie14ea8349e5dc698a11b3447429b3ca7cbab9bb3
Reviewed-on: https://gerrit.libreoffice.org/85774
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 2 | ||||
-rw-r--r-- | unotools/source/i18n/resmgr.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/syslocale.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/unotoolsservices.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 01a974bcecf2..9d4f711938d3 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -204,7 +204,7 @@ namespace utl OConfigurationValueContainer::OConfigurationValueContainer( const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety, - const sal_Char* _pConfigLocation, const sal_Int32 _nLevels ) + const char* _pConfigLocation, const sal_Int32 _nLevels ) :m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) ) { implConstruct( OUString::createFromAscii( _pConfigLocation ), _nLevels ); @@ -229,7 +229,7 @@ namespace utl "Could not access the configuration node located at " << _rConfigLocation); } - void OConfigurationValueContainer::registerExchangeLocation( const sal_Char* _pRelativePath, + void OConfigurationValueContainer::registerExchangeLocation( const char* _pRelativePath, void* _pContainer, const Type& _rValueType ) { // checks... diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 0bbd036b6255..21ac370ba7ab 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -273,7 +273,7 @@ uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames() sal_Int32 nIdx = 0; for (sal_Int32 i = 0; i < nMax; ++i) { - const sal_Char *pFullPropName = aNamesToHdl[i].pFullPropName; + const char *pFullPropName = aNamesToHdl[i].pFullPropName; if (pFullPropName) pNames[ nIdx++ ] = OUString::createFromAscii( pFullPropName ); } diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 82f63887932d..650ec5586b8d 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -714,7 +714,7 @@ public: } -const sal_Char cUserDefinedSettings[] = "UserDefinedSettings"; +const char cUserDefinedSettings[] = "UserDefinedSettings"; SvtLoadOptions_Impl::SvtLoadOptions_Impl() : ConfigItem( "Office.Common/Load" ) diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index 47069489aa41..4e899aa9ea26 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -112,7 +112,7 @@ static int IgnoringCrtReportHook(int reportType, wchar_t *message, int * /* retu namespace Translate { - std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale) + std::locale Create(const char* pPrefixName, const LanguageTag& rLocale) { static std::unordered_map<OString, std::locale> aCache; OString sIdentifier = rLocale.getGlibcLocaleString(".UTF-8").toUtf8(); diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index cad884f71d1f..b80a89aff396 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -187,7 +187,7 @@ const LanguageTag& SvtSysLocale::GetUILanguageTag() const // static rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding() { - const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( + const char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( osl_getThreadTextEncoding() ); if ( !pCharSet ) { diff --git a/unotools/source/misc/unotoolsservices.cxx b/unotools/source/misc/unotoolsservices.cxx index 4804e9ab5042..4d1d897f15e5 100644 --- a/unotools/source/misc/unotoolsservices.cxx +++ b/unotools/source/misc/unotoolsservices.cxx @@ -14,7 +14,7 @@ namespace sdecl = ::comphelper::service_decl; extern "C" SAL_DLLPUBLIC_EXPORT void* utl_component_getFactory( - sal_Char const* pImplName, void*, void*) + char const* pImplName, void*, void*) { return sdecl::component_getFactoryHelper( pImplName, {&OTempFileServiceDecl, &ServiceDocumenterDecl}); |