diff options
Diffstat (limited to 'sw/source/core/fields/expfld.cxx')
| -rw-r--r-- | sw/source/core/fields/expfld.cxx | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index e55c8598cf90..190d894d66f2 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -71,7 +71,7 @@ using ::rtl::OUString; SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) //----------------------------------------------------------------------------- -sal_Int16 lcl_SubTypeToAPI(USHORT nSubType) +sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) { sal_Int16 nRet = 0; switch(nSubType) @@ -104,7 +104,7 @@ sal_Int32 lcl_APIToSubType(const uno::Any& rAny) //----------------------------------------------------------------------------- -void ReplacePoint( String& rTmpName, BOOL bWithCommandType ) +void ReplacePoint( String& rTmpName, sal_Bool bWithCommandType ) { // replace first and last (if bWithCommandType: last two) dot Ersten und letzten Punkt ersetzen, da in Tabellennamen Punkte erlaubt sind // since table names may contain dots @@ -248,7 +248,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos, { Point aPt( pLayout->Frm().Pos() ); aPt.Y()++; // aus dem Header raus - pCntFrm = pPgFrm->GetCntntPos( aPt, FALSE, TRUE, FALSE ); + pCntFrm = pPgFrm->GetCntntPos( aPt, sal_False, sal_True, sal_False ); pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt ); } } @@ -288,9 +288,9 @@ void SwGetExpFieldType::Modify( SfxPoolItem*, SfxPoolItem* pNew ) --------------------------------------------------------------------*/ SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp, const String& rFormel, - USHORT nSub, ULONG nFmt) + sal_uInt16 nSub, sal_uLong nFmt) : SwFormulaField( pTyp, nFmt, 0.0 ), - bIsInBodyTxt( TRUE ), + bIsInBodyTxt( sal_True ), nSubType(nSub), bLateInitialization( false ) { @@ -308,7 +308,7 @@ String SwGetExpField::Expand() const String SwGetExpField::GetFieldName() const { String aStr( SwFieldType::GetTypeStr( - static_cast<USHORT>(((nsSwGetSetExpType::GSE_FORMULA & nSubType) != 0) + static_cast<sal_uInt16>(((nsSwGetSetExpType::GSE_FORMULA & nSubType) != 0) ? TYP_FORMELFLD : TYP_GETFLD ) )); aStr += ' '; @@ -369,7 +369,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld ) if(GetSubType() & nsSwGetSetExpType::GSE_STRING) { SwHash** ppHashTbl; - USHORT nSize; + sal_uInt16 nSize; rDoc.FldsToExpand( ppHashTbl, nSize, aEndFld ); LookString( ppHashTbl, nSize, GetFormula(), sExpand ); ::DeleteHashTable( ppHashTbl, nSize ); // HashTabelle loeschen @@ -399,17 +399,17 @@ void SwGetExpField::SetPar2(const String& rStr) SetFormula(rStr); } -USHORT SwGetExpField::GetSubType() const +sal_uInt16 SwGetExpField::GetSubType() const { return nSubType; } -void SwGetExpField::SetSubType(USHORT nType) +void SwGetExpField::SetSubType(sal_uInt16 nType) { nSubType = nType; } -void SwGetExpField::SetLanguage(USHORT nLng) +void SwGetExpField::SetLanguage(sal_uInt16 nLng) { if (nSubType & nsSwExtendedSubType::SUB_CMD) SwField::SetLanguage(nLng); @@ -420,7 +420,7 @@ void SwGetExpField::SetLanguage(USHORT nLng) /*-----------------07.03.98 16:08------------------- --------------------------------------------------*/ -BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -444,7 +444,7 @@ BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const break; case FIELD_PROP_BOOL2: { - BOOL bTmp = 0 != (nSubType & nsSwExtendedSubType::SUB_CMD); + sal_Bool bTmp = 0 != (nSubType & nsSwExtendedSubType::SUB_CMD); rAny.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -454,12 +454,12 @@ BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return TRUE; + return sal_True; } /*-----------------07.03.98 16:08------------------- --------------------------------------------------*/ -BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwGetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { sal_Int32 nTmp = 0; String sTmp; @@ -474,7 +474,7 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) break; case FIELD_PROP_USHORT1: rAny >>= nTmp; - nSubType = static_cast<USHORT>(nTmp); + nSubType = static_cast<sal_uInt16>(nTmp); break; case FIELD_PROP_PAR1: SetFormula( ::GetString( rAny, sTmp )); @@ -482,7 +482,7 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) case FIELD_PROP_SUBTYPE: nTmp = lcl_APIToSubType(rAny); if( nTmp >=0 ) - SetSubType( static_cast<USHORT>((GetSubType() & 0xff00) | nTmp)); + SetSubType( static_cast<sal_uInt16>((GetSubType() & 0xff00) | nTmp)); break; case FIELD_PROP_BOOL2: if(*(sal_Bool*) rAny.getValue()) @@ -496,23 +496,23 @@ BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return TRUE; + return sal_True; } /*-----------------JP: 17.06.93 ------------------- Set-Expression-Type --------------------------------------------------*/ -SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, USHORT nTyp ) +SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt16 nTyp ) : SwValueFieldType( pDc, RES_SETEXPFLD ), sName( rName ), pOutlChgNd( 0 ), sDelim( String::CreateFromAscii( "." ) ), nType(nTyp), nLevel( UCHAR_MAX ), - bDeleted( FALSE ) + bDeleted( sal_False ) { if( ( nsSwGetSetExpType::GSE_SEQ | nsSwGetSetExpType::GSE_STRING ) & nType ) - EnableFormat(FALSE); // Numberformatter nicht einsetzen + EnableFormat(sal_False); // Numberformatter nicht einsetzen } SwFieldType* SwSetExpFieldType::Copy() const @@ -535,7 +535,7 @@ void SwSetExpFieldType::Modify( SfxPoolItem*, SfxPoolItem* ) return; // nicht weiter expandieren } -void SwSetExpFieldType::SetSeqFormat(ULONG nFmt) +void SwSetExpFieldType::SetSeqFormat(sal_uLong nFmt) { SwClientIter aIter(*this); for( SwFmtFld* pFld = (SwFmtFld*)aIter.First( TYPE(SwFmtFld) ); @@ -543,7 +543,7 @@ void SwSetExpFieldType::SetSeqFormat(ULONG nFmt) pFld->GetFld()->ChangeFormat( nFmt ); } -ULONG SwSetExpFieldType::GetSeqFormat() +sal_uLong SwSetExpFieldType::GetSeqFormat() { if( !GetDepends() ) return SVX_NUM_ARABIC; @@ -552,15 +552,15 @@ ULONG SwSetExpFieldType::GetSeqFormat() return pFld->GetFormat(); } -USHORT SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld ) +sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld ) { if( !GetDepends() || !(nsSwGetSetExpType::GSE_SEQ & nType) ) return USHRT_MAX; -extern void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 ); +extern void InsertSort( SvUShorts& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 ); SvUShorts aArr( 64 ); - USHORT n; + sal_uInt16 n; // dann testmal, ob die Nummer schon vergeben ist oder ob eine neue // bestimmt werden muss. @@ -575,7 +575,7 @@ extern void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 ); // teste erstmal ob die Nummer schon vorhanden ist: - USHORT nNum = rFld.GetSeqNumber(); + sal_uInt16 nNum = rFld.GetSeqNumber(); if( USHRT_MAX != nNum ) { for( n = 0; n < aArr.Count(); ++n ) @@ -597,7 +597,7 @@ extern void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 ); return n; } -USHORT SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList ) +sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList ) { if( rList.Count() ) rList.Remove( 0, rList.Count() ); @@ -635,7 +635,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd ) const SwNodeNum & aNum = *(pTxtNd->GetNum()); // nur die Nummer besorgen, ohne Pre-/Post-fixstrings - String sNumber( pRule->MakeNumString(aNum, FALSE )); + String sNumber( pRule->MakeNumString(aNum, sal_False )); if( sNumber.Len() ) rFld.ChgExpStr( ( sNumber += sDelim ) += rFld.GetExpStr() ); @@ -652,7 +652,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd ) /* -----------------24.03.99 09:44------------------- * * --------------------------------------------------*/ -BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwSetExpFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -674,10 +674,10 @@ BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return sal_True; } -BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { switch( nWhichId ) { @@ -685,7 +685,7 @@ BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) { sal_Int32 nSet = lcl_APIToSubType(rAny); if(nSet >=0) - SetType(static_cast<USHORT>(nSet)); + SetType(static_cast<sal_uInt16>(nSet)); } break; case FIELD_PROP_PAR2: @@ -711,10 +711,10 @@ BOOL SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return sal_True; } -BOOL SwSeqFldList::InsertSort( _SeqFldLstElem* pNew ) +sal_Bool SwSeqFldList::InsertSort( _SeqFldLstElem* pNew ) { sal_Unicode* p = pNew->sDlgEntry.GetBufferAccess(); while( *p ) @@ -724,16 +724,16 @@ BOOL SwSeqFldList::InsertSort( _SeqFldLstElem* pNew ) ++p; } - USHORT nPos; - BOOL bRet = SeekEntry( *pNew, &nPos ); + sal_uInt16 nPos; + sal_Bool bRet = SeekEntry( *pNew, &nPos ); if( !bRet ) C40_INSERT( _SeqFldLstElem, pNew, nPos ); return bRet; } -BOOL SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, USHORT* pP ) +sal_Bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) { - USHORT nO = Count(), nM, nU = 0; + sal_uInt16 nO = Count(), nM, nU = 0; if( nO > 0 ) { CollatorWrapper & rCaseColl = ::GetAppCaseCollator(), @@ -745,7 +745,7 @@ BOOL SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, USHORT* pP ) const String& rTmp2 = rNew.sDlgEntry; xub_StrLen nFndPos2 = 0; String sNum2( rTmp2.GetToken( 0, ' ', nFndPos2 )); - BOOL bIsNum2IsNumeric = rCC.isAsciiNumeric( sNum2 ); + sal_Bool bIsNum2IsNumeric = rCC.isAsciiNumeric( sNum2 ); sal_Int32 nNum2 = bIsNum2IsNumeric ? sNum2.ToInt32() : 0; nO--; @@ -774,7 +774,7 @@ BOOL SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, USHORT* pP ) if( 0 == nCmp ) { if( pP ) *pP = nM; - return TRUE; + return sal_True; } else if( 0 < nCmp ) nU = nM + 1; @@ -785,7 +785,7 @@ BOOL SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, USHORT* pP ) } } if( pP ) *pP = nU; - return FALSE; + return sal_False; } /*-------------------------------------------------------------------- @@ -793,13 +793,13 @@ BOOL SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, USHORT* pP ) --------------------------------------------------------------------*/ SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const String& rFormel, - ULONG nFmt) + sal_uLong nFmt) : SwFormulaField( pTyp, nFmt, 0.0 ), nSeqNo( USHRT_MAX ), nSubType(0) { SetFormula(rFormel); // SubType ignorieren !!! - bInput = FALSE; + bInput = sal_False; if( IsSequenceFld() ) { SwValueField::SetValue(1.0); @@ -842,7 +842,7 @@ String SwSetExpField::GetFieldName() const ? TYP_SETINPFLD : TYP_SETFLD ); - String aStr( SwFieldType::GetTypeStr( static_cast<USHORT>(nStrType) ) ); + String aStr( SwFieldType::GetTypeStr( static_cast<sal_uInt16>(nStrType) ) ); aStr += ' '; aStr += GetTyp()->GetName(); @@ -871,7 +871,7 @@ SwField* SwSetExpField::Copy() const return pTmp; } -void SwSetExpField::SetSubType(USHORT nSub) +void SwSetExpField::SetSubType(sal_uInt16 nSub) { ((SwSetExpFieldType*)GetTyp())->SetType(nSub & 0xff); nSubType = nSub & 0xff00; @@ -879,7 +879,7 @@ void SwSetExpField::SetSubType(USHORT nSub) DBG_ASSERT( (nSub & 0xff) != 3, "SubType ist illegal!" ); } -USHORT SwSetExpField::GetSubType() const +sal_uInt16 SwSetExpField::GetSubType() const { return ((SwSetExpFieldType*)GetTyp())->GetType() | nSubType; } @@ -889,7 +889,7 @@ void SwSetExpField::SetValue( const double& rAny ) SwValueField::SetValue(rAny); if( IsSequenceFld() ) - sExpand = FormatNumber( (USHORT)GetValue(), GetFormat() ); + sExpand = FormatNumber( (sal_uInt16)GetValue(), GetFormat() ); else sExpand = ((SwValueFieldType*)GetTyp())->ExpandValue( rAny, GetFormat(), GetLanguage()); @@ -917,9 +917,9 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc if(sNodeText.Len()) { //now check if sNodeText starts with a non-alphanumeric character plus a blank - USHORT nSrcpt = pBreakIt->GetRealScriptOfText( sNodeText, 0 ); + sal_uInt16 nSrcpt = pBreakIt->GetRealScriptOfText( sNodeText, 0 ); - static USHORT nIds[] = + static sal_uInt16 nIds[] = { RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, RES_CHRATR_FONT, RES_CHRATR_FONT, @@ -939,7 +939,7 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc GetWhichOfScript( RES_CHRATR_LANGUAGE, nSrcpt )) ).GetLanguage(); CharClass aCC( SvxCreateLocale( eLang )); sal_Unicode c0 = sNodeText.GetChar(0); - BOOL bIsAlphaNum = aCC.isAlphaNumeric( sNodeText, 0 ); + sal_Bool bIsAlphaNum = aCC.isAlphaNumeric( sNodeText, 0 ); if( !bIsAlphaNum || (c0 == ' ' || c0 == '\t')) { @@ -966,7 +966,7 @@ const String& SwSetExpField::GetPar1() const String SwSetExpField::GetPar2() const { - USHORT nType = ((SwSetExpFieldType*)GetTyp())->GetType(); + sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); if (nType & nsSwGetSetExpType::GSE_STRING) return GetFormula(); @@ -975,7 +975,7 @@ String SwSetExpField::GetPar2() const void SwSetExpField::SetPar2(const String& rStr) { - USHORT nType = ((SwSetExpFieldType*)GetTyp())->GetType(); + sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType(); if( !(nType & nsSwGetSetExpType::GSE_SEQ) || rStr.Len() ) { @@ -1006,7 +1006,7 @@ SwFieldType* SwInputFieldType::Copy() const --------------------------------------------------------------------*/ SwInputField::SwInputField(SwInputFieldType* pTyp, const String& rContent, - const String& rPrompt, USHORT nSub, ULONG nFmt) : + const String& rPrompt, sal_uInt16 nSub, sal_uLong nFmt) : SwField(pTyp, nFmt), aContent(rContent), aPText(rPrompt), nSubType(nSub) { } @@ -1055,7 +1055,7 @@ String SwInputField::Expand() const /*-----------------06.03.98 11:12------------------- --------------------------------------------------*/ -BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwInputField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -1074,12 +1074,12 @@ BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: DBG_ERROR("illegal property"); } - return TRUE; + return sal_True; } /*-----------------06.03.98 11:12------------------- --------------------------------------------------*/ -BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { switch( nWhichId ) { @@ -1098,7 +1098,7 @@ BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: DBG_ERROR("illegal property"); } - return TRUE; + return sal_True; } /*-------------------------------------------------------------------- Beschreibung: Bedingung setzen @@ -1148,24 +1148,24 @@ String SwInputField::GetToolTip() const return aToolTip; } -BOOL SwInputField::isFormField() const +sal_Bool SwInputField::isFormField() const { return aHelp.Len() > 0 || aToolTip.Len() > 0; } -USHORT SwInputField::GetSubType() const +sal_uInt16 SwInputField::GetSubType() const { return nSubType; } -void SwInputField::SetSubType(USHORT nSub) +void SwInputField::SetSubType(sal_uInt16 nSub) { nSubType = nSub; } /*-----------------05.03.98 17:22------------------- --------------------------------------------------*/ -BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const +sal_Bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const { switch( nWhichId ) { @@ -1192,7 +1192,7 @@ BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const //I18N - if the formula contains only "TypeName+1" //and it's one of the initially created sequence fields //then the localized names has to be replaced by a programmatic name - OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), TRUE); + OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, GetFormula(), sal_True); rAny <<= OUString( sMyFormula ); } break; @@ -1211,13 +1211,13 @@ BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const break; case FIELD_PROP_BOOL3: { - BOOL bTmp = 0 != (nSubType & nsSwExtendedSubType::SUB_CMD); + sal_Bool bTmp = 0 != (nSubType & nsSwExtendedSubType::SUB_CMD); rAny.setValue(&bTmp, ::getBooleanCppuType()); } break; case FIELD_PROP_BOOL1: { - BOOL bTmp = GetInputFlag(); + sal_Bool bTmp = GetInputFlag(); rAny.setValue(&bTmp, ::getBooleanCppuType()); } break; @@ -1227,12 +1227,12 @@ BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const default: return SwField::QueryValue(rAny, nWhichId); } - return TRUE; + return sal_True; } /*-----------------05.03.98 17:22------------------- --------------------------------------------------*/ -BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) +sal_Bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { sal_Int32 nTmp32 = 0; sal_Int16 nTmp16 = 0; @@ -1275,7 +1275,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) //I18N - if the formula contains only "TypeName+1" //and it's one of the initially created sequence fields //then the localized names has to be replaced by a programmatic name - OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, FALSE); + OUString sMyFormula = SwXFieldMaster::LocalizeFormula(*this, uTmp, sal_False); SetFormula( sMyFormula ); } break; @@ -1289,7 +1289,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) case FIELD_PROP_SUBTYPE: nTmp32 = lcl_APIToSubType(rAny); if(nTmp32 >= 0) - SetSubType(static_cast<USHORT>((GetSubType() & 0xff00) | nTmp32)); + SetSubType(static_cast<sal_uInt16>((GetSubType() & 0xff00) | nTmp32)); break; case FIELD_PROP_PAR3: ::GetString( rAny, aPText ); @@ -1309,7 +1309,7 @@ BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) default: return SwField::PutValue(rAny, nWhichId); } - return TRUE; + return sal_True; } |