sal_Char->char in filter

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

24 files changed, 40 insertions, 40 deletions

diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index bf334aaf6d21..edc79b52081e 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -34,7 +34,7 @@ namespace filter{
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
-    filterconfig1_component_getFactory( const sal_Char* pImplementationName,
+    filterconfig1_component_getFactory( const char* pImplementationName,
                                         void* pServiceManager,
                                         void* /* pRegistryKey */ )
 {
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index a0cae19a890f..f5c66e4b5f2d 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -214,7 +214,7 @@ static OUString exportBackground(FlashExporter &aFlashExporter, const Reference<
 }
 
 template <typename TYPE>
-static TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const sal_Char* name, TYPE def)
+static TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const char* name, TYPE def)
 {
     TYPE temp = TYPE();
 
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index 32604cb075f9..9d1ade67cef2 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -32,7 +32,7 @@ using namespace ::swf;
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * flash_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+    const char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = nullptr;
 
diff --git a/filter/source/graphic/Services.cxx b/filter/source/graphic/Services.cxx
index a7abd8828844..49c86b5a8f92 100644
--- a/filter/source/graphic/Services.cxx
+++ b/filter/source/graphic/Services.cxx
@@ -30,7 +30,7 @@ const comphelper::service_decl::ServiceDecl graphicExportFilter(
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* graphicfilter_component_getFactory(
-    sal_Char const* pImplementationName, void*, void*)
+    char const* pImplementationName, void*, void*)
 {
     if ( rtl_str_compare (pImplementationName, GRAPHIC_EXPORT_FILTER_SERVICE) == 0 )
     {
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index dedcbddb0ede..d5d38625761d 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -201,7 +201,7 @@ private:
     void                ImplBmp( Bitmap const *, Bitmap const *, const Point &, double nWidth, double nHeight );
     void                ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice const & rVDev );
     void                ImplSetAttrForText( const Point & rPoint );
-    void                ImplWriteCharacter( sal_Char );
+    void                ImplWriteCharacter( char );
     void                ImplWriteString( const OString&, VirtualDevice const & rVDev, const long* pDXArry, bool bStretch );
     void                ImplDefineFont( const char*, const char* );
 
@@ -1953,7 +1953,7 @@ void PSWriter::ImplBmp( Bitmap const * pBitmap, Bitmap const * pMaskBitmap, cons
     }
 }
 
-void PSWriter::ImplWriteCharacter( sal_Char nChar )
+void PSWriter::ImplWriteCharacter( char nChar )
 {
     switch( nChar )
     {
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index a916f090ea4c..2a6f792c8883 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -695,7 +695,7 @@ sal_uLong PictReader::ReadAndDrawText()
 {
     char        nByteLen;
     sal_uInt32  nLen, nDataLen;
-    sal_Char    sText[256];
+    char        sText[256];
 
     pPict->ReadChar( nByteLen ); nLen=static_cast<sal_uLong>(nByteLen)&0x000000ff;
     nDataLen = nLen + 1;
@@ -1151,7 +1151,7 @@ void PictReader::ReadHeader()
 {
     short y1,x1,y2,x2;
 
-    sal_Char    sBuf[ 2 ];
+    char        sBuf[ 2 ];
     // previous code considers pPict->Tell() as the normal starting position,
     // can we have nStartPos != 0 ?
     sal_uLong   nStartPos = pPict->Tell();
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 89b26b1d32f6..bc2e1f472e17 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3948,9 +3948,9 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
     meBlibType = UNKNOWN;
     mnSize = 0;
 
-    sal_uInt32      nLen = static_cast<sal_uInt32>(rId.getLength());
-    const sal_Char* pData = rId.getStr();
-    GraphicType     eType( rObject.GetType() );
+    sal_uInt32  nLen = static_cast<sal_uInt32>(rId.getLength());
+    const char* pData = rId.getStr();
+    GraphicType eType( rObject.GetType() );
     if (nLen && (eType != GraphicType::NONE))
     {
         mnIdentifier[ 0 ] = rtl_crc32( 0,pData, nLen );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9786e880197c..0fd58f5e1e5d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6605,7 +6605,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool
                     sal_Int32 nDbgLen = nLength - nSkip;
                     if ( nDbgLen )
                     {
-                        std::vector<sal_Char> aData(nDbgLen);
+                        std::vector<char> aData(nDbgLen);
                         pGrStream->ReadBytes(aData.data(), nDbgLen);
                         pDbgOut->WriteBytes(aData.data(), nDbgLen);
                         pGrStream->SeekRel(-nDbgLen);
@@ -6790,9 +6790,9 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
 namespace {
 
 struct ClsIDs {
-    sal_uInt32      nId;
-    const sal_Char* pSvrName;
-    const sal_Char* pDspName;
+    sal_uInt32  nId;
+    const char* pSvrName;
+    const char* pDspName;
 };
 
 }
@@ -6930,7 +6930,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
         {
             if( 0x10000L > nStrLen )
             {
-                std::unique_ptr<sal_Char[]> pBuf(new sal_Char[ nStrLen ]);
+                std::unique_ptr<char[]> pBuf(new char[ nStrLen ]);
                 rStm.ReadBytes(pBuf.get(), nStrLen);
                 aSvrName = OUString( pBuf.get(), static_cast<sal_uInt16>(nStrLen)-1, osl_getThreadTextEncoding() );
             }
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 7b650e69c1e9..63f6476597a4 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -21,17 +21,17 @@ namespace rtfutil
 {
 OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 {
-    sal_Char aNToABuf[] = "0000000000000000";
+    char aNToABuf[] = "0000000000000000";
 
     OSL_ENSURE(nLen < sizeof(aNToABuf), "nLen is too big");
     if (nLen >= sizeof(aNToABuf))
         nLen = (sizeof(aNToABuf) - 1);
 
     // Set pointer to the buffer end
-    sal_Char* pStr = aNToABuf + (sizeof(aNToABuf) - 1);
+    char* pStr = aNToABuf + (sizeof(aNToABuf) - 1);
     for (sal_uInt8 n = 0; n < nLen; ++n)
     {
-        *(--pStr) = static_cast<sal_Char>(nHex & 0xf) + 48;
+        *(--pStr) = static_cast<char>(nHex & 0xf) + 48;
         if (*pStr > '9')
             *pStr += 39;
         nHex >>= 4;
@@ -56,7 +56,7 @@ OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* pS
     if (pSuccess)
         *pSuccess = true;
     OStringBuffer aBuf;
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
     // 0x0b instead of \n, etc because of the replacements in SwWW8AttrIter::GetSnippet()
     switch (c)
     {
@@ -71,7 +71,7 @@ OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* pS
         case '}':
         case '{':
             aBuf.append('\\');
-            aBuf.append(static_cast<sal_Char>(c));
+            aBuf.append(static_cast<char>(c));
             break;
         case 0xa0:
             // non-breaking space
@@ -87,7 +87,7 @@ OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* pS
             break;
         default:
             if (c >= ' ' && c <= '~')
-                aBuf.append(static_cast<sal_Char>(c));
+                aBuf.append(static_cast<char>(c));
             else
             {
                 OUString sBuf(&c, 1);
@@ -168,7 +168,7 @@ static bool TryOutString(const OUString& rStr, rtl_TextEncoding eDestEnc)
     return true;
 }
 
-OString OutStringUpr(const sal_Char* pToken, const OUString& rStr, rtl_TextEncoding eDestEnc)
+OString OutStringUpr(const char* pToken, const OUString& rStr, rtl_TextEncoding eDestEnc)
 {
     if (TryOutString(rStr, eDestEnc))
         return OStringLiteral("{") + pToken + " " + OutString(rStr, eDestEnc) + "}";
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index c82f6411941c..83856b5d5499 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5231,13 +5231,13 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe
     }
     else if( aTextHd.nRecType == PPT_PST_TextBytesAtom )
     {
-        std::unique_ptr<sal_Char[]> pBuf(new sal_Char[ nMaxLen + 1 ]);
+        std::unique_ptr<char[]> pBuf(new char[ nMaxLen + 1 ]);
         pBuf[ nMaxLen ] = 0;
         rIn.ReadBytes(pBuf.get(), nMaxLen);
-        sal_Char* pPtr = pBuf.get();
+        char* pPtr = pBuf.get();
         for (;;)
         {
-            sal_Char cLo = *pPtr;
+            char cLo = *pPtr;
             if ( cLo == 0 )
                 break;
             if ( cLo == 0xd )
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index bc323ea45d23..b80056658924 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -264,7 +264,7 @@ const ApiPaperSize& PaperSizeConv::getApiSizeForMSPaperSizeIndex( sal_Int32 nMSO
 }
 
 OUString findQuotedText( const OUString& rCommand,
-                const sal_Char* cStartQuote, const sal_Unicode uEndQuote )
+                const char* cStartQuote, const sal_Unicode uEndQuote )
 {
     OUString sRet;
     OUString sStartQuote( OUString::createFromAscii(cStartQuote) );
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 5099af082b87..e385099c7049 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -219,7 +219,7 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
-odfflatxml_component_getFactory( const sal_Char* pImplementationName,
+odfflatxml_component_getFactory( const char* pImplementationName,
                       void* pServiceManager,
                       void* /* pRegistryKey */ )
 {
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index cd1adfbafb43..bb2043783a16 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::registry;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    SAL_DLLPUBLIC_EXPORT void* pdffilter_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
     {
         OUString    aImplName( OUString::createFromAscii( pImplName ) );
         void*       pRet = nullptr;
diff --git a/filter/source/svg/gentoken.pl b/filter/source/svg/gentoken.pl
index 1c7736d77451..b8c138bbbb78 100644
--- a/filter/source/svg/gentoken.pl
+++ b/filter/source/svg/gentoken.pl
@@ -44,7 +44,7 @@ print ( GPERF "%null-strings\n" );
 print ( GPERF "%struct-type\n" );
 print ( GPERF "struct xmltoken\n" );
 print ( GPERF "{\n" );
-print ( GPERF "  const sal_Char *name; sal_Int32 nToken; \n" );
+print ( GPERF "  const char *name; sal_Int32 nToken; \n" );
 print ( GPERF "};\n" );
 print ( GPERF "%%\n" );
 
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index e0df140ea6d9..f5d7149db41a 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -845,7 +845,7 @@ namespace sdecl = comphelper::service_decl;
 
 // The C shared lib entry points
 extern "C" SAL_DLLPUBLIC_EXPORT void* svgfilter_component_getFactory(
-    sal_Char const* pImplName, void*, void*)
+    char const* pImplName, void*, void*)
 {
     if ( rtl_str_compare (pImplName, SVG_FILTER_IMPL_NAME) == 0 )
     {
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 6ddf2e444227..205bfabc6d4a 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1794,7 +1794,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
                      .append(aComma)
                      .append(OUString::number( aPolyPoint.Y() ));
 
-            sal_Char nCurrentMode = 0;
+            char nCurrentMode = 0;
             const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]);
             while( n < nSize )
             {
diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
index 8a3d62996279..cc3e7b30a364 100644
--- a/filter/source/svg/test/odfserializer.cxx
+++ b/filter/source/svg/test/odfserializer.cxx
@@ -97,7 +97,7 @@ void SAL_CALL ODFSerializer::characters( const OUString& aChars )
     const OString aStr = OUStringToOString(aChars, 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_xOutStream->writeBytes(m_aBuf);
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 238cdde2f6ea..1dd00aee80a0 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -33,7 +33,7 @@ using namespace T602ImportFilter;
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * t602filter_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+    const char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = nullptr;
 
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index de3f341872b3..bf5d8fc10e94 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -500,7 +500,7 @@ void T602ImportFilter::inschrdef(unsigned char ch)
 void T602ImportFilter::wrtfnt()
 {
     Reference < XAttributeList > xAttrList ( mpAttrList );
-    const sal_Char *style = "P1";
+    const char *style = "P1";
 
     switch(fst.nowfnt) {
         case standard : style = fst.uline ? "T7" : "T1"; break;
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index a6d9b6291410..6472accc2c43 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * xmlfa_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+    const char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = nullptr;
     OUString implName = OUString::createFromAscii( pImplName );
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index 49e437f86161..9ec13206c9f4 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -70,7 +70,7 @@ struct application_info_impl
     OUString   maXMLImporter;
     OUString   maXMLExporter;
 
-    application_info_impl(const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter);
+    application_info_impl(const char * pDocumentService, const OUString& rUINameRes, const char * mpXMLImporter, const char * mpXMLExporter);
 };
 
 
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 1646b433caa3..74d55a3c9194 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -316,7 +316,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+    const char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
     void * pRet = nullptr;
 
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index c935f1b91db9..c15a2a97780c 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1129,7 +1129,7 @@ void XMLFilterSettingsDialog::initFilterList()
     }
 }
 
-application_info_impl::application_info_impl( const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter )
+application_info_impl::application_info_impl( const char * pDocumentService, const OUString& rUINameRes, const char * mpXMLImporter, const char * mpXMLExporter )
 :   maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ),
     maDocumentUIName(Translate::ExpandVariables(rUINameRes)),
     maXMLImporter( mpXMLImporter, strlen( mpXMLImporter ), RTL_TEXTENCODING_ASCII_US ),
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 4ff351d69ce6..bbe848ad9cc3 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -542,7 +542,7 @@ using namespace XSLT;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void * xsltfilter_component_getFactory(const sal_Char * pImplName,
+    SAL_DLLPUBLIC_EXPORT void * xsltfilter_component_getFactory(const char * pImplName,
             void * pServiceManager, void * /* pRegistryKey */)
     {
         void * pRet = nullptr;