diff options
Diffstat (limited to 'sw/source/ui/fldui/fldmgr.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 288 |
1 files changed, 144 insertions, 144 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 2088ce591bbe..2d001a8c9577 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -143,7 +143,7 @@ enum /*-------------------------------------------------------------------- Beschreibung: Formate in der richtigen Reihenfolge --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA aSetFmt[] = +static const sal_uInt16 __FAR_DATA aSetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -151,14 +151,14 @@ static const USHORT __FAR_DATA aSetFmt[] = 0 }; -static const USHORT __FAR_DATA aGetFmt[] = +static const sal_uInt16 __FAR_DATA aGetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_??? // uebereinstimmen 0 }; -static const USHORT __FAR_DATA aUsrFmt[] = +static const sal_uInt16 __FAR_DATA aUsrFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -166,29 +166,29 @@ static const USHORT __FAR_DATA aUsrFmt[] = nsSwExtendedSubType::SUB_CMD }; -static const USHORT __FAR_DATA aDBFmt[] = +static const sal_uInt16 __FAR_DATA aDBFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_??? // uebereinstimmen nsSwExtendedSubType::SUB_OWN_FMT }; -static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); -static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); -static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); +static const sal_uInt16 VF_COUNT = sizeof(aGetFmt) / sizeof(sal_uInt16); +static const sal_uInt16 VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(sal_uInt16); +static const sal_uInt16 VF_DB_COUNT = sizeof(aDBFmt) / sizeof(sal_uInt16); /*-------------------------------------------------------------------- Beschreibung: Feldtypen und Subtypes --------------------------------------------------------------------*/ struct SwFldPack { - USHORT nTypeId; + sal_uInt16 nTypeId; - USHORT nSubTypeStart; - USHORT nSubTypeEnd; + sal_uInt16 nSubTypeStart; + sal_uInt16 nSubTypeEnd; - ULONG nFmtBegin; - ULONG nFmtEnd; + sal_uLong nFmtBegin; + sal_uLong nFmtEnd; }; /*-------------------------------------------------------------------- @@ -260,7 +260,7 @@ static SwWrtShell* lcl_GetShell() return 0; } -inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } +inline sal_uInt16 GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } /*-------------------------------------------------------------------- Beschreibung: FieldManager regelt das Einfuegen und Updaten @@ -271,7 +271,7 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) : pModule(0), pMacroItem(0), pWrtShell(pSh), - bEvalExp(TRUE) + bEvalExp(sal_True) { // aktuelles Feld ermitteln falls vorhanden GetCurFld(); @@ -286,14 +286,14 @@ SwFldMgr::~SwFldMgr() Beschreibung: RefMark ueber Namen organisieren --------------------------------------------------------------------*/ -BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) +sal_Bool SwFldMgr::CanInsertRefMark( const String& rStr ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); if(pSh) { - USHORT nCnt = pSh->GetCrsrCnt(); + sal_uInt16 nCnt = pSh->GetCrsrCnt(); // der letzte Crsr muss keine aufgespannte Selektion if( 1 < nCnt && !pSh->SwCrsrShell::HasSelection() ) @@ -308,7 +308,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) Beschreibung: Zugriff ueber ResIds --------------------------------------------------------------------*/ -void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) +void SwFldMgr::RemoveFldType(sal_uInt16 nResId, const String& rName ) { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); @@ -316,7 +316,7 @@ void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) pSh->RemoveFldType(nResId, rName); } -USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const +sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); @@ -324,7 +324,7 @@ USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const } -SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const +SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); @@ -332,7 +332,7 @@ SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const } -SwFieldType* SwFldMgr::GetFldType(USHORT nResId, const String& rName) const +SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const String& rName) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); @@ -364,7 +364,7 @@ SwField* SwFldMgr::GetCurFld() // Aktuelle Werte aufbereiten Parameter 1 und Parameter 2 // als auch das Format ermitteln // - const USHORT nTypeId = pCurFld->GetTypeId(); + const sal_uInt16 nTypeId = pCurFld->GetTypeId(); nCurFmt = pCurFld->GetFormat(); aCurPar1 = pCurFld->GetPar1(); @@ -388,7 +388,7 @@ SwField* SwFldMgr::GetCurFld() --------------------------------------------------------------------*/ -const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const +const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const { static SwFldGroupRgn __READONLY_DATA aRanges[] = { @@ -410,16 +410,16 @@ static SwFldGroupRgn __READONLY_DATA aWebRanges[] = }; if (bHtmlMode) - return aWebRanges[(USHORT)nGrpId]; + return aWebRanges[(sal_uInt16)nGrpId]; else - return aRanges[(USHORT)nGrpId]; + return aRanges[(sal_uInt16)nGrpId]; } /*-------------------------------------------------------------------- Beschreibung: GroupId bestimmen --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const +sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const { if (nTypeId == TYP_SETINPFLD) nTypeId = TYP_SETFLD; @@ -433,10 +433,10 @@ USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const if (nTypeId == TYP_FIXTIMEFLD) nTypeId = TYP_TIMEFLD; - for (USHORT i = GRP_DOC; i <= GRP_VAR; i++) + for (sal_uInt16 i = GRP_DOC; i <= GRP_VAR; i++) { const SwFldGroupRgn& rRange = GetGroupRange(bHtmlMode, i); - for (USHORT nPos = rRange.nStart; nPos < rRange.nEnd; nPos++) + for (sal_uInt16 nPos = rRange.nStart; nPos < rRange.nEnd; nPos++) { if (aSwFlds[nPos].nTypeId == nTypeId) return i; @@ -451,18 +451,18 @@ USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetTypeId(USHORT nPos) +sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos) { ASSERT(nPos < ::GetPackCount(), "unzulaessige Pos"); return aSwFlds[ nPos ].nTypeId; } -const String& SwFldMgr::GetTypeStr(USHORT nPos) +const String& SwFldMgr::GetTypeStr(sal_uInt16 nPos) { ASSERT(nPos < ::GetPackCount(), "unzulaessige TypeId"); - USHORT nFldWh = aSwFlds[ nPos ].nTypeId; + sal_uInt16 nFldWh = aSwFlds[ nPos ].nTypeId; // Sonderbehandlung fuer Datum/Zeit Felder (ohne var/fix) if( TYP_DATEFLD == nFldWh ) @@ -484,7 +484,7 @@ const String& SwFldMgr::GetTypeStr(USHORT nPos) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetPos(USHORT nTypeId) +sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) { switch( nTypeId ) { @@ -494,7 +494,7 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; } - for(USHORT i = 0; i < GetPackCount(); i++) + for(sal_uInt16 i = 0; i < GetPackCount(); i++) if(aSwFlds[i].nTypeId == nTypeId) return i; @@ -505,14 +505,14 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) Beschreibung: Subtypen eines Feldes lokalisieren --------------------------------------------------------------------*/ -BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) +sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, SvStringsDtor& rToFill) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); if(pSh) { - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); switch(nTypeId) { @@ -540,11 +540,11 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) case TYP_USERFLD: { - const USHORT nCount = pSh->GetFldTypeCount(); - for(USHORT i = 0; i < nCount; ++i) + const sal_uInt16 nCount = pSh->GetFldTypeCount(); + for(sal_uInt16 i = 0; i < nCount; ++i) { SwFieldType* pFldType = pSh->GetFldType( i ); - const USHORT nWhich = pFldType->Which(); + const sal_uInt16 nWhich = pFldType->Which(); if((nTypeId == TYP_DDEFLD && pFldType->Which() == RES_DDEFLD) || @@ -581,13 +581,13 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) // statische SubTypes if(nPos != USHRT_MAX) { - USHORT nCount; + sal_uInt16 nCount; if (nTypeId == TYP_DOCINFOFLD) nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN; else nCount = aSwFlds[nPos].nSubTypeEnd - aSwFlds[nPos].nSubTypeStart; - for(USHORT i = 0; i < nCount; ++i) + for(sal_uInt16 i = 0; i < nCount; ++i) { String* pNew; if (nTypeId == TYP_DOCINFOFLD) @@ -605,7 +605,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) } } } - bRet = TRUE; + bRet = sal_True; } return bRet; } @@ -616,18 +616,18 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) const +sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode) const { ASSERT(nTypeId < TYP_END, "unzulaessige TypeId"); { - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD)) return 0; - ULONG nStart = aSwFlds[nPos].nFmtBegin; - ULONG nEnd = aSwFlds[nPos].nFmtEnd; + sal_uLong nStart = aSwFlds[nPos].nFmtBegin; + sal_uLong nEnd = aSwFlds[nPos].nFmtEnd; if (bIsText && nEnd - nStart >= 2) return 2; @@ -643,7 +643,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co case FMT_DBFLD_BEGIN: return VF_DB_COUNT; case FMT_NUM_BEGIN: { - USHORT nCount = (USHORT)(nEnd - nStart); + sal_uInt16 nCount = (sal_uInt16)(nEnd - nStart); GetNumberingInfo(); if(xNumberingInfo.is()) { @@ -664,7 +664,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co } } - return (USHORT)(nEnd - nStart); + return (sal_uInt16)(nEnd - nStart); } } @@ -673,17 +673,17 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co --------------------------------------------------------------------*/ -String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const +String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const { String aRet; ASSERT(nTypeId < TYP_END, "unzulaessige TypeId"); - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); if(nPos == USHRT_MAX) return aRet; - ULONG nStart; + sal_uLong nStart; nStart = aSwFlds[nPos].nFmtBegin; @@ -691,7 +691,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd) - aRet = SW_RESSTR((USHORT)(nStart + nFormatId)); + aRet = SW_RESSTR((sal_uInt16)(nStart + nFormatId)); else if( FMT_NUM_BEGIN == nStart) { if(xNumberingInfo.is()) @@ -723,9 +723,9 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const Beschreibung: FormatId aus Pseudo-ID ermitteln --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const +sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const { - USHORT nId = (USHORT)nFormatId; + sal_uInt16 nId = (sal_uInt16)nFormatId; switch( nTypeId ) { @@ -746,9 +746,9 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const case TYP_SEQFLD: case TYP_GETREFPAGEFLD: { - USHORT nPos = GetPos( nTypeId ); - ULONG nBegin = aSwFlds[ nPos ].nFmtBegin; - ULONG nEnd = aSwFlds[nPos].nFmtEnd; + sal_uInt16 nPos = GetPos( nTypeId ); + sal_uLong nBegin = aSwFlds[ nPos ].nFmtBegin; + sal_uLong nEnd = aSwFlds[nPos].nFmtEnd; if((nBegin + nFormatId) < nEnd) { switch( nBegin + nFormatId ) @@ -804,15 +804,15 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const --------------------------------------------------------------------*/ -BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp ) +sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); if(!pSh) - return FALSE; + return sal_False; if( !pTyp && pCurFld ) { - const USHORT nTypeId = pCurFld->GetTypeId(); + const sal_uInt16 nTypeId = pCurFld->GetTypeId(); if( TYP_SETINPFLD == nTypeId || TYP_USRINPFLD == nTypeId ) pTyp = pSh->GetFldType( 0, RES_INPUTFLD ); else @@ -825,7 +825,7 @@ BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp ) return pSh->MoveFldType( 0, bNext, USHRT_MAX, RES_DBFLD ); } - return pTyp && pSh ? pSh->MoveFldType( pTyp, bNext ) : FALSE; + return pTyp && pSh ? pSh->MoveFldType( pTyp, bNext ) : sal_False; } /*-------------------------------------------------------------------- @@ -846,7 +846,7 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetCurTypeId() const +sal_uInt16 SwFldMgr::GetCurTypeId() const { return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX; } @@ -856,21 +856,21 @@ USHORT SwFldMgr::GetCurTypeId() const --------------------------------------------------------------------*/ -BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) +sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwField* pFld = 0; - BOOL bExp = FALSE; - BOOL bTbl = FALSE; - BOOL bPageVar = FALSE; - ULONG nFormatId = rData.nFormatId; - USHORT nSubType = rData.nSubType; + sal_Bool bExp = sal_False; + sal_Bool bTbl = sal_False; + sal_Bool bPageVar = sal_False; + sal_uLong nFormatId = rData.nFormatId; + sal_uInt16 nSubType = rData.nSubType; sal_Unicode cSeparator = rData.cSeparator; SwWrtShell* pCurShell = rData.pSh; if(!pCurShell) pCurShell = pWrtShell ? pWrtShell : ::lcl_GetShell(); DBG_ASSERT(pCurShell, "no SwWrtShell found"); if(!pCurShell) - return FALSE; + return sal_False; switch(rData.nTypeId) { // ACHTUNG dieses Feld wird ueber einen gesonderten Dialog eingefuegt @@ -884,7 +884,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwScriptFieldType* pType = (SwScriptFieldType*)pCurShell->GetFldType(0, RES_SCRIPTFLD); - pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (BOOL)nFormatId); + pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (sal_Bool)nFormatId); break; } case TYP_COMBINED_CHARS: @@ -910,7 +910,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DATEFLD: case TYP_TIMEFLD: { - USHORT nSub = static_cast< USHORT >(rData.nTypeId == TYP_DATEFLD ? DATEFLD : TIMEFLD); + sal_uInt16 nSub = static_cast< sal_uInt16 >(rData.nTypeId == TYP_DATEFLD ? DATEFLD : TIMEFLD); nSub |= nSubType == DATE_VAR ? 0 : FIXEDFLD; SwDateTimeFieldType* pTyp = @@ -935,14 +935,14 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } case TYP_CHAPTERFLD: { - USHORT nByte = (USHORT)rData.sPar2.ToInt32(); + sal_uInt16 nByte = (sal_uInt16)rData.sPar2.ToInt32(); SwChapterFieldType* pTyp = (SwChapterFieldType*)pCurShell->GetFldType(0, RES_CHAPTERFLD); pFld = new SwChapterField(pTyp, nFormatId); - nByte = Max(USHORT(1), nByte); - nByte = Min(nByte, USHORT(MAXLEVEL)); + nByte = Max(sal_uInt16(1), nByte); + nByte = Min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - ((SwChapterField*)pFld)->SetLevel((BYTE)nByte); + ((SwChapterField*)pFld)->SetLevel((sal_uInt8)nByte); break; } case TYP_NEXTPAGEFLD: @@ -996,8 +996,8 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwHiddenTxtFieldType* pTyp = (SwHiddenTxtFieldType*)pCurShell->GetFldType(0, RES_HIDDENTXTFLD); - pFld = new SwHiddenTxtField(pTyp, TRUE, rData.sPar1, rData.sPar2, FALSE, rData.nTypeId); - bExp = TRUE; + pFld = new SwHiddenTxtField(pTyp, sal_True, rData.sPar1, rData.sPar2, sal_False, rData.nTypeId); + bExp = sal_True; break; } case TYP_HIDDENPARAFLD: @@ -1005,7 +1005,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwHiddenParaFieldType* pTyp = (SwHiddenParaFieldType*)pCurShell->GetFldType(0, RES_HIDDENPARAFLD); pFld = new SwHiddenParaField(pTyp, rData.sPar1); - bExp = TRUE; + bExp = sal_True; break; } case TYP_SETREFFLD: @@ -1013,17 +1013,17 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) if( rData.sPar1.Len() > 0 && CanInsertRefMark( rData.sPar1 ) ) { pCurShell->SetAttr( SwFmtRefMark( rData.sPar1 ) ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } case TYP_GETREFFLD: { SwGetRefFieldType* pTyp = (SwGetRefFieldType*)pCurShell->GetFldType(0, RES_GETREFFLD); - USHORT nSeqNo = (USHORT)rData.sPar2.ToInt32(); + sal_uInt16 nSeqNo = (sal_uInt16)rData.sPar2.ToInt32(); pFld = new SwGetRefField(pTyp, rData.sPar1, nSubType, nSeqNo, nFormatId); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DDEFLD: @@ -1031,11 +1031,11 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. String sCmd( rData.sPar2 ); - USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( - SwDDEFieldType( rData.sPar1, sCmd, (USHORT)nFormatId )); + SwDDEFieldType( rData.sPar1, sCmd, (sal_uInt16)nFormatId )); pFld = new SwDDEField( pTyp ); break; } @@ -1123,7 +1123,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } pFld->ChangeFormat( nFormatId ); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBSETNUMBERFLD: @@ -1131,7 +1131,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DBNEXTSETFLD: case TYP_DBNAMEFLD: { - USHORT nPos, nTablePos, nCmdTypePos, nExpPos; + sal_uInt16 nPos, nTablePos, nCmdTypePos, nExpPos; String sPar1; SwDBData aDBData; @@ -1172,7 +1172,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBNextSetFieldType* pTyp = (SwDBNextSetFieldType*)pCurShell->GetFldType( 0, RES_DBNEXTSETFLD); pFld = new SwDBNextSetField(pTyp, sPar1, rData.sPar2, aDBData); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBNUMSETFLD: @@ -1180,7 +1180,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBNumSetFieldType* pTyp = (SwDBNumSetFieldType*)pCurShell->GetFldType( 0, RES_DBNUMSETFLD); pFld = new SwDBNumSetField( pTyp, sPar1, rData.sPar2, aDBData); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBSETNUMBERFLD: @@ -1188,7 +1188,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBSetNumberFieldType* pTyp = (SwDBSetNumberFieldType*) pCurShell->GetFldType(0, RES_DBSETNUMBERFLD); pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId); - bExp = TRUE; + bExp = sal_True; break; } } @@ -1210,7 +1210,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pFld = new SwUserField(pTyp, 0, nFormatId); if (pFld->GetSubType() != nSubType) pFld->SetSubType(nSubType); - bTbl = TRUE; + bTbl = sal_True; break; } case TYP_INPUTFLD: @@ -1227,16 +1227,16 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) new SwSetExpField(pTyp, aEmptyStr, nFormatId); // Typ vom SwSetExpFieldType nicht veraendern: - USHORT nOldSubType = pExpFld->GetSubType(); + sal_uInt16 nOldSubType = pExpFld->GetSubType(); pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00)); pExpFld->SetPromptText(rData.sPar2); - pExpFld->SetInputFlag(TRUE) ; - bExp = TRUE; + pExpFld->SetInputFlag(sal_True) ; + bExp = sal_True; pFld = pExpFld; } else - return FALSE; + return sal_False; } else { @@ -1250,13 +1250,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) // Dialog starten // - pCurShell->StartInputFldDlg(pFld, FALSE, rData.pParent); + pCurShell->StartInputFldDlg(pFld, sal_False, rData.pParent); break; } case TYP_SETFLD: { if (!rData.sPar2.Len()) // Leere Variablen sind nicht erlaubt - return FALSE; + return sal_False; SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType( SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1) ); @@ -1264,7 +1264,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwSetExpField* pExpFld = new SwSetExpField( pTyp, rData.sPar2, nFormatId); pExpFld->SetSubType(nSubType); pExpFld->SetPar2(rData.sPar2); - bExp = TRUE; + bExp = sal_True; pFld = pExpFld; break; } @@ -1273,7 +1273,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType( SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1, nsSwGetSetExpType::GSE_SEQ)); - BYTE nLevel = static_cast< BYTE >(nSubType & 0xff); + sal_uInt8 nLevel = static_cast< sal_uInt8 >(nSubType & 0xff); pTyp->SetOutlineLvl(nLevel); if (nLevel != 0x7f && cSeparator == 0) @@ -1281,7 +1281,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pTyp->SetDelimiter(cSeparator); SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId); - bExp = TRUE; + bExp = sal_True; pFld = pExpFld; nSubType = nsSwGetSetExpType::GSE_SEQ; break; @@ -1298,15 +1298,15 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) 0, RES_GETEXPFLD); pFld = new SwGetExpField(pTyp, rData.sPar1, pSetTyp->GetType(), nFormatId); pFld->SetSubType(nSubType | pSetTyp->GetType()); - bExp = TRUE; + bExp = sal_True; } else - return FALSE; + return sal_False; break; } case TYP_FORMELFLD: { - if(pCurShell->GetFrmType(0,FALSE) & FRMTYPE_TABLE) + if(pCurShell->GetFrmType(0,sal_False) & FRMTYPE_TABLE) { pCurShell->StartAllAction(); @@ -1333,13 +1333,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->UpdateTable(); pCurShell->EndAllAction(); - return TRUE; + return sal_True; /* // In der Tabelle Tabellenformeln einfuegen SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType( 0, RES_TABLEFLD); pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId); - bTbl = TRUE;*/ + bTbl = sal_True;*/ } else { @@ -1347,7 +1347,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->GetFldType(0, RES_GETEXPFLD); pFld = new SwGetExpField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId); pFld->SetSubType(nSubType); - bExp = TRUE; + bExp = sal_True; } break; } @@ -1355,13 +1355,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pFld = new SwRefPageSetField( (SwRefPageSetFieldType*) pCurShell->GetFldType( 0, RES_REFPAGESETFLD ), (short)rData.sPar2.ToInt32(), 0 != nSubType ); - bPageVar = TRUE; + bPageVar = sal_True; break; case TYP_GETREFPAGEFLD: pFld = new SwRefPageGetField( (SwRefPageGetFieldType*) pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ), nFormatId ); - bPageVar = TRUE; + bPageVar = sal_True; break; case TYP_DROPDOWN : { @@ -1377,7 +1377,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) break; default: { ASSERT(!this, "Falscher Feldtyp"); - return FALSE; + return sal_False; } } ASSERT(pFld, "Feld nicht vorhanden"); @@ -1385,7 +1385,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) //the auto language flag has to be set prior to the language! pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage); - USHORT nLang = GetCurrLanguage(); + sal_uInt16 nLang = GetCurrLanguage(); pFld->SetLanguage(nLang); // Einfuegen @@ -1394,13 +1394,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->Insert(*pFld); if(bExp && bEvalExp) - pCurShell->UpdateExpFlds(TRUE); + pCurShell->UpdateExpFlds(sal_True); if(bTbl) { - pCurShell->Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE ); + pCurShell->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False ); pCurShell->UpdateFlds(*pFld); - pCurShell->Right(CRSR_SKIP_CHARS, FALSE, 1, FALSE ); + pCurShell->Right(CRSR_SKIP_CHARS, sal_False, 1, sal_False ); } else if( bPageVar ) ((SwRefPageGetFieldType*)pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds(); @@ -1411,7 +1411,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) delete pFld; pCurShell->EndAllAction(); - return TRUE; + return sal_True; } /*-------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) --------------------------------------------------------------------*/ -void SwFldMgr::UpdateCurFld(ULONG nFormat, +void SwFldMgr::UpdateCurFld(sal_uLong nFormat, const String& rPar1, const String& rPar2, SwField * _pTmpFld) // #111840# @@ -1440,7 +1440,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, } SwFieldType* pType = pTmpFld->GetTyp(); - const USHORT nTypeId = pTmpFld->GetTypeId(); + const sal_uInt16 nTypeId = pTmpFld->GetTypeId(); SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); DBG_ASSERT(pSh, "no SwWrtShell found"); @@ -1448,8 +1448,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, return; pSh->StartAllAction(); - BOOL bSetPar2 = TRUE; - BOOL bSetPar1 = TRUE; + sal_Bool bSetPar2 = sal_True; + sal_Bool bSetPar1 = sal_True; String sPar1( rPar1 ); String sPar2( rPar2 ); @@ -1460,24 +1460,24 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); break; } case TYP_CHAPTERFLD: { - USHORT nByte = (USHORT)rPar2.ToInt32(); - nByte = Max(USHORT(1), nByte); - nByte = Min(nByte, USHORT(MAXLEVEL)); + sal_uInt16 nByte = (sal_uInt16)rPar2.ToInt32(); + nByte = Max(sal_uInt16(1), nByte); + nByte = Min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - ((SwChapterField*)pTmpFld)->SetLevel((BYTE)nByte); - bSetPar2 = FALSE; + ((SwChapterField*)pTmpFld)->SetLevel((sal_uInt8)nByte); + bSetPar2 = sal_False; break; } case TYP_SCRIPTFLD: - ((SwScriptField*)pTmpFld)->SetCodeURL((BOOL)nFormat); + ((SwScriptField*)pTmpFld)->SetCodeURL((sal_Bool)nFormat); break; case TYP_NEXTPAGEFLD: @@ -1521,11 +1521,11 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, case TYP_GETREFFLD: { - bSetPar2 = FALSE; - ((SwGetRefField*)pTmpFld)->SetSubType( (USHORT)rPar2.ToInt32() ); - USHORT nPos = rPar2.Search( '|' ); + bSetPar2 = sal_False; + ((SwGetRefField*)pTmpFld)->SetSubType( (sal_uInt16)rPar2.ToInt32() ); + sal_uInt16 nPos = rPar2.Search( '|' ); if( STRING_NOTFOUND != nPos ) - ((SwGetRefField*)pTmpFld)->SetSeqNo( (USHORT)rPar2.Copy( nPos + 1 ).ToInt32()); + ((SwGetRefField*)pTmpFld)->SetSeqNo( (sal_uInt16)rPar2.Copy( nPos + 1 ).ToInt32()); } break; case TYP_DROPDOWN: @@ -1537,7 +1537,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, pArray[nToken] = sPar2.GetToken(nToken, DB_DELIM); ((SwDropDownField*)pTmpFld)->SetItems(aEntries); ((SwDropDownField*)pTmpFld)->SetName(sPar1); - bSetPar1 = bSetPar2 = FALSE; + bSetPar1 = bSetPar2 = sal_False; } break; case TYP_AUTHORITY : @@ -1546,7 +1546,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld); SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType); SwAuthEntry aTempEntry; - for( USHORT i = 0; i < AUTH_FIELD_END; ++i ) + for( sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i ) aTempEntry.SetAuthorField( (ToxAuthorityField)i, rPar1.GetToken( i, TOX_STYLE_DELIMITER )); if( pAuthorityType->ChangeEntryContent( &aTempEntry ) ) @@ -1557,8 +1557,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) - bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated - bSetPar2 = FALSE; + bSetPar1 = sal_False; //otherwise it's a new or changed entry, the field needs to be updated + bSetPar2 = sal_False; } break; } @@ -1603,11 +1603,11 @@ void SwFldMgr::EvalExpFlds(SwWrtShell* pSh) if(pSh) { pSh->StartAllAction(); - pSh->UpdateExpFlds(TRUE); + pSh->UpdateExpFlds(sal_True); pSh->EndAllAction(); } } -USHORT SwFldMgr::GetCurrLanguage() const +sal_uInt16 SwFldMgr::GetCurrLanguage() const { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); if( pSh ) @@ -1617,9 +1617,9 @@ USHORT SwFldMgr::GetCurrLanguage() const void SwFieldType::_GetFldName() { - static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; + static const sal_uInt16 coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; - static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = { + static sal_uInt16 __READONLY_DATA coFldNms[ coFldCnt ] = { FLD_DATE_STD, FLD_TIME_STD, STR_FILENAMEFLD, @@ -1666,8 +1666,8 @@ void SwFieldType::_GetFldName() }; // Infos fuer Felder einfuegen - SwFieldType::pFldNames = new SvStringsDtor( (BYTE)coFldCnt, 2 ); - for( USHORT nIdx = 0; nIdx < coFldCnt; ++nIdx ) + SwFieldType::pFldNames = new SvStringsDtor( (sal_uInt8)coFldCnt, 2 ); + for( sal_uInt16 nIdx = 0; nIdx < coFldCnt; ++nIdx ) { String* pTmp = new SW_RESSTR( coFldNms[ nIdx ] ); pTmp->Assign( MnemonicGenerator::EraseAllMnemonicChars( *pTmp ) ); @@ -1679,9 +1679,9 @@ void SwFieldType::_GetFldName() Beschreibung: --------------------------------------------------------------------*/ -BOOL SwFldMgr::ChooseMacro(const String&) +sal_Bool SwFldMgr::ChooseMacro(const String&) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; // choose script dialog ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); @@ -1690,7 +1690,7 @@ BOOL SwFldMgr::ChooseMacro(const String&) if ( aScriptURL.getLength() != 0 ) { SetMacroPath( aScriptURL ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1728,7 +1728,7 @@ void SwFldMgr::SetMacroPath(const String& rPath) Beschreibung: --------------------------------------------------------------------*/ -ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal) +sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal) { double fValue; short nDefFormat; @@ -1745,8 +1745,8 @@ ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter Time aTime; - ULONG nNumFmtTime = (ULONG)aTime.GetSec() + (ULONG)aTime.GetMin() * 60L + - (ULONG)aTime.GetHour() * 3600L; + sal_uLong nNumFmtTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L + + (sal_uLong)aTime.GetHour() * 3600L; fValue += (double)nNumFmtTime / 86400.0; |