From 8b550895b3007eecfbcf02573d8eb5ed57a45c62 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 22 Dec 2019 17:01:45 +0200 Subject: sal_Char->char in sot..store Change-Id: Ia133c1a7549d81f2e88e34ab7e6c9ea578c745ae Reviewed-on: https://gerrit.libreoffice.org/85702 Tested-by: Jenkins Reviewed-by: Noel Grandin --- store/source/stordata.hxx | 6 +++--- store/source/stordir.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'store/source') diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx index 08251cf6e62b..7662bbe3bdbe 100644 --- a/store/source/stordata.hxx +++ b/store/source/stordata.hxx @@ -279,11 +279,11 @@ struct OStorePageNameBlock G m_aGuard; K m_aKey; sal_uInt32 m_nAttrib = 0; - sal_Char m_pData[STORE_MAXIMUM_NAMESIZE] = {}; + char m_pData[STORE_MAXIMUM_NAMESIZE] = {}; /** size. */ - static const size_t theSize = sizeof(G) + sizeof(K) + sizeof(sal_uInt32) + sizeof(sal_Char[STORE_MAXIMUM_NAMESIZE]); + static const size_t theSize = sizeof(G) + sizeof(K) + sizeof(sal_uInt32) + sizeof(char[STORE_MAXIMUM_NAMESIZE]); /** Construction. */ @@ -629,7 +629,7 @@ public: sal_uInt32 path() const { page const & rPage = PAGE(); - const sal_Char * pszName = rPage.m_aNameBlock.m_pData; + const char * pszName = rPage.m_aNameBlock.m_pData; sal_uInt32 nPath = store::ntohl(rPage.m_aNameBlock.m_aKey.m_nHigh); return rtl_crc32 (nPath, pszName, rtl_str_getLength(pszName)); } diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx index 15d3945e0774..7688194069de 100644 --- a/store/source/stordir.cxx +++ b/store/source/stordir.cxx @@ -45,7 +45,7 @@ using namespace store; */ static sal_Size convertTextToUnicode ( rtl_TextToUnicodeConverter hConverter, - const sal_Char *pSrcBuffer, sal_Size nSrcLength, + const char *pSrcBuffer, sal_Size nSrcLength, sal_Unicode *pDstBuffer, sal_Size nDstLength) { sal_uInt32 nCvtInfo = 0; @@ -178,7 +178,7 @@ storeError OStoreDirectory_Impl::iterate (storeFindData &rFindData) inode_holder_type xNode (aPage.get()); // Setup FindData. - sal_Char *p = xNode->m_aNameBlock.m_pData; + char *p = xNode->m_aNameBlock.m_pData; sal_Int32 n = rtl_str_getLength (p); sal_Int32 k = rFindData.m_nLength; -- cgit