diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 08:22:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 08:12:46 +0100 |
commit | a56955a4b323dd3e78ea49f2b3f3eebca5d5586c (patch) | |
tree | e2b59e7e47c8f54543d495e2849eec728d820e29 | |
parent | 7b1f3135de3211b0b750571ecdcd9dcab752b544 (diff) |
sal_Char->char in editeng..eventattacher
Change-Id: Ia9c736042a07a17377db6d88c5bcd2b468e98777
Reviewed-on: https://gerrit.libreoffice.org/85471
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | editeng/source/misc/svxacorr.cxx | 14 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/register.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/oleregister.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/test/MainThreadExecutor/register.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/test/mtexecutor/mteregister.cxx | 2 | ||||
-rw-r--r-- | embedserv/source/embed/register.cxx | 2 | ||||
-rw-r--r-- | emfio/source/reader/emfreader.cxx | 2 | ||||
-rw-r--r-- | eventattacher/source/eventattacher.cxx | 2 | ||||
-rw-r--r-- | include/editeng/svxacorr.hxx | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index cad718e86f6a..8160a448925f 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -105,11 +105,11 @@ namespace o3tl { } static const sal_Unicode cNonBreakingSpace = 0xA0; -static const sal_Char pXMLImplWrdStt_ExcptLstStr[] = "WordExceptList.xml"; -static const sal_Char pXMLImplCplStt_ExcptLstStr[] = "SentenceExceptList.xml"; -static const sal_Char pXMLImplAutocorr_ListStr[] = "DocumentList.xml"; +static const char pXMLImplWrdStt_ExcptLstStr[] = "WordExceptList.xml"; +static const char pXMLImplCplStt_ExcptLstStr[] = "SentenceExceptList.xml"; +static const char pXMLImplAutocorr_ListStr[] = "DocumentList.xml"; -static const sal_Char +static const char /* also at these beginnings - Brackets and all kinds of begin characters */ sImplSttSkipChars[] = "\"\'([{\x83\x84\x89\x91\x92\x93\x94", /* also at these ends - Brackets and all kinds of begin characters */ @@ -180,7 +180,7 @@ static bool lcl_IsSymbolChar( CharClass const & rCC, const OUString& rTxt, return false; } -static bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c ) +static bool lcl_IsInAsciiArr( const char* pArr, const sal_Unicode c ) { bool bRet = false; for( ; *pArr; ++pArr ) @@ -2024,7 +2024,7 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp() void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( std::unique_ptr<SvStringsISortDtor>& rpLst, - const sal_Char* pStrmName, + const char* pStrmName, tools::SvRef<SotStorage>& rStg) { if( rpLst ) @@ -2094,7 +2094,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( const SvStringsISortDtor& rLst, - const sal_Char* pStrmName, + const char* pStrmName, tools::SvRef<SotStorage> const &rStg, bool bConvert ) { diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index d6fc905078c2..66e2ad13a647 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -499,7 +499,7 @@ std::unique_ptr<SvxFieldData> SvxUnoTextField::CreateFieldData() const throw() else aContent = mpImpl->msString2; - sal_Int32 nPos = aContent.lastIndexOf( sal_Char(' '), 0 ); + sal_Int32 nPos = aContent.lastIndexOf( ' ', 0 ); if( nPos > 0 ) { aFirstName = aContent.copy( 0, nPos ); diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx index adb377544625..148fd5ad534f 100644 --- a/embeddedobj/source/commonembedding/register.cxx +++ b/embeddedobj/source/commonembedding/register.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; extern "C" { SAL_DLLPUBLIC_EXPORT void * embobj_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx index 7af86e8db9ae..cd3f5915807a 100644 --- a/embeddedobj/source/msole/oleregister.cxx +++ b/embeddedobj/source/msole/oleregister.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; extern "C" { SAL_DLLPUBLIC_EXPORT void * emboleobj_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx index 4c5dcb6281ab..777222e5d8ce 100644 --- a/embeddedobj/test/MainThreadExecutor/register.cxx +++ b/embeddedobj/test/MainThreadExecutor/register.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx index d3fffbb03699..76d8200551f1 100644 --- a/embeddedobj/test/mtexecutor/mteregister.cxx +++ b/embeddedobj/test/mtexecutor/mteregister.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index 8f593d877a1f..46b18d5fd949 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -50,7 +50,7 @@ static uno::Sequence< OUString > EmbedServer_getSupportedServiceNames() throw() extern "C" { -SAL_DLLPUBLIC_EXPORT void * emser_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * emser_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 2c48d3e6ce23..d0c975c2cc4c 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1734,7 +1734,7 @@ namespace emfio { if ( nLen <= static_cast<sal_Int32>( mnEndPos - mpInputStream->Tell() ) ) { - std::unique_ptr<sal_Char[]> pBuf(new sal_Char[ nLen ]); + std::unique_ptr<char[]> pBuf(new char[ nLen ]); mpInputStream->ReadBytes(pBuf.get(), nLen); aText = OUString(pBuf.get(), nLen, GetCharSet()); } diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 1a8af4411fd4..6594d66944dc 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -865,7 +865,7 @@ Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventList extern "C" { SAL_DLLPUBLIC_EXPORT void * evtatt_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * ) + const char * pImplName, void * pServiceManager, void * ) { void * pRet = nullptr; diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index cde80d6aca83..e0624aaaf8f0 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -182,10 +182,10 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists bool IsFileChanged_Imp(); void LoadXMLExceptList_Imp( std::unique_ptr<SvStringsISortDtor>& rpLst, - const sal_Char* pStrmName, + const char* pStrmName, tools::SvRef<SotStorage>& rStg); static void SaveExceptList_Imp( const SvStringsISortDtor& rLst, - const sal_Char* pStrmName, + const char* pStrmName, tools::SvRef<SotStorage> const & rStg, bool bConvert = false); |