From f0106e19303a3806a375833e2100538506ccbc0a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 18 Dec 2019 11:54:43 +0200 Subject: sal_Char->char in canvas..codemaker Change-Id: Iaf46b42a17bc00da0f86daeafea7b5346c4a6360 Reviewed-on: https://gerrit.libreoffice.org/85372 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/source/cairo/cairo_services.cxx | 2 +- canvas/source/directx/dx_canvas.cxx | 2 +- canvas/source/directx/dx_spritecanvas.cxx | 2 +- canvas/source/opengl/ogl_spritecanvas.cxx | 2 +- canvas/source/simplecanvas/simplecanvasimpl.cxx | 2 +- canvas/source/vcl/services.cxx | 2 +- .../source/controller/main/ChartDropTargetHelper.cxx | 2 +- .../controller/main/FeatureCommandDispatchBase.cxx | 2 +- .../controller/main/FeatureCommandDispatchBase.hxx | 2 +- chart2/source/inc/CommonFunctors.hxx | 4 ++-- chart2/workbench/addin/sampleaddin.cxx | 2 +- codemaker/source/codemaker/global.cxx | 20 ++++++++++---------- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index d9e2a4318816..c90ed7cfc7df 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -65,7 +65,7 @@ namespace cairocanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* cairocanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* cairocanvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&cairocanvas::cairoCanvasDecl, &cairocanvas::cairoSpriteCanvasDecl} ); diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 39a319f31cff..3aace1190f08 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -246,7 +246,7 @@ namespace dxcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* gdipluscanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* gdipluscanvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxCanvasDecl, &dxcanvas::dxBitmapCanvasDecl} ); diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 5d8243bc121d..e4ef8a5764d6 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -189,7 +189,7 @@ namespace dxcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* directx9canvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* directx9canvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&dxcanvas::dxSpriteCanvasDecl} ); diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 954ecf03bcf6..1c48812463f3 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -170,7 +170,7 @@ namespace oglcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* oglcanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* oglcanvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&oglcanvas::oglSpriteCanvasDecl} ); diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index cf5c426812fa..902c2c6a03d2 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -373,7 +373,7 @@ namespace } // The C shared lib entry points -extern "C" SAL_DLLPUBLIC_EXPORT void* simplecanvas_component_getFactory( sal_Char const* pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void* simplecanvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&simpleCanvasDecl} ); diff --git a/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx index e5167fbef49d..7b130c6fda32 100644 --- a/canvas/source/vcl/services.cxx +++ b/canvas/source/vcl/services.cxx @@ -60,7 +60,7 @@ namespace vclcanvas // The C shared lib entry points extern "C" -SAL_DLLPUBLIC_EXPORT void* vclcanvas_component_getFactory( sal_Char const* pImplName, +SAL_DLLPUBLIC_EXPORT void* vclcanvas_component_getFactory( char const* pImplName, void*, void* ) { return sdecl::component_getFactoryHelper( pImplName, {&vclcanvas::vclCanvasDecl, &vclcanvas::vclSpriteCanvasDecl} ); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx index 6ef4ff484539..15272dfc5963 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.cxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx @@ -40,7 +40,7 @@ std::vector< OUString > lcl_getStringsFromByteSequence( { std::vector< OUString > aResult; const sal_Int32 nLength = aByteSequence.getLength(); - const sal_Char * pBytes( reinterpret_cast< const sal_Char* >( aByteSequence.getConstArray())); + const char * pBytes( reinterpret_cast< const char* >( aByteSequence.getConstArray())); sal_Int32 nStartPos = 0; for( sal_Int32 nPos=0; nPosCommandGroup. */ - void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, + void implDescribeSupportedFeature( const char* pAsciiCommandURL, sal_uInt16 nId, sal_Int16 nGroup ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index e8818c67c972..d9daef13d574 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -75,7 +75,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString * pDouble, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, // use maximum decimal places available - sal_Char( '.' ), // decimal separator + '.', // decimal separator true // remove trailing zeros ); } @@ -118,7 +118,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, // use maximum decimal places available - static_cast< sal_Char >( '.' ), + '.', true ); } diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 7376b872b9c9..44e04a6b9e3a 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -62,7 +62,7 @@ sal_Bool SAL_CALL component_writeInfo( } 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; diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 5005882bd765..8d9b5907252f 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -100,7 +100,7 @@ OString createFileNameFromType( const OString& destination, OString fileName(fileNameBuf.makeStringAndClear()); - sal_Char token; + char token; #ifdef SAL_UNX fileName = fileName.replace('\\', '/'); token = '/'; @@ -164,15 +164,15 @@ static bool checkFileContent(const OString& targetFileName, const OString& tmpFi if (target != nullptr && tmp != nullptr) { - sal_Char buffer1[1024+1]; - sal_Char buffer2[1024+1]; + char buffer1[1024+1]; + char buffer2[1024+1]; sal_Int32 n1 = 0; sal_Int32 n2 = 0; while ( !bFindChanges && !feof(target) && !feof(tmp)) { - n1 = fread(buffer1, sizeof(sal_Char), 1024, target); - n2 = fread(buffer2, sizeof(sal_Char), 1024, tmp); + n1 = fread(buffer1, sizeof(char), 1024, target); + n2 = fread(buffer2, sizeof(char), 1024, tmp); if ( n1 != n2 ) bFindChanges = true; @@ -325,7 +325,7 @@ bool FileStream::write(void const * buffer, sal_uInt64 size) { FileStream &operator<<(FileStream& o, sal_uInt32 i) { sal_uInt64 writtenBytes; OString s = OString::number(static_cast(i)); - osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); + osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(char), &writtenBytes); return o; } FileStream &operator<<(FileStream& o, char const * s) { @@ -335,24 +335,24 @@ FileStream &operator<<(FileStream& o, char const * s) { } FileStream &operator<<(FileStream& o, OString const * s) { sal_uInt64 writtenBytes; - osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); + osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(char), &writtenBytes); return o; } FileStream &operator<<(FileStream& o, const OString& s) { sal_uInt64 writtenBytes; - osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); + osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(char), &writtenBytes); return o; } FileStream &operator<<(FileStream& o, OStringBuffer const * s) { sal_uInt64 writtenBytes; - osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); + osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(char), &writtenBytes); return o; } FileStream &operator<<(FileStream& o, const OStringBuffer& s) { sal_uInt64 writtenBytes; osl_writeFile( - o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); + o.m_file, s.getStr(), s.getLength() * sizeof(char), &writtenBytes); return o; } -- cgit