Kaydet (Commit) 418b5df9 authored tarafından Noel Grandin's avatar Noel Grandin

convert getSuppressedArgumentCount from xub_StrLen -> sal_Int32

convert IFunctionDescription::getSuppressedArgumentCount from xub_StrLen
-> sal_Int32

Change-Id: Iee7a094a6f067fa57ee828c434417f7583c0f32b
üst 8c787dec
......@@ -36,7 +36,7 @@ namespace formula
virtual OUString getFunctionName() const { return OUString(); }
virtual const IFunctionCategory* getCategory() const { return NULL; }
virtual OUString getDescription() const { return OUString(); }
virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
virtual sal_Int32 getSuppressedArgumentCount() const { return 0; }
virtual OUString getFormula(const ::std::vector< OUString >& ) const { return OUString(); }
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
virtual void initArgumentInfo() const {}
......
......@@ -82,7 +82,7 @@ namespace formula
virtual const IFunctionCategory* getCategory() const = 0;
virtual OUString getDescription() const = 0;
// GetSuppressedArgCount
virtual xub_StrLen getSuppressedArgumentCount() const = 0;
virtual sal_Int32 getSuppressedArgumentCount() const = 0;
// GetFormulaString
virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const = 0;
// GetVisibleArgMapping
......
......@@ -67,7 +67,7 @@ public:
virtual OUString getFunctionName() const ;
virtual const formula::IFunctionCategory* getCategory() const ;
virtual OUString getDescription() const ;
virtual xub_StrLen getSuppressedArgumentCount() const ;
virtual sal_Int32 getSuppressedArgumentCount() const ;
virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ;
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ;
virtual void initArgumentInfo() const;
......
......@@ -168,9 +168,9 @@ OUString FunctionDescription::getDescription() const
return m_xFunctionDescription->getDescription();
}
// -----------------------------------------------------------------------------
xub_StrLen FunctionDescription::getSuppressedArgumentCount() const
sal_Int32 FunctionDescription::getSuppressedArgumentCount() const
{
return static_cast<xub_StrLen>(m_aParameter.getLength());
return m_aParameter.getLength();
}
// -----------------------------------------------------------------------------
OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const
......
......@@ -1032,10 +1032,10 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
if ( bSuccess )
{
OUString sFormula = aDlg.getCurrentFormula();
xub_StrLen nIndex = 0;
if ( sFormula[0] == '=' )
nIndex = 1;
_in_out_rFormula = "rpt:" + sFormula.copy(nIndex);
_in_out_rFormula = "rpt:" + sFormula.copy(1);
else
_in_out_rFormula = "rpt:" + sFormula;
}
}
}
......
......@@ -153,7 +153,7 @@ public:
@return number of non-suppressed arguments
*/
sal_uInt16 GetSuppressedArgCount() const;
virtual xub_StrLen getSuppressedArgumentCount() const ;
virtual sal_Int32 getSuppressedArgumentCount() const ;
/**
Requests function data from AddInCollection
......
......@@ -312,7 +312,7 @@ OUString ScFuncDesc::getDescription() const
return sRet;
}
xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const
sal_Int32 ScFuncDesc::getSuppressedArgumentCount() const
{
return GetSuppressedArgCount();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment