include/sfx2/frmhtmlw.hxx | 8 ++++----
include/sfx2/viewfac.hxx | 2 +-
sfx2/source/appl/impldde.cxx | 2 +-
sfx2/source/bastyp/frmhtml.cxx | 6 +++---
sfx2/source/bastyp/frmhtmlw.cxx | 12 ++++++------
sfx2/source/control/unoctitm.cxx | 2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx | 6 +++---
sfx2/source/view/viewfac.cxx | 2 +-
shell/source/backends/localebe/localebecdef.cxx | 2 +-
shell/source/backends/macbe/macbecdef.cxx | 2 +-
shell/source/backends/wininetbe/wininetbecdef.cxx | 2 +-
shell/source/cmdmail/cmdmailentry.cxx | 2 +-
shell/source/sessioninstall/services.cxx | 4 ++--
shell/source/unix/exec/shellexec.cxx | 2 +-
shell/source/unix/exec/shellexecentry.cxx | 2 +-
shell/source/win32/SysShentry.cxx | 2 +-
shell/source/win32/simplemail/smplmailentry.cxx | 2 +-
slideshow/source/engine/opengl/TransitionerImpl.cxx | 2 +-
slideshow/source/engine/slideshowimpl.cxx | 2 +-
slideshow/source/engine/smilfunctionparser.cxx | 2 +-
sot/source/sdstor/stgole.cxx | 2 +-
sot/source/sdstor/storinfo.cxx | 2 +-
starmath/inc/token.hxx | 4 ++--
starmath/source/mathmlexport.cxx | 8 ++++----
starmath/source/mathmlexport.hxx | 6 +++---
starmath/source/mathmlimport.cxx | 8 ++++----
starmath/source/mathmlimport.hxx | 8 ++++----
starmath/source/mathtype.cxx | 2 +-
starmath/source/parse.cxx | 4 ++--
starmath/source/register.cxx | 2 +-
starmath/visual-editor-todo | 2 +-
stoc/source/invocation/invocation.cxx | 2 +-
stoc/source/invocation_adapterfactory/iafactory.cxx | 2 +-
stoc/source/javaloader/javaloader.cxx | 2 +-
stoc/source/javavm/javavm.cxx | 2 +-
stoc/source/namingservice/namingservice.cxx | 2 +-
stoc/source/proxy_factory/proxyfac.cxx | 2 +-
stoc/test/testsmgr_cpnt.cxx | 2 +-
store/source/stordata.hxx | 6 +++---
store/source/stordir.cxx | 4 ++--
40 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 8b550895b3007eecfbcf02573d8eb5ed57a45c62
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Dec 22 17:01:45 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Dec 22 18:04:41 2019 +0100
sal_Char->char in sot..store
Change-Id: Ia133c1a7549d81f2e88e34ab7e6c9ea578c745ae
Reviewed-on: https://gerrit.libreoffice.org/85702
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 62c586a20773..3ae8fe4209ec 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -114,7 +114,7 @@ bool StgCompObjStream::Load()
// higher bits are ignored
sal_uLong nStrLen = ::std::min( nLen1, sal_Int32(0xFFFE) );
- std::unique_ptr<sal_Char[]> p(new sal_Char[ nStrLen+1 ]);
+ std::unique_ptr<char[]> p(new char[ nStrLen+1 ]);
p[nStrLen] = 0;
if (ReadBytes( p.get(), nStrLen ) == nStrLen)
{
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index adbcba212828..d8480e86a459 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -36,7 +36,7 @@ SotClipboardFormatId ReadClipboardFormat( SvStream & rStm )
if( nLen > 0 )
{
// get a string name
- std::unique_ptr<sal_Char[]> p(new( ::std::nothrow ) sal_Char[ nLen ]);
+ std::unique_ptr<char[]> p(new( ::std::nothrow ) char[ nLen ]);
if (p && rStm.ReadBytes(p.get(), nLen) ==
static_cast<std::size_t>(nLen))
{
nFormat = SotExchange::RegisterFormatName(OUString(p.get(),
nLen-1, RTL_TEXTENCODING_ASCII_US));
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 8abe85e61858..786b4ff31d75 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -121,14 +121,14 @@ struct SmToken
SmToken();
SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
- const sal_Char* pText,
+ const char* pText,
TG nTokenGroup = TG::NONE,
sal_uInt16 nTokenLevel = 0);
};
struct SmTokenTableEntry
{
- const sal_Char* pIdent;
+ const char* pIdent;
SmTokenType const eType;
sal_Unicode const cMathChar;
TG const nGroup;
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index bfeab01c6284..6a8120c605a1 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -248,7 +248,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
const Reference<XComponent>& xComponent,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pComponentName )
+ const char* pComponentName )
{
OSL_ENSURE(xOutputStream.is(), "I really need an output stream!");
OSL_ENSURE(xComponent.is(), "Need component!");
@@ -292,10 +292,10 @@ bool SmXMLExportWrapper::WriteThroughComponent(
bool SmXMLExportWrapper::WriteThroughComponent(
const Reference < embed::XStorage >& xStorage,
const Reference<XComponent>& xComponent,
- const sal_Char* pStreamName,
+ const char* pStreamName,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pComponentName
+ const char* pComponentName
)
{
OSL_ENSURE(xStorage.is(), "Need storage!");
@@ -1291,7 +1291,7 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int
nLevel)
// nBold: -1 = yet undefined; 0 = false; 1 = true;
// nItalic: -1 = yet undefined; 0 = false; 1 = true;
// nSansSerifFixed: -1 = undefined; 0 = sans; 1 = serif; 2 =
fixed;
- const sal_Char *pText = "normal";
+ const char *pText = "normal";
if (nSansSerifFixed == -1 || nSansSerifFixed == 1)
{
pText = "normal";
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 72ce800ad3af..dda259310b78 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -51,15 +51,15 @@ public:
const css::uno::Reference< css::lang::XComponent >& xComponent,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pComponentName );
+ const char* pComponentName );
static bool WriteThroughComponent(
const css::uno::Reference< css::embed::XStorage >& xStor,
const css::uno::Reference< css::lang::XComponent >& xComponent,
- const sal_Char* pStreamName,
+ const char* pStreamName,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pComponentName );
+ const char* pComponentName );
};
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 18cf0e3b7ca6..9970e34dd3bc 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -250,7 +250,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
const Reference<XComponent>& xModelComponent,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pFilterName,
+ const char* pFilterName,
bool bEncrypted )
{
ErrCode nError = ERRCODE_SFX_DOLOADFAILED;
@@ -350,11 +350,11 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
ErrCode SmXMLImportWrapper::ReadThroughComponent(
const uno::Reference< embed::XStorage >& xStorage,
const Reference<XComponent>& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
Reference<uno::XComponentContext> const & rxContext,
Reference<beans::XPropertySet> const & rPropSet,
- const sal_Char* pFilterName )
+ const char* pFilterName )
{
OSL_ENSURE(xStorage.is(), "Need storage!");
OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!");
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 2357c9f09bf9..71444a86ad04 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -51,17 +51,17 @@ public:
const css::uno::Reference< css::lang::XComponent >& xModelComponent,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pFilterName,
+ const char* pFilterName,
bool bEncrypted );
static ErrCode ReadThroughComponent(
const css::uno::Reference< css::embed::XStorage >& xStorage,
const css::uno::Reference< css::lang::XComponent >& xModelComponent,
- const sal_Char* pStreamName,
- const sal_Char* pCompatibilityStreamName,
+ const char* pStreamName,
+ const char* pCompatibilityStreamName,
css::uno::Reference< css::uno::XComponentContext > const & rxContext,
css::uno::Reference< css::beans::XPropertySet > const & rPropSet,
- const sal_Char* pFilterName );
+ const char* pFilterName );
};
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index cd33f289dda7..06655e112597 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1703,7 +1703,7 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8
nSelector,
// read font name
while(true)
{
- sal_Char nChar8(0);
+ char nChar8(0);
pS->ReadChar( nChar8 );
if (nChar8 == 0)
break;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5fc391a86982..4e3b8172ca41 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -51,7 +51,7 @@ SmToken::SmToken()
SmToken::SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
- const sal_Char* pText,
+ const char* pText,
TG nTokenGroup,
sal_uInt16 nTokenLevel)
: aText(OUString::createFromAscii(pText))
@@ -1644,7 +1644,7 @@ std::unique_ptr<SmNode> SmParser::DoOper()
case TLIMSUP :
case TLIMINF :
{
- const sal_Char* pLim = nullptr;
+ const char* pLim = nullptr;
switch (eType)
{
case TLIM : pLim = "lim"; break;
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 304fb8fba2fa..89f7c2dd325a 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::lang;
extern "C" {
-SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const sal_Char*
pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* sm_component_getFactory( const char*
pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/starmath/visual-editor-todo b/starmath/visual-editor-todo
index f378d2db6940..04dedae01699 100644
--- a/starmath/visual-editor-todo
+++ b/starmath/visual-editor-todo
@@ -12,7 +12,7 @@ on IRC (jopsen) or e-mail me at jop...@gmail.com.
Easy
----
-1. SmGraphicWindow::KeyInput relies on comparison of sal_Char, a better way
must be available for CTRL+c
+1. SmGraphicWindow::KeyInput relies on comparison of char, a better way must
be available for CTRL+c
2. Code style (missing spaces, linebreaks and a few renames)
3. More documentation
4. Remove the CreateTextFromNode methods and replace calls to it with
NodeToTextVisitor
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index c1c97f6d05aa..9343e0865e22 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1120,7 +1120,7 @@ static const struct ImplementationEntry g_entries[] =
};
extern "C" SAL_DLLPUBLIC_EXPORT void * invocation_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
}
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index b1c654760b73..7e2aca96856e 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -904,7 +904,7 @@ static const struct ::cppu::ImplementationEntry g_entries[]
=
};
extern "C" SAL_DLLPUBLIC_EXPORT void * invocadapt_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey , g_entries );
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index 274de5c79990..065ff12558a5 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -371,7 +371,7 @@ static const struct ImplementationEntry g_entries[] =
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * javaloader_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
}
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index c6b3bd19dbf8..84120eaa3c85 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -577,7 +577,7 @@ private:
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * javavm_component_getFactory(sal_Char
const * pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * javavm_component_getFactory(char const
* pImplName,
void * pServiceManager,
void * pRegistryKey)
{
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index 6e613f11fd7d..b58212e2c176 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -145,7 +145,7 @@ static const struct ImplementationEntry g_entries[] =
};
extern "C" SAL_DLLPUBLIC_EXPORT void * namingservice_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , g_entries );
}
diff --git a/stoc/source/proxy_factory/proxyfac.cxx
b/stoc/source/proxy_factory/proxyfac.cxx
index 38da29b3485a..fde960165078 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -445,7 +445,7 @@ static const ::cppu::ImplementationEntry g_entries [] =
}
extern "C" SAL_DLLPUBLIC_EXPORT void * proxyfac_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, g_entries );
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 7faf7fea9686..0adc74f874c6 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void *
/*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
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;
commit 011dae60e2170f71ddf647d5ea2b844432480dc7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Dec 22 16:59:23 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Dec 22 18:04:27 2019 +0100
sal_Char->char in sfx2..slideshow
Change-Id: I59667664fc097989e0a78d8876f2be8353911236
Reviewed-on: https://gerrit.libreoffice.org/85701
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
