sal_Char->char in scaddins..sdext

Change-Id: If2456800ace3696c2582e19a4c8612fee7d77f90
Reviewed-on: https://gerrit.libreoffice.org/85700
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 41 insertions, 41 deletions

diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index b191462eef15..95d083ab9439 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -98,7 +98,7 @@ void OdfEmitter::write( const OUString& rText )
     const OString aStr = OUStringToOString(rText,RTL_TEXTENCODING_UTF8);
     const sal_Int32 nLen( aStr.getLength() );
     m_aBuf.realloc( nLen );
-    const sal_Char* pStr = aStr.getStr();
+    const char* pStr = aStr.getStr();
     std::copy(pStr,pStr+nLen,m_aBuf.getArray());
 
     m_xOutput->writeBytes(m_aBuf);
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index f164ac0a5ae7..88cb3e1789ab 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -157,27 +157,27 @@ PDFEntry* PDFName::clone() const
 OUString PDFName::getFilteredName() const
 {
     OStringBuffer aFilter( m_aName.getLength() );
-    const sal_Char* pStr = m_aName.getStr();
+    const char* pStr = m_aName.getStr();
     unsigned int nLen = m_aName.getLength();
     for( unsigned int i = 0; i < nLen; i++ )
     {
         if( (i < nLen - 3) && pStr[i] == '#' )
         {
-            sal_Char rResult = 0;
+            char rResult = 0;
             i++;
             if( pStr[i] >= '0' && pStr[i] <= '9' )
-                rResult = sal_Char( pStr[i]-'0' ) << 4;
+                rResult = char( pStr[i]-'0' ) << 4;
             else if( pStr[i] >= 'a' && pStr[i] <= 'f' )
-                rResult = sal_Char( pStr[i]-'a' + 10 ) << 4;
+                rResult = char( pStr[i]-'a' + 10 ) << 4;
             else if( pStr[i] >= 'A' && pStr[i] <= 'F' )
-                rResult = sal_Char( pStr[i]-'A' + 10 ) << 4;
+                rResult = char( pStr[i]-'A' + 10 ) << 4;
             i++;
             if( pStr[i] >= '0' && pStr[i] <= '9' )
-                rResult |= sal_Char( pStr[i]-'0' );
+                rResult |= char( pStr[i]-'0' );
             else if( pStr[i] >= 'a' && pStr[i] <= 'f' )
-                rResult |= sal_Char( pStr[i]-'a' + 10 );
+                rResult |= char( pStr[i]-'a' + 10 );
             else if( pStr[i] >= 'A' && pStr[i] <= 'F' )
-                rResult |= sal_Char( pStr[i]-'A' + 10 );
+                rResult |= char( pStr[i]-'A' + 10 );
             aFilter.append( rResult );
         }
         else
@@ -204,7 +204,7 @@ bool PDFString::emit( EmitContext& rWriteContext ) const
                          reinterpret_cast<sal_uInt8 *>(const_cast<char *>(aFiltered.getStr())),
                          pEData->m_nDecryptObject, pEData->m_nDecryptGeneration );
         // check for string or hex string
-        const sal_Char* pStr = aFiltered.getStr();
+        const char* pStr = aFiltered.getStr();
         if( aFiltered.getLength() > 1 &&
            ( (static_cast<unsigned char>(pStr[0]) == 0xff && static_cast<unsigned char>(pStr[1]) == 0xfe) ||
              (static_cast<unsigned char>(pStr[0]) == 0xfe && static_cast<unsigned char>(pStr[1]) == 0xff) ) )
@@ -247,10 +247,10 @@ OString PDFString::getFilteredString() const
     int nLen = m_aString.getLength();
     OStringBuffer aBuf( nLen );
 
-    const sal_Char* pStr = m_aString.getStr();
+    const char* pStr = m_aString.getStr();
     if( *pStr == '(' )
     {
-        const sal_Char* pRun = pStr+1;
+        const char* pRun = pStr+1;
         while( pRun - pStr < nLen-1 )
         {
             if( *pRun == '\\' )
@@ -258,7 +258,7 @@ OString PDFString::getFilteredString() const
                 pRun++;
                 if( pRun - pStr < nLen )
                 {
-                    sal_Char aEsc = 0;
+                    char aEsc = 0;
                     if( *pRun == 'n' )
                         aEsc = '\n';
                     else if( *pRun == 'r' )
@@ -306,25 +306,25 @@ OString PDFString::getFilteredString() const
     }
     else if( *pStr == '<' )
     {
-        const sal_Char* pRun = pStr+1;
+        const char* pRun = pStr+1;
         while( *pRun != '>' && pRun - pStr < nLen )
         {
-            sal_Char rResult = 0;
+            char rResult = 0;
             if( *pRun >= '0' && *pRun <= '9' )
-                rResult = sal_Char( ( *pRun-'0' ) << 4 );
+                rResult = char( ( *pRun-'0' ) << 4 );
             else if( *pRun >= 'a' && *pRun <= 'f' )
-                rResult = sal_Char( ( *pRun-'a' + 10 ) << 4 );
+                rResult = char( ( *pRun-'a' + 10 ) << 4 );
             else if( *pRun >= 'A' && *pRun <= 'F' )
-                rResult = sal_Char( ( *pRun-'A' + 10 ) << 4 );
+                rResult = char( ( *pRun-'A' + 10 ) << 4 );
             pRun++;
             if( *pRun != '>' && pRun - pStr < nLen )
             {
                 if( *pRun >= '0' && *pRun <= '9' )
-                    rResult |= sal_Char( *pRun-'0' );
+                    rResult |= char( *pRun-'0' );
                 else if( *pRun >= 'a' && *pRun <= 'f' )
-                    rResult |= sal_Char( *pRun-'a' + 10 );
+                    rResult |= char( *pRun-'a' + 10 );
                 else if( *pRun >= 'A' && *pRun <= 'F' )
-                    rResult |= sal_Char( *pRun-'A' + 10 );
+                    rResult |= char( *pRun-'A' + 10 );
             }
             pRun++;
             aBuf.append( rResult );
@@ -1101,12 +1101,12 @@ static const sal_uInt8 nPadString[32] =
     0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A
 };
 
-static void pad_or_truncate_to_32( const OString& rStr, sal_Char* pBuffer )
+static void pad_or_truncate_to_32( const OString& rStr, char* pBuffer )
 {
     int nLen = rStr.getLength();
     if( nLen > 32 )
         nLen = 32;
-    const sal_Char* pStr = rStr.getStr();
+    const char* pStr = rStr.getStr();
     memcpy( pBuffer, pStr, nLen );
     int i = 0;
     while( nLen < 32 )
@@ -1118,7 +1118,7 @@ static sal_uInt32 password_to_key( const OString& rPwd, sal_uInt8* pOutKey, PDFF
 {
     // see PDF reference 1.4 Algorithm 3.2
     // encrypt pad string
-    sal_Char aPadPwd[ENCRYPTION_BUF_LEN];
+    char aPadPwd[ENCRYPTION_BUF_LEN];
     pad_or_truncate_to_32( rPwd, aPadPwd );
     ::comphelper::Hash aDigest(::comphelper::HashType::MD5);
     aDigest.update(reinterpret_cast<unsigned char const*>(aPadPwd), sizeof(aPadPwd));
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 03dd5aca4dea..f973e24931c0 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -62,7 +62,7 @@ class StringEmitContext : public EmitContext
 
     virtual bool write( const void* pBuf, unsigned int nLen ) throw() override
     {
-        m_aBuf.append( static_cast<const sal_Char*>(pBuf), nLen );
+        m_aBuf.append( static_cast<const char*>(pBuf), nLen );
         return true;
     }
     virtual unsigned int getCurPos() throw() override { return m_aBuf.getLength(); }
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index 410776e5011c..ee3282c5521e 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -77,8 +77,8 @@ namespace
 
     struct ComponentDescription
     {
-        const sal_Char*     pAsciiServiceName;
-        const sal_Char*     pAsciiImplementationName;
+        const char*               pAsciiServiceName;
+        const char*               pAsciiImplementationName;
         ComponentFactory const    pFactory;
 
         ComponentDescription()
@@ -87,7 +87,7 @@ namespace
             ,pFactory( nullptr )
         {
         }
-        ComponentDescription( const sal_Char* _pAsciiServiceName, const sal_Char* _pAsciiImplementationName, ComponentFactory _pFactory )
+        ComponentDescription( const char* _pAsciiServiceName, const char* _pAsciiImplementationName, ComponentFactory _pFactory )
             :pAsciiServiceName( _pAsciiServiceName )
             ,pAsciiImplementationName( _pAsciiImplementationName )
             ,pFactory( _pFactory )
@@ -110,7 +110,7 @@ namespace
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* pdfimport_component_getFactory(
-    const sal_Char* pImplementationName,
+    const char* pImplementationName,
     SAL_UNUSED_PARAMETER void* /*pServiceManager*/,
     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ )
 {
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index bd9fddc5cd56..a171b5a3bdac 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -74,7 +74,7 @@ typedef ::cppu::WeakComponentImplHelper<
 
         virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) override
         {
-            maBuffer.append(reinterpret_cast<const sal_Char *>(aData.getConstArray()), aData.getLength());
+            maBuffer.append(reinterpret_cast<const char *>(aData.getConstArray()), aData.getLength());
         }
 
         virtual void SAL_CALL flush() override
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 87a831d82ba1..2be33dcede42 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -36,7 +36,7 @@ namespace pdfi
 namespace
 {
 
-static const sal_Char aBase64EncodeTable[] =
+static 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',
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 5074258605a5..e8932f16f3b7 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -204,15 +204,15 @@ public:
 OString lcl_unescapeLineFeeds(const OString& i_rStr)
 {
     const size_t nOrigLen(sal::static_int_cast<size_t>(i_rStr.getLength()));
-    const sal_Char* const pOrig(i_rStr.getStr());
-    std::unique_ptr<sal_Char[]> pBuffer(new sal_Char[nOrigLen + 1]);
+    const char* const pOrig(i_rStr.getStr());
+    std::unique_ptr<char[]> pBuffer(new char[nOrigLen + 1]);
 
-    const sal_Char* pRead(pOrig);
-    sal_Char* pWrite(pBuffer.get());
-    const sal_Char* pCur(pOrig);
+    const char* pRead(pOrig);
+    char* pWrite(pBuffer.get());
+    const char* pCur(pOrig);
     while ((pCur = strchr(pCur, '\\')) != nullptr)
     {
-        const sal_Char cNext(pCur[1]);
+        const char cNext(pCur[1]);
         if (cNext == 'n' || cNext == 'r' || cNext == '\\')
         {
             const size_t nLen(pCur - pRead);
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index fc99cd56fceb..2d8fb4ce6353 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -48,7 +48,7 @@ static const struct ImplementationEntry gServiceEntries[] =
 };
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory(
-        const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+        const char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
 }
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 70e3f57291c6..346e2847f3a7 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -610,8 +610,8 @@ void LineDescriptorList::SplitText (
     const OUString& rsText,
     vector<OUString>& rTextParts)
 {
-    const sal_Char cQuote ('\'');
-    const sal_Char cSeparator (',');
+    const char cQuote ('\'');
+    const char cSeparator (',');
 
     sal_Int32 nIndex (0);
     sal_Int32 nStart (0);
@@ -663,7 +663,7 @@ void LineDescriptorList::FormatText (
             if (PresenterCanvasHelper::GetTextSize(
                 rxFont, *iPart).Width > nMaximalWidth)
             {
-                const sal_Char cSpace (' ');
+                const char cSpace (' ');
 
                 sal_Int32 nIndex (0);
                 sal_Int32 nStart (0);