diff options
Diffstat (limited to 'sw/source/core/fields/tblcalc.cxx')
| -rw-r--r-- | sw/source/core/fields/tblcalc.cxx | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 8c0cc509a669..0f2b22dbdee8 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -70,7 +70,7 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara ) SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel, - USHORT nType, ULONG nFmt ) + sal_uInt16 nType, sal_uLong nFmt ) : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ), sExpand( '0' ), nSubType(nType) { @@ -147,12 +147,12 @@ String SwTblField::Expand() const return aStr; } -USHORT SwTblField::GetSubType() const +sal_uInt16 SwTblField::GetSubType() const { return nSubType; } -void SwTblField::SetSubType(USHORT nType) +void SwTblField::SetSubType(sal_uInt16 nType) { nSubType = nType; } @@ -181,14 +181,21 @@ void SwTblField::SetPar2(const String& rStr) } +<<<<<<< local BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +======= +/*-----------------04.03.98 10:33------------------- + +--------------------------------------------------*/ +sal_Bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const +>>>>>>> other { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; switch ( nWhichId ) { case FIELD_PROP_PAR2: { - USHORT nOldSubType = nSubType; + sal_uInt16 nOldSubType = nSubType; SwTblField* pThis = (SwTblField*)this; pThis->nSubType |= nsSwExtendedSubType::SUB_CMD; rAny <<= rtl::OUString( Expand() ); @@ -197,7 +204,7 @@ BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const break; case FIELD_PROP_BOOL1: { - BOOL bFormula = 0 != (nsSwExtendedSubType::SUB_CMD & nSubType); + sal_Bool bFormula = 0 != (nsSwExtendedSubType::SUB_CMD & nSubType); rAny.setValue(&bFormula, ::getBooleanCppuType()); } break; @@ -213,9 +220,14 @@ BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const return bRet; } +<<<<<<< local BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +======= +--------------------------------------------------*/ +sal_Bool SwTblField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) +>>>>>>> other { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; String sTmp; switch ( nWhichId ) { |