sal_Char->char in sfx2..slideshow

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

20 files changed, 33 insertions, 33 deletions

diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 4b827a7c97ad..02f2fdbeac63 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -38,12 +38,12 @@ namespace com::sun::star::uno { template <class interface_type> class Reference;
 class SFX2_DLLPUBLIC SfxFrameHTMLWriter
 {
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
-                                const sal_Char *pIndent, const OUString& rName,
+                                const char *pIndent, const OUString& rName,
                                 const OUString& rContent, bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = nullptr );
     SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
-                                const sal_Char *pIndent, const sal_Char *pName,
+                                const char *pIndent, const char *pName,
                                 const OUString& rContent, bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                                 OUString *pNonConvertableChars = nullptr );
@@ -51,7 +51,7 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
 public:
     static void Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
             const css::uno::Reference< css::document::XDocumentProperties>&,
-            const sal_Char *pIndent,
+            const char *pIndent,
             rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
             OUString *pNonConvertableChars = nullptr );
 
@@ -62,7 +62,7 @@ public:
 };
 
 inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
-                            const sal_Char *pIndent, const sal_Char *pName,
+                            const char *pIndent, const char *pName,
                             const OUString& rContent, bool bHTTPEquiv,
                             rtl_TextEncoding eDestEnc,
                             OUString *pNonConvertableChars )
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 5e96258dbb6c..476fd01f9f16 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -34,7 +34,7 @@ class SFX2_DLLPUBLIC SfxViewFactory
 {
 public:
     SfxViewFactory( SfxViewCtor fnC,
-                    SfxInterfaceId nOrdinal, const sal_Char* asciiViewName );
+                    SfxInterfaceId nOrdinal, const char* asciiViewName );
 
     SfxViewShell*  CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     SfxInterfaceId GetOrdinal() const { return nOrd; }
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index fbf452065520..5a42eadc8f2b 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -295,7 +295,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
 
     default:
         {
-            const sal_Char* p = static_cast<sal_Char const *>(pData->getData());
+            const char* p = static_cast<char const *>(pData->getData());
             long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : pData->getSize();
 
             Sequence< sal_Int8 > aSeq( reinterpret_cast<const sal_Int8*>(p), nLen );
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index c1641582934f..850dd0badc88 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -30,9 +30,9 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfxtypes.hxx>
 
-static sal_Char const sHTML_SC_yes[] =  "YES";
-static sal_Char const sHTML_SC_no[] =       "NO";
-static sal_Char const sHTML_SC_auto[] = "AUTO";
+static char const sHTML_SC_yes[] =  "YES";
+static char const sHTML_SC_no[] =       "NO";
+static char const sHTML_SC_auto[] = "AUTO";
 
 static HTMLOptionEnum<ScrollingMode> const aScrollingTable[] =
 {
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 10eb16a0c815..3c7db9c95232 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -53,11 +53,11 @@
 
 using namespace ::com::sun::star;
 
-static sal_Char const sHTML_SC_yes[] =  "YES";
-static sal_Char const sHTML_SC_no[] =       "NO";
+static char const sHTML_SC_yes[] =  "YES";
+static char const sHTML_SC_no[] =       "NO";
 
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
-                                  const sal_Char *pIndent,
+                                  const char *pIndent,
                                   const OUString& rName,
                                   const OUString& rContent,
                                   bool bHTTPEquiv,
@@ -83,11 +83,11 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
 
 void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         const uno::Reference<document::XDocumentProperties> & i_xDocProps,
-        const sal_Char *pIndent,
+        const char *pIndent,
         rtl_TextEncoding eDestEnc,
         OUString *pNonConvertableChars    )
 {
-    const sal_Char *pCharSet =
+    const char *pCharSet =
                 rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
 
     if( pCharSet )
@@ -287,7 +287,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
             aAny = xSet->getPropertyValue("FrameIsScrollingMode");
             if ( aAny >>= bVal )
             {
-                const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
+                const char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
                 sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_scrolling)
                     .append(pStr);
             }
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index bec98c57b486..1ae7996f2993 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -526,7 +526,7 @@ void UsageInfo::save()
     osl_getLocalTimeFromSystemTime( &systemTime, &localTime );
     osl_getDateTimeFromTimeValue( &localTime, &localDateTime );
 
-    sal_Char time[1024];
+    char time[1024];
     sprintf(time,"%4i-%02i-%02iT%02i_%02i_%02i", localDateTime.Year, localDateTime.Month, localDateTime.Day, localDateTime.Hours, localDateTime.Minutes, localDateTime.Seconds);
 
     //filename type: usage-YYYY-MM-DDTHH_MM_SS.csv
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index b9d072d27012..0eaa44115f07 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1003,7 +1003,7 @@ void SfxDocumentMetaData::updateUserDefinedAndAttributes()
                 "office:target-frame-name",
                 m_DefaultTarget);
         // xlink:show: _blank -> new, any other value -> replace
-        const sal_Char* show = m_DefaultTarget == "_blank" ? "new" : "replace";
+        const char* show = m_DefaultTarget == "_blank" ? "new" : "replace";
         attributes.emplace_back(
                 "xlink:show",
                 OUString::createFromAscii(show));
