From bd9d2c3205af57dc6ae9821a3bc9c098bf97dba1 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 19 Dec 2019 08:15:56 +0200
Subject: sal_Char->char in desktop..dtrans

Change-Id: I6ad7d6acf081c16f904eb1b2506b545a88046c48
Reviewed-on: https://gerrit.libreoffice.org/85470
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 dtrans/source/cnttype/mctfentry.cxx          | 2 +-
 dtrans/source/generic/dtrans.cxx             | 2 +-
 dtrans/source/win32/clipb/wcbentry.cxx       | 2 +-
 dtrans/source/win32/dnd/dndentry.cxx         | 2 +-
 dtrans/source/win32/dtobj/DTransHelper.cxx   | 2 +-
 dtrans/source/win32/dtobj/FmtFilter.cxx      | 4 ++--
 dtrans/source/win32/ftransl/ftranslentry.cxx | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'dtrans')

diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index e102564c7a2f..43d165876230 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -50,7 +50,7 @@ extern "C"
 // component_getFactory
 // returns a factory to create XFilePicker-Services
 
-SAL_DLLPUBLIC_EXPORT void* mcnttype_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* mcnttype_component_getFactory( const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 14cdecd817f4..0630b9a6f538 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -31,7 +31,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void * dtrans_component_getFactory(
-    const sal_Char * pImplName,
+    const char * pImplName,
     void * pServiceManager,
     void * /*pRegistryKey*/
 )
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index f0580e70e20e..e91bde9c07d7 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -53,7 +53,7 @@ extern "C"
 // component_getFactory
 // returns a factory to create XFilePicker-Services
 
-SAL_DLLPUBLIC_EXPORT void* sysdtrans_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* sysdtrans_component_getFactory( const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 58ec08f45858..0a44283e52b9 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.cxx
@@ -46,7 +46,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void*
-dnd_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+dnd_component_getFactory( const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
     Reference< XSingleServiceFactory > xFactory;
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index 5ca12d0fe26b..66d18f9fb528 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.cxx
@@ -179,7 +179,7 @@ sal_uInt32 CStgTransferHelper::memSize( CLIPFORMAT cf ) const
 
         if ( CF_TEXT == cf || RegisterClipboardFormatW( L"HTML Format" ) == cf )
         {
-            sal_Char* pText = static_cast< sal_Char* >( GlobalLock( hGlob ) );
+            char* pText = static_cast< char* >( GlobalLock( hGlob ) );
             if ( pText )
             {
                 dwSize = strlen(pText) + 1; // strlen + trailing '\0'
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 6b0d9c0ba30f..74df67541140 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -251,8 +251,8 @@ Sequence<sal_Int8> TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml)
     size_t lHtmlFormatHeader = dummyHtmlHeader.length();
 
     std::string textHtml(
-        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()),
-        reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + aTextHtml.getLength());
+        reinterpret_cast<const char*>(aTextHtml.getConstArray()),
+        reinterpret_cast<const char*>(aTextHtml.getConstArray()) + aTextHtml.getLength());
 
     std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader - 1; // we start one before '<HTML>' Word 2000 does also so
     std::string::size_type nEndHtml = textHtml.find(TAG_END_HTML) + lHtmlFormatHeader + TAG_END_HTML.length() + 1; // our SOffice 5.2 wants 2 behind </HTML>?
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index cdcfda46b10c..2959e589fa29 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -51,7 +51,7 @@ namespace
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void* ftransl_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* ftransl_component_getFactory( const char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ )
 {
     void* pRet = nullptr;
 
-- 
cgit v1.2.3