summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/compiler.hxx8
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/editutil.hxx6
-rw-r--r--sc/inc/funcdesc.hxx4
-rw-r--r--sc/inc/pch/precompiled_sc.hxx1
-rw-r--r--sc/inc/table.hxx2
7 files changed, 12 insertions, 13 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 34cef915e40a..c64ea91624b1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -467,7 +467,7 @@ public:
void CompileColRowNameFormula();
sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, rtl_TextEncoding eCharSet ) const;
- xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision,
+ sal_Int32 GetMaxNumberStringLen( sal_uInt16& nPrecision,
SCROW nRowStart, SCROW nRowEnd ) const;
sal_uInt16 GetTextWidth(SCROW nRow) const;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 0a1763b7f5b0..e258532d81cc 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -190,8 +190,8 @@ public:
formula::FormulaToken* CreateToken() const; // create typified token
void Load( SvStream&, sal_uInt16 nVer );
- static xub_StrLen GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array
- static size_t GetStrLenBytes( xub_StrLen nLen )
+ static sal_Int32 GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array
+ static size_t GetStrLenBytes( sal_Int32 nLen )
{ return nLen * sizeof(sal_Unicode); }
static size_t GetStrLenBytes( const sal_Unicode* pStr )
{ return GetStrLenBytes( GetStrLen( pStr ) ); }
@@ -327,7 +327,7 @@ private:
bool NextNewToken(bool bInArray = false);
virtual void SetError(sal_uInt16 nError);
- xub_StrLen NextSymbol(bool bInArray);
+ sal_Int32 NextSymbol(bool bInArray);
bool IsValue( const OUString& );
bool IsOpCode( const OUString&, bool bInArray );
bool IsOpCode2( const OUString& );
@@ -451,7 +451,7 @@ public:
in nFlags, all bits must match. If bTestLetterNumeric is false and
char>=128, no LetterNumeric test is done and false is returned. */
static bool IsCharFlagAllConventions(
- OUString const & rStr, xub_StrLen nPos, sal_uLong nFlags, bool bTestLetterNumeric = true );
+ OUString const & rStr, sal_Int32 nPos, sal_uLong nFlags, bool bTestLetterNumeric = true );
private:
// FormulaCompiler
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ded209cf0439..972a96c508fa 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1961,7 +1961,7 @@ public:
/** Maximum string length of numerical cells of a column, e.g. for dBase export.
@return String length in characters (!) including the decimal
separator, and the decimal precision needed. */
- xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision,
+ sal_Int32 GetMaxNumberStringLen( sal_uInt16& nPrecision,
SCTAB nTab, SCCOL nCol,
SCROW nRowStart, SCROW nRowEnd ) const;
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 2d3d4ce36cc2..a8cd1ab9797b 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -226,8 +226,8 @@ public:
void SetExecuteURL(bool bSet) { bExecuteURL = bSet; }
- virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_uInt16 );
- virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
+ virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_Int32 );
+ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
};
@@ -239,7 +239,7 @@ private:
public:
ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = false );
- virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
+ virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; }
void SetData(const ScHeaderFieldData& rNew) { aData = rNew; }
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index ed4a85c5b92c..12ab0c7d8b1a 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -236,13 +236,13 @@ public:
const ScFuncDesc* GetFunction( sal_uInt32 nIndex ) const;
- xub_StrLen GetMaxFuncNameLen() const
+ sal_Int32 GetMaxFuncNameLen() const
{ return nMaxFuncNameLen; }
private:
::std::vector<const ScFuncDesc*> aFunctionList; /**< List of functions */
::std::vector<const ScFuncDesc*>::iterator aFunctionListIter; /**< position in function list */
- xub_StrLen nMaxFuncNameLen; /**< Length of longest function name */
+ sal_Int32 nMaxFuncNameLen; /**< Length of longest function name */
};
/**
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index ea231353d2bd..dc8520f10c21 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -936,7 +936,6 @@
#include <tools/shl.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
#include <tools/wintypes.hxx>
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index eb17a18d90b8..22720e746b48 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -831,7 +831,7 @@ public:
sal_Int32 GetMaxStringLen( SCCOL nCol,
SCROW nRowStart, SCROW nRowEnd, rtl_TextEncoding eCharSet ) const;
- xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision,
+ sal_Int32 GetMaxNumberStringLen( sal_uInt16& nPrecision,
SCCOL nCol,
SCROW nRowStart, SCROW nRowEnd ) const;
generated by cgit (git 2.34.1) at 2024-07-25 09:28:34 +0000