diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 11:54:43 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 14:18:55 +0100 |
commit | f0106e19303a3806a375833e2100538506ccbc0a (patch) | |
tree | 2f63b5e1de568d1c568be0575c193ec0ea804947 /codemaker | |
parent | 97d736d27435fb26d5609000f77bd79ece08572e (diff) |
sal_Char->char in canvas..codemaker
Change-Id: Iaf46b42a17bc00da0f86daeafea7b5346c4a6360
Reviewed-on: https://gerrit.libreoffice.org/85372
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'codemaker')
-rw-r--r-- | codemaker/source/codemaker/global.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
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<sal_Int32>(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; } |