summaryrefslogtreecommitdiff
path: root/formula/source/ui/dlg/FormulaHelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'formula/source/ui/dlg/FormulaHelper.cxx')
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx52
1 files changed, 26 insertions, 26 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 1d71b40919eb..88c43f0daee0 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -47,7 +47,7 @@ namespace formula
virtual ::rtl::OUString getDescription() const { return ::rtl::OUString(); }
virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& ) const { return ::rtl::OUString(); }
- virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& ) const {}
+ virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
virtual void initArgumentInfo() const {}
virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
virtual rtl::OString getHelpId() const { return ""; }
@@ -74,14 +74,14 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager)
{
m_pCharClass = m_pSysLocale->GetCharClassPtr();
}
-BOOL FormulaHelper::GetNextFunc( const String& rFormula,
- BOOL bBack,
+sal_Bool FormulaHelper::GetNextFunc( const String& rFormula,
+ sal_Bool bBack,
xub_StrLen& rFStart, // Ein- und Ausgabe
xub_StrLen* pFEnd, // = NULL
const IFunctionDescription** ppFDesc, // = NULL
::std::vector< ::rtl::OUString>* pArgs ) const // = NULL
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
xub_StrLen nOldStart = rFStart;
String aFname;
@@ -114,7 +114,7 @@ BOOL FormulaHelper::GetNextFunc( const String& rFormula,
}
if ( *ppFDesc && pArgs )
{
- GetArgStrings( *pArgs,rFormula, rFStart, static_cast<USHORT>((*ppFDesc)->getParameterCount() ));
+ GetArgStrings( *pArgs,rFormula, rFStart, static_cast<sal_uInt16>((*ppFDesc)->getParameterCount() ));
}
else
{
@@ -133,13 +133,13 @@ BOOL FormulaHelper::GetNextFunc( const String& rFormula,
void FormulaHelper::FillArgStrings( const String& rFormula,
xub_StrLen nFuncPos,
- USHORT nArgs,
+ sal_uInt16 nArgs,
::std::vector< ::rtl::OUString >& _rArgs ) const
{
xub_StrLen nStart = 0;
xub_StrLen nEnd = 0;
- USHORT i;
- BOOL bLast = FALSE;
+ sal_uInt16 i;
+ sal_Bool bLast = sal_False;
for ( i=0; i<nArgs && !bLast; i++ )
{
@@ -152,7 +152,7 @@ void FormulaHelper::FillArgStrings( const String& rFormula,
if ( nEnd != nStart )
_rArgs.push_back(rFormula.Copy( nStart, nEnd-1-nStart ));
else
- _rArgs.push_back(String()), bLast = TRUE;
+ _rArgs.push_back(String()), bLast = sal_True;
}
else
{
@@ -174,7 +174,7 @@ void FormulaHelper::FillArgStrings( const String& rFormula,
void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
,const String& rFormula,
xub_StrLen nFuncPos,
- USHORT nArgs ) const
+ sal_uInt16 nArgs ) const
{
if (nArgs)
{
@@ -184,10 +184,10 @@ void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
//------------------------------------------------------------------------
-inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
+inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
{
if( _pCharClass->isLetterNumeric( rStr, nPos ) )
- return TRUE;
+ return sal_True;
else
{ // In internationalized versions function names may contain a dot
// and in every version also an underscore... ;-)
@@ -199,7 +199,7 @@ inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_
xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
xub_StrLen nStart,
- BOOL bBack,
+ sal_Bool bBack,
String* pFuncName ) const
{
xub_StrLen nStrLen = rFormula.Len();
@@ -210,11 +210,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
xub_StrLen nFStart = FUNC_NOTFOUND;
xub_StrLen nParPos = nStart;
- BOOL bRepeat, bFound;
+ sal_Bool bRepeat, bFound;
do
{
- bFound = FALSE;
- bRepeat = FALSE;
+ bFound = sal_False;
+ bRepeat = sal_False;
if ( bBack )
{
@@ -228,7 +228,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
if (nParPos > 0)
nParPos--;
}
- else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+ else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
nParPos--;
}
}
@@ -243,7 +243,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
nParPos++;
nParPos++;
}
- else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+ else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
nParPos++;
}
}
@@ -268,13 +268,13 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
}
else // Klammern ohne Funktion -> weitersuchen
{
- bRepeat = TRUE;
+ bRepeat = sal_True;
if ( !bBack )
nParPos++;
else if (nParPos > 0)
nParPos--;
else
- bRepeat = FALSE;
+ bRepeat = sal_False;
}
}
else // keine Klammern gefunden
@@ -300,7 +300,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
short nParCount = 0;
bool bInArray = false;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while ( !bFound && (nStart < nStrLen) )
{
@@ -318,10 +318,10 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
{
nParCount--;
if ( nParCount == 0 )
- bFound = TRUE;
+ bFound = sal_True;
else if ( nParCount < 0 )
{
- bFound = TRUE;
+ bFound = sal_True;
nStart--; // einen zu weit gelesen
}
}
@@ -337,7 +337,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
{
if ( !bInArray && nParCount == 0 )
{
- bFound = TRUE;
+ bFound = sal_True;
nStart--; // einen zu weit gelesen
}
}
@@ -349,7 +349,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
//------------------------------------------------------------------
-xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, USHORT nArg ) const
+xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, sal_uInt16 nArg ) const
{
xub_StrLen nStrLen = rStr.Len();
@@ -358,7 +358,7 @@ xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, US
short nParCount = 0;
bool bInArray = false;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while ( !bFound && (nStart < nStrLen) )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 02:50:49 +0000