diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 09:50:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 10:35:21 +0100 |
commit | 5b97250bfc158fcd2726a670af710eb6a9235490 (patch) | |
tree | 6c35aead255afbb346c2167933db1ebc7661b3b3 /lotuswordpro | |
parent | b2098c3ac42f761306e5e565a9c96185e8d2cd41 (diff) |
sal_Char->char in lotuswordpro..odk
Change-Id: I5a7bd149554d24276a67437b654f8ffd2610a276
Reviewed-on: https://gerrit.libreoffice.org/85478
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/explode.cxx | 14 | ||||
-rw-r--r-- | lotuswordpro/source/filter/explode.hxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptools.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfbase64.cxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx index 1815e406ea93..017bd476139b 100644 --- a/lotuswordpro/source/filter/explode.cxx +++ b/lotuswordpro/source/filter/explode.cxx @@ -334,7 +334,7 @@ sal_Int32 Decompression::explode() * @descr bits to string * @return */ -void Decompression::ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen) +void Decompression::ToString(sal_uInt32 nBits, char *pChar, sal_uInt32 nLen) { sal_uInt32 nBit; for (sal_uInt32 i=nLen; i > 0; i--) @@ -364,7 +364,7 @@ sal_uInt32 Decompression::Decode(HuffmanTreeNode * pRoot) nReadAlready = (nReadAlready << 1) | (nRead & 0x01); - sal_Char sCode[16]; + char sCode[16]; ToString(nReadAlready, sCode, i); nRet = pRoot->QueryValue(sCode); if (nRet != 0xffffffff) @@ -456,13 +456,13 @@ HuffmanTreeNode::~HuffmanTreeNode() { } -HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const sal_Char * pInCode) +HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const char * pInCode) { HuffmanTreeNode *pNew = new HuffmanTreeNode(nValue); std::string aCode(pInCode); // query its parents - const sal_Char cLast = aCode.back(); + const char cLast = aCode.back(); aCode.pop_back(); HuffmanTreeNode * pParent = QueryNode(aCode.c_str()); if (!pParent) @@ -477,14 +477,14 @@ HuffmanTreeNode * HuffmanTreeNode::InsertNode(sal_uInt32 nValue, const sal_Char return pNew; } -HuffmanTreeNode * HuffmanTreeNode::QueryNode(const sal_Char * pCode) +HuffmanTreeNode * HuffmanTreeNode::QueryNode(const char * pCode) { sal_uInt32 nLen = strlen(pCode); HuffmanTreeNode * pNode = this; // this is the root for(sal_uInt32 i=0; i<nLen && pNode; i++) { - sal_Char cChar= pCode[i]; + char cChar= pCode[i]; if (cChar == '0') { pNode = pNode->left.get(); @@ -497,7 +497,7 @@ HuffmanTreeNode * HuffmanTreeNode::QueryNode(const sal_Char * pCode) return pNode; } -sal_uInt32 HuffmanTreeNode::QueryValue(const sal_Char * pCode) +sal_uInt32 HuffmanTreeNode::QueryValue(const char * pCode) { HuffmanTreeNode * pNode =QueryNode(pCode); if (pNode) diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx index a313c55dd2bd..95f45f2ef821 100644 --- a/lotuswordpro/source/filter/explode.hxx +++ b/lotuswordpro/source/filter/explode.hxx @@ -69,9 +69,9 @@ class HuffmanTreeNode public: explicit HuffmanTreeNode(sal_uInt32 value = 0xffffffff) ; ~HuffmanTreeNode() ; - HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const sal_Char * pInCode); - HuffmanTreeNode * QueryNode(const sal_Char *pCode); - sal_uInt32 QueryValue(const sal_Char *pCode); + HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const char * pInCode); + HuffmanTreeNode * QueryNode(const char *pCode); + sal_uInt32 QueryValue(const char *pCode); }; /** @@ -116,7 +116,7 @@ public: void ConstructTree1(); void ConstructTree2(); void fillArray(); - static void ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen); + static void ToString(sal_uInt32 nBits, char *pChar, sal_uInt32 nLen); }; #endif diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx index 8ce2e9676d63..6c84aaab51eb 100644 --- a/lotuswordpro/source/filter/lwptools.cxx +++ b/lotuswordpro/source/filter/lwptools.cxx @@ -89,7 +89,7 @@ void LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, if( !IsUnicodePacked(pObjStrm, strlen) ) { sal_uInt16 len = 0; - sal_Char buf[1024]; + char buf[1024]; while(strlen) { @@ -104,7 +104,7 @@ void LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, } else { - sal_Char buf[1024]; + char buf[1024]; sal_Unicode unibuf[1024]; sal_uInt8 readbyte; sal_uInt16 readword; diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.cxx b/lotuswordpro/source/filter/xfilter/xfbase64.cxx index 3a1c82778f48..1b7224a248ce 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.cxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.cxx @@ -61,7 +61,7 @@ #include <memory> #include "xfbase64.hxx" -const sal_Char aBase64EncodeTable[] = +const char aBase64EncodeTable[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', @@ -72,7 +72,7 @@ const sal_Char aBase64EncodeTable[] = * @descr Encode 3 byte to 4 byte. * Please refer to RFC to get the base64 algorithm. */ -static void Encode_(const sal_uInt8 *src, sal_Char* dest) +static void Encode_(const sal_uInt8 *src, char* dest) { sal_Int32 nBinaer = (src[ 0] << 16) + (src[1] << 8) + @@ -96,7 +96,7 @@ static void Encode_(const sal_uInt8 *src, sal_Char* dest) */ OUString XFBase64::Encode(sal_uInt8 const *buf, sal_Int32 len) { - std::unique_ptr<sal_Char[]> buffer; + std::unique_ptr<char[]> buffer; sal_Int32 nNeeded; sal_Int32 cycles = len/3; sal_Int32 remain = len%3; @@ -105,7 +105,7 @@ OUString XFBase64::Encode(sal_uInt8 const *buf, sal_Int32 len) nNeeded = cycles*4; else nNeeded = (cycles+1)*4; - buffer.reset(new sal_Char[nNeeded+1]); + buffer.reset(new char[nNeeded+1]); memset(buffer.get(), 0, nNeeded+1); diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx index 9a9befd877dc..6ccb241496fd 100644 --- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx @@ -97,7 +97,7 @@ void XFTextContent::ToXml(IXFStream *pStrm) pStrm->Characters(sSubString.copy(0,nIndex)); for (j=nIndex+1;j<nSize-i;j++) { - if (sSubString[j] != sal_Char(' ')) + if (sSubString[j] != ' ') break; } IXFAttrList *pAttrList = pStrm->GetAttrList(); |