summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx4
-rw-r--r--sc/source/ui/dbgui/imoptdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx38
-rw-r--r--sc/source/ui/docshell/impex.cxx4
-rw-r--r--sc/source/ui/inc/drawview.hxx2
-rw-r--r--sc/source/ui/unoobj/appluno.cxx2
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx2
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx2
-rw-r--r--sc/source/ui/vba/service.cxx2
-rw-r--r--sc/source/ui/vba/vbaeventshelper.cxx6
-rw-r--r--sc/source/ui/view/drawview.cxx6
-rw-r--r--sc/source/ui/view/output2.cxx4
-rw-r--r--sc/source/ui/view/tabvwshf.cxx2
14 files changed, 39 insertions, 39 deletions
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 )
{
generated by cgit (git 2.34.1) at 2025-02-07 13:53:38 +0000