[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source sd/qa sd/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Dec 22 14:50:34 UTC 2019
sc/inc/miscuno.hxx | 4 -
sc/qa/unit/opencl-test.cxx | 4 -
sc/source/core/data/dpobject.cxx | 4 -
sc/source/core/data/global.cxx | 2
sc/source/core/data/sheetevents.cxx | 2
sc/source/core/data/tabprotection.cxx | 2
sc/source/core/inc/cellkeytranslator.hxx | 6 -
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/addinhelpid.cxx | 4 -
sc/source/core/tool/adiasync.cxx | 2
sc/source/core/tool/autoform.cxx | 2
sc/source/core/tool/callform.cxx | 12 +--
sc/source/core/tool/cellkeytranslator.cxx | 8 +-
sc/source/core/tool/compiler.cxx | 12 +--
sc/source/core/tool/editutil.cxx | 4 -
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/interpr2.cxx | 6 -
sc/source/core/tool/interpr4.cxx | 6 -
sc/source/core/tool/interpr7.cxx | 2
sc/source/core/tool/parclass.cxx | 2
sc/source/core/tool/rangenam.cxx | 2
sc/source/filter/dif/difexp.cxx | 12 +--
sc/source/filter/excel/tokstack.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xestring.cxx | 10 +-
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/excel/xistream.cxx | 2
sc/source/filter/excel/xlchart.cxx | 40 +++++-----
sc/source/filter/excel/xlescher.cxx | 4 -
sc/source/filter/excel/xlstyle.cxx | 20 ++---
sc/source/filter/excel/xltools.cxx | 4 -
sc/source/filter/ftools/fapihelper.cxx | 2
sc/source/filter/ftools/ftools.cxx | 2
sc/source/filter/html/htmlexp.cxx | 16 ++--
sc/source/filter/html/htmlpars.cxx | 4 -
sc/source/filter/inc/drawingfragment.hxx | 2
sc/source/filter/inc/eeparser.hxx | 6 -
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/htmlexp.hxx | 6 -
sc/source/filter/inc/lotform.hxx | 2
sc/source/filter/inc/lotimpop.hxx | 4 -
sc/source/filter/inc/numberformatsbuffer.hxx | 2
sc/source/filter/inc/qproform.hxx | 4 -
sc/source/filter/inc/tool.h | 2
sc/source/filter/inc/xestring.hxx | 6 -
sc/source/filter/inc/xlchart.hxx | 2
sc/source/filter/inc/xlformula.hxx | 2
sc/source/filter/lotus/filter.cxx | 2
sc/source/filter/lotus/lotform.cxx | 12 +--
sc/source/filter/lotus/lotimpop.cxx | 4 -
sc/source/filter/lotus/op.cxx | 18 ++--
sc/source/filter/lotus/optab.cxx | 2
sc/source/filter/lotus/tool.cxx | 4 -
sc/source/filter/oox/defnamesbuffer.cxx | 2
sc/source/filter/oox/drawingfragment.cxx | 2
sc/source/filter/oox/formulabase.cxx | 8 +-
sc/source/filter/oox/numberformatsbuffer.cxx | 8 +-
sc/source/filter/oox/pagesettings.cxx | 4 -
sc/source/filter/oox/stylesbuffer.cxx | 2
sc/source/filter/orcus/orcusfiltersimpl.cxx | 2
sc/source/filter/qpro/qproform.cxx | 8 +-
sc/source/filter/rtf/eeimpars.cxx | 4 -
sc/source/filter/rtf/rtfexp.cxx | 4 -
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/filter/xml/XMLConverter.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/dbgui/asciiopt.cxx | 4 -
sc/source/ui/dbgui/imoptdlg.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/docshell/docsh.cxx | 38 ++++-----
sc/source/ui/docshell/impex.cxx | 4 -
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/unoobj/appluno.cxx | 2
sc/source/ui/unoobj/miscuno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 2
sc/source/ui/vba/service.cxx | 2
sc/source/ui/vba/vbaeventshelper.cxx | 6 -
sc/source/ui/view/drawview.cxx | 6 -
sc/source/ui/view/output2.cxx | 4 -
sc/source/ui/view/tabvwshf.cxx | 2
sd/qa/unit/export-tests-ooxml2.cxx | 2
sd/source/core/EffectMigration.cxx | 6 -
sd/source/filter/eppt/pptexanimations.cxx | 16 ++--
sd/source/filter/eppt/pptexanimations.hxx | 2
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/propread.cxx | 4 -
sd/source/filter/xml/sdxmlwrp.cxx | 20 ++---
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 2
sd/source/ui/framework/configuration/ConfigurationClassifier.hxx | 2
sd/source/ui/unoidl/facreg.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 4 -
sd/source/ui/view/drviewse.cxx | 2
93 files changed, 244 insertions(+), 244 deletions(-)
New commits:
commit e8527c6ffa8b346a0a8a84a6b81e538cd7733ebe
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Dec 22 12:41:03 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Dec 22 15:49:49 2019 +0100
sal_Char->char in sd
Change-Id: I1fb2b9e7e3e4666e1fad4f36cda5c7b24e0f1ebf
Reviewed-on: https://gerrit.libreoffice.org/85691
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx
index 78452a763f01..8f1436a340eb 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -600,7 +600,7 @@ void SdOOXMLExportTest2::testExportTransitionsPPTX()
void SdOOXMLExportTest2::testPresetShapesExport()
{
::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/preset-shapes-export.odp"), ODP);
- const sal_Char *sShapeTypeAndValues[] =
+ const char *sShapeTypeAndValues[] =
{
"wedgeEllipseCallout",
"adj1","val 45310",
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 5bc0809fc6a6..29f4134aff97 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -52,7 +52,7 @@ namespace {
struct deprecated_FadeEffect_conversion_table_entry
{
FadeEffect const meFadeEffect;
- const sal_Char* mpPresetId;
+ const char* mpPresetId;
};
}
@@ -222,8 +222,8 @@ namespace {
struct deprecated_AnimationEffect_conversion_table_entry
{
AnimationEffect const meEffect;
- const sal_Char* mpPresetId;
- const sal_Char* mpPresetSubType;
+ const char* mpPresetId;
+ const char* mpPresetSubType;
};
}
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 9ceab36e4bec..58a2ad938db6 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -106,12 +106,12 @@ static void ImplTranslateAttribute( OUString& rString, const TranslateMode eTran
}
else if ( eTranslateMode & TRANSLATE_MEASURE )
{
- const sal_Char* pDest[] = { "#ppt_x", "#ppt_y", "#ppt_w", "#ppt_h", nullptr };
- const sal_Char* pSource[] = { "x", "y", "width", "height", nullptr };
+ const char* pDest[] = { "#ppt_x", "#ppt_y", "#ppt_w", "#ppt_h", nullptr };
+ const char* pSource[] = { "x", "y", "width", "height", nullptr };
sal_Int32 nIndex = 0;
- const sal_Char** ps = pSource;
- const sal_Char** pd = pDest;
+ const char** ps = pSource;
+ const char** pd = pDest;
while( *ps )
{
@@ -215,9 +215,9 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl
return nPresetSubType;
}
-const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection )
+const char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection )
{
- const sal_Char* pRet = nullptr;
+ const char* pRet = nullptr;
int nFit = 0;
const oox::ppt::transition* p = oox::ppt::transition::getList();
@@ -1519,7 +1519,7 @@ sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const OUString& rAtt
struct Entry
{
- const sal_Char* pName;
+ const char* pName;
sal_uInt8 nType;
};
static const Entry lcl_attributeMap[] =
@@ -1879,7 +1879,7 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference
rStrm.WriteUInt32( nBits )
.WriteUInt32( nTransition );
}
- const sal_Char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
+ const char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
if ( pFilter )
{
const OUString aStr( OUString::createFromAscii( pFilter ) );
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index 6bdd0eeb0bc9..99cff57b844c 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -127,7 +127,7 @@ public:
static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId );
static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName );
- static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection );
+ static const char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection );
static css::uno::Reference< css::drawing::XShape > getTargetElementShape( const css::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget );
};
} // namespace ppt
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b140e930749f..8ee778b8944b 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1039,7 +1039,7 @@ SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage const * pPage)
OUString HtmlExport::CreateMetaCharset()
{
OUString aStr;
- const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
+ const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
if ( pCharSet )
{
aStr = " <meta HTTP-EQUIV=CONTENT-TYPE CONTENT=\"text/html; charset=" +
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index ab80510d07b8..1aaf42064a8c 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -105,7 +105,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
{
try
{
- std::unique_ptr<sal_Char[]> pString( new sal_Char[ nItemSize ] );
+ std::unique_ptr<char[]> pString( new char[ nItemSize ] );
if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
{
nItemSize >>= 1;
@@ -292,7 +292,7 @@ void Section::GetDictionary(Dictionary& rDict)
}
else
{
- std::unique_ptr<sal_Char[]> pString( new sal_Char[nSize] );
+ std::unique_ptr<char[]> pString( new char[nSize] );
aStream.ReadBytes(pString.get(), nSize);
aString = OUString(pString.get(), lcl_getMaxSafeStrLen(nSize), mnTextEnc);
}
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 90e0e4f120fa..7a5d446e5d97 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -130,16 +130,16 @@ namespace {
struct XML_SERVICEMAP
{
- const sal_Char* mpService;
- const sal_Char* mpStream;
+ const char* mpService;
+ const char* mpStream;
};
struct XML_SERVICES
{
- const sal_Char* mpMeta;
- const sal_Char* mpStyles;
- const sal_Char* mpContent;
- const sal_Char* mpSettings;
+ const char* mpMeta;
+ const char* mpStyles;
+ const char* mpContent;
+ const char* mpSettings;
};
}
@@ -180,7 +180,7 @@ ErrCode ReadThroughComponent(
const Reference<XComponent>& xModelComponent,
const OUString& rStreamName,
Reference<uno::XComponentContext> const & rxContext,
- const sal_Char* pFilterName,
+ const char* pFilterName,
const Sequence<Any>& rFilterArguments,
const OUString& rName,
bool bMustBeSuccessfull,
@@ -311,10 +311,10 @@ ErrCode ReadThroughComponent(
ErrCode 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,
- const sal_Char* pFilterName,
+ const char* pFilterName,
const Sequence<Any>& rFilterArguments,
const OUString& rName,
bool bMustBeSuccessfull )
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index c39adf26d126..ab9ecddd7be0 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -150,7 +150,7 @@ void ConfigurationClassifier::CopyResources (
#if DEBUG_SD_CONFIGURATION_TRACE
void ConfigurationClassifier::TraceResourceIdVector (
- const sal_Char* pMessage,
+ const char* pMessage,
const ResourceIdVector& rResources)
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 25b07f1bdcb3..8753c4a73d59 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -89,7 +89,7 @@ public:
const ResourceIdVector& GetC1andC2() const { return maC1andC2;}
static void TraceResourceIdVector (
- const sal_Char* pMessage,
+ const char* pMessage,
const ResourceIdVector& rResources);
#endif
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 9314a60b4fe2..6fffe8a3bec5 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -61,7 +61,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void * sd_component_getFactory(
- const sal_Char * pImplName,
+ const char * pImplName,
void * pServiceManager,
void * )
{
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f478a828e8e5..e728f0fb9e05 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -100,7 +100,7 @@ enum WID_PAGE
}
-static sal_Char const sEmptyPageName[sizeof("page")] = "page";
+static char const sEmptyPageName[sizeof("page")] = "page";
// this function stores the property maps for draw pages in impress and draw
static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind )
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 30fe413e5d83..17e225e7c1c8 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -240,7 +240,7 @@ namespace {
bDefaultValue is returned. Otherwise <FALSE/> is returned.
*/
bool GetBoolValue (
- const sal_Char* pName,
+ const char* pName,
const bool bDefaultValue) const
{
bool bValue = mrProperties.getBoolValue( pName, bDefaultValue );
@@ -252,7 +252,7 @@ namespace {
returned.
*/
bool GetBoolValue (
- const sal_Char* pName,
+ const char* pName,
const sal_Int32 nTriggerValue) const
{
sal_Int32 nValue = static_cast<sal_Int32>(mrProperties.getIntValue( pName, 0 ));
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 97592f5c6a69..7bbc8946e3db 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -124,7 +124,7 @@ static void ImpAddPrintableCharactersToTextEdit(SfxRequest const & rReq, ::sd::V
{
for(sal_Int32 a(0); a < aInputString.getLength(); a++)
{
- sal_Char aChar = static_cast<sal_Char>(aInputString[a]);
+ char aChar = static_cast<char>(aInputString[a]);
vcl::KeyCode aKeyCode;
KeyEvent aKeyEvent(aChar, aKeyCode);
commit 6873e0a969948a96679f667400da4eaa4ef2cc07
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Dec 22 12:27:00 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Dec 22 15:49:36 2019 +0100
sal_Char->char in sc
Change-Id: I7e212a36898e71b03db88053647bfeee12a49cb5
Reviewed-on: https://gerrit.libreoffice.org/85690
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 37250a6d21e2..7a851ddba9e8 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -150,12 +150,12 @@ public:
static void SetOptionalPropertyValue(
const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
- const sal_Char* pPropName, const css::uno::Any& rVal );
+ const char* pPropName, const css::uno::Any& rVal );
template<typename ValueType>
static void SetOptionalPropertyValue(
const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
- const sal_Char* pPropName, const ValueType& rVal )
+ const char* pPropName, const ValueType& rVal )
{
css::uno::Any any;
any <<= rVal;
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index f72300da02f3..f27ed8ad5ab3 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -738,10 +738,10 @@ void ScOpenCLTest::testSystematic()
double fExcel = rDoc.GetValue(ScAddress(j, nBVertBegin + (i - nAVertBegin), 0));
const OString sFailedMessage =
- OStringChar(static_cast<sal_Char>('A'+j)) +
+ OStringChar(static_cast<char>('A'+j)) +
OString::number(i+1) +
"!=" +
- OStringChar(static_cast<sal_Char>('A'+j)) +
+ OStringChar(static_cast<char>('A'+j)) +
OString::number(nBVertBegin+(i-nAVertBegin)+1);
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sFailedMessage.getStr(), fExcel, fLibre, 1e-10);
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 6f653f894e03..8f1756b23e1b 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1490,8 +1490,8 @@ bool dequote( const OUString& rSource, sal_Int32 nStartPos, sal_Int32& rEndPos,
struct ScGetPivotDataFunctionEntry
{
- const sal_Char* pName;
- sal_Int16 const eFunc;
+ const char* pName;
+ sal_Int16 const eFunc;
};
bool parseFunction( const OUString& rList, sal_Int32 nStartPos, sal_Int32& rEndPos, sal_Int16& rFunc )
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index c657bd81defc..6b7c06e5fc2d 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -600,7 +600,7 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet )
OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal )
{
- const sal_Char* pChar;
+ const char* pChar;
switch ( eVal )
{
// old CharSet strings for compatibility
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index a89198c2523d..d3ebc7a48719 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -23,7 +23,7 @@
OUString ScSheetEvents::GetEventName(ScSheetEventId nEvent)
{
- static const sal_Char* aEventNames[] =
+ static const char* aEventNames[] =
{
"OnFocus", // SC_SHEETEVENT_FOCUS
"OnUnfocus", // SC_SHEETEVENT_UNFOCUS
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 5b2f8333dffe..3f0d0dae595c 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -187,7 +187,7 @@ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(
// TODO: Right now, we only support double-hash by SHA1.
if (eHash == PASSHASH_SHA1)
{
- auto aChars = comphelper::sequenceToContainer<vector<sal_Char>>(rPassHash);
+ auto aChars = comphelper::sequenceToContainer<vector<char>>(rPassHash);
Sequence<sal_Int8> aNewHash;
SvPasswordHelper::GetHashPassword(aNewHash, aChars.data(), aChars.size());
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 3abee208c59e..c521d944cf4b 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -32,11 +32,11 @@ struct TransItem;
struct ScCellKeyword
{
- const sal_Char* mpName;
+ const char* mpName;
OpCode const meOpCode;
const css::lang::Locale& mrLocale;
- ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const css::lang::Locale& rLocale);
+ ScCellKeyword(const char* pName, OpCode eOpCode, const css::lang::Locale& rLocale);
};
typedef std::unordered_map< OUString, ::std::vector<ScCellKeyword> > ScCellKeywordHashMap;
@@ -69,7 +69,7 @@ private:
ScCellKeywordTranslator();
void init();
- void addToMap(const OUString& rKey, const sal_Char* pName,
+ void addToMap(const OUString& rKey, const char* pName,
const css::lang::Locale& rLocale,
OpCode eOpCode);
void addToMap(const TransItem* pItems, const css::lang::Locale& rLocale);
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 56e2c421d8c8..139f8f77453d 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -297,7 +297,7 @@ void ScUnoAddInCollection::Initialize()
static sal_uInt16 lcl_GetCategory( const OUString& rName )
{
- static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] =
+ static const char* aFuncNames[SC_FUNCGROUP_COUNT] =
{
// array index = ID - 1 (ID starts at 1)
// all upper case
diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx
index 4a7b8f6a1992..832ce509197d 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -24,8 +24,8 @@
// A struct containing the built-in function name and the built-in help ID.
struct ScUnoAddInHelpId
{
- const sal_Char* pFuncName;
- const sal_Char* sHelpId;
+ const char* pFuncName;
+ const char* sHelpId;
};
// Help IDs for Analysis AddIn. MUST BE SORTED for binary search.
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index dc9523005d37..8f8ded6d06f3 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -97,7 +97,7 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData )
break;
case ParamType::PTR_STRING :
{
- sal_Char* pChar = static_cast<sal_Char*>(pData);
+ char* pChar = static_cast<char*>(pData);
if ( p->pStr )
*p->pStr = OUString( pChar, strlen(pChar),osl_getThreadTextEncoding() );
else
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index ff6c8e4926f4..28ce5f21c56c 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -71,7 +71,7 @@
* be synchronized with Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx
*/
-static const sal_Char sAutoTblFmtName[] = "autotbl.fmt";
+static const char sAutoTblFmtName[] = "autotbl.fmt";
// till SO5PF
const sal_uInt16 AUTOFORMAT_ID_X = 9501;
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 0970dc983d6c..6f814f975bf0 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -51,11 +51,11 @@ typedef void (CALLTYPE* ExFuncPtr16)(void*, void*, void*, void*, void*, void*, v
typedef void (CALLTYPE* GetFuncCountPtr)(sal_uInt16& nCount);
typedef void (CALLTYPE* GetFuncDataPtr)
- (sal_uInt16& nNo, sal_Char* pFuncName, sal_uInt16& nParamCount, ParamType* peType, sal_Char* pInternalName);
+ (sal_uInt16& nNo, char* pFuncName, sal_uInt16& nParamCount, ParamType* peType, char* pInternalName);
typedef void (CALLTYPE* SetLanguagePtr)( sal_uInt16& nLanguage );
typedef void (CALLTYPE* GetParamDesc)
- (sal_uInt16& nNo, sal_uInt16& nParam, sal_Char* pName, sal_Char* pDesc );
+ (sal_uInt16& nNo, sal_uInt16& nParam, char* pName, char* pDesc );
typedef void (CALLTYPE* IsAsync) ( sal_uInt16& nNo,
ParamType* peType );
@@ -201,8 +201,8 @@ bool InitExternalFunc(const OUString& rModuleName)
(*reinterpret_cast<GetFuncCountPtr>(fpGetCount))(nCount);
for (sal_uInt16 i=0; i < nCount; i++)
{
- sal_Char cFuncName[256];
- sal_Char cInternalName[256];
+ char cFuncName[256];
+ char cInternalName[256];
sal_uInt16 nParamCount;
ParamType eParamType[MAXFUNCPARAM];
ParamType eAsyncType = ParamType::NONE;
@@ -354,8 +354,8 @@ void LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16
oslGenericFunction fProc = pLib->getFunctionSymbol(GETPARAMDESC);
if ( fProc != nullptr )
{
- sal_Char pcName[256];
- sal_Char pcDesc[256];
+ char pcName[256];
+ char pcDesc[256];
*pcName = *pcDesc = 0;
sal_uInt16 nFuncNo = nNumber; // don't let it mess up via reference...
reinterpret_cast< ::GetParamDesc>(fProc)( nFuncNo, nParam, pcName, pcDesc );
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 5ad71ca4c833..7878d1a47d57 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -71,7 +71,7 @@ static LocaleMatch lclLocaleCompare(const lang::Locale& rLocale1, const Language
return eMatchLevel;
}
-ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const lang::Locale& rLocale) :
+ScCellKeyword::ScCellKeyword(const char* pName, OpCode eOpCode, const lang::Locale& rLocale) :
mpName(pName),
meOpCode(eOpCode),
mrLocale(rLocale)
@@ -99,7 +99,7 @@ static void lclMatchKeyword(OUString& rName, const ScCellKeywordHashMap& aMap,
}
LanguageTag aLanguageTag( pLocale ? *pLocale : lang::Locale("","",""));
- const sal_Char* aBestMatchName = itr->second.front().mpName;
+ const char* aBestMatchName = itr->second.front().mpName;
LocaleMatch eLocaleMatchLevel = LOCALE_MATCH_NONE;
bool bOpCodeMatched = false;
@@ -186,7 +186,7 @@ ScCellKeywordTranslator::~ScCellKeywordTranslator()
struct TransItem
{
const sal_Unicode* from;
- const sal_Char* to;
+ const char* to;
OpCode const func;
};
@@ -207,7 +207,7 @@ void ScCellKeywordTranslator::init()
#include "cellkeywords.inl"
}
-void ScCellKeywordTranslator::addToMap(const OUString& rKey, const sal_Char* pName, const lang::Locale& rLocale, OpCode eOpCode)
+void ScCellKeywordTranslator::addToMap(const OUString& rKey, const char* pName, const lang::Locale& rLocale, OpCode eOpCode)
{
ScCellKeyword aKeyItem( pName, eOpCode, rLocale );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f5d30d2e8f36..b2aa24f727b5 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -101,7 +101,7 @@ enum ScanState
}
-static const sal_Char* pInternal[2] = { "TTT", "__DEBUG_VAR" };
+static const char* pInternal[2] = { "TTT", "__DEBUG_VAR" };
using namespace ::com::sun::star::i18n;
@@ -2840,7 +2840,7 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
// read the old names as well.
struct FunctionName
{
- const sal_Char* pName;
+ const char* pName;
OpCode eOp;
};
static const FunctionName aOdffAliases[] = {
@@ -2872,8 +2872,8 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
// recognized as old versions wrote them.
struct FunctionName
{
- const sal_Char* pName;
- OpCode eOp;
+ const char* pName;
+ OpCode eOp;
};
static const FunctionName aOoxmlAliases[] = {
{ "EFFECTIVE", ocEffect }, // EFFECTIVE -> EFFECT
@@ -2903,8 +2903,8 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
// those are renamed.
struct FunctionName
{
- const sal_Char* pName;
- OpCode eOp;
+ const char* pName;
+ OpCode eOp;
};
static const FunctionName aPodfAliases[] = {
{ "EFFECT", ocEffect } // EFFECTIVE -> EFFECT
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 96470d3634b5..3e0689410adc 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -71,7 +71,7 @@ OUString ScEditUtil::ModifyDelimiters( const OUString& rOld )
return aRet;
}
-static OUString lcl_GetDelimitedString( const EditEngine& rEngine, const sal_Char c )
+static OUString lcl_GetDelimitedString( const EditEngine& rEngine, const char c )
{
sal_Int32 nParCount = rEngine.GetParagraphCount();
OUStringBuffer aRet( nParCount * 80 );
@@ -84,7 +84,7 @@ static OUString lcl_GetDelimitedString( const EditEngine& rEngine, const sal_Cha
return aRet.makeStringAndClear();
}
-static OUString lcl_GetDelimitedString( const EditTextObject& rEdit, const sal_Char c )
+static OUString lcl_GetDelimitedString( const EditTextObject& rEdit, const char c )
{
sal_Int32 nParCount = rEdit.GetParagraphCount();
OUStringBuffer aRet( nParCount * 80 );
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 388ed68f14ed..175228ccb104 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3503,7 +3503,7 @@ void ScInterpreter::ScChar()
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT;
- sal_Char cEncodedChar = static_cast<sal_Char>(fVal);
+ char cEncodedChar = static_cast<char>(fVal);
OUString aStr(&cEncodedChar, 1, osl_getThreadTextEncoding(), convertFlags);
PushString(aStr);
}
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 2dc9010e8eed..37b25cc2215a 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3282,9 +3282,9 @@ static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& r
{
struct ConvertInfo
{
- const sal_Char* pCurrText;
- double fRate;
- int nDec;
+ const char* pCurrText;
+ double fRate;
+ int nDec;
};
static const ConvertInfo aConvertTable[] = {
{ "EUR", 1.0, 2 },
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 1a371f3f3381..78a2bf59f7f2 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2528,7 +2528,7 @@ void ScInterpreter::ScExternal()
ParamType eParamType[MAXFUNCPARAM];
void* ppParam[MAXFUNCPARAM];
double nVal[MAXFUNCPARAM];
- sal_Char* pStr[MAXFUNCPARAM];
+ char* pStr[MAXFUNCPARAM];
sal_uInt8* pCellArr[MAXFUNCPARAM];
short i;
@@ -2567,7 +2567,7 @@ void ScInterpreter::ScExternal()
SetError( FormulaError::StringOverflow );
else
{
- pStr[i-1] = new sal_Char[ADDIN_MAXSTRLEN];
+ pStr[i-1] = new char[ADDIN_MAXSTRLEN];
strncpy( pStr[i-1], aStr.getStr(), ADDIN_MAXSTRLEN );
pStr[i-1][ADDIN_MAXSTRLEN-1] = 0;
ppParam[i] = pStr[i-1];
@@ -2646,7 +2646,7 @@ void ScInterpreter::ScExternal()
break;
case ParamType::PTR_STRING :
{
- std::unique_ptr<sal_Char[]> pcErg(new sal_Char[ADDIN_MAXSTRLEN]);
+ std::unique_ptr<char[]> pcErg(new char[ADDIN_MAXSTRLEN]);
ppParam[0] = pcErg.get();
pLegacyFuncData->Call(ppParam);
OUString aUni( pcErg.get(), strlen(pcErg.get()), osl_getThreadTextEncoding() );
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 8b58519bcda2..902cc717aff2 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -431,7 +431,7 @@ void ScInterpreter::ScEncodeURL()
OStringBuffer aUrlBuf( nLen );
for ( int i = 0; i < nLen; i++ )
{
- sal_Char c = aUtf8Str[ i ];
+ char c = aUtf8Str[ i ];
if ( rtl::isAsciiAlphanumeric( static_cast<unsigned char>( c ) ) || c == '-' || c == '_' )
aUrlBuf.append( c );
else
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index e47fe47fe148..e05b48e0436d 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -525,7 +525,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
void ScParameterClassification::GenerateDocumentation()
{
- static const sal_Char aEnvVarName[] = "OOO_CALC_GENPARCLASSDOC";
+ static const char aEnvVarName[] = "OOO_CALC_GENPARCLASSDOC";
if ( !getenv( aEnvVarName) )
return;
MergeArgumentsFromFunctionResource();
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7e6a8daebdcf..88596fec0e3b 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -468,7 +468,7 @@ ScRangeData::IsNameValidType ScRangeData::IsNameValid( const OUString& rName, co
{
/* XXX If changed, sc/source/filter/ftools/ftools.cxx
* ScfTools::ConvertToScDefinedName needs to be changed too. */
- sal_Char const a('.');
+ char const a('.');
if (rName.indexOf(a) != -1)
return NAME_INVALID_BAD_STRING;
sal_Int32 nPos = 0;
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 84179282a650..59d341a0fb92 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -83,12 +83,12 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
bContextOrNotAsciiEncoding = false;
}
- const sal_Char p2DoubleQuotes_LF[] = "\"\"\n";
- const sal_Char pSpecDataType_LF[] = "-1,0\n";
- const sal_Char pEmptyData[] = "1,0\n\"\"\n";
- const sal_Char pStringData[] = "1,0\n";
- const sal_Char pNumData[] = "0,";
- const sal_Char pNumDataERROR[] = "0,0\nERROR\n";
+ const char p2DoubleQuotes_LF[] = "\"\"\n";
+ const char pSpecDataType_LF[] = "-1,0\n";
+ const char pEmptyData[] = "1,0\n\"\"\n";
+ const char pStringData[] = "1,0\n";
+ const char pNumData[] = "0,";
+ const char pNumDataERROR[] = "0,0\nERROR\n";
OUStringBuffer aOS;
OUString aString;
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index de64bcef7a75..a0e3974caafb 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -445,7 +445,7 @@ TokenId TokenPool::Store( const sal_uInt16 nIndex )
TokenId TokenPool::Store( const OUString& rString )
{
- // mostly copied to Store( const sal_Char* ), to avoid a temporary string
+ // mostly copied to Store( const char* ), to avoid a temporary string
if (!CheckElementOrGrow())
return static_cast<const TokenId>(nElementCurrent+1);
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 44325e4804aa..65fa3f896e31 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1224,7 +1224,7 @@ void XclExpNote::Save( XclExpStream& rStrm )
case EXC_BIFF5:
{
// write the NOTE record directly, there may be the need to create more than one
- const sal_Char* pcBuffer = maNoteText.getStr();
+ const char* pcBuffer = maNoteText.getStr();
sal_uInt16 nCharsLeft = static_cast< sal_uInt16 >( maNoteText.getLength() );
while( nCharsLeft )
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 70df7cde57ca..80a89af7a25d 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -146,7 +146,7 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc )
{
if( !cChar )
{
- sal_Char cByteChar = 0;
+ char cByteChar = 0;
BuildAppend( &cByteChar, 1 );
}
else
@@ -473,13 +473,13 @@ void XclExpString::CharsToBuffer( const sal_Unicode* pcSource, sal_Int32 nBegin,
mbWrapped = ::std::find( aBeg, aEnd, EXC_LF ) != aEnd;
}
-void XclExpString::CharsToBuffer( const sal_Char* pcSource, sal_Int32 nBegin, sal_Int32 nLen )
+void XclExpString::CharsToBuffer( const char* pcSource, sal_Int32 nBegin, sal_Int32 nLen )
{
OSL_ENSURE( maCharBuffer.size() >= static_cast< size_t >( nBegin + nLen ),
"XclExpString::CharsToBuffer - char buffer invalid" );
ScfUInt8Vec::iterator aBeg = maCharBuffer.begin() + nBegin;
ScfUInt8Vec::iterator aEnd = aBeg + nLen;
- const sal_Char* pcSrcChar = pcSource;
+ const char* pcSrcChar = pcSource;
for( ScfUInt8Vec::iterator aIt = aBeg; aIt != aEnd; ++aIt, ++pcSrcChar )
*aIt = static_cast< sal_uInt8 >( *pcSrcChar );
mbIsUnicode = false;
@@ -518,7 +518,7 @@ void XclExpString::Build( const sal_Unicode* pcSource, sal_Int32 nCurrLen, XclSt
CharsToBuffer( pcSource, 0, mnLen );
}
-void XclExpString::Build( const sal_Char* pcSource, sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMaxLen )
+void XclExpString::Build( const char* pcSource, sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMaxLen )
{
Init( nCurrLen, nFlags, nMaxLen, false );
CharsToBuffer( pcSource, 0, mnLen );
@@ -544,7 +544,7 @@ void XclExpString::BuildAppend( const sal_Unicode* pcSource, sal_Int32 nAddLen )
}
}
-void XclExpString::BuildAppend( const sal_Char* pcSource, sal_Int32 nAddLen )
+void XclExpString::BuildAppend( const char* pcSource, sal_Int32 nAddLen )
{
OSL_ENSURE( !mbIsBiff8, "XclExpString::BuildAppend - must not be called at unicode strings" );
if( !mbIsBiff8 )
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 47ca45d10f25..d654f38ab133 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2916,7 +2916,7 @@ OUString XclImpPictureObj::GetOleStorageName() const
if( (mbEmbedded || mbLinked) && !mbControl && (mnStorageId > 0) )
{
aStrgName = mbEmbedded ? OUStringLiteral(EXC_STORAGE_OLE_EMBEDDED) : OUStringLiteral(EXC_STORAGE_OLE_LINKED);
- static const sal_Char spcHexChars[] = "0123456789ABCDEF";
+ static const char spcHexChars[] = "0123456789ABCDEF";
for( sal_uInt8 nIndex = 32; nIndex > 0; nIndex -= 4 )
aStrgName.append(OUStringChar( spcHexChars[ ::extract_value< sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] ));
}
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index a0293e69dd6e..0904903da3c0 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -944,7 +944,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars )
OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars )
{
nChars = GetMaxRawReadSize(nChars);
- std::unique_ptr<sal_Char[]> pcBuffer(new sal_Char[ nChars + 1 ]);
+ std::unique_ptr<char[]> pcBuffer(new char[ nChars + 1 ]);
sal_uInt16 nCharsRead = ReadRawData( pcBuffer.get(), nChars );
pcBuffer[ nCharsRead ] = '\0';
OUString aRet( pcBuffer.get(), strlen(pcBuffer.get()), mrRoot.GetTextEncoding() );
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index a51ecefd74f6..b3a388ce7fb2 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -454,16 +454,16 @@ const XclChFormatInfo& XclChFormatInfoProvider::GetFormatInfo( XclChObjectType e
namespace {
// chart type service names
-const sal_Char SERVICE_CHART2_AREA[] = "com.sun.star.chart2.AreaChartType";
-const sal_Char SERVICE_CHART2_CANDLE[] = "com.sun.star.chart2.CandleStickChartType";
-const sal_Char SERVICE_CHART2_COLUMN[] = "com.sun.star.chart2.ColumnChartType";
-const sal_Char SERVICE_CHART2_LINE[] = "com.sun.star.chart2.LineChartType";
-const sal_Char SERVICE_CHART2_NET[] = "com.sun.star.chart2.NetChartType";
-const sal_Char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
-const sal_Char SERVICE_CHART2_PIE[] = "com.sun.star.chart2.PieChartType";
-const sal_Char SERVICE_CHART2_SCATTER[] = "com.sun.star.chart2.ScatterChartType";
-const sal_Char SERVICE_CHART2_BUBBLE[] = "com.sun.star.chart2.BubbleChartType";
-const sal_Char SERVICE_CHART2_SURFACE[] = "com.sun.star.chart2.ColumnChartType"; // Todo
+const char SERVICE_CHART2_AREA[] = "com.sun.star.chart2.AreaChartType";
+const char SERVICE_CHART2_CANDLE[] = "com.sun.star.chart2.CandleStickChartType";
+const char SERVICE_CHART2_COLUMN[] = "com.sun.star.chart2.ColumnChartType";
+const char SERVICE_CHART2_LINE[] = "com.sun.star.chart2.LineChartType";
+const char SERVICE_CHART2_NET[] = "com.sun.star.chart2.NetChartType";
+const char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
+const char SERVICE_CHART2_PIE[] = "com.sun.star.chart2.PieChartType";
+const char SERVICE_CHART2_SCATTER[] = "com.sun.star.chart2.ScatterChartType";
+const char SERVICE_CHART2_BUBBLE[] = "com.sun.star.chart2.BubbleChartType";
+const char SERVICE_CHART2_SURFACE[] = "com.sun.star.chart2.ColumnChartType"; // Todo
namespace csscd = css::chart::DataLabelPlacement;
@@ -606,29 +606,29 @@ OUString XclChObjectTable::InsertObject(const uno::Any& rObj)
namespace {
/** Property names for line style in common objects. */
-const sal_Char* const sppcLineNamesCommon[] =
+const char* const sppcLineNamesCommon[] =
{ "LineStyle", "LineWidth", "LineColor", "LineTransparence", "LineDashName", nullptr };
/** Property names for line style in linear series objects. */
-const sal_Char* const sppcLineNamesLinear[] =
+const char* const sppcLineNamesLinear[] =
{ "LineStyle", "LineWidth", "Color", "Transparency", "LineDashName", nullptr };
/** Property names for line style in filled series objects. */
-const sal_Char* const sppcLineNamesFilled[] =
+const char* const sppcLineNamesFilled[] =
{ "BorderStyle", "BorderWidth", "BorderColor", "BorderTransparency", "BorderDashName", nullptr };
/** Property names for solid area style in common objects. */
-const sal_Char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", nullptr };
+const char* const sppcAreaNamesCommon[] = { "FillStyle", "FillColor", "FillTransparence", nullptr };
/** Property names for solid area style in filled series objects. */
-const sal_Char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", nullptr };
+const char* const sppcAreaNamesFilled[] = { "FillStyle", "Color", "Transparency", nullptr };
/** Property names for gradient area style in common objects. */
-const sal_Char* const sppcGradNamesCommon[] = { "FillStyle", "FillGradientName", nullptr };
+const char* const sppcGradNamesCommon[] = { "FillStyle", "FillGradientName", nullptr };
/** Property names for gradient area style in filled series objects. */
-const sal_Char* const sppcGradNamesFilled[] = { "FillStyle", "GradientName", nullptr };
+const char* const sppcGradNamesFilled[] = { "FillStyle", "GradientName", nullptr };
/** Property names for hatch area style in common objects. */
-const sal_Char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", nullptr };
+const char* const sppcHatchNamesCommon[] = { "FillStyle", "FillHatchName", "FillColor", "FillBackground", nullptr };
/** Property names for hatch area style in filled series objects. */
-const sal_Char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", nullptr };
+const char* const sppcHatchNamesFilled[] = { "FillStyle", "HatchName", "Color", "FillBackground", nullptr };
/** Property names for bitmap area style. */
-const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", nullptr };
+const char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "FillBitmapMode", nullptr };
} // namespace
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 283c8e60a019..45bcbbc753a8 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -298,8 +298,8 @@ namespace {
static const struct
{
- const sal_Char* mpcListenerType;
- const sal_Char* mpcEventMethod;
+ const char* mpcListenerType;
+ const char* mpcEventMethod;
}
spTbxListenerData[] =
{
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 8d769042642a..cf87e8aeafd0 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -534,41 +534,41 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight )
namespace {
/** Property names for common font settings. */
-const sal_Char *const sppcPropNamesChCommon[] =
+const char *const sppcPropNamesChCommon[] =
{
"CharUnderline", "CharStrikeout", "CharColor", "CharContoured", "CharShadowed", nullptr
};
/** Property names for Western font settings. */
-const sal_Char *const sppcPropNamesChWstrn[] =
+const char *const sppcPropNamesChWstrn[] =
{
"CharFontName", "CharHeight", "CharPosture", "CharWeight", nullptr
};
/** Property names for Asian font settings. */
-const sal_Char *const sppcPropNamesChAsian[] =
+const char *const sppcPropNamesChAsian[] =
{
"CharFontNameAsian", "CharHeightAsian", "CharPostureAsian", "CharWeightAsian", nullptr
};
/** Property names for Complex font settings. */
-const sal_Char *const sppcPropNamesChCmplx[] =
+const char *const sppcPropNamesChCmplx[] =
{
"CharFontNameComplex", "CharHeightComplex", "CharPostureComplex", "CharWeightComplex", nullptr
};
/** Property names for escapement. */
-const sal_Char *const sppcPropNamesChEscapement[] =
+const char *const sppcPropNamesChEscapement[] =
{
"CharEscapement", "CharEscapementHeight", nullptr
};
const sal_Int8 EXC_API_ESC_HEIGHT = 58; /// Default escapement font height.
/** Property names for Western font settings without font name. */
-const sal_Char *const *const sppcPropNamesChWstrnNoName = sppcPropNamesChWstrn + 1;
+const char *const *const sppcPropNamesChWstrnNoName = sppcPropNamesChWstrn + 1;
/** Property names for Asian font settings without font name. */
-const sal_Char *const *const sppcPropNamesChAsianNoName = sppcPropNamesChAsian + 1;
+const char *const *const sppcPropNamesChAsianNoName = sppcPropNamesChAsian + 1;
/** Property names for Complex font settings without font name. */
-const sal_Char *const *const sppcPropNamesChCmplxNoName = sppcPropNamesChCmplx + 1;
+const char *const *const sppcPropNamesChCmplxNoName = sppcPropNamesChCmplx + 1;
/** Property names for font settings in form controls. */
-const sal_Char *const sppcPropNamesControl[] =
+const char *const sppcPropNamesControl[] =
{
"FontName", "FontFamily", "FontCharset", "FontHeight", "FontSlant",
"FontWeight", "FontLineStyle", "FontStrikeout", "TextColor", nullptr
@@ -771,7 +771,7 @@ constexpr LanguageType PRV_LANGUAGE_ASIAN_PRIM = primary(LANGUAGE_CHINESE);
struct XclBuiltInFormat
{
sal_uInt16 mnXclNumFmt; /// Excel built-in index.
- const sal_Char* mpFormat; /// Format string, may be 0 (meOffset used then).
+ const char* mpFormat; /// Format string, may be 0 (meOffset used then).
NfIndexTableOffset const meOffset; /// SvNumberFormatter format index, if mpFormat==0.
sal_uInt16 const mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE.
};
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 2a531a70da61..9c94d10765c1 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -435,7 +435,7 @@ OUString XclTools::GetXclFontName( const OUString& rFontName )
static const char maDefNamePrefix[] = "Excel_BuiltIn_"; /// Prefix for built-in defined names.
static const char maDefNamePrefixXml[] = "_xlnm."; /// Prefix for built-in defined names for OOX
-static const sal_Char* const ppcDefNames[] =
+static const char* const ppcDefNames[] =
{
"Consolidate_Area",
"Auto_Open",
@@ -509,7 +509,7 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
static const char maStyleNamePrefix1[] = "Excel_BuiltIn_"; /// Prefix for built-in cell style names.
static const char maStyleNamePrefix2[] = "Excel Built-in "; /// Prefix for built-in cell style names from OOX filter.
-static const sal_Char* const ppcStyleNames[] =
+static const char* const ppcStyleNames[] =
{
"", // "Normal" not used directly, but localized "Default"
"RowLevel_", // outline level will be appended
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index bd5aac4ae5ef..e0230edfcf72 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -267,7 +267,7 @@ void ScfPropertySet::SetProperties( const Sequence< OUString >& rPropNames, cons
}
}
-ScfPropSetHelper::ScfPropSetHelper( const sal_Char* const* ppcPropNames ) :
+ScfPropSetHelper::ScfPropSetHelper( const char* const* ppcPropNames ) :
mnNextIdx( 0 )
{
OSL_ENSURE( ppcPropNames, "ScfPropSetHelper::ScfPropSetHelper - no strings found" );
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 8d1dca1b0a9c..e1813a10d82a 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -116,7 +116,7 @@ rtl_TextEncoding ScfTools::GetSystemTextEncoding()
OUString ScfTools::GetHexStr( sal_uInt16 nValue )
{
- const sal_Char pHex[] = "0123456789ABCDEF";
+ const char pHex[] = "0123456789ABCDEF";
OUString aStr = OUStringChar( pHex[ nValue >> 12 ] )
+ OUStringChar( pHex[ (nValue >> 8) & 0x000F ] )
+ OUStringChar( pHex[ (nValue >> 4) & 0x000F ] )
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index a31caa8e31ca..79b1d803d62f 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -80,11 +80,11 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-const static sal_Char sMyBegComment[] = "<!-- ";
-const static sal_Char sMyEndComment[] = " -->";
-const static sal_Char sDisplay[] = "display:";
-const static sal_Char sBorder[] = "border:";
-const static sal_Char sBackground[] = "background:";
+const static char sMyBegComment[] = "<!-- ";
+const static char sMyEndComment[] = " -->";
+const static char sDisplay[] = "display:";
+const static char sBorder[] = "border:";
+const static char sBackground[] = "background:";
const sal_uInt16 ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
{
@@ -100,7 +100,7 @@ const char* ScHTMLExport::pFontSizeCss[SC_HTML_FONTSIZES] =
};
const sal_uInt16 ScHTMLExport::nCellSpacing = 0;
-const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] =
+const char ScHTMLExport::sIndentSource[nIndentMax+1] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
// Macros for HTML export
@@ -178,7 +178,7 @@ static void lcl_AddStamp( OUString& rStr, const OUString& rName,
static OString lcl_makeHTMLColorTriplet(const Color& rColor)
{
- sal_Char buf[24];
+ char buf[24];
// <font COLOR="#00FF40">hello</font>
snprintf( buf, 24, "\"#%02X%02X%02X\"", rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue() );
@@ -889,7 +889,7 @@ void ScHTMLExport::WriteCell( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, SC
aStrTD.append('"');
}
- const sal_Char* pChar;
+ const char* pChar;
sal_uInt16 nHeightPixel;
const ScMergeAttr& rMergeAttr = pAttr->GetItem( ATTR_MERGE, pCondItemSet );
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 412150a2204c..a1ccfb6e4ded 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -255,7 +255,7 @@ ErrCode ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
{
// When not loading, set up fake http headers to force the SfxHTMLParser to use UTF8
// (used when pasting from clipboard)
- const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
+ const char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
if( pCharSet )
{
OUString aContentType = "text/html; charset=" +
@@ -2774,7 +2774,7 @@ ErrCode ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
{
/* When not loading, set up fake HTTP headers to force the SfxHTMLParser
to use UTF8 (used when pasting from clipboard) */
- const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
+ const char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( RTL_TEXTENCODING_UTF8 );
if( pCharSet )
{
OUString aContentType = "text/html; charset=" +
diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index 4fec8fe14367..50fcc9da5b54 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -59,7 +59,7 @@ public:
explicit Shape(
const WorksheetHelper& rHelper,
const AttributeList& rAttribs,
- const sal_Char* pcServiceName );
+ const char* pcServiceName );
protected:
virtual void finalizeXShape(
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index 25329a380c5e..90fe0960a810 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -30,8 +30,8 @@
#include <vector>
#include <map>
-const sal_Char nHorizontal = 1;
-const sal_Char nVertical = 2;
+const char nHorizontal = 1;
+const char nVertical = 2;
struct ScHTMLImage
{
@@ -41,7 +41,7 @@ struct ScHTMLImage
OUString aFilterName;
std::unique_ptr<Graphic>
pGraphic; // is taken over by WriteToDocument
- sal_Char nDir; // 1==hori, 2==verti, 3==both
+ char nDir; // 1==hori, 2==verti, 3==both
ScHTMLImage() :
aSize( 0, 0 ), aSpace( 0, 0 ), nDir( nHorizontal )
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 6dadd7a7fb43..1776c99227ca 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -215,7 +215,7 @@ class ScfPropSetHelper
{
public:
/** @param ppPropNames A null-terminated array of ASCII property names. */
- explicit ScfPropSetHelper( const sal_Char* const* ppcPropNames );
+ explicit ScfPropSetHelper( const char* const* ppcPropNames );
// read properties --------------------------------------------------------
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 2fcc5517aa7e..a2478f35e856 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -105,7 +105,7 @@ class ScHTMLExport : public ScExportBase
static sal_uInt16 nFontSize[SC_HTML_FONTSIZES];
static const char* pFontSizeCss[SC_HTML_FONTSIZES];
static const sal_uInt16 nCellSpacing;
- static const sal_Char sIndentSource[];
+ static const char sIndentSource[];
typedef std::unique_ptr<std::map<OUString, OUString> > FileNameMapPtr;
typedef std::vector<ScHTMLGraphEntry> GraphEntryList;
@@ -120,7 +120,7 @@ class ScHTMLExport : public ScExportBase
rtl_TextEncoding eDestEnc;
SCTAB nUsedTables;
short nIndent;
- sal_Char sIndent[nIndentMax+1];
+ char sIndent[nIndentMax+1];
bool const bAll; // whole document
bool bTabHasGraphics;
bool bTabAlignedLeft;
@@ -168,7 +168,7 @@ class ScHTMLExport : public ScExportBase
Size MMToPixel( const Size& r100thMMSize );
void IncIndent( short nVal );
- const sal_Char* GetIndentStr() const
+ const char* GetIndentStr() const
{
return sIndent;
}
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index e87b36ed3ce3..5f39ee0cfd64 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -70,7 +70,7 @@ private:
static DefTokenId IndexToToken( sal_uInt8 );
static FUNC_TYPE IndexToTypeWK123( sal_uInt8 );
static DefTokenId IndexToTokenWK123( sal_uInt8 );
- void DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtName );
+ void DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const char* pExtName );
void LotusRelToScRel(sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD);
bool bWK3; // alternative Code translation for < WK1
bool bWK123; // alternative for 123
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 7429cb4efb25..2214d17daa82 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -62,7 +62,7 @@ private:
inline void Read( ScAddress& );
inline void Read( ScRange& );
// for addresses/ranges in the format row(16)/tab(8)/col(8)
- inline void Read( sal_Char& );
+ inline void Read( char& );
inline void Read( sal_uInt8& );
inline void Read( sal_uInt16& );
inline void Read( sal_Int16& );
@@ -99,7 +99,7 @@ inline void ImportLotus::Read( ScRange& rRange )
Read( rRange.aEnd );
}
-inline void ImportLotus::Read( sal_Char& r )
+inline void ImportLotus::Read( char& r )
{
pIn->ReadChar( r );
}
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 29181b4848d0..5dd843781b1c 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -63,7 +63,7 @@ public:
/** Sets the passed format code, encoded in UTF-8. */
void setFormatCode(
const css::lang::Locale& rLocale,
- const sal_Char* pcFmtCode );
+ const char* pcFmtCode );
/** Sets the passed predefined format code identifier. */
void setPredefinedId(
const css::lang::Locale& rLocale,
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 667bb665e8c0..6c25c481ba1b 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -59,13 +59,13 @@ public:
static const size_t nBufSize = 256;
QProToSc( SvStream &aStr, svl::SharedStringPool& rSPool, const ScAddress& rRefPos );
ConvErr Convert( const ScDocument* pDoc, std::unique_ptr<ScTokenArray>& pArray );
- void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString );
+ void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const char* pExtString );
void ReadSRD( const ScDocument* pDoc, ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel );
void IncToken( TokenId &aParam );
static DefTokenId IndexToToken( sal_uInt16 nToken );
static QPRO_FUNC_TYPE IndexToType( sal_uInt8 nToken );
static DefTokenId IndexToDLLId( sal_uInt16 nIndex );
- static const sal_Char* getString( sal_uInt8 nIndex );
+ static const char* getString( sal_uInt8 nIndex );
};
#endif
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index c2eb72f867c1..1d9559d73b2e 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -31,7 +31,7 @@ const sal_uInt8 nFractionalFloat = 2; // " " "
struct LotusContext;
-void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString);
+void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, char *pString);
void SetFormat(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt);
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 6bb88f824524..fd0d9fadaac1 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -183,7 +183,7 @@ private:
/** Inserts the passed character array into the internal character buffer.
@param nBegin First index in internal buffer to fill.
@param nLen Number of characters to insert. */
- void CharsToBuffer( const sal_Char* pcSource, sal_Int32 nBegin, sal_Int32 nLen );
+ void CharsToBuffer( const char* pcSource, sal_Int32 nBegin, sal_Int32 nLen );
/** Initializes flags, string length, and resizes character buffer.
@param nFlags Modifiers for string export.
@@ -205,7 +205,7 @@ private:
@param nCurrLen The real count of characters contained in the passed buffer.
@param nMaxLen The maximum length allowed of the resulting string. */
void Build(
- const sal_Char* pcSource, sal_Int32 nCurrLen,
+ const char* pcSource, sal_Int32 nCurrLen,
XclStrFlags nFlags, sal_uInt16 nMaxLen );
/** Initializes string length and resizes character buffers for appending operation.
@@ -218,7 +218,7 @@ private:
/** Appends the given character array to the character buffer.
@param pcSource The source character buffer. Trailing NUL character is not necessary.
@param nAddLen The real count of characters contained in the passed buffer. */
- void BuildAppend( const sal_Char* pcSource, sal_Int32 nAddLen );
+ void BuildAppend( const char* pcSource, sal_Int32 nAddLen );
/** Initializes write process on stream. */
void PrepareWrite( XclExpStream& rStrm, sal_uInt16 nBytes ) const;
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 8ba2219b96fe..a0bda2119ac0 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1209,7 +1209,7 @@ struct XclChTypeInfo
XclChTypeId meTypeId; /// Unique chart type identifier.
XclChTypeCateg meTypeCateg; /// Chart type category this type belongs to.
sal_uInt16 mnRecId; /// Record identifier written to the file.
- const sal_Char* mpcServiceName; /// Service name of the type.
+ const char* mpcServiceName; /// Service name of the type.
XclChVarPointMode meVarPointMode; /// Mode for varying point colors.
sal_Int32 mnDefaultLabelPos; /// Default data label position (API constant).
bool mbCombinable2d; /// true = Types can be combined in one axes set.
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index e281615bd3eb..ce4a81f693b2 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -317,7 +317,7 @@ struct XclFunctionInfo
sal_uInt8 const mnRetClass; /// Token class of the return value.
XclFuncParamInfo const mpParamInfos[ EXC_FUNCINFO_PARAMINFO_COUNT ]; /// Information for all parameters.
sal_uInt8 const mnFlags; /// Additional flags (EXC_FUNCFLAG_* constants).
- const sal_Char* mpcMacroName; /** Function name, if simulated by
+ const char* mpcMacroName; /** Function name, if simulated by
a macro call (UTF-8) EXC_FUNCFLAG_ADDINEQUIV is 0;
or programmatical add-in name
if stored as such and
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index 6723f7d402c6..e80686f9aa0b 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -162,7 +162,7 @@ static WKTYP ScanVersion(SvStream& aStream)
if( nVersNr == 0x0004 && nRecLen == 26 )
{
// 4 bytes of 26 read => skip 22 (read instead of seek to make IsEof() work just in case)
- sal_Char aDummy[22];
+ char aDummy[22];
aStream.ReadBytes(aDummy, 22);
return !aStream.good() ? eWK_Error : eWK3;
}
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 6736732bfef3..783780624f34 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -31,11 +31,11 @@
#include <sal/log.hxx>
#include <memory>
-static const sal_Char* GetAddInName( const sal_uInt8 nIndex );
+static const char* GetAddInName( const sal_uInt8 nIndex );
static DefTokenId lcl_KnownAddIn(const OString& rTest);
-void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtString )
+void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const char* pExtString )
{
TokenId eParam[ 256 ];
sal_Int32 nPass;
@@ -392,7 +392,7 @@ void LotusToSc::Convert( std::unique_ptr<ScTokenArray>& rpErg, sal_Int32& rRest
FUNC_TYPE eType = FT_NOP;
TokenId nBuf0;
DefTokenId eOc;
- const sal_Char* pExtName = nullptr;
+ const char* pExtName = nullptr;
RangeNameBufferWK3& rRangeNameBufferWK3 = *m_rContext.pRngNmBffWK3;
ScComplexRefData aCRD;
@@ -610,7 +610,7 @@ void LotusToSc::Convert( std::unique_ptr<ScTokenArray>& rpErg, sal_Int32& rRest
if( nStrLen )
{
- std::unique_ptr<sal_Char[]> p(new (::std::nothrow) sal_Char[ nStrLen + 1 ]);
+ std::unique_ptr<char[]> p(new (::std::nothrow) char[ nStrLen + 1 ]);
if (p)
{
aIn.ReadBytes(p.get(), nStrLen);
@@ -1724,9 +1724,9 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
return pToken[ nIndex ];
}
-const sal_Char* GetAddInName( const sal_uInt8 n )
+const char* GetAddInName( const sal_uInt8 n )
{
- static const sal_Char* pNames[ 256 ] =
+ static const char* pNames[ 256 ] =
{
nullptr, // 0 8-Byte-IEEE-Float
nullptr, // 1 Variable
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 73ab64c29559..0c8db339f29a 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -159,7 +159,7 @@ void ImportLotus::Userrange()
Read( nRangeType );
- sal_Char aBuffer[ 17 ];
+ char aBuffer[ 17 ];
pIn->ReadBytes(aBuffer, 16);
aBuffer[ 16 ] = 0;
OUString aName( aBuffer, strlen(aBuffer), eQuellChar );
@@ -198,7 +198,7 @@ void ImportLotus::Labelcell()
{
ScAddress aA;
OUString aLabel;
- sal_Char cAlign;
+ char cAlign;
Read( aA );
Read( cAlign );
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index c2043a00ccdf..73713508a568 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -113,7 +113,7 @@ void OP_Label(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= std::min<sal_uInt16>(n, 5);
- std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
+ std::unique_ptr<char[]> pText(new char[n + 1]);
r.ReadBytes(pText.get(), n);
pText[n] = 0;
@@ -193,7 +193,7 @@ void OP_NamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
// POST: don't save for invalid coordinates
sal_uInt16 nColSt, nRowSt, nColEnd, nRowEnd;
- sal_Char cBuffer[ 16+1 ];
+ char cBuffer[ 16+1 ];
r.ReadBytes(cBuffer, 16);
cBuffer[ 16 ] = 0;
@@ -209,7 +209,7 @@ void OP_NamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
pRange.reset(new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt),
static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) ));
- sal_Char cBuf[sizeof(cBuffer)+1];
+ char cBuf[sizeof(cBuffer)+1];
if( rtl::isAsciiDigit( static_cast<unsigned char>(*cBuffer) ) )
{ // first char in name is a number -> prepend 'A'
cBuf[0] = 'A';
@@ -232,7 +232,7 @@ void OP_SymphNamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
sal_uInt16 nColSt, nRowSt, nColEnd, nRowEnd;
sal_uInt8 nType;
- sal_Char cBuffer[ 16+1 ];
+ char cBuffer[ 16+1 ];
r.ReadBytes(cBuffer, 16);
cBuffer[ 16 ] = 0;
@@ -248,7 +248,7 @@ void OP_SymphNamedRange(LotusContext& rContext, SvStream& r, sal_uInt16 /*n*/)
pRange.reset(new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt),
static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) ));
- sal_Char cBuf[sizeof(cBuffer)+1];
+ char cBuf[sizeof(cBuffer)+1];
if( rtl::isAsciiDigit( static_cast<unsigned char>(*cBuffer) ) )
{ // first char in name is a number -> prepend 'A'
cBuf[0] = 'A';
@@ -363,7 +363,7 @@ void OP_Label123(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= std::min<sal_uInt16>(n, 4);
- std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
+ std::unique_ptr<char[]> pText(new char[n + 1]);
r.ReadBytes(pText.get(), n);
pText[ n ] = 0;
@@ -446,7 +446,7 @@ void OP_Note123(LotusContext& rContext, SvStream& r, sal_uInt16 n)
n -= std::min<sal_uInt16>(n, 4);
- std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]);
+ std::unique_ptr<char[]> pText(new char[n + 1]);
r.ReadBytes(pText.get(), n);
pText[ n ] = 0;
@@ -580,11 +580,11 @@ void OP_SheetName123(LotusContext& rContext, SvStream& rStream, sal_uInt16 nLeng
sal_uInt16 nSheetNum(0);
rStream.ReadUInt16(nSheetNum);
- ::std::vector<sal_Char> sSheetName;
+ ::std::vector<char> sSheetName;
sSheetName.reserve(nLength-4);
for (sal_uInt16 i = 4; i < nLength; ++i)
{
- sal_Char c;
+ char c;
rStream.ReadChar( c );
sSheetName.push_back(c);
}
diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx
index 4622d5d72c44..b4cbaff91a9d 100644
--- a/sc/source/filter/lotus/optab.cxx
+++ b/sc/source/filter/lotus/optab.cxx
@@ -21,7 +21,7 @@
#include <optab.h>
#include "lotfilter.hxx"
-// edit function sal_Char *X( sal_Char * )
+// edit function char *X( char * )
OPCODE_FKT LotusContext::pOpFkt[ FKT_LIMIT ] =
{ // Code
OP_BOF, // 0
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 0c5fcbc0df7c..52248f796f0f 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -35,14 +35,14 @@
#include <math.h>
-void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString)
+void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, char* pString)
{
// evaluate Label-Format
SAL_WARN_IF( pString == nullptr, "sc.filter", "PutFormString(): pString == NULL" );
if (!pString)
return;
- sal_Char cForm;
+ char cForm;
SvxHorJustifyItem* pJustify = nullptr;
cForm = *pString;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 182be74080e1..93c91c574d75 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -55,7 +55,7 @@ const sal_uInt32 BIFF12_DEFNAME_BUILTIN = 0x00000020;
const OUStringLiteral spcOoxPrefix("_xlnm.");
-const sal_Char* const sppcBaseNames[] =
+const char* const sppcBaseNames[] =
{
"Consolidate_Area",
"Auto_Open",
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 0eb6b460217d..09ac89d60d17 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -90,7 +90,7 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl )
}
}
-Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, const sal_Char* pcServiceName ) :
+Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, const char* pcServiceName ) :
::oox::drawingml::Shape( pcServiceName ),
WorksheetHelper( rHelper )
{
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 9af3ad97048a..5156ab5ec207 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -179,8 +179,8 @@ typedef std::shared_ptr< FunctionInfo > FunctionInfoRef;
struct FunctionData
{
- const sal_Char* mpcOdfFuncName; /// ODF function name.
- const sal_Char* mpcOoxFuncName; /// OOXML function name.
+ const char* mpcOdfFuncName; /// ODF function name.
+ const char* mpcOoxFuncName; /// OOXML function name.
sal_uInt16 const mnBiff12FuncId; /// BIFF12 function identifier.
sal_uInt16 const mnBiffFuncId; /// BIFF2-BIFF8 function identifier.
sal_uInt8 const mnMinParamCount; /// Minimum number of parameters.
@@ -1138,7 +1138,7 @@ private:
static bool initOpCode( sal_Int32& ornOpCode, const OpCodeEntrySequence& rEntrySeq, sal_Int32 nSpecialId );
bool initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, const OUString& rOdfName, const OUString& rOoxName );
- bool initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, const sal_Char* pcOdfName, const sal_Char* pcOoxName );
+ bool initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, const char* pcOdfName, const char* pcOoxName );
bool initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, sal_Unicode cOdfName, sal_Unicode cOoxName );
bool initFuncOpCode( FunctionInfo& orFuncInfo, const ApiTokenMap& rFuncTokenMap );
@@ -1294,7 +1294,7 @@ bool OpCodeProviderImpl::initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rT
return false;
}
-bool OpCodeProviderImpl::initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, const sal_Char* pcOdfName, const sal_Char* pcOoxName )
+bool OpCodeProviderImpl::initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rTokenMap, const char* pcOdfName, const char* pcOoxName )
{
OUString aOoxName;
if( pcOoxName ) aOoxName = OUString::createFromAscii( pcOoxName );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 2ca5a3dc88f2..60515720f0f2 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -53,7 +53,7 @@ namespace {
struct BuiltinFormat
{
sal_Int32 mnNumFmtId; /// Built-in number format index.
- const sal_Char* mpcFmtCode; /// Format string, UTF-8, may be 0 (mnPredefId is used then).
+ const char* mpcFmtCode; /// Format string, UTF-8, may be 0 (mnPredefId is used then).
sal_Int16 const mnPredefId; /// Predefined format index, if mpcFmtCode is 0.
sal_Int32 const mnReuseId; /// Use this format, if mpcFmtCode is 0 and mnPredefId is -1.
};
@@ -1627,8 +1627,8 @@ static const BuiltinFormat spBuiltinFormats_zh_TW[] =
/** Specifies a built-in number format table for a specific locale. */
struct BuiltinFormatTable
{
- const sal_Char* mpcLocale; /// The locale for this table.
- const sal_Char* mpcParent; /// The locale of the parent table.
+ const char* mpcLocale; /// The locale for this table.
+ const char* mpcParent; /// The locale of the parent table.
const BuiltinFormat* mpFormats; /// The number format table (may be 0, if equal to parent).
};
@@ -1927,7 +1927,7 @@ void NumberFormat::setFormatCode( const OUString& rFmtCode )
maModel.maFmtCode = sFormat.makeStringAndClear();
}
-void NumberFormat::setFormatCode( const Locale& rLocale, const sal_Char* pcFmtCode )
+void NumberFormat::setFormatCode( const Locale& rLocale, const char* pcFmtCode )
{
maModel.maLocale = rLocale;
maModel.maFmtCode = OStringToOUString( OString( pcFmtCode ), RTL_TEXTENCODING_UTF8 );
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index dc92ad40ca11..7fd571505081 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -445,7 +445,7 @@ private:
namespace {
// different names for bold font style (lowercase)
-static const sal_Char* const sppcBoldNames[] =
+static const char* const sppcBoldNames[] =
{
"bold",
"fett", // German 'bold'
@@ -456,7 +456,7 @@ static const sal_Char* const sppcBoldNames[] =
};
// different names for italic font style (lowercase)
-static const sal_Char* const sppcItalicNames[] =
+static const char* const sppcItalicNames[] =
{
"italic",
"kursiv", // German 'italic'
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 009faee536f9..f67d4b01c47f 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2340,7 +2340,7 @@ void Dxf::fillToItemSet( SfxItemSet& rSet ) const
namespace {
-const sal_Char* const sppcStyleNames[] =
+const char* const sppcStyleNames[] =
{
"Normal",
"RowLevel_", // outline level will be appended
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 72e2f3612aaa..1560dc232322 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -56,7 +56,7 @@ bool loadFileContent(SfxMedium& rMedium, orcus::iface::import_filter& filter)
{
char pData[nReadBuffer];
nRead = pStream->ReadBytes(pData, nReadBuffer);
- aBuffer.append(static_cast<sal_Char*>(pData), nRead);
+ aBuffer.append(pData, nRead);
}
while (nRead == nReadBuffer);
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 6c2d46a9f874..d92eac3c24de 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -68,7 +68,7 @@ QProToSc::QProToSc( SvStream& rStream, svl::SharedStringPool& rSPool, const ScAd
aEingPos = rRefPos;
}
-void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString )
+void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const char* pExtString )
{
TokenId eParam[ nBufSize ];
sal_Int32 nCount;
@@ -204,7 +204,7 @@ ConvErr QProToSc::Convert( const ScDocument* pDoc, std::unique_ptr<ScTokenArray>
QPRO_FUNC_TYPE eType;
DefTokenId eOc;
double nFloatArray[ nBufSize ] = {0};
- const sal_Char* pExtString = nullptr;
+ const char* pExtString = nullptr;
aCRD.InitFlags();
aSRD.InitFlags();
@@ -660,9 +660,9 @@ DefTokenId QProToSc::IndexToDLLId( sal_uInt16 nIndex )
return eId;
}
-const sal_Char* QProToSc::getString( sal_uInt8 nIndex )
+const char* QProToSc::getString( sal_uInt8 nIndex )
{
- const sal_Char* pExtString = nullptr;
+ const char* pExtString = nullptr;
switch( nIndex )
{
case 57:
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 58cf4e18f29d..ec83fec61fad 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -486,7 +486,7 @@ bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, ScEEParseEntry* pE )
OutputDevice* pDefaultDev = Application::GetDefaultDevice();
long nWidth, nHeight;
nWidth = nHeight = 0;
- sal_Char nDir = nHorizontal;
+ char nDir = nHorizontal;
for (const std::unique_ptr<ScHTMLImage> & pImage : pE->maImageList)
{
ScHTMLImage* pI = pImage.get();
@@ -562,7 +562,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
Point aInsertPos( aCellInsertPos );
Point aSpace;
Size aLogicSize;
- sal_Char nDir = nHorizontal;
+ char nDir = nHorizontal;
for (const std::unique_ptr<ScHTMLImage> & pImage : pE->maImageList)
{
ScHTMLImage* pI = pImage.get();
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 17fe3b442706..60871111cd8e 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -104,7 +104,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
const ScMergeAttr& rMergeAttr = pAttr->GetItem( ATTR_MERGE );
const SvxVerJustifyItem& rVerJustifyItem= pAttr->GetItem( ATTR_VER_JUSTIFY );
- const sal_Char* pChar;
+ const char* pChar;
if ( rMergeAttr.GetColMerge() != 0 )
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMGF );
@@ -190,7 +190,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
const SvxPostureItem& rPostureItem = pAttr->GetItem( ATTR_FONT_POSTURE );
const SvxUnderlineItem& rUnderlineItem = pAttr->GetItem( ATTR_FONT_UNDERLINE );
- const sal_Char* pChar;
+ const char* pChar;
switch( rHorJustifyItem.GetValue() )
{
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 219e0f6d7905..c880da8ab417 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -919,7 +919,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
{
// write only as embedded, not linked
OUString aStorageName( "MBD" );
- sal_Char aBuf[ sizeof(sal_uInt32) * 2 + 1 ];
+ char aBuf[ sizeof(sal_uInt32) * 2 + 1 ];
// FIXME Eeek! Is this just a way to get a unique id?
sal_uInt32 nPictureId = sal_uInt32(sal_uIntPtr(this) >> 2);
sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) );
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 303795ace556..5bb50f5990e2 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -355,7 +355,7 @@ struct ScXMLConditionInfo
ScXMLConditionTokenType const meType;
sheet::ValidationType const meValidation;
sheet::ConditionOperator const meOperator;
- const sal_Char* mpcIdentifier;
+ const char* mpcIdentifier;
sal_Int32 const mnIdentLength;
};
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 4e98d40ddb45..2c30fffa9359 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -434,7 +434,7 @@ void ScXMLExport::SetSourceStream( const uno::Reference<io::XInputStream>& xNewS
{
// make sure it's a plain UTF-8 stream as written by OOo itself
- const sal_Char pXmlHeader[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+ const char pXmlHeader[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
sal_Int32 nLen = strlen(pXmlHeader);
uno::Sequence<sal_Int8> aFileStart(nLen);
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 7ad7043e47df..5f719a31c21c 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -22,8 +22,8 @@
#include <comphelper/string.hxx>
#include <osl/thread.h>
-static const sal_Char pStrFix[] = "FIX";
-static const sal_Char pStrMrg[] = "MRG";
+static const char pStrFix[] = "FIX";
+static const char pStrMrg[] = "MRG";
ScAsciiOptions::ScAsciiOptions() :
bFixedLen ( false ),
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 26781924baac..3de4d7ade31a 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -23,7 +23,7 @@
#include <osl/thread.h>
#include <global.hxx>
-static const sal_Char pStrFix[] = "FIX";
+static const char pStrFix[] = "FIX";
// The option string can no longer contain a semicolon (because of pick list),
// therefore, starting with version 336 comma instead
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 2cc37704d7ac..ca92a787f18d 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -626,7 +626,7 @@ void ScImportAsciiDlg::SetSeparators()
{
OString sString(OUStringToOString(maFieldSeparators,
RTL_TEXTENCODING_MS_1252));
- const sal_Char *aSep = sString.getStr();
+ const char *aSep = sString.getStr();
sal_Int32 len = maFieldSeparators.getLength();
for (int i = 0; i < len; ++i)
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 689a257192bf..b15d08f9668a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -139,25 +139,25 @@ using ::std::vector;
// Filter names (like in sclib.cxx)
-static const sal_Char pFilterSc50[] = "StarCalc 5.0";
-static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char pFilterAscii[] = SC_TEXT_CSV_FILTER_NAME;
-static const sal_Char pFilterLotus[] = "Lotus";
-static const sal_Char pFilterQPro6[] = "Quattro Pro 6.0";
-static const sal_Char pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char pFilterExcel95[] = "MS Excel 95";
-static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char pFilterExcel97[] = "MS Excel 97";
-static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char pFilterDBase[] = "dBase";
-static const sal_Char pFilterDif[] = "DIF";
-static const sal_Char pFilterSylk[] = "SYLK";
-static const sal_Char pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
-static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const char pFilterSc50[] = "StarCalc 5.0";
+static const char pFilterXML[] = "StarOffice XML (Calc)";
+static const char pFilterAscii[] = SC_TEXT_CSV_FILTER_NAME;
+static const char pFilterLotus[] = "Lotus";
+static const char pFilterQPro6[] = "Quattro Pro 6.0";
+static const char pFilterExcel4[] = "MS Excel 4.0";
+static const char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const char pFilterExcel5[] = "MS Excel 5.0/95";
+static const char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const char pFilterExcel95[] = "MS Excel 95";
+static const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const char pFilterExcel97[] = "MS Excel 97";
+static const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const char pFilterDBase[] = "dBase";
+static const char pFilterDif[] = "DIF";
+static const char pFilterSylk[] = "SYLK";
+static const char pFilterHtml[] = "HTML (StarCalc)";
+static const char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
+static const char pFilterRtf[] = "Rich Text Format (StarCalc)";
#define ShellClass_ScDocShell
#include <scslots.hxx>
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 204cfafe86da..f0d865e239b5 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -313,7 +313,7 @@ bool ScImportExport::ImportString( const OUString& rText, SotClipboardFormatId n
{
rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
OString aTmp( rText.getStr(), rText.getLength(), eEnc );
- SvMemoryStream aStrm( const_cast<char *>(aTmp.getStr()), aTmp.getLength() * sizeof(sal_Char), StreamMode::READ );
+ SvMemoryStream aStrm( const_cast<char *>(aTmp.getStr()), aTmp.getLength() * sizeof(char), StreamMode::READ );
aStrm.SetStreamCharSet( eEnc );
SetNoEndianSwap( aStrm ); //! no swapping in memory
return ImportStream( aStrm, OUString(), nFmt );
@@ -368,7 +368,7 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, So
aStrm.WriteChar( 0 );
if( aStrm.TellEnd() <= nSizeLimit )
{
- rText = static_cast<const sal_Char*>(aStrm.GetData());
+ rText = static_cast<const char*>(aStrm.GetData());
return true;
}
}
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 46f5598705f2..9fe94d062824 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -173,7 +173,7 @@ public:
// and to create own derivations of ObjectContact
virtual sdr::contact::ObjectContact* createViewSpecificObjectContact(
SdrPageWindow& rPageWindow,
- const sal_Char* pDebugName) const override;
+ const char* pDebugName) const override;
};
extern Point aDragStartDiff;
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index a0628fb8e132..683714501a15 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -91,7 +91,7 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "stardiv.StarCalc.ScSpreadsheetSe
extern "C" {
SAL_DLLPUBLIC_EXPORT void * sc_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
+ const char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
if (!pServiceManager)
return nullptr;
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index 6adcac3b01cc..c8ccfa464295 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -168,7 +168,7 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
}
void ScUnoHelpFunctions::SetOptionalPropertyValue(
- const Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
+ const Reference<beans::XPropertySet>& rPropSet, const char* pPropName, const Any& rVal )
{
try
{
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 65d649913343..3d7605d446d0 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1068,7 +1068,7 @@ void SAL_CALL ScShapeObj::removeEventListener(
// XText
// (special handling for ScCellFieldObj)
-static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const sal_Char* pName )
+static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSource, const char* pName )
{
OUString aNameStr(OUString::createFromAscii(pName));
try
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index 9ff35e3a70a9..dab8e9d4db62 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -31,7 +31,7 @@ namespace sdecl = comphelper::service_decl;
extern "C"
{
SAL_DLLPUBLIC_EXPORT void * vbaobj_component_getFactory(
- const sal_Char * pImplName, void *, void *)
+ const char * pImplName, void *, void *)
{
void* pRet = sdecl::component_getFactoryHelper(
pImplName, {&range::serviceDecl, &workbook::serviceDecl, &worksheet::serviceDecl, &window::serviceDecl, &hyperlink::serviceDecl, &application::serviceDecl} );
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index 51897fa525c5..5b165c21635e 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -529,13 +529,13 @@ ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs ) :
return;
// global
- auto registerAutoEvent = [this](sal_Int32 nID, const sal_Char* sName)
+ auto registerAutoEvent = [this](sal_Int32 nID, const char* sName)
{ registerEventHandler(nID, script::ModuleType::NORMAL, (OString("Auto_").concat(sName)).getStr(), -1, uno::Any(false)); };
registerAutoEvent(AUTO_OPEN, "Open");
registerAutoEvent(AUTO_CLOSE, "Close");
// Workbook
- auto registerWorkbookEvent = [this](sal_Int32 nID, const sal_Char* sName, sal_Int32 nCancelIndex)
+ auto registerWorkbookEvent = [this](sal_Int32 nID, const char* sName, sal_Int32 nCancelIndex)
{ registerEventHandler(nID, script::ModuleType::DOCUMENT, (OString("Workbook_").concat(sName)).getStr(), nCancelIndex, uno::Any(false)); };
registerWorkbookEvent( WORKBOOK_ACTIVATE, "Activate", -1 );
registerWorkbookEvent( WORKBOOK_DEACTIVATE, "Deactivate", -1 );
@@ -550,7 +550,7 @@ ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs ) :
registerWorkbookEvent( WORKBOOK_WINDOWRESIZE, "WindowResize", -1 );
// Worksheet events. All events have a corresponding workbook event.
- auto registerWorksheetEvent = [this](sal_Int32 nID, const sal_Char* sName, sal_Int32 nCancelIndex)
+ auto registerWorksheetEvent = [this](sal_Int32 nID, const char* sName, sal_Int32 nCancelIndex)
{
registerEventHandler(nID, script::ModuleType::DOCUMENT, (OString("Worksheet_").concat(sName)).getStr(),
nCancelIndex, uno::Any(true));
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 74d054f092a0..d5517b991f00 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -1159,7 +1159,7 @@ namespace sdr
explicit ObjectContactOfScDrawView(
const ScDrawView& rScDrawView,
SdrPageWindow& rPageWindow,
- const sal_Char* pDebugName);
+ const char* pDebugName);
virtual bool supportsGridOffsets() const override;
virtual void calculateGridOffsetForViewOjectContact(
@@ -1175,7 +1175,7 @@ namespace sdr
ObjectContactOfScDrawView::ObjectContactOfScDrawView(
const ScDrawView& rScDrawView,
SdrPageWindow& rPageWindow,
- const sal_Char* pDebugName)
+ const char* pDebugName)
: ObjectContactOfPageView(rPageWindow, pDebugName),
mrScDrawView(rScDrawView)
{
@@ -1232,7 +1232,7 @@ namespace sdr
// Create own derivation of ObjectContact for calc
sdr::contact::ObjectContact* ScDrawView::createViewSpecificObjectContact(
SdrPageWindow& rPageWindow,
- const sal_Char* pDebugName) const
+ const char* pDebugName) const
{
return new sdr::contact::ObjectContactOfScDrawView(
*this,
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 947bda3d1875..7f38fe353561 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -722,9 +722,9 @@ long ScDrawStringsVars::GetMaxDigitWidth()
if (nMaxDigitWidth > 0)
return nMaxDigitWidth;
- for (sal_Char i = 0; i < 10; ++i)
+ for (char i = 0; i < 10; ++i)
{
- sal_Char cDigit = '0' + i;
+ char cDigit = '0' + i;
long n = pOutput->pFmtDevice->GetTextWidth(OUString(cDigit));
nMaxDigitWidth = ::std::max(nMaxDigitWidth, n);
}
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 00f85a151662..b14aacca8eec 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -370,7 +370,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
OUString aErrMsg ( ScResId( STR_INVALIDTABNAME ) );
OUString aName;
OUString aDlgTitle;
- const sal_Char* pHelpId = nullptr;
+ const char* pHelpId = nullptr;
switch ( nSlot )
{
More information about the Libreoffice-commits
mailing list