summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sot/source/sdstor/stgole.cxx2
-rw-r--r--sot/source/sdstor/storinfo.cxx2
-rw-r--r--starmath/inc/token.hxx4
-rw-r--r--starmath/source/mathmlexport.cxx8
-rw-r--r--starmath/source/mathmlexport.hxx6
-rw-r--r--starmath/source/mathmlimport.cxx8
-rw-r--r--starmath/source/mathmlimport.hxx8
-rw-r--r--starmath/source/mathtype.cxx2
-rw-r--r--starmath/source/parse.cxx4
-rw-r--r--starmath/source/register.cxx2
-rw-r--r--starmath/visual-editor-todo2
-rw-r--r--stoc/source/invocation/invocation.cxx2
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx2
-rw-r--r--stoc/source/javaloader/javaloader.cxx2
-rw-r--r--stoc/source/javavm/javavm.cxx2
-rw-r--r--stoc/source/namingservice/namingservice.cxx2
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx2
-rw-r--r--stoc/test/testsmgr_cpnt.cxx2
-rw-r--r--store/source/stordata.hxx6
-rw-r--r--store/source/stordir.cxx4
20 files changed, 36 insertions, 36 deletions
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 jopsen@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;
generated by cgit (git 2.34.1) at 2025-01-10 20:57:16 +0000