@@ -1750,7 +1750,7 @@ SfxDocumentMetaData::loadFromStorage(
     sal_uInt64 version = SotStorage::GetVersion( xStorage );
     // Oasis is also the default (0)
     bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 );
-    const sal_Char *pServiceName = bOasis
+    const char *pServiceName = bOasis
         ? "com.sun.star.document.XMLOasisMetaImporter"
         : "com.sun.star.document.XMLMetaImporter";
 
@@ -1834,7 +1834,7 @@ SfxDocumentMetaData::storeToStorage(
     const sal_uInt64 version = SotStorage::GetVersion( xStorage );
     // Oasis is also the default (0)
     const bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 );
-    const sal_Char *pServiceName = bOasis
+    const char *pServiceName = bOasis
         ? "com.sun.star.document.XMLOasisMetaExporter"
         : "com.sun.star.document.XMLMetaExporter";
 
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index c3e98aefe27c..61cadd48053f 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -47,7 +47,7 @@ OUString SfxViewFactory::GetAPIViewName() const
 // CTOR / DTOR -----------------------------------------------------------
 
 SfxViewFactory::SfxViewFactory( SfxViewCtor fnC,
-                                SfxInterfaceId nOrdinal, const sal_Char* asciiViewName ):
+                                SfxInterfaceId nOrdinal, const char* asciiViewName ):
     fnCreate(fnC),
     nOrd(nOrdinal),
     m_sViewName( OUString::createFromAscii( asciiViewName ) )
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index 93d2bc45e012..fbbd63690d55 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * localebe1_component_getFactory(
-    const sal_Char *aImplementationName,
+    const char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
 
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index 7d10f6a2dfaa..3e4803c48f2a 100644
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 };
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void * macbe1_component_getFactory( const char *aImplementationName, void *aServiceManager, void *aRegistryKey)
 {
 
     return cppu::component_getFactoryHelper(
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 92bb5c8f65ce..72fca9378d35 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 } ;
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * wininetbe1_component_getFactory( const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * wininetbe1_component_getFactory( const char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
 
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 80c6ca85b752..c82f67493226 100644
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -44,7 +44,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void* cmdmail_component_getFactory(
-    const sal_Char* pImplName,
+    const char* pImplName,
     SAL_UNUSED_PARAMETER void* /*pSrvManager*/,
     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ )
 {
diff --git a/shell/source/sessioninstall/services.cxx b/shell/source/sessioninstall/services.cxx
index fbb6641d8eb5..4b72bff193f9 100644
--- a/shell/source/sessioninstall/services.cxx
+++ b/shell/source/sessioninstall/services.cxx
@@ -21,14 +21,14 @@ const sdecl::ServiceDecl SyncDbusSessionHelperServiceDecl(
     "org.freedesktop.PackageKit.SyncDbusSessionHelper");
 
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* losessioninstall_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* losessioninstall_component_getFactory( char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&SyncDbusSessionHelperServiceDecl} );
 }
 
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( sal_Char const* pImplName, void* pServiceManager, void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* sessioninstall_component_getFactory( char const* pImplName, void* pServiceManager, void* pRegistryKey )
 {
     return losessioninstall_component_getFactory(pImplName, pServiceManager, pRegistryKey);
 }
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 3daea4a2b18a..58c5ef4661d8 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -69,7 +69,7 @@ namespace
         for(sal_Int32 n=0; n < nmax; ++n)
         {
             // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\'
-            sal_Char c = rURL[n];
+            char c = rURL[n];
             if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' )  && c != '/' && c != '.' )
                 rBuffer.append( '\\' );
 
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index baa304476a3d..dbd9cba0a80a 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -42,7 +42,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory(
-    const sal_Char* pImplName,
+    const char* pImplName,
     SAL_UNUSED_PARAMETER void* /*pSrvManager*/,
     SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ )
 {
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index 7306ea5e7a5a..130ba8de7dd5 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -44,7 +44,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void* syssh_component_getFactory(
-        const sal_Char* pImplName, void*, void* /*pRegistryKey*/ )
+        const char* pImplName, void*, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index d34aa12f0fb3..f4293144b13a 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -45,7 +45,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void* smplmail_component_getFactory(
-        const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+        const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 3219e32f9abf..19cbea1f8a38 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -1316,7 +1316,7 @@ namespace sdecl = comphelper::service_decl;
 
 // The C shared lib entry points
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* ogltrans_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* ogltrans_component_getFactory( char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&OGLTransitionFactoryDecl} );
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 3786571d0a6e..aa6ee0b5eeb9 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2412,7 +2412,7 @@ const sdecl::ServiceDecl slideShowDecl(
 
 // The C shared lib entry points
 extern "C"
-SAL_DLLPUBLIC_EXPORT void* slideshow_component_getFactory( sal_Char const* pImplName,
+SAL_DLLPUBLIC_EXPORT void* slideshow_component_getFactory( char const* pImplName,
                                          void*, void* )
 {
     return sdecl::component_getFactoryHelper( pImplName, {&slideShowDecl} );
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 9a6673e7db2a..6c587e8919a0 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -57,7 +57,7 @@ namespace slideshow
     {
         namespace
         {
-            typedef const sal_Char*                   StringIteratorT;
+            typedef const char*                   StringIteratorT;
 
             struct ParserContext
             {