diff options
| author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
| commit | c554b5b803216ebda1dcf58b377b89028f482e1e (patch) | |
| tree | 3265da5308f78702e1c4033de20f25684067e621 /sc/source/ui/miscdlgs | |
| parent | 7bfe9976e007b92e86082ec2802845c76bf7ce09 (diff) | |
| parent | f663a19f9653385500addf5eb6c03dae86296101 (diff) | |
accfixes: merged to m100
Diffstat (limited to 'sc/source/ui/miscdlgs')
33 files changed, 647 insertions, 647 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index cd09a35d3..a78300127 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -68,7 +68,7 @@ #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute(); -inline void EnableDisable( Window& rWin, BOOL bEnable ) +inline void EnableDisable( Window& rWin, sal_Bool bEnable ) { if (bEnable) rWin.Enable(); @@ -90,9 +90,9 @@ ScRedlinData::ScRedlinData() nInfo=RD_SPECIAL_NONE; nActionNo=0; pData=NULL; - bDisabled=FALSE; - bIsRejectable=FALSE; - bIsAcceptable=FALSE; + bDisabled=sal_False; + bIsRejectable=sal_False; + bIsAcceptable=sal_False; nTable=SCTAB_MAX; nCol=SCCOL_MAX; nRow=SCROW_MAX; @@ -103,9 +103,9 @@ ScRedlinData::~ScRedlinData() nInfo=RD_SPECIAL_NONE; nActionNo=0; pData=NULL; - bDisabled=FALSE; - bIsRejectable=FALSE; - bIsAcceptable=FALSE; + bDisabled=sal_False; + bIsRejectable=sal_False; + bIsAcceptable=sal_False; } @@ -141,16 +141,16 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP aStrEmpty ( ScResId( STR_EMPTY )) { FreeResource(); -// bScAcceptChgDlgIsDead=FALSE; - bNoSelection=FALSE; - bNeedsUpdate=FALSE; - bIgnoreMsg=FALSE; +// bScAcceptChgDlgIsDead=sal_False; + bNoSelection=sal_False; + bNeedsUpdate=sal_False; + bIgnoreMsg=sal_False; nAcceptCount=0; nRejectCount=0; - bAcceptEnableFlag=TRUE; - bRejectEnableFlag=TRUE; - bHasFilterEntry=FALSE; - bUseColor=FALSE; + bAcceptEnableFlag=sal_True; + bRejectEnableFlag=sal_True; + bHasFilterEntry=sal_False; + bUseColor=sal_False; aReOpenTimer.SetTimeout(50); aReOpenTimer.SetTimeoutHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl )); @@ -172,7 +172,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP pTPFilter->SetReadyHdl(LINK( this, ScAcceptChgDlg, FilterHandle )); pTPFilter->SetRefHdl(LINK( this, ScAcceptChgDlg, RefHandle )); pTPFilter->SetModifyHdl(LINK( this, ScAcceptChgDlg, FilterModified)); - pTPFilter->HideRange(FALSE); + pTPFilter->HideRange(sal_False); pTPView->InsertCalcHeader(); pTPView->SetRejectClickHdl( LINK( this, ScAcceptChgDlg,RejectHandle)); pTPView->SetAcceptClickHdl( LINK(this, ScAcceptChgDlg, AcceptHandle)); @@ -201,7 +201,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP } ScAcceptChgDlg::~ScAcceptChgDlg() { -// bScAcceptChgDlgIsDead=TRUE; +// bScAcceptChgDlgIsDead=sal_True; ClearView(); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -224,13 +224,13 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) pDoc=NULL; } - bNoSelection=FALSE; - bNeedsUpdate=FALSE; - bIgnoreMsg=FALSE; + bNoSelection=sal_False; + bNeedsUpdate=sal_False; + bIgnoreMsg=sal_False; nAcceptCount=0; nRejectCount=0; - bAcceptEnableFlag=TRUE; - bRejectEnableFlag=TRUE; + bAcceptEnableFlag=sal_True; + bRejectEnableFlag=sal_True; // #91781# don't call Init here (switching between views), just set link below // (dialog is just hidden, not deleted anymore, when switching views) @@ -260,7 +260,7 @@ void __EXPORT ScAcceptChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); pTPFilter->ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(sal_uInt16 i=0;i<aUserColl.GetCount();i++) pTPFilter->InsertAuthor(aUserColl[i]->GetString()); } @@ -275,7 +275,7 @@ void __EXPORT ScAcceptChgDlg::Init() pTPFilter->SetFirstTime(aChangeViewSet.GetTheFirstDateTime()); pTPFilter->SetLastDate(aChangeViewSet.GetTheLastDateTime()); pTPFilter->SetLastTime(aChangeViewSet.GetTheLastDateTime()); - pTPFilter->SetDateMode((USHORT)aChangeViewSet.GetTheDateMode()); + pTPFilter->SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode()); pTPFilter->CheckComment(aChangeViewSet.HasComment()); pTPFilter->SetComment(aChangeViewSet.GetTheComment()); @@ -318,10 +318,10 @@ void ScAcceptChgDlg::ClearView() { nAcceptCount=0; nRejectCount=0; - pTheView->SetUpdateMode(FALSE); + pTheView->SetUpdateMode(sal_False); pTheView->Clear(); - pTheView->SetUpdateMode(TRUE); + pTheView->SetUpdateMode(sal_True); } String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) @@ -355,11 +355,11 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) } -BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) +sal_Bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) { - if(pScChangeAction==NULL) return FALSE; + if(pScChangeAction==NULL) return sal_False; - BOOL bFlag=FALSE; + sal_Bool bFlag=sal_False; ScRange aRef=pScChangeAction->GetBigRange().MakeRange(); String aUser=pScChangeAction->GetUser(); @@ -376,7 +376,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) { if(!pScChangeAction->IsDialogParent()) { - pScChangeAction->GetDescription( aDesc, pDoc, TRUE); + pScChangeAction->GetDescription( aDesc, pDoc, sal_True); } } else @@ -405,12 +405,12 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) if(pRangeEntry!=NULL) { - bFlag=TRUE; + bFlag=sal_True; } } else { - bFlag=TRUE; + bFlag=sal_True; } } @@ -419,7 +419,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeAction, ScChangeActionState /* eState */, SvLBoxEntry* pParent, - BOOL bDelMaster,BOOL bDisabled,ULONG nPos) + sal_Bool bDelMaster,sal_Bool bDisabled,sal_uLong nPos) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -427,7 +427,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA SvLBoxEntry* pEntry=NULL; - BOOL bFlag=FALSE; + sal_Bool bFlag=sal_False; ScRange aRef=pScChangeAction->GetBigRange().MakeRange(); String aUser=pScChangeAction->GetUser(); @@ -455,13 +455,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA { aString=aStrContentWithChild; pNewData->nInfo=RD_SPECIAL_VISCONTENT; - pNewData->bIsRejectable=FALSE; - pNewData->bIsAcceptable=FALSE; + pNewData->bIsRejectable=sal_False; + pNewData->bIsAcceptable=sal_False; } else { aString=*MakeTypeString(eType); - pScChangeAction->GetDescription( aDesc, pDoc, TRUE); + pScChangeAction->GetDescription( aDesc, pDoc, sal_True); } } else @@ -470,9 +470,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA if(bDelMaster) { - pScChangeAction->GetDescription( aDesc, pDoc,TRUE); - pNewData->bDisabled=TRUE; - pNewData->bIsRejectable=FALSE; + pScChangeAction->GetDescription( aDesc, pDoc,sal_True); + pNewData->bDisabled=sal_True; + pNewData->bIsRejectable=sal_False; } else pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete()); @@ -480,11 +480,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA } aString+='\t'; - pScChangeAction->GetRefString(aRefStr, pDoc, TRUE); + pScChangeAction->GetRefString(aRefStr, pDoc, sal_True); aString+=aRefStr; aString+='\t'; - BOOL bIsGenerated; + sal_Bool bIsGenerated; if(!pChanges->IsGenerated(pScChangeAction->GetActionNumber())) { @@ -495,13 +495,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA aString+=' '; aString+=ScGlobal::pLocaleData->getTime(aDateTime); aString+='\t'; - bIsGenerated=FALSE; + bIsGenerated=sal_False; } else { aString+='\t'; aString+='\t'; - bIsGenerated=TRUE; + bIsGenerated=sal_True; } String aComment=pScChangeAction->GetComment(); @@ -531,14 +531,14 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA //SC_CAS_VIRGIN,SC_CAS_ACCEPTED,SC_CAS_REJECTED if(pRangeEntry!=NULL) { - bHasFilterEntry=TRUE; - bFlag=TRUE; + bHasFilterEntry=sal_True; + bFlag=sal_True; } } else if(!bIsGenerated) { - bHasFilterEntry=TRUE; - bFlag=TRUE; + bHasFilterEntry=sal_True; + bFlag=sal_True; } } } @@ -570,18 +570,18 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChangeAction, ScChangeActionState eState,SvLBoxEntry* pParent, - BOOL bDelMaster,BOOL bDisabled,ULONG nPos) + sal_Bool bDelMaster,sal_Bool bDisabled,sal_uLong nPos) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pScChangeAction==NULL || pChanges==NULL) return NULL; - BOOL bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber()); + sal_Bool bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber()); SvLBoxEntry* pEntry=NULL; - int bFlag=FALSE; + int bFlag=sal_False; ScRange aRef=pScChangeAction->GetBigRange().MakeRange(); String aUser=pScChangeAction->GetUser(); @@ -602,12 +602,12 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang if(pRangeEntry!=NULL && pScChangeAction->GetState()==eState) { - bFlag=TRUE; + bFlag=sal_True; } } else if(pScChangeAction->GetState()==eState && !bIsGenerated) { - bFlag=TRUE; + bFlag=sal_True; } } @@ -637,13 +637,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang { aString=aStrContentWithChild; pNewData->nInfo=RD_SPECIAL_VISCONTENT; - pNewData->bIsRejectable=FALSE; - pNewData->bIsAcceptable=FALSE; + pNewData->bIsRejectable=sal_False; + pNewData->bIsAcceptable=sal_False; } else { aString=*MakeTypeString(eType); - pScChangeAction->GetDescription( aDesc, pDoc, TRUE); + pScChangeAction->GetDescription( aDesc, pDoc, sal_True); } } else @@ -652,9 +652,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang if(bDelMaster) { - pScChangeAction->GetDescription( aDesc, pDoc,TRUE); - pNewData->bDisabled=TRUE; - pNewData->bIsRejectable=FALSE; + pScChangeAction->GetDescription( aDesc, pDoc,sal_True); + pNewData->bDisabled=sal_True; + pNewData->bIsRejectable=sal_False; } else pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete()); @@ -662,7 +662,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang } aString+='\t'; - pScChangeAction->GetRefString(aRefStr, pDoc, TRUE); + pScChangeAction->GetRefString(aRefStr, pDoc, sal_True); aString+=aRefStr; aString+='\t'; @@ -701,16 +701,16 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang } SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, - SvLBoxEntry* pParent, ULONG nSpecial) + SvLBoxEntry* pParent, sal_uLong nSpecial) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); SvLBoxEntry* pEntry=NULL; if(pScChangeAction==NULL || pChanges==NULL) return NULL; - BOOL bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber()); + sal_Bool bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber()); - BOOL bFlag=FALSE; + sal_Bool bFlag=sal_False; ScRange aRef=pScChangeAction->GetBigRange().MakeRange(); String aUser=pScChangeAction->GetUser(); @@ -730,11 +730,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte //SC_CAS_VIRGIN,SC_CAS_ACCEPTED,SC_CAS_REJECTED if(pRangeEntry!=NULL) { - bFlag=TRUE; + bFlag=sal_True; } } else if(!bIsGenerated) - bFlag=TRUE; + bFlag=sal_True; } String aRefStr; @@ -775,7 +775,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte aDesc+=a2String; aString+='\t'; - pScChangeAction->GetRefString(aRefStr, pDoc, TRUE); + pScChangeAction->GetRefString(aRefStr, pDoc, sal_True); aString+=aRefStr; aString+='\t'; @@ -811,7 +811,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte pNewData->pData=(void *)pScChangeAction; pNewData->nActionNo=pScChangeAction->GetActionNumber(); pNewData->bIsAcceptable=pScChangeAction->IsClickable(); - pNewData->bIsRejectable=FALSE; + pNewData->bIsRejectable=sal_False; pNewData->bDisabled=!pNewData->bIsAcceptable; pNewData->aDateTime=aDateTime; pNewData->nRow = aRef.aStart.Row(); @@ -820,7 +820,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte if(pTheView->IsValidComment(&aComment) && bFlag) { - bHasFilterEntry=TRUE; + bHasFilterEntry=sal_True; pEntry=pTheView->InsertEntry(aString,pNewData,pParent); } else @@ -834,7 +834,7 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) { ClearView(); UpdateView(); - bNoSelection=FALSE; + bNoSelection=sal_False; } return SfxModelessDialog::PreNotify(rNEvt); @@ -843,16 +843,16 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) void ScAcceptChgDlg::UpdateView() { - bNeedsUpdate=FALSE; + bNeedsUpdate=sal_False; DateTime aDateTime; SvLBoxEntry* pParent=NULL; ScChangeTrack* pChanges=NULL; const ScChangeAction* pScChangeAction=NULL; - bAcceptEnableFlag=TRUE; - bRejectEnableFlag=TRUE; + bAcceptEnableFlag=sal_True; + bRejectEnableFlag=sal_True; SetPointer(Pointer(POINTER_WAIT)); - pTheView->SetUpdateMode(FALSE); - BOOL bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()|| + pTheView->SetUpdateMode(sal_False); + sal_Bool bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()|| pTPFilter->IsAuthor()||pTPFilter->IsComment(); bUseColor=bFilterFlag; @@ -866,11 +866,11 @@ void ScAcceptChgDlg::UpdateView() } } ScChangeActionTable ActionTable; - BOOL bTheFlag=FALSE; + sal_Bool bTheFlag=sal_False; while(pScChangeAction!=NULL) { - bHasFilterEntry=FALSE; + bHasFilterEntry=sal_False; switch(pScChangeAction->GetState()) { case SC_CAS_VIRGIN: @@ -885,7 +885,7 @@ void ScAcceptChgDlg::UpdateView() else pParent=NULL; - bTheFlag=TRUE; + bTheFlag=sal_True; break; case SC_CAS_ACCEPTED: @@ -903,12 +903,12 @@ void ScAcceptChgDlg::UpdateView() { if(!bFilterFlag) { - pParent->EnableChildsOnDemand(TRUE); + pParent->EnableChildsOnDemand(sal_True); } else { - BOOL bTestFlag=bHasFilterEntry; - bHasFilterEntry=FALSE; + sal_Bool bTestFlag=bHasFilterEntry; + bHasFilterEntry=sal_False; if(Expand(pChanges,pScChangeAction,pParent,!bTestFlag)&&!bTestFlag) pTheView->RemoveEntry(pParent); } @@ -918,7 +918,7 @@ void ScAcceptChgDlg::UpdateView() } if( bTheFlag && (!pDoc->IsDocEditable() || pChanges->IsProtected()) ) - bTheFlag=FALSE; + bTheFlag=sal_False; pTPView->EnableAccept(bTheFlag); pTPView->EnableAcceptAll(bTheFlag); @@ -930,16 +930,16 @@ void ScAcceptChgDlg::UpdateView() pParent=pTheView->InsertEntry( aStrAllAccepted, static_cast< RedlinData * >(NULL), static_cast< SvLBoxEntry * >(NULL)); - pParent->EnableChildsOnDemand(TRUE); + pParent->EnableChildsOnDemand(sal_True); } if(nRejectCount>0) { pParent=pTheView->InsertEntry( aStrAllRejected, static_cast< RedlinData * >(NULL), static_cast< SvLBoxEntry * >(NULL)); - pParent->EnableChildsOnDemand(TRUE); + pParent->EnableChildsOnDemand(sal_True); } - pTheView->SetUpdateMode(TRUE); + pTheView->SetUpdateMode(sal_True); SetPointer(Pointer(POINTER_ARROW)); SvLBoxEntry* pEntry=pTheView->First(); if(pEntry!=NULL) @@ -949,7 +949,7 @@ void ScAcceptChgDlg::UpdateView() } //---------------------------------------------------------------------------- -BOOL ScAcceptChgDlg::Close() +sal_Bool ScAcceptChgDlg::Close() { return SfxModelessDialog::Close(); } @@ -973,23 +973,23 @@ IMPL_LINK( ScAcceptChgDlg, MinSizeHandle, SvxAcceptChgCtr*, pCtr ) IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) { - USHORT nId =ScSimpleRefDlgWrapper::GetChildWindowId(); + sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); - ScSimpleRefDlgWrapper::SetDefaultPosSize(GetPosPixel(),GetSizePixel(),TRUE); + ScSimpleRefDlgWrapper::SetDefaultPosSize(GetPosPixel(),GetSizePixel(),sal_True); - SC_MOD()->SetRefDialog( nId, TRUE ); + SC_MOD()->SetRefDialog( nId, sal_True ); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); ScSimpleRefDlgWrapper* pWnd =(ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId ); if(pWnd!=NULL) { -// bSimpleRefDlgStarted=TRUE; - USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId(); - pViewFrm->ShowChildWindow(nAcceptId,FALSE); +// bSimpleRefDlgStarted=sal_True; + sal_uInt16 nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId(); + pViewFrm->ShowChildWindow(nAcceptId,sal_False); pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle)); pWnd->SetRefString(pTPFilter->GetRange()); - pWnd->SetAutoReOpen(FALSE); + pWnd->SetAutoReOpen(sal_False); Window* pWin=pWnd->GetWindow(); pWin->SetPosSizePixel(GetPosPixel(),GetSizePixel()); Hide(); @@ -1001,10 +1001,10 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult) { - USHORT nId; + sal_uInt16 nId; -// bSimpleRefDlgStarted=FALSE; - ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE); +// bSimpleRefDlgStarted=sal_False; + ScSimpleRefDlgWrapper::SetAutoReOpen(sal_True); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if(pResult!=NULL) @@ -1024,12 +1024,12 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult) Invalidate(); } nId = ScAcceptChgDlgWrapper::GetChildWindowId(); - pViewFrm->ShowChildWindow( nId, TRUE ); + pViewFrm->ShowChildWindow( nId, sal_True ); } else { nId = ScAcceptChgDlgWrapper::GetChildWindowId(); - pViewFrm->SetChildWindow( nId, FALSE ); + pViewFrm->SetChildWindow( nId, sal_False ); } return 0; } @@ -1050,7 +1050,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) { SetPointer(Pointer(POINTER_WAIT)); - bIgnoreMsg=TRUE; + bIgnoreMsg=sal_True; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pRef!=NULL) @@ -1082,7 +1082,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef ) } SetPointer(Pointer(POINTER_ARROW)); - bIgnoreMsg=FALSE; + bIgnoreMsg=sal_False; return 0; } IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) @@ -1090,7 +1090,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) SetPointer(Pointer(POINTER_WAIT)); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - bIgnoreMsg=TRUE; + bIgnoreMsg=sal_True; if(pRef!=NULL) { SvLBoxEntry* pEntry=pTheView->FirstSelected(); @@ -1105,7 +1105,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) { if(pEntryData->nInfo==RD_SPECIAL_CONTENT) { - pChanges->SelectContent(pScChangeAction,TRUE); + pChanges->SelectContent(pScChangeAction,sal_True); } else { @@ -1124,7 +1124,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef ) ClearView(); UpdateView(); } - bIgnoreMsg=FALSE; + bIgnoreMsg=sal_False; return 0; } @@ -1179,7 +1179,7 @@ void ScAcceptChgDlg::AcceptFiltered() IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) { SetPointer(Pointer(POINTER_WAIT)); - bIgnoreMsg=TRUE; + bIgnoreMsg=sal_True; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pChanges!=NULL) { @@ -1203,7 +1203,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) } SetPointer(Pointer(POINTER_ARROW)); - bIgnoreMsg=FALSE; + bIgnoreMsg=sal_False; return 0; } @@ -1212,7 +1212,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) { SetPointer(Pointer(POINTER_WAIT)); - bIgnoreMsg=TRUE; + bIgnoreMsg=sal_True; ScChangeTrack* pChanges=pDoc->GetChangeTrack(); if(pChanges!=NULL) { @@ -1231,7 +1231,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) ClearView(); UpdateView(); } - bIgnoreMsg=FALSE; + bIgnoreMsg=sal_False; SetPointer(Pointer(POINTER_ARROW)); return 0; @@ -1243,7 +1243,7 @@ IMPL_LINK( ScAcceptChgDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) { aSelectionTimer.Start(); } - bNoSelection=FALSE; + bNoSelection=sal_False; return 0; } @@ -1276,12 +1276,12 @@ void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction, } } -BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent) +sal_Bool ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent) { - BOOL bTheTestFlag=TRUE; + sal_Bool bTheTestFlag=sal_True; ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData()); const ScChangeAction* pScChangeAction = (ScChangeAction*) pEntryData->pData; - BOOL bParentInserted = FALSE; + sal_Bool bParentInserted = sal_False; // If the parent is a MatrixOrigin then place it in the right order before // the MatrixReferences. Also if it is the first content change at this // position don't insert the first dependent MatrixReference as the special @@ -1292,7 +1292,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo { pActionTable->Insert( pScChangeAction->GetActionNumber(), (ScChangeAction*) pScChangeAction ); - bParentInserted = TRUE; + bParentInserted = sal_True; } SvLBoxEntry* pEntry=NULL; @@ -1304,18 +1304,18 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo pCChild=(const ScChangeActionContent*)pActionTable->Next(); } - if(pCChild==NULL) return TRUE; + if(pCChild==NULL) return sal_True; SvLBoxEntry* pOriginal=InsertChangeActionContent(pCChild,pParent,RD_SPECIAL_CONTENT); if(pOriginal!=NULL) { - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; ScRedlinData *pParentData=(ScRedlinData *)(pOriginal->GetUserData()); pParentData->pData=(void *)pScChangeAction; pParentData->nActionNo=pScChangeAction->GetActionNumber(); pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value - pParentData->bIsRejectable=FALSE; - pParentData->bDisabled=FALSE; + pParentData->bIsRejectable=sal_False; + pParentData->bDisabled=sal_False; } while(pCChild!=NULL) { @@ -1324,7 +1324,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo pEntry=InsertChangeActionContent(pCChild,pParent,RD_SPECIAL_NONE); if(pEntry!=NULL) - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; } pCChild=(const ScChangeActionContent*)pActionTable->Next(); } @@ -1336,13 +1336,13 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo if(pEntry!=NULL) { - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; ScRedlinData *pParentData=(ScRedlinData *)(pEntry->GetUserData()); pParentData->pData=(void *)pScChangeAction; pParentData->nActionNo=pScChangeAction->GetActionNumber(); pParentData->bIsAcceptable=pScChangeAction->IsClickable(); - pParentData->bIsRejectable=FALSE; - pParentData->bDisabled=FALSE; + pParentData->bIsRejectable=sal_False; + pParentData->bDisabled=sal_False; } } @@ -1350,10 +1350,10 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo } -BOOL ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent) +sal_Bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - BOOL bTheTestFlag=TRUE; + sal_Bool bTheTestFlag=sal_True; ScChangeActionState eState = SC_CAS_VIRGIN; String aString=pTheView->GetEntryText( pParent); @@ -1376,35 +1376,35 @@ BOOL ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent) { if(pScChangeAction->GetState()==eState && InsertFilteredAction(pScChangeAction,eState,pParent)!=NULL) - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; pScChangeAction=pScChangeAction->GetNext(); } return bTheTestFlag; } -BOOL ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent) +sal_Bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - BOOL bTheTestFlag=TRUE; + sal_Bool bTheTestFlag=sal_True; SvLBoxEntry* pEntry=NULL; const ScChangeAction* pChild=(const ScChangeAction*)pActionTable->First(); while(pChild!=NULL) { - pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,FALSE,TRUE); + pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_False,sal_True); if(pEntry!=NULL) { - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); - pEntryData->bIsRejectable=FALSE; - pEntryData->bIsAcceptable=FALSE; - pEntryData->bDisabled=TRUE; + pEntryData->bIsRejectable=sal_False; + pEntryData->bIsAcceptable=sal_False; + pEntryData->bDisabled=sal_True; if(pChild->IsDialogParent()) { - //pEntry->EnableChildsOnDemand(TRUE); + //pEntry->EnableChildsOnDemand(sal_True); Expand(pChanges,pChild,pEntry); } } @@ -1412,11 +1412,11 @@ BOOL ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* } return bTheTestFlag; } -BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction, +sal_Bool ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction, ScChangeActionTable* pActionTable,SvLBoxEntry* pParent) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); - BOOL bTheTestFlag=TRUE; + sal_Bool bTheTestFlag=sal_True; SvLBoxEntry* pEntry=NULL; ScChangeActionTable aDelActionTable; const ScChangeAction* pChild=(const ScChangeAction*)pActionTable->First(); @@ -1425,18 +1425,18 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction, { if(pScChangeAction!=pChild) - pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,FALSE,TRUE); + pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_False,sal_True); else - pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,TRUE,TRUE); + pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_True,sal_True); if(pEntry!=NULL) { ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); - pEntryData->bIsRejectable=FALSE; - pEntryData->bIsAcceptable=FALSE; - pEntryData->bDisabled=TRUE; + pEntryData->bIsRejectable=sal_False; + pEntryData->bIsAcceptable=sal_False; + pEntryData->bDisabled=sal_True; - bTheTestFlag=FALSE; + bTheTestFlag=sal_False; if ( pChild->IsDialogParent() ) { Expand(pChanges,pChild,pEntry); @@ -1444,7 +1444,7 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction, pChanges->GetDependents((ScChangeAction*) pChild,aDelActionTable); if(aDelActionTable.First()!=NULL) { - pEntry->EnableChildsOnDemand(TRUE); + pEntry->EnableChildsOnDemand(sal_True); } aDelActionTable.Clear(); */ @@ -1455,10 +1455,10 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction, return bTheTestFlag; } -BOOL ScAcceptChgDlg::Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, - SvLBoxEntry* pEntry,BOOL bFilter) +sal_Bool ScAcceptChgDlg::Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, + SvLBoxEntry* pEntry,sal_Bool bFilter) { - BOOL bTheTestFlag=TRUE; + sal_Bool bTheTestFlag=sal_True; if(pChanges!=NULL &&pEntry!=NULL &&pScChangeAction!=NULL) { @@ -1513,8 +1513,8 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) if(pEntry->HasChildsOnDemand()) { - BOOL bTheTestFlag=TRUE; - pEntry->EnableChildsOnDemand(FALSE); + sal_Bool bTheTestFlag=sal_True; + pEntry->EnableChildsOnDemand(sal_False); pTheView->RemoveEntry(pTheView->FirstChild(pEntry)); if(pEntryData!=NULL) @@ -1556,32 +1556,32 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) } } SetPointer(Pointer(POINTER_ARROW)); - return (ULONG) TRUE; + return (sal_uLong) sal_True; } -void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, - ULONG nEndAction, ULONG /* nPos */) +void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, + sal_uLong nEndAction, sal_uLong /* nPos */) { if(pChanges!=NULL) { DateTime aDateTime; SvLBoxEntry* pParent=NULL; const ScChangeAction* pScChangeAction=NULL; - bAcceptEnableFlag=TRUE; - bRejectEnableFlag=TRUE; + bAcceptEnableFlag=sal_True; + bRejectEnableFlag=sal_True; SetPointer(Pointer(POINTER_WAIT)); - pTheView->SetUpdateMode(FALSE); + pTheView->SetUpdateMode(sal_False); ScChangeActionTable ActionTable; - BOOL bTheFlag=FALSE; + sal_Bool bTheFlag=sal_False; - BOOL bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()|| + sal_Bool bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()|| pTPFilter->IsAuthor()||pTPFilter->IsComment(); bUseColor=bFilterFlag; - for(ULONG i=nStartAction;i<=nEndAction;i++) + for(sal_uLong i=nStartAction;i<=nEndAction;i++) { pScChangeAction=pChanges->GetAction(i); if(pScChangeAction==NULL) continue; @@ -1601,7 +1601,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, else pParent=NULL; - bTheFlag=TRUE; + bTheFlag=sal_True; break; case SC_CAS_ACCEPTED: @@ -1619,12 +1619,12 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, { if(!bFilterFlag) { - pParent->EnableChildsOnDemand(TRUE); + pParent->EnableChildsOnDemand(sal_True); } else { - BOOL bTestFlag=bHasFilterEntry; - bHasFilterEntry=FALSE; + sal_Bool bTestFlag=bHasFilterEntry; + bHasFilterEntry=sal_False; if(Expand(pChanges,pScChangeAction,pParent,!bTestFlag)&&!bTestFlag) pTheView->RemoveEntry(pParent); } @@ -1634,22 +1634,22 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, } if( bTheFlag && (!pDoc->IsDocEditable() || pChanges->IsProtected()) ) - bTheFlag=FALSE; + bTheFlag=sal_False; pTPView->EnableAccept(bTheFlag); pTPView->EnableAcceptAll(bTheFlag); pTPView->EnableReject(bTheFlag); pTPView->EnableRejectAll(bTheFlag); - pTheView->SetUpdateMode(TRUE); + pTheView->SetUpdateMode(sal_True); SetPointer(Pointer(POINTER_ARROW)); } } -void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction) +void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) { - pTheView->SetUpdateMode(FALSE); + pTheView->SetUpdateMode(sal_False); SvLBoxEntry* pEntry=pTheView->GetCurEntry(); @@ -1658,7 +1658,7 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction) if(pEntry!=NULL) pEntryData=(ScRedlinData *)(pEntry->GetUserData()); - ULONG nAction=0; + sal_uLong nAction=0; if(pEntryData!=NULL) { nAction=pEntryData->nActionNo; @@ -1669,19 +1669,19 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction) pTheView->SetCurEntry(pTheView->GetModel()->GetEntry(0)); } - BOOL bRemove=FALSE; + sal_Bool bRemove=sal_False; // MUST do it backwards, don't delete parents before children and GPF pEntry=pTheView->Last(); while(pEntry!=NULL) { - bRemove=FALSE; + bRemove=sal_False; pEntryData=(ScRedlinData *)(pEntry->GetUserData()); if(pEntryData!=NULL) { nAction=pEntryData->nActionNo; - if(nStartAction<=nAction && nAction<=nEndAction) bRemove=TRUE; + if(nStartAction<=nAction && nAction<=nEndAction) bRemove=sal_True; } @@ -1694,33 +1694,33 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction) } pEntry=pPrevEntry; } - pTheView->SetUpdateMode(TRUE); + pTheView->SetUpdateMode(sal_True); } -void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction) +void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction) { - pTheView->SetUpdateMode(FALSE); + pTheView->SetUpdateMode(sal_False); - ULONG nPos=LIST_APPEND; + sal_uLong nPos=LIST_APPEND; - BOOL bRemove=FALSE; + sal_Bool bRemove=sal_False; SvLBoxEntry* pEntry=pTheView->First(); SvLBoxEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL); SvLBoxEntry* pLastEntry=NULL; while(pEntry!=NULL) { - bRemove=FALSE; + bRemove=sal_False; ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData()); if(pEntryData!=NULL) { ScChangeAction* pScChangeAction= (ScChangeAction*) pEntryData->pData; - ULONG nAction=pScChangeAction->GetActionNumber(); + sal_uLong nAction=pScChangeAction->GetActionNumber(); - if(nStartAction<=nAction && nAction<=nEndAction) bRemove=TRUE; + if(nStartAction<=nAction && nAction<=nEndAction) bRemove=sal_True; } if(bRemove) @@ -1756,7 +1756,7 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U else AppendChanges(pChgTrack,nStartAction,nEndAction); - pTheView->SetUpdateMode(TRUE); + pTheView->SetUpdateMode(sal_True); } @@ -1767,8 +1767,8 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue(); ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get(); - ULONG nStartAction; - ULONG nEndAction; + sal_uLong nStartAction; + sal_uLong nEndAction; while(pTrackInfo!=NULL) { @@ -1777,7 +1777,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) if(!bIgnoreMsg) { - bNoSelection=TRUE; + bNoSelection=sal_True; switch(pTrackInfo->eMsgType) { @@ -1786,7 +1786,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) case SC_CTM_REMOVE: RemoveEntrys(nStartAction,nEndAction); break; case SC_CTM_PARENT: - case SC_CTM_CHANGE: //bNeedsUpdate=TRUE; + case SC_CTM_CHANGE: //bNeedsUpdate=sal_True; UpdateEntrys(pChgTrack,nStartAction,nEndAction); break; default: @@ -1803,7 +1803,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) } IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG ) { - ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE); + ScSimpleRefDlgWrapper::SetAutoReOpen(sal_True); aAcceptChgCtr.ShowFilterPage(); RefHandle(NULL); @@ -1814,9 +1814,9 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) { ScTabView* pTabView = pViewData->GetView(); - BOOL bAcceptFlag = TRUE; - BOOL bRejectFlag = TRUE; - BOOL bContMark = FALSE; + sal_Bool bAcceptFlag = sal_True; + sal_Bool bRejectFlag = sal_True; + sal_Bool bContMark = sal_False; pTabView->DoneBlockMode(); // clears old marking SvLBoxEntry* pEntry = pTheView->FirstSelected(); @@ -1835,16 +1835,16 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) const ScBigRange& rBigRange = pScChangeAction->GetBigRange(); if( rBigRange.IsValid( pDoc ) && IsActive() ) { - BOOL bSetCursor = !pTheView->NextSelected( pEntry ); + sal_Bool bSetCursor = !pTheView->NextSelected( pEntry ); pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark ); - bContMark = TRUE; + bContMark = sal_True; } } } else { - bAcceptFlag = FALSE; - bRejectFlag = FALSE; + bAcceptFlag = sal_False; + bRejectFlag = sal_False; } bAcceptEnableFlag = bAcceptFlag; bRejectEnableFlag = bRejectFlag; @@ -1853,7 +1853,7 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) } ScChangeTrack* pChanges = pDoc->GetChangeTrack(); - BOOL bEnable = pDoc->IsDocEditable() && pChanges && !pChanges->IsProtected(); + sal_Bool bEnable = pDoc->IsDocEditable() && pChanges && !pChanges->IsProtected(); pTPView->EnableAccept( bAcceptFlag && bEnable ); pTPView->EnableReject( bRejectFlag && bEnable ); @@ -1881,11 +1881,11 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) aPopup.Deactivate(); } - USHORT nSortedCol= pTheView->GetSortedCol(); + sal_uInt16 nSortedCol= pTheView->GetSortedCol(); if(nSortedCol!=0xFFFF) { - USHORT nItemId=nSortedCol+SC_SUB_SORT+1; + sal_uInt16 nItemId=nSortedCol+SC_SUB_SORT+1; aPopup.CheckItem(nItemId); @@ -1896,7 +1896,7 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) } } - aPopup.EnableItem(SC_CHANGES_COMMENT,FALSE); + aPopup.EnableItem(SC_CHANGES_COMMENT,sal_False); if(pDoc->IsDocEditable() && pEntry!=NULL) { @@ -1910,7 +1910,7 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) } } - USHORT nCommand=aPopup.Execute( this, GetPointerPosPixel() ); + sal_uInt16 nCommand=aPopup.Execute( this, GetPointerPosPixel() ); if(nCommand) @@ -1925,14 +1925,14 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) ScChangeAction* pScChangeAction= (ScChangeAction*) pEntryData->pData; - pViewData->GetDocShell()->ExecuteChangeCommentDialog( pScChangeAction, this,FALSE); + pViewData->GetDocShell()->ExecuteChangeCommentDialog( pScChangeAction, this,sal_False); } } } else { - BOOL bSortDir=pTheView->GetSortDirection(); - USHORT nDialogCol=nCommand-SC_SUB_SORT-1; + sal_Bool bSortDir=pTheView->GetSortDirection(); + sal_uInt16 nDialogCol=nCommand-SC_SUB_SORT-1; if(nSortedCol==nDialogCol) bSortDir=!bSortDir; pTheView->SortByCol(nDialogCol,bSortDir); /* @@ -1982,13 +1982,13 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) if ( aStr.Len()) { - USHORT nCount=(USHORT)aStr.ToInt32(); + sal_uInt16 nCount=(sal_uInt16)aStr.ToInt32(); - for(USHORT i=0;i<nCount;i++) + for(sal_uInt16 i=0;i<nCount;i++) { xub_StrLen n1 = aStr.Search(';'); aStr.Erase(0, n1+1); - pTheView->SetTab(i,(USHORT)aStr.ToInt32(),MAP_PIXEL); + pTheView->SetTab(i,(sal_uInt16)aStr.ToInt32(),MAP_PIXEL); } } } @@ -2000,11 +2000,11 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const SfxModelessDialog::FillInfo(rInfo); rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "AcceptChgDat:(" )); - USHORT nCount=pTheView->TabCount(); + sal_uInt16 nCount=pTheView->TabCount(); rInfo.aExtraString += String::CreateFromInt32(nCount); rInfo.aExtraString += ';'; - for(USHORT i=0;i<nCount;i++) + for(sal_uInt16 i=0;i<nCount;i++) { rInfo.aExtraString += String::CreateFromInt32(pTheView->GetTab(i)); rInfo.aExtraString += ';'; @@ -2029,7 +2029,7 @@ void ScAcceptChgDlg::InitFilter() pTheView->SetFilterComment(pTPFilter->IsComment()); utl::SearchParam aSearchParam( pTPFilter->GetComment(), - utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE ); + utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False ); pTheView->SetCommentParams(&aSearchParam); @@ -2118,8 +2118,8 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) if(pLeftItem != NULL && pRightItem != NULL) { - USHORT nLeftKind=pLeftItem->IsA(); - USHORT nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind=pLeftItem->IsA(); + sal_uInt16 nRightKind=pRightItem->IsA(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 8d061b20d..f210fc536 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -70,8 +70,8 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi , pAccel( NULL ) , pHiddenMarks(NULL) , nRefTab(0) - , bHighLightRef( FALSE ) - , bAccInserted( FALSE ) + , bHighLightRef( sal_False ) + , bAccInserted( sal_False ) { ScInputOptions aInputOption=SC_MOD()->GetInputOptions(); bEnableColorRef=aInputOption.GetRangeFinder(); @@ -85,14 +85,14 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper() // common cleanup for ScAnyRefDlg and ScFormulaDlg is done here HideReference(); - enableInput( TRUE ); + enableInput( sal_True ); ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); if ( pInputHdl ) pInputHdl->ResetDelayTimer(); // stop the timer for disabling the input line } // ----------------------------------------------------------------------------- -void ScFormulaReferenceHelper::enableInput( BOOL bEnable ) +void ScFormulaReferenceHelper::enableInput( sal_Bool bEnable ) { TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); @@ -114,8 +114,8 @@ void ScFormulaReferenceHelper::enableInput( BOOL bEnable ) Window *pParent=pWin->GetParent(); if(pParent) { - pParent->EnableInput(bEnable,TRUE /* FALSE */); - if(TRUE /*bChilds*/) + pParent->EnableInput(bEnable,sal_True /* sal_False */); + if(sal_True /*bChilds*/) pViewSh->EnableRefInput(bEnable); } } @@ -132,7 +132,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr ) { if( /*!pRefEdit &&*/ bEnableColorRef ) { - bHighLightRef=TRUE; + bHighLightRef=sal_True; ScViewData* pViewData=ScDocShell::GetViewData(); if ( pViewData ) { @@ -141,14 +141,14 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr ) ScRangeList aRangeList; - pTabViewShell->DoneRefMode( FALSE ); + pTabViewShell->DoneRefMode( sal_False ); pTabViewShell->ClearHighlightRanges(); if( ParseWithNames( aRangeList, rStr, pDoc ) ) { ScRange* pRangeEntry = aRangeList.First(); - USHORT nIndex=0; + sal_uInt16 nIndex=0; while(pRangeEntry != NULL) { ColorData aColName = ScRangeFindList::GetColorName(nIndex++); @@ -174,7 +174,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin ScRange aRange; String aRangeStr( rStr.GetToken( nToken ) ); - USHORT nFlags = aRange.ParseAny( aRangeStr, pDoc, aDetails ); + sal_uInt16 nFlags = aRange.ParseAny( aRangeStr, pDoc, aDetails ); if ( nFlags & SCA_VALID ) { if ( (nFlags & SCA_TAB_3D) == 0 ) @@ -196,7 +196,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) { if( /*!pRefEdit &&*/ bEnableColorRef) { - bHighLightRef=TRUE; + bHighLightRef=sal_True; ScViewData* pViewData=ScDocShell::GetViewData(); if ( pViewData && pRefComp.get() ) { @@ -211,17 +211,17 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) if(pTabViewShell!=NULL && pScTokA!=NULL) { - pTabViewShell->DoneRefMode( FALSE ); + pTabViewShell->DoneRefMode( sal_False ); pTabViewShell->ClearHighlightRanges(); pScTokA->Reset(); const ScToken* pToken = static_cast<const ScToken*>(pScTokA->GetNextReference()); - USHORT nIndex=0; + sal_uInt16 nIndex=0; while(pToken!=NULL) { - BOOL bDoubleRef=(pToken->GetType()==formula::svDoubleRef); + sal_Bool bDoubleRef=(pToken->GetType()==formula::svDoubleRef); if(pToken->GetType()==formula::svSingleRef || bDoubleRef) @@ -253,7 +253,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) } } // ----------------------------------------------------------------------------- -void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode ) +void ScFormulaReferenceHelper::HideReference( sal_Bool bDoneRefMode ) { ScViewData* pViewData=ScDocShell::GetViewData(); @@ -263,14 +263,14 @@ void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode ) if(pTabViewShell!=NULL) { - // bDoneRefMode is FALSE when called from before SetReference. + // bDoneRefMode is sal_False when called from before SetReference. // In that case, RefMode was just started and must not be ended now. if ( bDoneRefMode ) - pTabViewShell->DoneRefMode( FALSE ); + pTabViewShell->DoneRefMode( sal_False ); pTabViewShell->ClearHighlightRanges(); } - bHighLightRef=FALSE; + bHighLightRef=sal_False; } } // ----------------------------------------------------------------------------- @@ -323,9 +323,9 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R { pViewShell->SetTabNo( pRange->aStart.Tab() ); pViewShell->MoveCursorAbs( pRange->aStart.Col(), - pRange->aStart.Row(), SC_FOLLOW_JUMP, FALSE, FALSE ); + pRange->aStart.Row(), SC_FOLLOW_JUMP, sal_False, sal_False ); pViewShell->MoveCursorAbs( pRange->aEnd.Col(), - pRange->aEnd.Row(), SC_FOLLOW_JUMP, TRUE, FALSE ); + pRange->aEnd.Row(), SC_FOLLOW_JUMP, sal_True, sal_False ); m_pDlg->SetReference( *pRange, pDoc ); } } @@ -348,7 +348,7 @@ void ScFormulaReferenceHelper::Init() pRefCell.reset( new ScFormulaCell( pDoc, aCursorPos, rStrExp ) ); pRefComp.reset( new ScCompiler( pDoc, aCursorPos) ); pRefComp->SetGrammar( pDoc->GetGrammar() ); - pRefComp->SetCompileForFAP(TRUE); + pRefComp->SetCompileForFAP(sal_True); nRefTab = nTab; } // if ( pViewData ) @@ -365,13 +365,13 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) case KEY_ESCAPE: if( pRefEdit ) pRefEdit->GrabFocus(); - m_pDlg->RefInputDone( TRUE ); + m_pDlg->RefInputDone( sal_True ); break; } - return TRUE; + return sal_True; } //---------------------------------------------------------------------------- -void ScFormulaReferenceHelper::RefInputDone( BOOL bForced ) +void ScFormulaReferenceHelper::RefInputDone( sal_Bool bForced ) { //<!--Modified by PengYunQuan for Validity Cell Range Picker //if (pRefEdit && (bForced || !pRefBtn)) @@ -381,7 +381,7 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced ) if (bAccInserted) // Accelerator wieder abschalten { Application::RemoveAccel( pAccel.get() ); - bAccInserted = FALSE; + bAccInserted = sal_False; } // Fenstertitel anpassen @@ -401,8 +401,8 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced ) } // Alle anderen: Show(); - USHORT nChildren = m_pWindow->GetChildCount(); - for ( USHORT i = 0; i < nChildren; i++ ) + sal_uInt16 nChildren = m_pWindow->GetChildCount(); + for ( sal_uInt16 i = 0; i < nChildren; i++ ) if (pHiddenMarks[i]) { m_pWindow->GetChild(i)->GetWindow( WINDOW_CLIENT )->Show(); @@ -428,11 +428,11 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: sNewDialogText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); // Alle Elemente ausser EditCell und Button verstecken - USHORT nChildren = m_pWindow->GetChildCount(); - pHiddenMarks = new BOOL [nChildren]; - for (USHORT i = 0; i < nChildren; i++) + sal_uInt16 nChildren = m_pWindow->GetChildCount(); + pHiddenMarks = new sal_Bool [nChildren]; + for (sal_uInt16 i = 0; i < nChildren; i++) { - pHiddenMarks[i] = FALSE; + pHiddenMarks[i] = sal_False; Window* pWin = m_pWindow->GetChild(i); pWin = pWin->GetWindow( WINDOW_CLIENT ); if (pWin == (Window*)pRefEdit) @@ -443,7 +443,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: ; // do nothing else if (pWin->IsVisible()) { - pHiddenMarks[i] = TRUE; + pHiddenMarks[i] = sal_True; pWin->Hide(); } } @@ -497,7 +497,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: pAccel->SetSelectHdl( LINK( this, ScFormulaReferenceHelper, AccelSelectHdl ) ); } Application::InsertAccel( pAccel.get() ); - bAccInserted = TRUE; + bAccInserted = sal_True; // } } } @@ -509,11 +509,11 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula if( pRefEdit == pEdit ) // is this the active ref edit field? { pRefEdit->GrabFocus(); // before RefInputDone() - m_pDlg->RefInputDone( TRUE ); // finish ref input + m_pDlg->RefInputDone( sal_True ); // finish ref input } else { - m_pDlg->RefInputDone( TRUE ); // another active ref edit? + m_pDlg->RefInputDone( sal_True ); // another active ref edit? m_pDlg->RefInputStart( pEdit, pButton ); // start ref input // pRefEdit might differ from pEdit after RefInputStart() (i.e. ScFormulaDlg) if( pRefEdit ) @@ -522,11 +522,11 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula } } // ----------------------------------------------------------------------------- -BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) +sal_Bool ScFormulaReferenceHelper::DoClose( sal_uInt16 nId ) { SfxApplication* pSfxApp = SFX_APP(); - SetDispatcherLock( FALSE ); //! here and in dtor ? + SetDispatcherLock( sal_False ); //! here and in dtor ? SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && pViewFrm->HasChildWindow(FID_INPUTLINE_STATUS) ) @@ -550,17 +550,17 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) if (pMyDisp) pMyViewFrm = pMyDisp->GetFrame(); } - SC_MOD()->SetRefDialog( nId, FALSE, pMyViewFrm ); + SC_MOD()->SetRefDialog( nId, sal_False, pMyViewFrm ); pSfxApp->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) ); ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); if ( pScViewShell ) - pScViewShell->UpdateInputHandler(TRUE); + pScViewShell->UpdateInputHandler(sal_True); - return TRUE; + return sal_True; } -void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) +void ScFormulaReferenceHelper::SetDispatcherLock( sal_Bool bLock ) { // lock / unlock only the dispatchers of Calc documents @@ -587,11 +587,11 @@ void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) // ----------------------------------------------------------------------------- void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */) { - enableInput( FALSE ); + enableInput( sal_False ); EnableSpreadsheets(); } -void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds) +void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChilds) { TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); @@ -613,7 +613,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds) Window *pParent=pWin->GetParent(); if(pParent) { - pParent->EnableInput(bFlag,FALSE); + pParent->EnableInput(bFlag,sal_False); if(bChilds) pViewSh->EnableRefInput(bFlag); } @@ -681,7 +681,7 @@ void lcl_HideAllReferences() //---------------------------------------------------------------------------- ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW, - Window* pParent, USHORT nResId*/, bool bBindRef ) + Window* pParent, sal_uInt16 nResId*/, bool bBindRef ) : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), m_rWindow( rWindow ), m_bInRefMode( false ), @@ -723,7 +723,7 @@ bool ScRefHandler::EnterRefMode() { pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() ); if( pScViewShell ) - pScViewShell->UpdateInputHandler(TRUE); + pScViewShell->UpdateInputHandler(sal_True); pParentDoc = pMyViewFrm->GetObjectShell(); } } @@ -740,15 +740,15 @@ bool ScRefHandler::EnterRefMode() if ( pInputHdl ) pInputHdl->NotifyChange( NULL ); - m_aHelper.enableInput( FALSE ); + m_aHelper.enableInput( sal_False ); m_aHelper.EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( TRUE ); + m_aHelper.SetDispatcherLock( sal_True ); //@Test - //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702 + //SFX_APPWINDOW->Disable(sal_True); //@BugID 54702 return m_bInRefMode = true; } @@ -767,14 +767,14 @@ bool ScRefHandler::LeaveRefMode() lcl_HideAllReferences(); if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) ) - pDlg->SetModalInputMode(FALSE); - SetDispatcherLock( FALSE ); //! here and in DoClose ? + pDlg->SetModalInputMode(sal_False); + SetDispatcherLock( sal_False ); //! here and in DoClose ? ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); if( pScViewShell ) - pScViewShell->UpdateInputHandler(TRUE); + pScViewShell->UpdateInputHandler(sal_True); - //SFX_APPWINDOW->Enable(TRUE,TRUE); + //SFX_APPWINDOW->Enable(sal_True,sal_True); lcl_InvalidateWindows(); m_bInRefMode = false; @@ -822,7 +822,7 @@ void ScRefHandler::SwitchToDocument() //---------------------------------------------------------------------------- -BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 +sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { // default: allow only same document (overridden in function dialog) String aCmpName; @@ -835,20 +835,20 @@ BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::IsRefInputMode() const +sal_Bool __EXPORT ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::DoClose( USHORT nId ) +sal_Bool __EXPORT ScRefHandler::DoClose( sal_uInt16 nId ) { m_aHelper.DoClose(nId); - return TRUE; + return sal_True; } -void ScRefHandler::SetDispatcherLock( BOOL bLock ) +void ScRefHandler::SetDispatcherLock( sal_Bool bLock ) { m_aHelper.SetDispatcherLock( bLock ); } @@ -869,11 +869,11 @@ void ScRefHandler::AddRefEntry() //---------------------------------------------------------------------------- -BOOL __EXPORT ScRefHandler::IsTableLocked() const +sal_Bool __EXPORT ScRefHandler::IsTableLocked() const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden - return FALSE; + return sal_False; } //---------------------------------------------------------------------------- @@ -897,7 +897,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* //The two following function is commentted out by PengYunQuan for Validity Cell Range Picker //long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt ) //{ -// USHORT nSwitch=rNEvt.GetType(); +// sal_uInt16 nSwitch=rNEvt.GetType(); // if(nSwitch==EVENT_GETFOCUS) // { // pActiveWin=rNEvt.GetWindow(); @@ -913,15 +913,15 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* // { // if(IsVisible()) // { -// m_aHelper.enableInput( FALSE ); +// m_aHelper.enableInput( sal_False ); // m_aHelper.EnableSpreadsheets(); -// m_aHelper.SetDispatcherLock( TRUE ); +// m_aHelper.SetDispatcherLock( sal_True ); // aTimer.Start(); // } // else // { -// m_aHelper.enableInput( TRUE ); -// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ? +// m_aHelper.enableInput( sal_True ); +// m_aHelper.SetDispatcherLock( sal_False ); //! here and in DoClose ? // } // } //} @@ -937,7 +937,7 @@ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEv {\ if( bBindRef || m_bInRefMode )\ {\ - USHORT nSwitch=rNEvt.GetType();\ + sal_uInt16 nSwitch=rNEvt.GetType();\ if(nSwitch==EVENT_GETFOCUS)\ {\ pActiveWin=rNEvt.GetWindow();\ @@ -957,15 +957,15 @@ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( State {\ if(m_rWindow.IsVisible())\ {\ - m_aHelper.enableInput( FALSE );\ + m_aHelper.enableInput( sal_False );\ m_aHelper.EnableSpreadsheets();\ - m_aHelper.SetDispatcherLock( TRUE );\ + m_aHelper.SetDispatcherLock( sal_True );\ aTimer.Start();\ }\ else\ {\ - m_aHelper.enableInput( TRUE );\ - m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\ + m_aHelper.enableInput( sal_True );\ + m_aHelper.SetDispatcherLock( sal_False ); /*//! here and in DoClose ?*/\ }\ }\ } @@ -989,7 +989,7 @@ bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const String& rStr, ScD return m_aHelper.ParseWithNames( rRanges, rStr, pDoc ); } // ----------------------------------------------------------------------------- -void ScRefHandler::HideReference( BOOL bDoneRefMode ) +void ScRefHandler::HideReference( sal_Bool bDoneRefMode ) { m_aHelper.HideReference( bDoneRefMode ); } @@ -1004,7 +1004,7 @@ void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB m_aHelper.ReleaseFocus( pEdit,pButton ); } //---------------------------------------------------------------------------- -void ScRefHandler::RefInputDone( BOOL bForced ) +void ScRefHandler::RefInputDone( sal_Bool bForced ) { m_aHelper.RefInputDone( bForced ); } diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index ceed2e048..31bce08f6 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -104,8 +104,8 @@ //CHINA001 aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , //CHINA001 // //CHINA001 nIndex ( 0 ), -//CHINA001 bFmtInserted ( FALSE ), -//CHINA001 bCoreDataChanged( FALSE ), +//CHINA001 bFmtInserted ( sal_False ), +//CHINA001 bCoreDataChanged( sal_False ), //CHINA001 pFormat ( pAutoFormat ), //CHINA001 pSelFmtData ( pSelFormatData ) //CHINA001 { @@ -125,7 +125,7 @@ //CHINA001 //CHINA001 void ScAutoFormatDlg::Init() //CHINA001 { -//CHINA001 USHORT nCount; +//CHINA001 sal_uInt16 nCount; //CHINA001 String aEntry; //CHINA001 //CHINA001 aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); @@ -153,7 +153,7 @@ //CHINA001 //CHINA001 nCount = pFormat->GetCount(); //CHINA001 -//CHINA001 for ( USHORT i = 0; i < nCount; i++ ) +//CHINA001 for ( sal_uInt16 i = 0; i < nCount; i++ ) //CHINA001 { //CHINA001 ((*pFormat)[i])->GetName( aEntry ); //CHINA001 aLbFormat.InsertEntry( aEntry ); @@ -173,7 +173,7 @@ //CHINA001 { //CHINA001 aBtnAdd.Disable(); //CHINA001 aBtnRemove.Disable(); -//CHINA001 bFmtInserted = TRUE; +//CHINA001 bFmtInserted = sal_True; //CHINA001 } //CHINA001 } //CHINA001 @@ -224,7 +224,7 @@ //CHINA001 IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) //CHINA001 { //CHINA001 ScAutoFormatData* pData = (*pFormat)[nIndex]; -//CHINA001 BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); +//CHINA001 sal_Bool bCheck = ((CheckBox*)pBtn)->IsChecked(); //CHINA001 //CHINA001 if ( pBtn == &aBtnNumFormat ) //CHINA001 pData->SetIncludeValueFormat( bCheck ); @@ -242,7 +242,7 @@ //CHINA001 if ( !bCoreDataChanged ) //CHINA001 { //CHINA001 aBtnCancel.SetText( aStrClose ); -//CHINA001 bCoreDataChanged = TRUE; +//CHINA001 bCoreDataChanged = sal_True; //CHINA001 } //CHINA001 //CHINA001 pWndPreview->NotifyChange( pData ); @@ -259,7 +259,7 @@ //CHINA001 String aStrStandard( ScResId(STR_STANDARD) ); //CHINA001 String aFormatName; //CHINA001 ScStringInputDlg* pDlg; -//CHINA001 BOOL bOk = FALSE; +//CHINA001 sal_Bool bOk = sal_False; //CHINA001 //CHINA001 while ( !bOk ) //CHINA001 { @@ -283,7 +283,7 @@ //CHINA001 //CHINA001 if ( bFmtInserted ) //CHINA001 { -//CHINA001 USHORT nAt = pFormat->IndexOf( pNewData ); +//CHINA001 sal_uInt16 nAt = pFormat->IndexOf( pNewData ); //CHINA001 //CHINA001 aLbFormat.InsertEntry( aFormatName, nAt ); //CHINA001 aLbFormat.SelectEntry( aFormatName ); @@ -292,11 +292,11 @@ //CHINA001 if ( !bCoreDataChanged ) //CHINA001 { //CHINA001 aBtnCancel.SetText( aStrClose ); -//CHINA001 bCoreDataChanged = TRUE; +//CHINA001 bCoreDataChanged = sal_True; //CHINA001 } //CHINA001 //CHINA001 SelFmtHdl( 0 ); -//CHINA001 bOk = TRUE; +//CHINA001 bOk = sal_True; //CHINA001 } //CHINA001 else //CHINA001 delete pNewData; @@ -305,7 +305,7 @@ //CHINA001 //CHINA001 if ( !bFmtInserted ) //CHINA001 { -//CHINA001 USHORT nRet = ErrorBox( this, +//CHINA001 sal_uInt16 nRet = ErrorBox( this, //CHINA001 WinBits( WB_OK_CANCEL | WB_DEF_OK), //CHINA001 ScGlobal::GetRscString(STR_INVALID_AFNAME) //CHINA001 ).Execute(); @@ -314,7 +314,7 @@ //CHINA001 } //CHINA001 } //CHINA001 else -//CHINA001 bOk = TRUE; +//CHINA001 bOk = sal_True; //CHINA001 //CHINA001 delete pDlg; //CHINA001 } @@ -346,7 +346,7 @@ //CHINA001 if ( !bCoreDataChanged ) //CHINA001 { //CHINA001 aBtnCancel.SetText( aStrClose ); -//CHINA001 bCoreDataChanged = TRUE; +//CHINA001 bCoreDataChanged = sal_True; //CHINA001 } //CHINA001 //CHINA001 pFormat->AtFree( nIndex ); // in der Core loeschen @@ -363,7 +363,7 @@ //CHINA001 //CHINA001 IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, pBtn) //CHINA001 { -//CHINA001 BOOL bOk = FALSE; +//CHINA001 sal_Bool bOk = sal_False; //CHINA001 while( !bOk ) //CHINA001 { //CHINA001 @@ -377,9 +377,9 @@ //CHINA001 HID_SC_RENAME_AUTOFMT ); //CHINA001 if( pDlg->Execute() == RET_OK ) //CHINA001 { -//CHINA001 BOOL bFmtRenamed = FALSE; +//CHINA001 sal_Bool bFmtRenamed = sal_False; //CHINA001 pDlg->GetInputString( aFormatName ); -//CHINA001 USHORT n; +//CHINA001 sal_uInt16 n; //CHINA001 //CHINA001 if ( aFormatName.Len() > 0 ) //CHINA001 { @@ -405,29 +405,29 @@ //CHINA001 //CHINA001 pFormat->Insert( pNewData); //CHINA001 -//CHINA001 USHORT nCount = pFormat->GetCount(); +//CHINA001 sal_uInt16 nCount = pFormat->GetCount(); //CHINA001 -//CHINA001 aLbFormat.SetUpdateMode(FALSE); +//CHINA001 aLbFormat.SetUpdateMode(sal_False); //CHINA001 aLbFormat.Clear(); -//CHINA001 for ( USHORT i = 0; i < nCount; i++ ) +//CHINA001 for ( sal_uInt16 i = 0; i < nCount; i++ ) //CHINA001 { //CHINA001 ((*pFormat)[i])->GetName( aEntry ); //CHINA001 aLbFormat.InsertEntry( aEntry ); //CHINA001 } //CHINA001 -//CHINA001 aLbFormat.SetUpdateMode( TRUE); +//CHINA001 aLbFormat.SetUpdateMode( sal_True); //CHINA001 aLbFormat.SelectEntry( aFormatName); //CHINA001 //CHINA001 if ( !bCoreDataChanged ) //CHINA001 { //CHINA001 aBtnCancel.SetText( aStrClose ); -//CHINA001 bCoreDataChanged = TRUE; +//CHINA001 bCoreDataChanged = sal_True; //CHINA001 } //CHINA001 //CHINA001 //CHINA001 SelFmtHdl( 0 ); -//CHINA001 bOk = TRUE; -//CHINA001 bFmtRenamed = TRUE; +//CHINA001 bOk = sal_True; +//CHINA001 bFmtRenamed = sal_True; //CHINA001 } //CHINA001 } //CHINA001 if( !bFmtRenamed ) @@ -439,7 +439,7 @@ //CHINA001 } //CHINA001 } //CHINA001 else -//CHINA001 bOk = TRUE; +//CHINA001 bOk = sal_True; //CHINA001 delete pDlg; //CHINA001 } //CHINA001 @@ -489,7 +489,7 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume aVD ( *this ), aScriptedText ( aVD ), xBreakIter ( pDoc->GetBreakIterator() ), - bFitWidth ( FALSE ), + bFitWidth ( sal_False ), mbRTL ( false ), aPrvSize ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ), mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ), @@ -532,7 +532,7 @@ void lcl_SetFontProperties( rFont.SetItalic ( (FontItalic)rPostureItem.GetValue() ); } -void ScAutoFmtPreview::MakeFonts( USHORT nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ) +void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ) { if ( pCurData ) { @@ -573,7 +573,7 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va SETONALLFONTS( SetShadow, pShadowedItem->GetValue() ) SETONALLFONTS( SetColor, aColor ) SETONALLFONTS( SetSize, aFontSize ) - SETONALLFONTS( SetTransparent, TRUE ) + SETONALLFONTS( SetTransparent, sal_True ) #undef SETONALLFONTS } @@ -581,9 +581,9 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va //------------------------------------------------------------------------ -USHORT ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const +sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const { - static const USHORT pnFmtMap[] = + static const sal_uInt16 pnFmtMap[] = { 0, 1, 2, 1, 3, 4, 5, 6, 5, 7, @@ -617,11 +617,11 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) //------------------------ String cellString; - BOOL bNumFormat = pCurData->GetIncludeValueFormat(); - ULONG nNum; + sal_Bool bNumFormat = pCurData->GetIncludeValueFormat(); + sal_uLong nNum; double nVal; Color* pDummy = NULL; - USHORT nIndex = static_cast< USHORT >( maArray.GetCellIndex( nCol, nRow, mbRTL ) ); + sal_uInt16 nIndex = static_cast< sal_uInt16 >( maArray.GetCellIndex( nCol, nRow, mbRTL ) ); switch( nIndex ) { @@ -660,7 +660,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) mknum: if( bNumFormat ) { - ScNumFormatAbbrev& rNumFormat = (ScNumFormatAbbrev&)pCurData->GetNumFormat( (USHORT) nNum ); + ScNumFormatAbbrev& rNumFormat = (ScNumFormatAbbrev&)pCurData->GetNumFormat( (sal_uInt16) nNum ); nNum = rNumFormat.GetFormatIndex( *pNumFmt ); } else @@ -672,11 +672,11 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) if ( cellString.Len() > 0 ) { Size aStrSize; - USHORT nFmtIndex = GetFormatIndex( nCol, nRow ); + sal_uInt16 nFmtIndex = GetFormatIndex( nCol, nRow ); Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); Point aPos = cellRect.TopLeft(); - USHORT nRightX = 0; - BOOL bJustify = pCurData->GetIncludeJustify(); + sal_uInt16 nRightX = 0; + sal_Bool bJustify = pCurData->GetIncludeJustify(); SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); SvxCellHorJustify eJustification; @@ -729,21 +729,21 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) aStrSize = aScriptedText.GetTextSize(); } - nRightX = (USHORT)( cellRect.GetWidth() + nRightX = (sal_uInt16)( cellRect.GetWidth() - aStrSize.Width() - FRAME_OFFSET ); //----------------------------- // vertikal (immer zentrieren): //----------------------------- - aPos.Y() += (mnRowHeight - (USHORT)aStrSize.Height()) / 2; + aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2; //----------- // horizontal //----------- if ( eJustification != SVX_HOR_JUSTIFY_STANDARD ) { - USHORT nHorPos = (USHORT) + sal_uInt16 nHorPos = (sal_uInt16) ((cellRect.GetWidth()-aStrSize.Width())/2); switch ( eJustification ) @@ -849,7 +849,7 @@ void ScAutoFmtPreview::Init() SetBorderStyle( WINDOW_BORDER_MONO ); maArray.Initialize( 5, 5 ); maArray.SetUseDiagDoubleClipping( false ); - CalcCellArray( FALSE ); + CalcCellArray( sal_False ); CalcLineMap(); TypeId aType(TYPE(ScDocShell)); @@ -865,7 +865,7 @@ void ScAutoFmtPreview::Init() //------------------------------------------------------------------------ -void ScAutoFmtPreview::CalcCellArray( BOOL bFitWidthP ) +void ScAutoFmtPreview::CalcCellArray( sal_Bool bFitWidthP ) { maArray.SetXOffset( 2 ); maArray.SetAllColWidths( bFitWidthP ? mnDataColWidth2 : mnDataColWidth1 ); @@ -940,7 +940,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { sal_uInt32 nOldDrawMode = aVD.GetDrawMode(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True) if( GetSettings().GetStyleSettings().GetHighContrastMode() ) aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); @@ -950,7 +950,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) Point aTmpPoint; Rectangle aRect( aTmpPoint, aWndSize ); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); aVD.SetFont( aFont ); aVD.SetLineColor(); aVD.SetFillColor( aBackCol ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 776ddb62d..7fc3b3dc3 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -43,7 +43,7 @@ // struct ScConflictsListEntry //============================================================================= -bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const +bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { ScChangeActionList::const_iterator aEnd = maSharedActions.end(); for ( ScChangeActionList::const_iterator aItr = maSharedActions.begin(); aItr != aEnd; ++aItr ) @@ -57,7 +57,7 @@ bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const return false; } -bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const +bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const { ScChangeActionList::const_iterator aEnd = maOwnActions.end(); for ( ScChangeActionList::const_iterator aItr = maOwnActions.begin(); aItr != aEnd; ++aItr ) @@ -76,7 +76,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const // class ScConflictsListHelper //============================================================================= -//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ) +//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, sal_uLong nSharedAction ) //UNUSED2008-05 { //UNUSED2008-05 ScConflictsList::const_iterator aEnd = rConflictsList.end(); //UNUSED2008-05 for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -90,7 +90,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const //UNUSED2008-05 return false; //UNUSED2008-05 } -bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ) +bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::const_iterator aEnd = rConflictsList.end(); for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -104,7 +104,7 @@ bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG return false; } -ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction ) +ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, sal_uLong nSharedAction ) { ScConflictsList::iterator aEnd = rConflictsList.end(); for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -118,7 +118,7 @@ ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsLi return NULL; } -ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, ULONG nOwnAction ) +ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::iterator aEnd = rConflictsList.end(); for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -178,8 +178,8 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL // class ScConflictsFinder //============================================================================= -ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ULONG nEndShared, - ULONG nStartOwn, ULONG nEndOwn, ScConflictsList& rConflictsList ) +ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, + sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) :mpTrack( pTrack ) ,mnStartShared( nStartShared ) ,mnEndShared( nEndShared ) @@ -229,7 +229,7 @@ ScConflictsListEntry* ScConflictsFinder::GetIntersectingEntry( const ScChangeAct return NULL; } -ScConflictsListEntry* ScConflictsFinder::GetEntry( ULONG nSharedAction, const ScChangeActionList& rOwnActions ) +ScConflictsListEntry* ScConflictsFinder::GetEntry( sal_uLong nSharedAction, const ScChangeActionList& rOwnActions ) { // try to get a list entry which already contains the shared action ScConflictsListEntry* pEntry = ScConflictsListHelper::GetSharedActionEntry( mrConflictsList, nSharedAction ); @@ -444,9 +444,9 @@ ScConflictsListBox::~ScConflictsListBox() { } -//UNUSED2008-05 ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const +//UNUSED2008-05 sal_uLong ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const //UNUSED2008-05 { -//UNUSED2008-05 ULONG nPos = 0; +//UNUSED2008-05 sal_uLong nPos = 0; //UNUSED2008-05 SvLBoxEntry* pEntry = GetRootLevelParent( First() ); //UNUSED2008-05 while ( pEntry ) //UNUSED2008-05 { @@ -566,7 +566,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen if ( pAction && pDoc ) { String aDesc; - pAction->GetDescription( aDesc, pDoc, TRUE, false ); + pAction->GetDescription( aDesc, pDoc, sal_True, false ); aString += aDesc; aString += '\t'; @@ -582,7 +582,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen DateTime aDateTime = pAction->GetDateTime(); aString += ScGlobal::pLocaleData->getDate( aDateTime ); aString += ' '; - aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE ); + aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False ); aString += '\t'; } @@ -606,7 +606,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) { if ( bSelectHandle ) { - maLbConflicts.SelectAll( FALSE ); + maLbConflicts.SelectAll( sal_False ); } if ( !maLbConflicts.IsSelected( pRootEntry ) ) { @@ -662,7 +662,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) ScTabView* pTabView = mpViewData->GetView(); pTabView->DoneBlockMode(); - BOOL bContMark = FALSE; + sal_Bool bContMark = sal_False; SvLBoxEntry* pEntry = maLbConflicts.FirstSelected(); while ( pEntry ) { @@ -678,9 +678,9 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) const ScBigRange& rBigRange = ( static_cast< const ScChangeAction* >( pAction ) )->GetBigRange(); if ( rBigRange.IsValid( mpOwnDoc ) ) { - BOOL bSetCursor = !maLbConflicts.NextSelected( pEntry ); + sal_Bool bSetCursor = !maLbConflicts.NextSelected( pEntry ); pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark ); - bContMark = TRUE; + bContMark = sal_True; } } } @@ -735,9 +735,9 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) SetConflictAction( pRootEntry, eConflictAction ); pRootEntry = maLbConflicts.NextSibling( pRootEntry ); } - maLbConflicts.SetUpdateMode( FALSE ); + maLbConflicts.SetUpdateMode( sal_False ); maLbConflicts.Clear(); - maLbConflicts.SetUpdateMode( TRUE ); + maLbConflicts.SetUpdateMode( sal_True ); SetPointer( Pointer( POINTER_ARROW ) ); EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 38b539265..d15a036a4 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -44,7 +44,7 @@ ScColOrRowDlg::ScColOrRowDlg( Window* pParent, const String& rStrTitle, const String& rStrLabel, - BOOL bColDefault ) + sal_Bool bColDefault ) : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ), // diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index f649cba2d..4bd94c725 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -52,9 +52,9 @@ #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() -const ULONG nEntryDataCol = 0; -const ULONG nEntryDataRow = 1; -const ULONG nEntryDataDelim = 2; +const sal_uLong nEntryDataCol = 0; +const sal_uLong nEntryDataRow = 1; +const sal_uLong nEntryDataDelim = 2; //============================================================================ @@ -108,7 +108,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, pDoc ( ptrViewData->GetDocument() ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ) + bDlgLostFocus ( sal_False ) { xColNameRanges = pDoc->GetColNameRanges()->Clone(); xRowNameRanges = pDoc->GetRowNameRanges()->Clone(); @@ -199,8 +199,8 @@ void ScColRowNameRangesDlg::Init() } else { - aBtnColHead.Check( TRUE ); - aBtnRowHead.Check( FALSE ); + aBtnColHead.Check( sal_True ); + aBtnRowHead.Check( sal_False ); aEdAssign.SetText( EMPTY_STRING ); aEdAssign2.SetText( EMPTY_STRING ); } @@ -234,22 +234,22 @@ void ScColRowNameRangesDlg::Init() #* #************************************************************************/ -void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) +void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool bRef) { theCurData = theCurArea = rLabelRange; - BOOL bValid = TRUE; + sal_Bool bValid = sal_True; SCCOL nCol1 = theCurArea.aStart.Col(); SCCOL nCol2 = theCurArea.aEnd.Col(); SCROW nRow1 = theCurArea.aStart.Row(); SCROW nRow2 = theCurArea.aEnd.Row(); if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) ) { // Spaltenkoepfe und Grenzfall gesamte Tabelle - aBtnColHead.Check( TRUE ); - aBtnRowHead.Check( FALSE ); + aBtnColHead.Check( sal_True ); + aBtnRowHead.Check( sal_False ); if ( nRow2 == MAXROW ) { if ( nRow1 == 0 ) - bValid = FALSE; // Grenzfall gesamte Tabelle + bValid = sal_False; // Grenzfall gesamte Tabelle else { // Head unten, Data oben theCurData.aStart.SetRow( 0 ); @@ -264,8 +264,8 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) } else { // Zeilenkoepfe - aBtnRowHead.Check( TRUE ); - aBtnColHead.Check( FALSE ); + aBtnRowHead.Check( sal_True ); + aBtnColHead.Check( sal_False ); if ( nCol2 == MAXCOL ) { // Head rechts, Data links theCurData.aStart.SetCol( 0 ); @@ -334,7 +334,7 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) #* #************************************************************************/ -void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRef) +void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,sal_Bool bRef) { theCurData = rDataRange; if ( aBtnColHead.IsChecked() ) @@ -421,9 +421,9 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD String aRefStr; if ( pEdActive == &aEdAssign ) - SetColRowData( rRef, TRUE ); + SetColRowData( rRef, sal_True ); else - AdjustColRowData( rRef, TRUE ); + AdjustColRowData( rRef, sal_True ); aBtnColHead.Enable(); aBtnRowHead.Enable(); aBtnAdd.Enable(); @@ -446,7 +446,7 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD #* #************************************************************************/ -BOOL __EXPORT ScColRowNameRangesDlg::Close() +sal_Bool __EXPORT ScColRowNameRangesDlg::Close() { return DoClose( ScColRowNameRangesDlgWrapper::GetChildWindowId() ); } @@ -470,7 +470,7 @@ void ScColRowNameRangesDlg::SetActive() { if ( bDlgLostFocus ) { - bDlgLostFocus = FALSE; + bDlgLostFocus = sal_False; if( pEdActive ) pEdActive->GrabFocus(); } @@ -502,14 +502,14 @@ void ScColRowNameRangesDlg::SetActive() void ScColRowNameRangesDlg::UpdateNames() { - aLbRange.SetUpdateMode( FALSE ); + aLbRange.SetUpdateMode( sal_False ); //----------------------------------------------------------- aLbRange.Clear(); aRangeMap.clear(); aEdAssign.SetText( EMPTY_STRING ); - ULONG nCount, j; - USHORT nPos; //@008 Hilfsvariable q eingefuegt + sal_uLong nCount, j; + sal_uInt16 nPos; //@008 Hilfsvariable q eingefuegt SCCOL nCol1; //@008 04.09.97 SCROW nRow1; //Erweiterung fuer Bereichsnamen @@ -616,7 +616,7 @@ void ScColRowNameRangesDlg::UpdateNames() delete [] ppSortArray; } //----------------------------------------------------------- - aLbRange.SetUpdateMode( TRUE ); + aLbRange.SetUpdateMode( sal_True ); aLbRange.Invalidate(); } @@ -636,14 +636,14 @@ void ScColRowNameRangesDlg::UpdateNames() #* #************************************************************************/ -void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColName ) +void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, sal_Bool bColName ) { ScRangePair* pPair = NULL; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL ) - bFound = TRUE; + bFound = sal_True; else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL ) - bFound = TRUE; + bFound = sal_True; if ( bFound ) { @@ -687,7 +687,7 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam #* #************************************************************************/ -BOOL ScColRowNameRangesDlg::IsRefInputMode() const +sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const { return (pEdActive != NULL); } @@ -777,8 +777,8 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) { const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); ScRange aRange1, aRange2; - BOOL bOk1; - if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID)) != FALSE + sal_Bool bOk1; + if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID)) != sal_False && ((aRange2.ParseAny( aNewData, pDoc, eConv ) & SCA_VALID) == SCA_VALID) ) { theCurArea = aRange1; @@ -805,8 +805,8 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) aBtnAdd.Disable(); aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); - aBtnColHead.Check( TRUE ); - aBtnRowHead.Check( FALSE ); + aBtnColHead.Check( sal_True ); + aBtnRowHead.Check( sal_False ); aEdAssign2.SetText( EMPTY_STRING ); theCurArea = ScRange(); theCurData = theCurArea; @@ -843,20 +843,20 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) { String aRangeStr = aLbRange.GetSelectEntry(); - USHORT nSelectPos = aLbRange.GetSelectEntryPos(); - BOOL bColName = - ((ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol); + sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); + sal_Bool bColName = + ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol); NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); if (itr == aRangeMap.end()) return 0; const ScRange& rRange = itr->second; ScRangePair* pPair = NULL; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL ) - bFound = TRUE; + bFound = sal_True; else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL ) - bFound = TRUE; + bFound = sal_True; if ( bFound ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); @@ -874,7 +874,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) delete pPair; UpdateNames(); - USHORT nCnt = aLbRange.GetEntryCount(); + sal_uInt16 nCnt = aLbRange.GetEntryCount(); if ( nSelectPos >= nCnt ) { if ( nCnt ) @@ -884,7 +884,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) } aLbRange.SelectEntryPos( nSelectPos ); if ( nSelectPos && - (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) + (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile--- aLbRange.GrabFocus(); @@ -892,8 +892,8 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) aBtnRemove.Disable(); aEdAssign.SetText( EMPTY_STRING ); theCurArea = theCurData = ScRange(); - aBtnColHead.Check( TRUE ); - aBtnRowHead.Check( FALSE ); + aBtnColHead.Check( sal_True ); + aBtnRowHead.Check( sal_False ); aEdAssign2.SetText( EMPTY_STRING ); Range1SelectHdl( 0 ); } @@ -920,11 +920,11 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) { - USHORT nSelectPos = aLbRange.GetSelectEntryPos(); - USHORT nCnt = aLbRange.GetEntryCount(); - USHORT nMoves = 0; + sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); + sal_uInt16 nCnt = aLbRange.GetEntryCount(); + sal_uInt16 nMoves = 0; while ( nSelectPos < nCnt - && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) + && (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) { // skip Delimiter ++nMoves; aLbRange.SelectEntryPos( ++nSelectPos ); @@ -950,8 +950,8 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); if ( itr != aRangeMap.end() ) { - BOOL bColName = - ((ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol); + sal_Bool bColName = + ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol); UpdateRangeData( itr->second, bColName ); aBtnAdd.Disable(); aBtnRemove.Enable(); @@ -1008,14 +1008,14 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) { String aNewArea( aEdAssign.GetText() ); - BOOL bValid = FALSE; + sal_Bool bValid = sal_False; if ( aNewArea.Len() > 0 ) { ScRange aRange; if ( (aRange.ParseAny( aNewArea, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID) == SCA_VALID ) { SetColRowData( aRange ); - bValid = TRUE; + bValid = sal_True; } } if ( bValid ) @@ -1096,8 +1096,8 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) { if ( !aBtnColHead.GetSavedValue() ) { - aBtnColHead.Check( TRUE ); - aBtnRowHead.Check( FALSE ); + aBtnColHead.Check( sal_True ); + aBtnRowHead.Check( sal_False ); if ( theCurArea.aStart.Row() == 0 && theCurArea.aEnd.Row() == MAXROW ) { theCurArea.aEnd.SetRow( MAXROW - 1 ); @@ -1134,8 +1134,8 @@ IMPL_LINK( ScColRowNameRangesDlg, RowClickHdl, void *, EMPTYARG ) { if ( !aBtnRowHead.GetSavedValue() ) { - aBtnRowHead.Check( TRUE ); - aBtnColHead.Check( FALSE ); + aBtnRowHead.Check( sal_True ); + aBtnColHead.Check( sal_False ); if ( theCurArea.aStart.Col() == 0 && theCurArea.aEnd.Col() == MAXCOL ) { theCurArea.aEnd.SetCol( MAXCOL - 1 ); diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index e3fc21672..222994ef5 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -39,11 +39,11 @@ #include "miscdlgs.hrc" -static BYTE nDelItemChecked=0; +static sal_uInt8 nDelItemChecked=0; //================================================================== -ScDeleteCellDlg::ScDeleteCellDlg( Window* pParent, BOOL bDisallowCellMove ) : +ScDeleteCellDlg::ScDeleteCellDlg( Window* pParent, sal_Bool bDisallowCellMove ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DELCELL ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 1811a1eee..14cc979b9 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -41,15 +41,15 @@ //================================================================== -BOOL ScDeleteContentsDlg::bPreviousAllCheck = FALSE; -USHORT ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | +sal_Bool ScDeleteContentsDlg::bPreviousAllCheck = sal_False; +sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_VALUE); //----------------------------------------------------------------------- ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, - USHORT nCheckDefaults ) : + sal_uInt16 nCheckDefaults ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DELCONT ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), @@ -64,12 +64,12 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - bObjectsDisabled( FALSE ) + bObjectsDisabled( sal_False ) { if ( nCheckDefaults != 0 ) { ScDeleteContentsDlg::nPreviousChecks = nCheckDefaults; - ScDeleteContentsDlg::bPreviousAllCheck = FALSE; + ScDeleteContentsDlg::bPreviousAllCheck = sal_False; } aBtnDelAll.Check ( ScDeleteContentsDlg::bPreviousAllCheck ); @@ -98,7 +98,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, //------------------------------------------------------------------------ -USHORT ScDeleteContentsDlg::GetDelContentsCmdBits() const +sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const { ScDeleteContentsDlg::nPreviousChecks = 0; @@ -126,7 +126,7 @@ USHORT ScDeleteContentsDlg::GetDelContentsCmdBits() const //------------------------------------------------------------------------ -void ScDeleteContentsDlg::DisableChecks( BOOL bDelAllChecked ) +void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked ) { if ( bDelAllChecked ) { @@ -157,8 +157,8 @@ void ScDeleteContentsDlg::DisableChecks( BOOL bDelAllChecked ) void ScDeleteContentsDlg::DisableObjects() { - bObjectsDisabled = TRUE; - aBtnDelObjects.Check(FALSE); + bObjectsDisabled = sal_True; + aBtnDelObjects.Check(sal_False); aBtnDelObjects.Disable(); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index bb6a30745..cd95b7ce8 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -61,7 +61,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, String aStartStr, double fStep, double fMax, - USHORT nPossDir ) + sal_uInt16 nPossDir ) : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), @@ -117,7 +117,7 @@ __EXPORT ScFillSeriesDlg::~ScFillSeriesDlg() //---------------------------------------------------------------------------- -void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag) +void ScFillSeriesDlg::SetEdStartValEnabled(sal_Bool bFlag) { bStartValFlag=bFlag; if(bFlag) @@ -134,7 +134,7 @@ void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag) //---------------------------------------------------------------------------- -void ScFillSeriesDlg::Init( USHORT nPossDir ) +void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) { aBtnOk.SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) ); aBtnArithmetic.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) ); @@ -223,7 +223,7 @@ void ScFillSeriesDlg::Init( USHORT nPossDir ) rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt ); aEdEndVal.SetText( aEndTxt ); - bStartValFlag=FALSE; + bStartValFlag=sal_False; aFlSep1.SetStyle( aFlSep1.GetStyle() | WB_VERT ); aFlSep2.SetStyle( aFlSep2.GetStyle() | WB_VERT ); @@ -232,16 +232,16 @@ void ScFillSeriesDlg::Init( USHORT nPossDir ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckStartVal() { - BOOL bValOk = FALSE; + sal_Bool bValOk = sal_False; sal_uInt32 nKey = 0; String aStr( aEdStartVal.GetText() ); if ( aStr.Len() == 0 || aBtnAutoFill.IsChecked()) { fStartVal = MAXDOUBLE; - bValOk = TRUE; + bValOk = sal_True; } else bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fStartVal ); @@ -252,7 +252,7 @@ BOOL __EXPORT ScFillSeriesDlg::CheckStartVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; String aStr( aEdIncrement.GetText() ); @@ -263,16 +263,16 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() //---------------------------------------------------------------------------- -BOOL __EXPORT ScFillSeriesDlg::CheckEndVal() +sal_Bool __EXPORT ScFillSeriesDlg::CheckEndVal() { - BOOL bValOk = FALSE; + sal_Bool bValOk = sal_False; sal_uInt32 nKey = 0; String aStr( aEdEndVal.GetText() ); if ( aStr.Len() == 0 ) { fEndVal = (fIncrement < 0) ? -MAXDOUBLE : MAXDOUBLE; - bValOk = TRUE; + bValOk = sal_True; } else bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fEndVal ); @@ -341,21 +341,21 @@ IMPL_LINK( ScFillSeriesDlg, OKHdl, void *, EMPTYARG ) else if ( aBtnMonth.IsChecked() ) theFillDateCmd = FILL_MONTH; else if ( aBtnYear.IsChecked() ) theFillDateCmd = FILL_YEAR; - BOOL bAllOk = TRUE; + sal_Bool bAllOk = sal_True; Edit* pEdWrong = NULL; if ( !CheckStartVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdStartVal; } else if ( !CheckIncrementVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdIncrement; } else if ( !CheckEndVal() ) { - bAllOk = FALSE; + bAllOk = sal_False; pEdWrong = &aEdEndVal; } if ( bAllOk ) diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 60513d76e..87b57371e 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -42,9 +42,9 @@ //================================================================== ScGroupDlg::ScGroupDlg( Window* pParent, - USHORT nResId, - BOOL bUngroup, - BOOL bRows ) : + sal_uInt16 nResId, + sal_Bool bUngroup, + sal_Bool bRows ) : ModalDialog ( pParent, ScResId( nResId ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), @@ -68,7 +68,7 @@ ScGroupDlg::ScGroupDlg( Window* pParent, //------------------------------------------------------------------------ -BOOL ScGroupDlg::GetColsChecked() const +sal_Bool ScGroupDlg::GetColsChecked() const { return aBtnCols.IsChecked(); } diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 3dcdb1ee1..69e4fb1c2 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -59,7 +59,7 @@ #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute(); -inline void EnableDisable( Window& rWin, BOOL bEnable ) +inline void EnableDisable( Window& rWin, sal_Bool bEnable ) { if (bEnable) rWin.Enable(); @@ -102,10 +102,10 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl)); aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighLightHandle )); aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle )); - aFilterCtr.HideRange(FALSE); + aFilterCtr.HideRange(sal_False); aFilterCtr.Show(); - SetDispatcherLock( TRUE ); - //SFX_APPWINDOW->Disable(FALSE); + SetDispatcherLock( sal_True ); + //SFX_APPWINDOW->Disable(sal_False); Init(); @@ -113,7 +113,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind ScHighlightChgDlg::~ScHighlightChgDlg() { - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); //SFX_APPWINDOW->Enable(); } @@ -130,7 +130,7 @@ void __EXPORT ScHighlightChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); aFilterCtr.ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(sal_uInt16 i=0;i<aUserColl.GetCount();i++) aFilterCtr.InsertAuthor(aUserColl[i]->GetString()); } @@ -145,7 +145,7 @@ void __EXPORT ScHighlightChgDlg::Init() aFilterCtr.SetFirstTime(aChangeViewSet.GetTheFirstDateTime()); aFilterCtr.SetLastDate(aChangeViewSet.GetTheLastDateTime()); aFilterCtr.SetLastTime(aChangeViewSet.GetTheLastDateTime()); - aFilterCtr.SetDateMode((USHORT)aChangeViewSet.GetTheDateMode()); + aFilterCtr.SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode()); aFilterCtr.CheckAuthor(aChangeViewSet.HasAuthor()); aFilterCtr.CheckComment(aChangeViewSet.HasComment()); aFilterCtr.SetComment(aChangeViewSet.GetTheComment()); @@ -173,7 +173,7 @@ void __EXPORT ScHighlightChgDlg::Init() pRangeEntry->Format( aRefStr, ABS_DREF3D, pDoc ); aFilterCtr.SetRange(aRefStr); } - aFilterCtr.Enable(TRUE,TRUE); + aFilterCtr.Enable(sal_True,sal_True); HighLightHandle(&aHighlightBox); } @@ -195,12 +195,12 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } //---------------------------------------------------------------------------- -BOOL __EXPORT ScHighlightChgDlg::Close() +sal_Bool __EXPORT ScHighlightChgDlg::Close() { return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); } -void ScHighlightChgDlg::RefInputDone( BOOL bForced) +void ScHighlightChgDlg::RefInputDone( sal_Bool bForced) { ScAnyRefDlg::RefInputDone(bForced); if(bForced || !aRbAssign.IsVisible()) @@ -221,13 +221,13 @@ void ScHighlightChgDlg::SetActive() aEdAssign.Hide(); aRbAssign.Hide(); SFX_APPWINDOW->Enable(); - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); } //RefInputDone(); */ } -BOOL ScHighlightChgDlg::IsRefInputMode() const +sal_Bool ScHighlightChgDlg::IsRefInputMode() const { return aEdAssign.IsVisible(); } @@ -238,13 +238,13 @@ IMPL_LINK( ScHighlightChgDlg, HighLightHandle, CheckBox*, pCb ) { if(aHighlightBox.IsChecked()) { - aFilterCtr.Enable(TRUE,TRUE); + aFilterCtr.Enable(sal_True,sal_True); aCbAccept.Enable(); aCbReject.Enable(); } else { - aFilterCtr.Disable(TRUE); + aFilterCtr.Disable(sal_True); aCbAccept.Disable(); aCbReject.Disable(); } @@ -256,8 +256,8 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) { if(pRef!=NULL) { - SetDispatcherLock( TRUE ); - //SFX_APPWINDOW->Disable(FALSE); + SetDispatcherLock( sal_True ); + //SFX_APPWINDOW->Disable(sal_False); aEdAssign.Show(); aRbAssign.Show(); aEdAssign.SetText(aFilterCtr.GetRange()); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 20a501700..7121f8190 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -39,11 +39,11 @@ #include "miscdlgs.hrc" -static BYTE nInsItemChecked=0; +static sal_uInt8 nInsItemChecked=0; //================================================================== -ScInsertCellDlg::ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove) : +ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : ModalDialog ( pParent, ScResId( RID_SCDLG_INSCELL ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 39332abe7..c02e2f78f 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -41,18 +41,18 @@ //================================================================== -BOOL ScInsertContentsDlg::bPreviousAllCheck = TRUE; -USHORT ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | +sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_True; +sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_ATTRIB | IDF_OBJECTS); -USHORT ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; -USHORT ScInsertContentsDlg::nPreviousChecks2 = 0; -USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd +sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; +sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; +sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd //----------------------------------------------------------------------- ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, - USHORT nCheckDefaults, + sal_uInt16 nCheckDefaults, const String* pStrTitle ) : ModalDialog ( pParent, ScResId( RID_SCDLG_INSCONT ) ), @@ -85,11 +85,11 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - bOtherDoc ( FALSE ), - bFillMode ( FALSE ), - bChangeTrack ( FALSE ), - bMoveDownDisabled( FALSE ), - bMoveRightDisabled( FALSE ) + bOtherDoc ( sal_False ), + bFillMode ( sal_False ), + bChangeTrack ( sal_False ), + bMoveDownDisabled( sal_False ), + bMoveRightDisabled( sal_False ) { if ( pStrTitle ) SetText( *pStrTitle ); @@ -97,7 +97,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, if ( nCheckDefaults != 0 ) { ScInsertContentsDlg::nPreviousChecks = nCheckDefaults; - ScInsertContentsDlg::bPreviousAllCheck = FALSE; + ScInsertContentsDlg::bPreviousAllCheck = sal_False; ScInsertContentsDlg::nPreviousChecks2 = 0; } @@ -119,18 +119,18 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, switch( ScInsertContentsDlg::nPreviousFormulaChecks ) { - case PASTE_NOFUNC: aRbNoOp.Check(TRUE); break; - case PASTE_ADD: aRbAdd.Check(TRUE); break; - case PASTE_SUB: aRbSub.Check(TRUE); break; - case PASTE_MUL: aRbMul.Check(TRUE); break; - case PASTE_DIV: aRbDiv.Check(TRUE); break; + case PASTE_NOFUNC: aRbNoOp.Check(sal_True); break; + case PASTE_ADD: aRbAdd.Check(sal_True); break; + case PASTE_SUB: aRbSub.Check(sal_True); break; + case PASTE_MUL: aRbMul.Check(sal_True); break; + case PASTE_DIV: aRbDiv.Check(sal_True); break; } switch( ScInsertContentsDlg::nPreviousMoveMode ) { - case INS_NONE: aRbMoveNone.Check(TRUE); break; - case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break; - case INS_CELLSRIGHT: aRbMoveRight.Check(TRUE); break; + case INS_NONE: aRbMoveNone.Check(sal_True); break; + case INS_CELLSDOWN: aRbMoveDown.Check(sal_True); break; + case INS_CELLSRIGHT: aRbMoveRight.Check(sal_True); break; } aBtnSkipEmptyCells.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0); @@ -151,7 +151,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, //------------------------------------------------------------------------ -USHORT ScInsertContentsDlg::GetInsContentsCmdBits() const +sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const { ScInsertContentsDlg::nPreviousChecks = 0; @@ -191,7 +191,7 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode() //------------------------------------------------------------------------ -void ScInsertContentsDlg::DisableChecks( BOOL bInsAllChecked ) +void ScInsertContentsDlg::DisableChecks( sal_Bool bInsAllChecked ) { if ( bInsAllChecked ) { @@ -242,7 +242,7 @@ void ScInsertContentsDlg::TestModes() aFlFrame.Disable(); aBtnInsAll.Disable(); - DisableChecks(TRUE); + DisableChecks(sal_True); } else { @@ -266,52 +266,52 @@ void ScInsertContentsDlg::TestModes() } } -void ScInsertContentsDlg::SetOtherDoc( BOOL bSet ) +void ScInsertContentsDlg::SetOtherDoc( sal_Bool bSet ) { if ( bSet != bOtherDoc ) { bOtherDoc = bSet; TestModes(); if ( bSet ) - aRbMoveNone.Check(TRUE); + aRbMoveNone.Check(sal_True); } } -void ScInsertContentsDlg::SetFillMode( BOOL bSet ) +void ScInsertContentsDlg::SetFillMode( sal_Bool bSet ) { if ( bSet != bFillMode ) { bFillMode = bSet; TestModes(); if ( bSet ) - aRbMoveNone.Check(TRUE); + aRbMoveNone.Check(sal_True); } } -void ScInsertContentsDlg::SetChangeTrack( BOOL bSet ) +void ScInsertContentsDlg::SetChangeTrack( sal_Bool bSet ) { if ( bSet != bChangeTrack ) { bChangeTrack = bSet; TestModes(); if ( bSet ) - aRbMoveNone.Check(TRUE); + aRbMoveNone.Check(sal_True); } } void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) { - BOOL bDown = ((nDisable & SC_CELL_SHIFT_DISABLE_DOWN) != 0); - BOOL bRight = ((nDisable & SC_CELL_SHIFT_DISABLE_RIGHT) != 0); + sal_Bool bDown = ((nDisable & SC_CELL_SHIFT_DISABLE_DOWN) != 0); + sal_Bool bRight = ((nDisable & SC_CELL_SHIFT_DISABLE_RIGHT) != 0); if ( bDown != bMoveDownDisabled || bRight != bMoveRightDisabled ) { bMoveDownDisabled = bDown; bMoveRightDisabled = bRight; TestModes(); if ( bMoveDownDisabled && aRbMoveDown.IsChecked() ) - aRbMoveNone.Check(TRUE); + aRbMoveNone.Check(sal_True); if ( bMoveRightDisabled && aRbMoveRight.IsChecked() ) - aRbMoveNone.Check(TRUE); + aRbMoveNone.Check(sal_True); } } @@ -353,7 +353,7 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() } } -USHORT ScInsertContentsDlg::GetFormulaCmdBits() const +sal_uInt16 ScInsertContentsDlg::GetFormulaCmdBits() const { ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; if(aRbAdd.IsChecked()) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index e535c3782..e66955207 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -226,7 +226,7 @@ void ScInsertTableDlg::SetFromTo_Impl() void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) { - aLbTables.SetUpdateMode( FALSE ); + aLbTables.SetUpdateMode( sal_False ); aLbTables.Clear(); if ( pSrcDoc ) @@ -241,7 +241,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) } } - aLbTables.SetUpdateMode( TRUE ); + aLbTables.SetUpdateMode( sal_True ); if(aLbTables.GetEntryCount()==1) aLbTables.SelectEntryPos(0); @@ -249,7 +249,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) //------------------------------------------------------------------------ -const String* ScInsertTableDlg::GetFirstTable( USHORT* pN ) +const String* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) { const String* pStr = NULL; @@ -272,7 +272,7 @@ const String* ScInsertTableDlg::GetFirstTable( USHORT* pN ) //------------------------------------------------------------------------ -const String* ScInsertTableDlg::GetNextTable( USHORT* pN ) +const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) { const String* pStr = NULL; @@ -393,7 +393,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg if ( pDocShTables ) pDocShTables->DoClose(); // delete passiert beim Zuweisen auf die Ref - pMed->UseInteractionHandler( TRUE ); // to enable the filter options dialog + pMed->UseInteractionHandler( sal_True ); // to enable the filter options dialog pDocShTables = new ScDocShell; aDocShTablesRef = pDocShTables; @@ -403,7 +403,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg pDocShTables->DoLoad( pMed ); SetPointer( aOldPtr ); - ULONG nErr = pDocShTables->GetErrorCode(); + sal_uLong nErr = pDocShTables->GetErrorCode(); if ( nErr ) ErrorHandler::HandleError( nErr ); // auch Warnings diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index eb010b414..d042efd41 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -44,7 +44,7 @@ //================================================================== ScSelEntryDlg::ScSelEntryDlg( Window* pParent, - USHORT nResId, + sal_uInt16 nResId, const String& aTitle, const String& aLbTitle, List& aEntryList ) : @@ -84,7 +84,7 @@ String ScSelEntryDlg::GetSelectEntry() const //------------------------------------------------------------------------ -//UNUSED2008-05 USHORT ScSelEntryDlg::GetSelectEntryPos() const +//UNUSED2008-05 sal_uInt16 ScSelEntryDlg::GetSelectEntryPos() const //UNUSED2008-05 { //UNUSED2008-05 return aLb.GetSelectEntryPos(); //UNUSED2008-05 } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index bdff26fe0..405fcbce8 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -133,9 +133,9 @@ IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG ) String aFilter; String aOptions; - // get filter name by looking at the file content (bWithContent = TRUE) + // get filter name by looking at the file content (bWithContent = sal_True) // Break operation if any error occured inside. - if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, TRUE, TRUE )) + if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, sal_True, sal_True )) return 0; // #i53241# replace HTML filter with DataQuery filter @@ -168,11 +168,11 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile ); - ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction + ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, sal_True ); // with interaction pSourceShell = aLoader.GetDocShell(); if ( pSourceShell ) { - ULONG nErr = pSourceShell->GetErrorCode(); + sal_uLong nErr = pSourceShell->GetErrorCode(); if (nErr) ErrorHandler::HandleError( nErr ); // including warnings @@ -184,7 +184,7 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, - ULONG nRefresh ) + sal_uLong nRefresh ) { LoadDocument( rFile, rFilter, rOptions ); if (pSourceShell) @@ -204,7 +204,7 @@ void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilte aLbRanges.SelectEntry( aRange ); } - BOOL bDoRefresh = ( nRefresh != 0 ); + sal_Bool bDoRefresh = ( nRefresh != 0 ); aBtnReload.Check( bDoRefresh ); if (bDoRefresh) aNfDelay.SetValue( nRefresh ); @@ -253,13 +253,13 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg if (pSourceShell) pSourceShell->DoClose(); // deleted when assigning aSourceRef - pMed->UseInteractionHandler( TRUE ); // to enable the filter options dialog + pMed->UseInteractionHandler( sal_True ); // to enable the filter options dialog pSourceShell = new ScDocShell; aSourceRef = pSourceShell; pSourceShell->DoLoad( pMed ); - ULONG nErr = pSourceShell->GetErrorCode(); + sal_uLong nErr = pSourceShell->GetErrorCode(); if (nErr) ErrorHandler::HandleError( nErr ); // including warnings @@ -288,7 +288,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg void ScLinkedAreaDlg::UpdateSourceRanges() { - aLbRanges.SetUpdateMode( FALSE ); + aLbRanges.SetUpdateMode( sal_False ); aLbRanges.Clear(); if ( pSourceShell ) @@ -300,7 +300,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges() aLbRanges.InsertEntry( aName ); } - aLbRanges.SetUpdateMode( TRUE ); + aLbRanges.SetUpdateMode( sal_True ); if ( aLbRanges.GetEntryCount() == 1 ) aLbRanges.SelectEntryPos(0); @@ -308,10 +308,10 @@ void ScLinkedAreaDlg::UpdateSourceRanges() void ScLinkedAreaDlg::UpdateEnable() { - BOOL bEnable = ( pSourceShell && aLbRanges.GetSelectEntryCount() ); + sal_Bool bEnable = ( pSourceShell && aLbRanges.GetSelectEntryCount() ); aBtnOk.Enable( bEnable ); - BOOL bReload = aBtnReload.IsChecked(); + sal_Bool bReload = aBtnReload.IsChecked(); aNfDelay.Enable( bReload ); aFtSeconds.Enable( bReload ); } @@ -349,8 +349,8 @@ String ScLinkedAreaDlg::GetOptions() String ScLinkedAreaDlg::GetSource() { String aSource; - USHORT nCount = aLbRanges.GetSelectEntryCount(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = aLbRanges.GetSelectEntryCount(); + for (sal_uInt16 i=0; i<nCount; i++) { if (i > 0) aSource.Append( (sal_Unicode) ';' ); @@ -359,10 +359,10 @@ String ScLinkedAreaDlg::GetSource() return aSource; } -ULONG ScLinkedAreaDlg::GetRefresh() +sal_uLong ScLinkedAreaDlg::GetRefresh() { if ( aBtnReload.IsChecked() ) - return sal::static_int_cast<ULONG>( aNfDelay.GetValue() ); + return sal::static_int_cast<sal_uLong>( aNfDelay.GetValue() ); else return 0; // disabled } diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index ceb96573e..c3430e618 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -42,11 +42,11 @@ //================================================================== ScMetricInputDlg::ScMetricInputDlg( Window* pParent, - USHORT nResId, + sal_uInt16 nResId, long nCurrent, long nDefault, FieldUnit eFUnit, - USHORT nDecimals, + sal_uInt16 nDecimals, long nMaximum, long nMinimum, long nFirst, @@ -98,14 +98,14 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const mit Nachkommastellen: double nVal = aEdValue.GetValue( eUnit ); - USHORT nDecs = aEdValue.GetDecimalDigits(); + sal_uInt16 nDecs = aEdValue.GetDecimalDigits(); double nFactor = 0.0; - // static long ImpPower10( USHORT nDecs ) + // static long ImpPower10( sal_uInt16 nDecs ) { nFactor = 1.0; - for ( USHORT i=0; i < nDecs; i++ ) + for ( sal_uInt16 i=0; i < nDecs; i++ ) nFactor *= 10.0; } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 37405ee1d..9b27b91cd 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -70,7 +70,7 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent ) // nDocument ( 0 ), nTable ( 0 ), - bCopyTable ( FALSE ) + bCopyTable ( sal_False ) { #if ENABLE_LAYOUT #undef ScResId @@ -88,17 +88,17 @@ __EXPORT ScMoveTableDlg::~ScMoveTableDlg() //------------------------------------------------------------------------ -USHORT ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } +sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; } -BOOL ScMoveTableDlg::GetCopyTable () const { return bCopyTable; } +sal_Bool ScMoveTableDlg::GetCopyTable () const { return bCopyTable; } -void ScMoveTableDlg::SetCopyTable(BOOL bFlag) +void ScMoveTableDlg::SetCopyTable(sal_Bool bFlag) { aBtnCopy.Check(bFlag); } -void ScMoveTableDlg::EnableCopyTable(BOOL bFlag) +void ScMoveTableDlg::EnableCopyTable(sal_Bool bFlag) { if(bFlag) aBtnCopy.Enable(); @@ -113,7 +113,7 @@ void __EXPORT ScMoveTableDlg::Init() { aBtnOk.SetClickHdl ( LINK( this, ScMoveTableDlg, OkHdl ) ); aLbDoc.SetSelectHdl ( LINK( this, ScMoveTableDlg, SelHdl ) ); - aBtnCopy.Check( FALSE ); + aBtnCopy.Check( sal_False ); InitDocListBox(); SelHdl( &aLbDoc ); } @@ -124,11 +124,11 @@ void ScMoveTableDlg::InitDocListBox() { SfxObjectShell* pSh = SfxObjectShell::GetFirst(); ScDocShell* pScSh = NULL; - USHORT nSelPos = 0; - USHORT i = 0; + sal_uInt16 nSelPos = 0; + sal_uInt16 i = 0; aLbDoc.Clear(); - aLbDoc.SetUpdateMode( FALSE ); + aLbDoc.SetUpdateMode( sal_False ); while ( pSh ) { @@ -147,7 +147,7 @@ void ScMoveTableDlg::InitDocListBox() pSh = SfxObjectShell::GetNext( *pSh ); } - aLbDoc.SetUpdateMode( TRUE ); + aLbDoc.SetUpdateMode( sal_True ); aLbDoc.InsertEntry( String( ScResId( STR_NEWDOC ) ) ); aLbDoc.SelectEntryPos( nSelPos ); } @@ -158,10 +158,10 @@ void ScMoveTableDlg::InitDocListBox() IMPL_LINK( ScMoveTableDlg, OkHdl, void *, EMPTYARG ) { - USHORT nDocSel = aLbDoc.GetSelectEntryPos(); - USHORT nDocLast = aLbDoc.GetEntryCount()-1; - USHORT nTabSel = aLbTable.GetSelectEntryPos(); - USHORT nTabLast = aLbTable.GetEntryCount()-1; + sal_uInt16 nDocSel = aLbDoc.GetSelectEntryPos(); + sal_uInt16 nDocLast = aLbDoc.GetEntryCount()-1; + sal_uInt16 nTabSel = aLbTable.GetSelectEntryPos(); + sal_uInt16 nTabLast = aLbTable.GetEntryCount()-1; nDocument = (nDocSel != nDocLast) ? nDocSel : SC_DOC_NEW; nTable = (nTabSel != nTabLast) ? static_cast<SCTAB>(nTabSel) : SC_TAB_APPEND; @@ -183,7 +183,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) String aName; aLbTable.Clear(); - aLbTable.SetUpdateMode( FALSE ); + aLbTable.SetUpdateMode( sal_False ); if ( pDoc ) { nLast = pDoc->GetTableCount()-1; @@ -194,7 +194,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) } } aLbTable.InsertEntry( ScGlobal::GetRscString(STR_MOVE_TO_END) ); - aLbTable.SetUpdateMode( TRUE ); + aLbTable.SetUpdateMode( sal_True ); aLbTable.SelectEntryPos( 0 ); } diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 770551e33..77d4f03b9 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -41,7 +41,7 @@ //================================================================== -ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) +ScNameCreateDlg::ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags ) : ModalDialog( pParent, ScResId(RID_SCDLG_NAMES_CREATE) ), aFixedLine ( this, ScResId( FL_FRAME ) ), aTopBox ( this, ScResId( BTN_TOP ) ), @@ -52,19 +52,19 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) aCancelButton ( this, ScResId( BTN_CANCEL ) ), aHelpButton ( this, ScResId( BTN_HELP ) ) { - aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE ); - aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE ); - aBottomBox.Check( (nFlags & NAME_BOTTOM)? TRUE : FALSE ); - aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE ); + aTopBox.Check ( (nFlags & NAME_TOP) ? sal_True : sal_False ); + aLeftBox.Check ( (nFlags & NAME_LEFT) ? sal_True : sal_False ); + aBottomBox.Check( (nFlags & NAME_BOTTOM)? sal_True : sal_False ); + aRightBox.Check ( (nFlags & NAME_RIGHT) ? sal_True : sal_False ); FreeResource(); } //------------------------------------------------------------------ -USHORT ScNameCreateDlg::GetFlags() const +sal_uInt16 ScNameCreateDlg::GetFlags() const { - USHORT nResult = 0; + sal_uInt16 nResult = 0; nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ; nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ; diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx index d72d86d2b..0d55b0362 100644 --- a/sc/source/ui/miscdlgs/namepast.cxx +++ b/sc/source/ui/miscdlgs/namepast.cxx @@ -42,7 +42,7 @@ //================================================================== -ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList ) +ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, sal_Bool bInsList ) : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ), aLabelText ( this, ScResId( FT_LABEL ) ), aNameList ( this, ScResId( LB_ENTRYLIST ) ), @@ -59,10 +59,10 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL aNameList.SetSelectHdl( LINK( this,ScNamePasteDlg,ListSelHdl) ); aNameList.SetDoubleClickHdl( LINK( this,ScNamePasteDlg,ListDblClickHdl) ); - USHORT nCnt = pList->GetCount(); + sal_uInt16 nCnt = pList->GetCount(); String aText; - for( USHORT i=0 ; i<nCnt ; i++ ) + for( sal_uInt16 i=0 ; i<nCnt ; i++ ) { ScRangeData* pData = (*pList)[ i ]; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 13e2084c6..cf3dee030 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -67,7 +67,7 @@ ScSolverProgressDialog::ScSolverProgressDialog( Window* pParent ) maFlButtons ( this, ScResId( FL_BUTTONS ) ), maBtnOk ( this, ScResId( BTN_OK ) ) { - maBtnOk.Enable(FALSE); + maBtnOk.Enable(sal_False); FreeResource(); } @@ -159,7 +159,7 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt ) //---------------------------------------------------------------------------- -ScOptSolverSave::ScOptSolverSave( const String& rObjective, BOOL bMax, BOOL bMin, BOOL bValue, +ScOptSolverSave::ScOptSolverSave( const String& rObjective, sal_Bool bMax, sal_Bool bMin, sal_Bool bValue, const String& rTarget, const String& rVariable, const std::vector<ScOptConditionRow>& rConditions, const String& rEngine, @@ -302,8 +302,8 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); - Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE, FALSE ); - Image aDelHC = ::GetImage( xFrame, aSlotURL, FALSE, TRUE ); // high contrast + Image aDelNm = ::GetImage( xFrame, aSlotURL, sal_False, sal_False ); + Image aDelHC = ::GetImage( xFrame, aSlotURL, sal_False, sal_True ); // high contrast for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) { @@ -464,7 +464,7 @@ void ScOptSolverDlg::EnableButtons() //---------------------------------------------------------------------------- -BOOL ScOptSolverDlg::Close() +sal_Bool ScOptSolverDlg::Close() { return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() ); } @@ -509,7 +509,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) aStr = aName; else // format cell/range reference { - USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D; + sal_uInt16 nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D; if ( bSingle ) aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); else @@ -542,7 +542,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) //---------------------------------------------------------------------------- -BOOL ScOptSolverDlg::IsRefInputMode() const +sal_Bool ScOptSolverDlg::IsRefInputMode() const { return mpEdActive != NULL; } @@ -556,7 +556,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) { bool bSolve = ( pBtn == &maBtnSolve ); - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); SwitchToDocument(); bool bClose = true; @@ -576,7 +576,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) else { // no solution -> dialog is kept open - SetDispatcherLock( TRUE ); + SetDispatcherLock( sal_True ); } } else if ( pBtn == &maBtnOpt ) @@ -641,7 +641,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) if( pBtn == mpDelButton[nRow] ) { - BOOL bHadFocus = pBtn->HasFocus(); + sal_Bool bHadFocus = pBtn->HasFocus(); ReadConditions(); long nVecPos = nScrollPos + nRow; @@ -784,7 +784,7 @@ bool ScOptSolverDlg::ParseRef( ScRange& rRange, const String& rInput, bool bAllo { ScRangeUtil aRangeUtil; ScAddress::Details aDetails(mpDoc->GetAddressConvention(), 0, 0); - USHORT nFlags = rRange.ParseAny( rInput, mpDoc, aDetails ); + sal_uInt16 nFlags = rRange.ParseAny( rInput, mpDoc, aDetails ); if ( nFlags & SCA_VALID ) { if ( (nFlags & SCA_TAB_3D) == 0 ) @@ -855,8 +855,8 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal } uno::Sequence<table::CellAddress> aVariables; sal_Int32 nVarPos = 0; - ULONG nRangeCount = aVarRanges.Count(); - for (ULONG nRangePos=0; nRangePos<nRangeCount; ++nRangePos) + sal_uLong nRangeCount = aVarRanges.Count(); + for (sal_uLong nRangePos=0; nRangePos<nRangeCount; ++nRangePos) { ScRange aRange(*aVarRanges.GetObject(nRangePos)); aRange.Justify(); @@ -1034,7 +1034,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal { ScAddress aCellPos; ScUnoConversion::FillScAddress( aCellPos, aVariables[nVarPos] ); - aFunc.PutCell( aCellPos, new ScValueCell( aSolution[nVarPos] ), TRUE ); + aFunc.PutCell( aCellPos, new ScValueCell( aSolution[nVarPos] ), sal_True ); } mpDocShell->UnlockPaint(); } @@ -1069,7 +1069,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal { ScAddress aCellPos; ScUnoConversion::FillScAddress( aCellPos, aVariables[nVarPos] ); - aFunc.PutCell( aCellPos, new ScValueCell( aOldValues[nVarPos] ), TRUE ); + aFunc.PutCell( aCellPos, new ScValueCell( aOldValues[nVarPos] ), sal_True ); } mpDocShell->UnlockPaint(); } diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 79d53b9c8..0068a8306 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -41,7 +41,7 @@ static const ScTableProtection::Option aOptions[] = { ScTableProtection::SELECT_LOCKED_CELLS, ScTableProtection::SELECT_UNLOCKED_CELLS, }; -static const USHORT nOptionCount = sizeof(aOptions)/sizeof(aOptions[0]); +static const sal_uInt16 nOptionCount = sizeof(aOptions)/sizeof(aOptions[0]); ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) : @@ -78,7 +78,7 @@ short ScTableProtectionDlg::Execute() void ScTableProtectionDlg::SetDialogData(const ScTableProtection& rData) { - for (USHORT i = 0; i < nOptionCount; ++i) + for (sal_uInt16 i = 0; i < nOptionCount; ++i) maOptionsListBox.CheckEntryPos(i, rData.isOptionEnabled(aOptions[i])); } @@ -89,7 +89,7 @@ void ScTableProtectionDlg::WriteData(ScTableProtection& rData) const // We assume that the two password texts match. rData.setPassword(maPassword1Edit.GetText()); - for (USHORT i = 0; i < nOptionCount; ++i) + for (sal_uInt16 i = 0; i < nOptionCount; ++i) rData.setOption(aOptions[i], maOptionsListBox.IsChecked(i)); } diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index f1004a3fa..78d4a55a4 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -40,13 +40,13 @@ //------------------------------------------------------------------------ ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, - ScDocShell *pShell,ScChangeAction *pAction,BOOL bPrevNext) + ScDocShell *pShell,ScChangeAction *pAction,sal_Bool bPrevNext) { - //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,TRUE); + //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,sal_True); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, TRUE ); + pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, sal_True ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDocShell=pShell; pDlg->DontChangeAuthor(); @@ -116,8 +116,8 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) pDlg->SetText(aTitle); aComment=pChangeAction->GetComment(); - BOOL bNext=FindNext(pChangeAction)!=NULL; - BOOL bPrev=FindPrev(pChangeAction)!=NULL; + sal_Bool bNext=FindNext(pChangeAction)!=NULL; + sal_Bool bPrev=FindPrev(pChangeAction)!=NULL; pDlg->EnableTravel(bNext,bPrev); String aAuthor = pChangeAction->GetUser(); @@ -125,7 +125,7 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) DateTime aDT = pChangeAction->GetDateTime(); String aDate = ScGlobal::pLocaleData->getDate( aDT ); aDate += ' '; - aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE ); + aDate += ScGlobal::pLocaleData->getTime( aDT, sal_False, sal_False ); pDlg->ShowLastAuthor(aAuthor, aDate); pDlg->SetNote(aComment); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 628b50bfd..6e4585193 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -101,8 +101,8 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, pFormat ( pAutoFormat ), pSelFmtData ( pSelFormatData ), nIndex ( 0 ), - bCoreDataChanged( FALSE ), - bFmtInserted ( FALSE ) + bCoreDataChanged( sal_False ), + bFmtInserted ( sal_False ) { Init(); pWndPreview->NotifyChange( (*pFormat)[0] ); @@ -120,7 +120,7 @@ __EXPORT ScAutoFormatDlg::~ScAutoFormatDlg() void ScAutoFormatDlg::Init() { - USHORT nCount; + sal_uInt16 nCount; String aEntry; aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); @@ -148,7 +148,7 @@ void ScAutoFormatDlg::Init() nCount = pFormat->GetCount(); - for ( USHORT i = 0; i < nCount; i++ ) + for ( sal_uInt16 i = 0; i < nCount; i++ ) { ((*pFormat)[i])->GetName( aEntry ); aLbFormat.InsertEntry( aEntry ); @@ -168,7 +168,7 @@ void ScAutoFormatDlg::Init() { aBtnAdd.Disable(); aBtnRemove.Disable(); - bFmtInserted = TRUE; + bFmtInserted = sal_True; } } @@ -219,7 +219,7 @@ IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { ScAutoFormatData* pData = (*pFormat)[nIndex]; - BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); + sal_Bool bCheck = ((CheckBox*)pBtn)->IsChecked(); if ( pBtn == &aBtnNumFormat ) pData->SetIncludeValueFormat( bCheck ); @@ -237,7 +237,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) if ( !bCoreDataChanged ) { aBtnCancel.SetText( aStrClose ); - bCoreDataChanged = TRUE; + bCoreDataChanged = sal_True; } pWndPreview->NotifyChange( pData ); @@ -254,7 +254,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) String aStrStandard( SfxResId(STR_STANDARD) ); String aFormatName; ScStringInputDlg* pDlg; - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; while ( !bOk ) { @@ -278,7 +278,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) if ( bFmtInserted ) { - USHORT nAt = pFormat->IndexOf( pNewData ); + sal_uInt16 nAt = pFormat->IndexOf( pNewData ); aLbFormat.InsertEntry( aFormatName, nAt ); aLbFormat.SelectEntry( aFormatName ); @@ -287,11 +287,11 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) if ( !bCoreDataChanged ) { aBtnCancel.SetText( aStrClose ); - bCoreDataChanged = TRUE; + bCoreDataChanged = sal_True; } SelFmtHdl( 0 ); - bOk = TRUE; + bOk = sal_True; } else delete pNewData; @@ -300,7 +300,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) if ( !bFmtInserted ) { - USHORT nRet = ErrorBox( this, + sal_uInt16 nRet = ErrorBox( this, WinBits( WB_OK_CANCEL | WB_DEF_OK), ScGlobal::GetRscString(STR_INVALID_AFNAME) ).Execute(); @@ -309,7 +309,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) } } else - bOk = TRUE; + bOk = sal_True; delete pDlg; } @@ -341,7 +341,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) if ( !bCoreDataChanged ) { aBtnCancel.SetText( aStrClose ); - bCoreDataChanged = TRUE; + bCoreDataChanged = sal_True; } pFormat->AtFree( nIndex ); // in der Core loeschen @@ -358,7 +358,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; while( !bOk ) { @@ -372,9 +372,9 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) HID_SC_REN_AFMT_DLG, HID_SC_REN_AFMT_NAME ); if( pDlg->Execute() == RET_OK ) { - BOOL bFmtRenamed = FALSE; + sal_Bool bFmtRenamed = sal_False; pDlg->GetInputString( aFormatName ); - USHORT n; + sal_uInt16 n; if ( aFormatName.Len() > 0 ) { @@ -400,29 +400,29 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) pFormat->Insert( pNewData); - USHORT nCount = pFormat->GetCount(); + sal_uInt16 nCount = pFormat->GetCount(); - aLbFormat.SetUpdateMode(FALSE); + aLbFormat.SetUpdateMode(sal_False); aLbFormat.Clear(); - for ( USHORT i = 0; i < nCount; i++ ) + for ( sal_uInt16 i = 0; i < nCount; i++ ) { ((*pFormat)[i])->GetName( aEntry ); aLbFormat.InsertEntry( aEntry ); } - aLbFormat.SetUpdateMode( TRUE); + aLbFormat.SetUpdateMode( sal_True); aLbFormat.SelectEntry( aFormatName); if ( !bCoreDataChanged ) { aBtnCancel.SetText( aStrClose ); - bCoreDataChanged = TRUE; + bCoreDataChanged = sal_True; } SelFmtHdl( 0 ); - bOk = TRUE; - bFmtRenamed = TRUE; + bOk = sal_True; + bFmtRenamed = sal_True; } } if( !bFmtRenamed ) @@ -434,7 +434,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) } } else - bOk = TRUE; + bOk = sal_True; delete pDlg; } diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 96d5ded3b..26043b900 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -158,12 +158,12 @@ void ScShareDocumentDlg::UpdateView() ::rtl::OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex ); ::rtl::OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex ); nIndex = 0; - USHORT nDay = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); - USHORT nMonth = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); - USHORT nYear = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); + sal_uInt16 nDay = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); + sal_uInt16 nMonth = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); + sal_uInt16 nYear = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() ); nIndex = 0; - USHORT nHours = sal::static_int_cast< USHORT >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); - USHORT nMinutes = sal::static_int_cast< USHORT >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); + sal_uInt16 nHours = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); + sal_uInt16 nMinutes = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); Date aDate( nDay, nMonth, nYear ); Time aTime( nHours, nMinutes ); DateTime aDateTime( aDate, aTime ); @@ -172,7 +172,7 @@ void ScShareDocumentDlg::UpdateView() aString += '\t'; aString += ScGlobal::pLocaleData->getDate( aDateTime ); aString += ' '; - aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE ); + aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False ); maLbUsers.InsertEntry( aString, NULL ); } @@ -228,7 +228,7 @@ void ScShareDocumentDlg::UpdateView() aString += ScGlobal::pLocaleData->getDate( aDateTime ); aString += ' '; - aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE ); + aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False ); maLbUsers.InsertEntry( aString, NULL ); } diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 03ac53d3c..7abcb20ea 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -70,7 +70,7 @@ void ScShowTabDlg::SetDescription( aLb.SetHelpId( sLbHelpId ); } -void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) +void ScShowTabDlg::Insert( const String& rString, sal_Bool bSelected ) { aLb.InsertEntry( rString ); if( bSelected ) @@ -79,17 +79,17 @@ void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) //------------------------------------------------------------------------ -USHORT ScShowTabDlg::GetSelectEntryCount() const +sal_uInt16 ScShowTabDlg::GetSelectEntryCount() const { return aLb.GetSelectEntryCount(); } -String ScShowTabDlg::GetSelectEntry(USHORT nPos) const +String ScShowTabDlg::GetSelectEntry(sal_uInt16 nPos) const { return aLb.GetSelectEntry(nPos); } -USHORT ScShowTabDlg::GetSelectEntryPos(USHORT nPos) const +sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const { return aLb.GetSelectEntryPos(nPos); } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 9dfc1af2d..c8d076bc7 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -80,22 +80,22 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP // pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( FALSE ), - bAutoReOpen ( TRUE ), - bCloseOnButtonUp( FALSE ), - bSingleCell ( FALSE ), - bMultiSelection ( FALSE ) + bRefInputMode ( sal_False ), + bAutoReOpen ( sal_True ), + bCloseOnButtonUp( sal_False ), + bSingleCell ( sal_False ), + bMultiSelection ( sal_False ) { // damit die Strings in der Resource bei den FixedTexten bleiben koennen: Init(); FreeResource(); - SetDispatcherLock( TRUE ); // Modal-Modus einschalten + SetDispatcherLock( sal_True ); // Modal-Modus einschalten } //---------------------------------------------------------------------------- __EXPORT ScSimpleRefDlg::~ScSimpleRefDlg() { - SetDispatcherLock( FALSE ); // Modal-Modus einschalten + SetDispatcherLock( sal_False ); // Modal-Modus einschalten } //---------------------------------------------------------------------------- @@ -116,7 +116,7 @@ void ScSimpleRefDlg::Init() { aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) ); - bCloseFlag=FALSE; + bCloseFlag=sal_False; } //---------------------------------------------------------------------------- @@ -159,10 +159,10 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) //---------------------------------------------------------------------------- -BOOL __EXPORT ScSimpleRefDlg::Close() +sal_Bool __EXPORT ScSimpleRefDlg::Close() { CancelBtnHdl(&aBtnCancel); - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -177,9 +177,9 @@ void ScSimpleRefDlg::SetActive() RefInputDone(); } //------------------------------------------------------------------------ -BOOL ScSimpleRefDlg::IsRefInputMode() const +sal_Bool ScSimpleRefDlg::IsRefInputMode() const { - return TRUE; + return sal_True; } String ScSimpleRefDlg::GetRefString() const @@ -200,7 +200,7 @@ void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort, aChangeHdl = rChange; } -void ScSimpleRefDlg::SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ) +void ScSimpleRefDlg::SetFlags( sal_Bool bSetCloseOnButtonUp, sal_Bool bSetSingleCell, sal_Bool bSetMultiSelection ) { bCloseOnButtonUp = bSetCloseOnButtonUp; bSingleCell = bSetSingleCell; @@ -216,10 +216,10 @@ void ScSimpleRefDlg::StartRefInput() } aRbAssign.DoRef(); - bCloseFlag=TRUE; + bCloseFlag=sal_True; } -void ScSimpleRefDlg::RefInputDone( BOOL bForced) +void ScSimpleRefDlg::RefInputDone( sal_Bool bForced) { ScAnyRefDlg::RefInputDone(bForced); if ( (bForced || bCloseOnButtonUp) && bCloseFlag ) @@ -230,7 +230,7 @@ void ScSimpleRefDlg::RefInputDone( BOOL bForced) // ======== IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) { - bAutoReOpen=FALSE; + bAutoReOpen=sal_False; String aResult=aEdAssign.GetText(); aCloseHdl.Call(&aResult); Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose @@ -242,7 +242,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG ) { - bAutoReOpen=FALSE; + bAutoReOpen=sal_False; String aResult=aEdAssign.GetText(); aCloseHdl.Call(NULL); Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 2f5244329..7b661d171 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -76,7 +76,7 @@ class ScSolverOptionsString : public SvLBoxString sal_Int32 mnIntValue; public: - ScSolverOptionsString( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : + ScSolverOptionsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ), mbIsDouble( false ), mfDoubleValue( 0.0 ), @@ -89,10 +89,10 @@ public: void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; } void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; } - virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; -void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* /* pEntry */ ) +void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ ) { //! move position? (SvxLinguTabPage: aPos.X() += 20) String aNormalStr( GetText() ); @@ -174,7 +174,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, maProperties.realloc(0); // don't use options from different engine } if ( nSelect >= 0 ) // select in list box - maLbEngine.SelectEntryPos( static_cast<USHORT>(nSelect) ); + maLbEngine.SelectEntryPos( static_cast<sal_uInt16>(nSelect) ); if ( !maProperties.getLength() ) ReadFromComponent(); // fill maProperties from component (using maEngine) @@ -207,8 +207,8 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( SvLBoxEntry* pEntry = pModel->GetEntry(nEntryPos); bool bHasData = false; - USHORT nItemCount = pEntry->ItemCount(); - for (USHORT nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos) + sal_uInt16 nItemCount = pEntry->ItemCount(); + for (sal_uInt16 nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos) { SvLBoxItem* pItem = pEntry->GetItem( nItemPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); @@ -264,7 +264,7 @@ void ScSolverOptionsDialog::FillListBox() // fill the list box - maLbSettings.SetUpdateMode(FALSE); + maLbSettings.SetUpdateMode(sal_False); maLbSettings.Clear(); String sEmpty; @@ -317,7 +317,7 @@ void ScSolverOptionsDialog::FillListBox() pModel->Insert( pEntry ); } - maLbSettings.SetUpdateMode(TRUE); + maLbSettings.SetUpdateMode(sal_True); } void ScSolverOptionsDialog::ReadFromComponent() @@ -330,8 +330,8 @@ void ScSolverOptionsDialog::EditOption() SvLBoxEntry* pEntry = maLbSettings.GetCurEntry(); if (pEntry) { - USHORT nItemCount = pEntry->ItemCount(); - for (USHORT nPos=0; nPos<nItemCount; ++nPos) + sal_uInt16 nItemCount = pEntry->ItemCount(); + for (sal_uInt16 nPos=0; nPos<nItemCount; ++nPos) { SvLBoxItem* pItem = pEntry->GetItem( nPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); @@ -380,7 +380,7 @@ IMPL_LINK( ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, EMPTYA IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) { - USHORT nSelectPos = maLbEngine.GetSelectEntryPos(); + sal_uInt16 nSelectPos = maLbEngine.GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) { String aNewEngine( maImplNames[nSelectPos] ); @@ -396,14 +396,14 @@ IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) IMPL_LINK( ScSolverOptionsDialog, SettingsSelHdl, SvxCheckListBox*, EMPTYARG ) { - BOOL bCheckbox = FALSE; + sal_Bool bCheckbox = sal_False; SvLBoxEntry* pEntry = maLbSettings.GetCurEntry(); if (pEntry) { SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON); if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON ) - bCheckbox = TRUE; + bCheckbox = sal_True; } maBtnEdit.Enable( !bCheckbox ); diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 790ac64b4..07dfabe97 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -80,7 +80,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pDoc ( pDocument ), nCurTab ( aCursorPos.Tab() ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ), + bDlgLostFocus ( sal_False ), errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), @@ -130,7 +130,7 @@ void __EXPORT ScSolverDlg::Init() //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::Close() +sal_Bool __EXPORT ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } @@ -141,7 +141,7 @@ void ScSolverDlg::SetActive() { if ( bDlgLostFocus ) { - bDlgLostFocus = FALSE; + bDlgLostFocus = sal_False; if( pEdActive ) pEdActive->GrabFocus(); } @@ -163,7 +163,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) String aStr; ScAddress aAdr = rRef.aStart; - USHORT nFmt = ( aAdr.Tab() == nCurTab ) + sal_uInt16 nFmt = ( aAdr.Tab() == nCurTab ) ? SCA_ABS : SCA_ABS_3D; @@ -207,14 +207,14 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) //---------------------------------------------------------------------------- -BOOL ScSolverDlg::IsRefInputMode() const +sal_Bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } //---------------------------------------------------------------------------- -BOOL __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal ) +sal_Bool __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal ) { sal_uInt32 n1 = 0; double n2; @@ -237,8 +237,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 3. wurde ein korrekter Zielwert eingegeben const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); - USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); + sal_uInt16 nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); + sal_uInt16 nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { @@ -259,7 +259,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) theTargetValStr ); ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); SwitchToDocument(); GetBindings().GetDispatcher()->Execute( SID_SOLVE, diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index b5ba7899e..adb56b229 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -102,7 +102,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() const Size aSize15x15 = Size( 15, 15 ); const Size aSize10x10 = Size( 10, 10 ); const Size aSize5x5 = Size( 5, 5 ); - USHORT nSelectedItem = 0; + sal_uInt16 nSelectedItem = 0; DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -155,10 +155,10 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG ) Handler, called when color selection is changed */ { - USHORT nItemId = aTabBgColorSet.GetSelectItemId(); + sal_uInt16 nItemId = aTabBgColorSet.GetSelectItemId(); Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO ); aTabBgColor = aColor; - EndDialog( TRUE ); + EndDialog( sal_True ); return 0; } @@ -167,10 +167,10 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG ) // Handler, called when the OK button is pushed - USHORT nItemId = aTabBgColorSet.GetSelectItemId(); + sal_uInt16 nItemId = aTabBgColorSet.GetSelectItemId(); Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO ); aTabBgColor = aColor; - EndDialog( TRUE ); + EndDialog( sal_True ); return 0; } @@ -187,10 +187,10 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt ) case KEY_SPACE: case KEY_RETURN: { - USHORT nItemId = GetSelectItemId(); + sal_uInt16 nItemId = GetSelectItemId(); const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO ); aTabBgColorDlg->aTabBgColor = aColor; - aTabBgColorDlg->EndDialog(TRUE); + aTabBgColorDlg->EndDialog(sal_True); } break; } diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 884560c55..8036637a8 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -76,7 +76,7 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pDoc ( pDocument ), nCurTab ( theFormulaCell.Tab() ), pEdActive ( NULL ), - bDlgLostFocus ( FALSE ), + bDlgLostFocus ( sal_False ), errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), @@ -127,7 +127,7 @@ void __EXPORT ScTabOpDlg::Init() //---------------------------------------------------------------------------- -BOOL __EXPORT ScTabOpDlg::Close() +sal_Bool __EXPORT ScTabOpDlg::Close() { return DoClose( ScTabOpDlgWrapper::GetChildWindowId() ); } @@ -138,7 +138,7 @@ void ScTabOpDlg::SetActive() { if ( bDlgLostFocus ) { - bDlgLostFocus = FALSE; + bDlgLostFocus = sal_False; if( pEdActive ) pEdActive->GrabFocus(); } @@ -160,7 +160,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) RefInputStart(pEdActive); String aStr; - USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) + sal_uInt16 nFmt = ( rRef.aStart.Tab() == nCurTab ) ? SCR_ABS : SCR_ABS_3D; @@ -236,10 +236,10 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) //---------------------------------------------------------------------------- -BOOL lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab, +sal_Bool lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab, ScRefAddress& rStart, ScRefAddress& rEnd ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if ( rString.Search(':') != STRING_NOTFOUND ) bRet = ConvertDoubleRef( pDoc, rString, nCurTab, rStart, rEnd, eConv ); @@ -258,8 +258,8 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) { if ( pBtn == &aBtnOk ) { - BYTE nMode = 3; - USHORT nError = 0; + sal_uInt8 nMode = 3; + sal_uInt16 nError = 0; // Zu ueberpruefen: // 1. enthalten die Strings korrekte Tabellenkoordinaten/def.Namen? @@ -324,7 +324,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) nMode ); ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); - SetDispatcherLock( FALSE ); + SetDispatcherLock( sal_False ); SwitchToDocument(); GetBindings().GetDispatcher()->Execute( SID_TABOP, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 7c48cf288..4bfe6264e 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -68,7 +68,7 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, // ----------------------------------------------------------------------- -void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void __EXPORT ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001 switch( nId ) @@ -118,7 +118,7 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : // ----------------------------------------------------------------------- -void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void __EXPORT ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { switch( nId ) { diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 3d970e4e5..f6b0f8b5d 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -75,14 +75,14 @@ ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : bool ScReplaceWarnBox::IsDialogEnabled() { - return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == TRUE; + return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == sal_True; } void ScReplaceWarnBox::DisableDialog() { ScModule* pScMod = SC_MOD(); ScInputOptions aInputOpt( pScMod->GetInputOptions() ); - aInputOpt.SetReplaceCellsWarn( FALSE ); + aInputOpt.SetReplaceCellsWarn( sal_False ); pScMod->SetInputOptions( aInputOpt ); } |