diff options
Diffstat (limited to 'sc/source/ui/view/tabvwsh4.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 374 |
1 files changed, 187 insertions, 187 deletions
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 0835d08de9fd..f219708ee7fd 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -107,13 +107,13 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -USHORT ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC; -USHORT ScTabViewShell::nInsCellsCtrlState = 0; -USHORT ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; +sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC; +sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0; +sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; // ----------------------------------------------------------------------- -void __EXPORT ScTabViewShell::Activate(BOOL bMDI) +void __EXPORT ScTabViewShell::Activate(sal_Bool bMDI) { SfxViewShell::Activate(bMDI); @@ -125,7 +125,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) ScModule* pScMod = SC_MOD(); pScMod->ViewShellChanged(); - ActivateView( TRUE, bFirstActivate ); + ActivateView( sal_True, bFirstActivate ); ActivateOlk( GetViewData() ); // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat @@ -166,12 +166,12 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) } } - UpdateInputHandler( TRUE ); + UpdateInputHandler( sal_True ); if ( bFirstActivate ) { SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_NAVIGATOR_UPDATEALL ) ); - bFirstActivate = FALSE; + bFirstActivate = sal_False; // #116278# ReadExtOptions (view settings from Excel import) must also be done // after the ctor, because of the potential calls to Window::Show. @@ -183,7 +183,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) if ( pExtOpt && pExtOpt->IsChanged() ) { GetViewData()->ReadExtOptions(*pExtOpt); // Excel view settings - SetTabNo( GetViewData()->GetTabNo(), TRUE ); + SetTabNo( GetViewData()->GetTabNo(), sal_True ); pExtOpt->SetChanged( false ); } } @@ -209,7 +209,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) if(pScMod->IsRefDialogOpen()) { - USHORT nModRefDlgId=pScMod->GetCurRefDlgId(); + sal_uInt16 nModRefDlgId=pScMod->GetCurRefDlgId(); SfxChildWindow* pChildWnd = pThisFrame->GetChildWindow( nModRefDlgId ); if ( pChildWnd ) { @@ -227,7 +227,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) // beim Umschalten zwischen Dokumenten) } -void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) +void __EXPORT ScTabViewShell::Deactivate(sal_Bool bMDI) { HideTip(); @@ -249,17 +249,17 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) { // #85421# during shell deactivation, shells must not be switched, or the loop // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work - BOOL bOldDontSwitch = bDontSwitch; - bDontSwitch = TRUE; + sal_Bool bOldDontSwitch = bDontSwitch; + bDontSwitch = sal_True; DeActivateOlk( GetViewData() ); - ActivateView( FALSE, FALSE ); + ActivateView( sal_False, sal_False ); if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace - GetViewData()->GetDocShell()->UpdateOle(GetViewData(),TRUE); + GetViewData()->GetDocShell()->UpdateOle(GetViewData(),sal_True); if ( pHdl ) - pHdl->NotifyChange( NULL, TRUE ); // Timer-verzoegert wg. Dokumentwechsel + pHdl->NotifyChange( NULL, sal_True ); // Timer-verzoegert wg. Dokumentwechsel if (pScActiveViewShell == this) pScActiveViewShell = NULL; @@ -289,7 +289,7 @@ void ScTabViewShell::SetActive() #endif } -USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing) +sal_uInt16 __EXPORT ScTabViewShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) { // Call EnterHandler even in formula mode here, // so a formula change in an embedded object isn't lost @@ -316,8 +316,8 @@ USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing) if ( pFormShell ) { - USHORT nRet = pFormShell->PrepareClose(bUI, bForBrowsing); - if (nRet!=TRUE) + sal_uInt16 nRet = pFormShell->PrepareClose(bUI, bForBrowsing); + if (nRet!=sal_True) return nRet; } return SfxViewShell::PrepareClose(bUI,bForBrowsing); @@ -414,7 +414,7 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r aNewSize.Height() += aBorder.Top() + aBorder.Bottom(); } - DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin + DoResize( rOfs, aNewSize, sal_True ); // rSize = Groesse von gridwin UpdateOleZoom(); // Zoom fuer In-Place berechnen @@ -455,7 +455,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract aNewY = aFrac400; GetViewData()->UpdateScreenZoom( aNewX, aNewY ); - SetZoom( aNewX, aNewY, TRUE ); + SetZoom( aNewX, aNewY, sal_True ); PaintGrid(); PaintTop(); @@ -478,7 +478,7 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const SCCOL nCol = pViewData->GetPosX(WhichH(ePos)); SCROW nRow = pViewData->GetPosY(WhichV(ePos)); SCTAB nTab = pViewData->GetTabNo(); - BOOL bNegativePage = pDoc->IsNegativePage( nTab ); + sal_Bool bNegativePage = pDoc->IsNegativePage( nTab ); Rectangle aLogicRect = pDoc->GetMMRect( nCol, nRow, nCol, nRow, nTab ); if ( bNegativePage ) @@ -505,14 +505,14 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aTest.X(), aTest.Y(), ePos, nPosX, nPosY ); - BOOL bLeft; - BOOL bTop; + sal_Bool bLeft; + sal_Bool bTop; pViewData->GetMouseQuadrant( aTest, ePos, nPosX, nPosY, bLeft, bTop ); if (!bLeft) ++nPosX; if (!bTop) ++nPosY; - aTest = pViewData->GetScrPos( (SCCOL)nPosX, (SCROW)nPosY, ePos, TRUE ); + aTest = pViewData->GetScrPos( (SCCOL)nPosX, (SCROW)nPosY, ePos, sal_True ); rRect.SetSize(Size(aTest.X(),aTest.Y())); #endif @@ -547,7 +547,7 @@ void __EXPORT ScTabViewShell::ShowCursor(FASTBOOL /* bOn */) //------------------------------------------------------------------ -void __EXPORT ScTabViewShell::WriteUserData(String& rData, BOOL /* bBrowse */) +void __EXPORT ScTabViewShell::WriteUserData(String& rData, sal_Bool /* bBrowse */) { GetViewData()->WriteUserData(rData); } @@ -557,7 +557,7 @@ void ScTabViewShell::WriteUserDataSequence (uno::Sequence < beans::PropertyValue GetViewData()->WriteUserDataSequence (rSettings); } -void __EXPORT ScTabViewShell::ReadUserData(const String& rData, BOOL /* bBrowse */) +void __EXPORT ScTabViewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */) { if ( !GetViewData()->GetDocShell()->IsPreview() ) DoReadUserData( rData ); @@ -572,13 +572,13 @@ void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::Property void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::PropertyValue >& rSettings ) { Window* pOldWin = GetActiveWin(); - BOOL bFocus = pOldWin && pOldWin->HasFocus(); + sal_Bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData()->ReadUserDataSequence(rSettings); - SetTabNo( GetViewData()->GetTabNo(), TRUE ); + SetTabNo( GetViewData()->GetTabNo(), sal_True ); if ( GetViewData()->IsPagebreakMode() ) - SetCurSubShell( GetCurObjectSelectionType(), TRUE ); + SetCurSubShell( GetCurObjectSelectionType(), sal_True ); Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) @@ -607,13 +607,13 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper void ScTabViewShell::DoReadUserData( const String& rData ) { Window* pOldWin = GetActiveWin(); - BOOL bFocus = pOldWin && pOldWin->HasFocus(); + sal_Bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData()->ReadUserData(rData); - SetTabNo( GetViewData()->GetTabNo(), TRUE ); + SetTabNo( GetViewData()->GetTabNo(), sal_True ); if ( GetViewData()->IsPagebreakMode() ) - SetCurSubShell( GetCurObjectSelectionType(), TRUE ); + SetCurSubShell( GetCurObjectSelectionType(), sal_True ); Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) @@ -649,7 +649,7 @@ void ScTabViewShell::DoReadUserData( const String& rData ) //UNUSED2008-05 void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) //UNUSED2008-05 { //UNUSED2008-05 SfxWhichIter aIter( rSet ); -//UNUSED2008-05 USHORT nWhich = aIter.FirstWhich(); +//UNUSED2008-05 sal_uInt16 nWhich = aIter.FirstWhich(); //UNUSED2008-05 //UNUSED2008-05 while ( nWhich ) //UNUSED2008-05 { @@ -660,7 +660,7 @@ void ScTabViewShell::DoReadUserData( const String& rData ) void ScTabViewShell::SetDrawShellOrSub() { - bActiveDrawSh = TRUE; + bActiveDrawSh = sal_True; if(bActiveDrawFormSh) { @@ -690,7 +690,7 @@ void ScTabViewShell::SetDrawShellOrSub() } } -void ScTabViewShell::SetDrawShell( BOOL bActive ) +void ScTabViewShell::SetDrawShell( sal_Bool bActive ) { if(bActive) { @@ -706,17 +706,17 @@ void ScTabViewShell::SetDrawShell( BOOL bActive ) { SetCurSubShell(OST_Cell); } - bActiveDrawFormSh=FALSE; - bActiveGraphicSh=FALSE; - bActiveMediaSh=FALSE; - bActiveOleObjectSh=FALSE; - bActiveChartSh=FALSE; + bActiveDrawFormSh=sal_False; + bActiveGraphicSh=sal_False; + bActiveMediaSh=sal_False; + bActiveOleObjectSh=sal_False; + bActiveChartSh=sal_False; } - BOOL bWasDraw = bActiveDrawSh || bActiveDrawTextSh; + sal_Bool bWasDraw = bActiveDrawSh || bActiveDrawTextSh; bActiveDrawSh = bActive; - bActiveDrawTextSh = FALSE; + bActiveDrawTextSh = sal_False; if ( !bActive ) { @@ -727,22 +727,22 @@ void ScTabViewShell::SetDrawShell( BOOL bActive ) { // Aktiven Teil an Cursor anpassen, etc. MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(), - SC_FOLLOW_NONE, FALSE, FALSE, TRUE ); + SC_FOLLOW_NONE, sal_False, sal_False, sal_True ); } } } -void ScTabViewShell::SetDrawTextShell( BOOL bActive ) +void ScTabViewShell::SetDrawTextShell( sal_Bool bActive ) { bActiveDrawTextSh = bActive; if ( bActive ) { - bActiveDrawFormSh=FALSE; - bActiveGraphicSh=FALSE; - bActiveMediaSh=FALSE; - bActiveOleObjectSh=FALSE; - bActiveChartSh=FALSE; - bActiveDrawSh = FALSE; + bActiveDrawFormSh=sal_False; + bActiveGraphicSh=sal_False; + bActiveMediaSh=sal_False; + bActiveOleObjectSh=sal_False; + bActiveChartSh=sal_False; + bActiveDrawSh = sal_False; SetCurSubShell(OST_DrawText); } else @@ -750,7 +750,7 @@ void ScTabViewShell::SetDrawTextShell( BOOL bActive ) } -void ScTabViewShell::SetPivotShell( BOOL bActive ) +void ScTabViewShell::SetPivotShell( sal_Bool bActive ) { bActivePivotSh = bActive; @@ -761,12 +761,12 @@ void ScTabViewShell::SetPivotShell( BOOL bActive ) { if ( bActive ) { - bActiveDrawTextSh = bActiveDrawSh = FALSE; - bActiveDrawFormSh=FALSE; - bActiveGraphicSh=FALSE; - bActiveMediaSh=FALSE; - bActiveOleObjectSh=FALSE; - bActiveChartSh=FALSE; + bActiveDrawTextSh = bActiveDrawSh = sal_False; + bActiveDrawFormSh=sal_False; + bActiveGraphicSh=sal_False; + bActiveMediaSh=sal_False; + bActiveOleObjectSh=sal_False; + bActiveChartSh=sal_False; SetCurSubShell(OST_Pivot); } else @@ -774,31 +774,31 @@ void ScTabViewShell::SetPivotShell( BOOL bActive ) } } -void ScTabViewShell::SetAuditShell( BOOL bActive ) +void ScTabViewShell::SetAuditShell( sal_Bool bActive ) { bActiveAuditingSh = bActive; if ( bActive ) { - bActiveDrawTextSh = bActiveDrawSh = FALSE; - bActiveDrawFormSh=FALSE; - bActiveGraphicSh=FALSE; - bActiveMediaSh=FALSE; - bActiveOleObjectSh=FALSE; - bActiveChartSh=FALSE; + bActiveDrawTextSh = bActiveDrawSh = sal_False; + bActiveDrawFormSh=sal_False; + bActiveGraphicSh=sal_False; + bActiveMediaSh=sal_False; + bActiveOleObjectSh=sal_False; + bActiveChartSh=sal_False; SetCurSubShell(OST_Auditing); } else SetCurSubShell(OST_Cell); } -void ScTabViewShell::SetDrawFormShell( BOOL bActive ) +void ScTabViewShell::SetDrawFormShell( sal_Bool bActive ) { bActiveDrawFormSh = bActive; if(bActiveDrawFormSh) SetCurSubShell(OST_DrawForm); } -void ScTabViewShell::SetChartShell( BOOL bActive ) +void ScTabViewShell::SetChartShell( sal_Bool bActive ) { bActiveChartSh = bActive; @@ -806,7 +806,7 @@ void ScTabViewShell::SetChartShell( BOOL bActive ) SetCurSubShell(OST_Chart); } -void ScTabViewShell::SetGraphicShell( BOOL bActive ) +void ScTabViewShell::SetGraphicShell( sal_Bool bActive ) { bActiveGraphicSh = bActive; @@ -814,7 +814,7 @@ void ScTabViewShell::SetGraphicShell( BOOL bActive ) SetCurSubShell(OST_Graphic); } -void ScTabViewShell::SetMediaShell( BOOL bActive ) +void ScTabViewShell::SetMediaShell( sal_Bool bActive ) { bActiveMediaSh = bActive; @@ -822,7 +822,7 @@ void ScTabViewShell::SetMediaShell( BOOL bActive ) SetCurSubShell(OST_Media); } -void ScTabViewShell::SetOleObjectShell( BOOL bActive ) +void ScTabViewShell::SetOleObjectShell( sal_Bool bActive ) { bActiveOleObjectSh = bActive; @@ -832,7 +832,7 @@ void ScTabViewShell::SetOleObjectShell( BOOL bActive ) SetCurSubShell(OST_Cell); } -void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive ) +void ScTabViewShell::SetEditShell(EditView* pView, sal_Bool bActive ) { if(bActive) { @@ -850,7 +850,7 @@ void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive ) bActiveEditSh = bActive; } -void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) +void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, sal_Bool bForce) { ScViewData* pViewData = GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -863,7 +863,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pCellShell->SetRepeatTarget( &aTarget ); } - BOOL bPgBrk=pViewData->IsPagebreakMode(); + sal_Bool bPgBrk=pViewData->IsPagebreakMode(); if(bPgBrk && !pPageBreakShell) { @@ -874,8 +874,8 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) if ( eOST!=eCurOST || bForce ) { - BOOL bCellBrush = FALSE; // "format paint brush" allowed for cells - BOOL bDrawBrush = FALSE; // "format paint brush" allowed for drawing objects + sal_Bool bCellBrush = sal_False; // "format paint brush" allowed for cells + sal_Bool bDrawBrush = sal_False; // "format paint brush" allowed for drawing objects if(eCurOST!=OST_NONE) RemoveSubShell(); @@ -888,7 +888,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); - bCellBrush = TRUE; + bCellBrush = sal_True; } break; case OST_Editing: @@ -935,7 +935,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pDrawShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pDrawShell); - bDrawBrush = TRUE; + bDrawBrush = sal_True; } break; @@ -948,7 +948,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pDrawFormShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pDrawFormShell); - bDrawBrush = TRUE; + bDrawBrush = sal_True; } break; @@ -961,7 +961,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pChartShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pChartShell); - bDrawBrush = TRUE; + bDrawBrush = sal_True; } break; @@ -974,7 +974,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pOleObjectShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pOleObjectShell); - bDrawBrush = TRUE; + bDrawBrush = sal_True; } break; @@ -987,7 +987,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pGraphicShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pGraphicShell); - bDrawBrush = TRUE; + bDrawBrush = sal_True; } break; @@ -1014,7 +1014,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pPivotShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pPivotShell); - bCellBrush = TRUE; + bCellBrush = sal_True; } break; case OST_Auditing: @@ -1030,7 +1030,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) pAuditingShell->SetRepeatTarget( &aTarget ); } AddSubShell(*pAuditingShell); - bCellBrush = TRUE; + bCellBrush = sal_True; } break; default: @@ -1049,7 +1049,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } } -void ScTabViewShell::SetFormShellAtTop( BOOL bSet ) +void ScTabViewShell::SetFormShellAtTop( sal_Bool bSet ) { if ( pFormShell && !bSet ) pFormShell->ForgetActiveControl(); // let the FormShell know it no longer has the focus @@ -1057,14 +1057,14 @@ void ScTabViewShell::SetFormShellAtTop( BOOL bSet ) if ( bFormShellAtTop != bSet ) { bFormShellAtTop = bSet; - SetCurSubShell( GetCurObjectSelectionType(), TRUE ); + SetCurSubShell( GetCurObjectSelectionType(), sal_True ); } } IMPL_LINK( ScTabViewShell, FormControlActivated, FmFormShell*, EMPTYARG ) { // a form control got the focus, so the form shell has to be on top - SetFormShellAtTop( TRUE ); + SetFormShellAtTop( sal_True ); return 0; } @@ -1078,9 +1078,9 @@ ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType() SfxShell* ScTabViewShell::GetMySubShell() const { - // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein... + // GetSubShell() war frueher const, und GetSubShell(sal_uInt16) sollte es auch sein... - USHORT nPos = 0; + sal_uInt16 nPos = 0; SfxShell* pSub = ((ScTabViewShell*)this)->GetSubShell(nPos); while (pSub) { @@ -1107,12 +1107,12 @@ SfxShell* ScTabViewShell::GetMySubShell() const //UNUSED2008-05 } //UNUSED2008-05 } -BOOL ScTabViewShell::IsDrawTextShell() const +sal_Bool ScTabViewShell::IsDrawTextShell() const { return ( pDrawTextShell && ( GetMySubShell() == pDrawTextShell ) ); } -BOOL ScTabViewShell::IsAuditShell() const +sal_Bool ScTabViewShell::IsAuditShell() const { return ( pAuditingShell && ( GetMySubShell() == pAuditingShell ) ); } @@ -1148,13 +1148,13 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() //------------------------------------------------------------------ -SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate ) +SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( sal_Bool bCreate ) { // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) return GetViewData()->GetDocShell()->GetPrinter(bCreate); } -USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool ) +sal_uInt16 __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool ) { return GetViewData()->GetDocShell()->SetPrinter( pNewPrinter, nDiffFlags ); } @@ -1203,8 +1203,8 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) pDlg->EnableRange ( PRINTDIALOG_RANGE ); pDlg->SetFirstPage ( 1 ); pDlg->SetMinPage ( 1 ); - pDlg->SetLastPage ( (USHORT)nDocPageMax ); - pDlg->SetMaxPage ( (USHORT)nDocPageMax ); + pDlg->SetLastPage ( (sal_uInt16)nDocPageMax ); + pDlg->SetMaxPage ( (sal_uInt16)nDocPageMax ); pDlg->EnableCollate (); return pDlg; @@ -1230,7 +1230,7 @@ void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog ) } ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, - PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ) + PrintDialog *pPrintDialog, sal_Bool bSilent, sal_Bool bIsAPI ) { // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection, // ask if only the selection should be printed @@ -1245,7 +1245,7 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, return ERRCODE_IO_ABORT; if ( nBtn == RET_OK ) - bPrintSelected = TRUE; + bPrintSelected = sal_True; } ErrCode nRet = ERRCODE_IO_ABORT; @@ -1258,7 +1258,7 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, uno::Sequence<sal_Int32> aSheets; SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); - USHORT nPrinted = 0; + sal_uInt16 nPrinted = 0; for ( SCTAB nTab=0; nTab<nTabCount; nTab++ ) if ( bAllTabs || rMarkData.GetTableSelect(nTab) ) { @@ -1276,12 +1276,12 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, nRet = SfxViewShell::DoPrint( pPrinter, pPrintDialog, bSilent, bIsAPI ); } - bPrintSelected = FALSE; + bPrintSelected = sal_False; return nRet; } -USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, +sal_uInt16 __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, sal_Bool bIsAPI, PrintDialog* pPrintDialog ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -1296,7 +1296,7 @@ USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, void ScTabViewShell::StopEditShell() { if ( pEditShell != NULL && !bDontSwitch ) - SetEditShell(NULL, FALSE ); + SetEditShell(NULL, sal_False ); } //------------------------------------------------------------------ @@ -1314,7 +1314,7 @@ IMPL_LINK( ScTabViewShell, SimpleRefClose, String*, EMPTYARG ) SetTabNo( GetViewData()->GetRefTabNo() ); } - ScSimpleRefDlgWrapper::SetAutoReOpen( TRUE ); + ScSimpleRefDlgWrapper::SetAutoReOpen( sal_True ); return 0; } @@ -1360,7 +1360,7 @@ IMPL_LINK( ScTabViewShell, SimpleRefChange, String*, pResult ) void ScTabViewShell::StartSimpleRefDialog( const String& rTitle, const String& rInitVal, - BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection ) + sal_Bool bCloseOnButtonUp, sal_Bool bSingleCell, sal_Bool bMultiSelection ) { SfxViewFrame* pViewFrm = GetViewFrame(); @@ -1373,9 +1373,9 @@ void ScTabViewShell::StartSimpleRefDialog( pViewFrm->GetFrame().Appear(); } - USHORT nId = ScSimpleRefDlgWrapper::GetChildWindowId(); + sal_uInt16 nId = ScSimpleRefDlgWrapper::GetChildWindowId(); - SC_MOD()->SetRefDialog( nId, TRUE, pViewFrm ); + SC_MOD()->SetRefDialog( nId, sal_True, pViewFrm ); ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId ); if (pWnd) @@ -1386,7 +1386,7 @@ void ScTabViewShell::StartSimpleRefDialog( LINK( this, ScTabViewShell, SimpleRefChange ) ); pWnd->SetRefString( rInitVal ); pWnd->SetFlags( bCloseOnButtonUp, bSingleCell, bMultiSelection ); - pWnd->SetAutoReOpen( FALSE ); + pWnd->SetAutoReOpen( sal_False ); Window* pWin = pWnd->GetWindow(); pWin->SetText( rTitle ); pWnd->StartRefInput(); @@ -1396,7 +1396,7 @@ void ScTabViewShell::StartSimpleRefDialog( void ScTabViewShell::StopSimpleRefDialog() { SfxViewFrame* pViewFrm = GetViewFrame(); - USHORT nId = ScSimpleRefDlgWrapper::GetChildWindowId(); + sal_uInt16 nId = ScSimpleRefDlgWrapper::GetChildWindowId(); ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId ); if (pWnd) @@ -1409,29 +1409,29 @@ void ScTabViewShell::StopSimpleRefDialog() //------------------------------------------------------------------ -BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) +sal_Bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { ScModule* pScMod = SC_MOD(); SfxViewFrame* pThisFrame = GetViewFrame(); if ( pThisFrame->GetChildWindow( SID_OPENDLG_FUNCTION ) ) - return FALSE; + return sal_False; KeyCode aCode = rKEvt.GetKeyCode(); - BOOL bShift = aCode.IsShift(); - BOOL bControl = aCode.IsMod1(); - BOOL bAlt = aCode.IsMod2(); - USHORT nCode = aCode.GetCode(); - BOOL bUsed = FALSE; - BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles - BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace - BOOL bDraw = IsDrawTextEdit(); + sal_Bool bShift = aCode.IsShift(); + sal_Bool bControl = aCode.IsMod1(); + sal_Bool bAlt = aCode.IsMod2(); + sal_uInt16 nCode = aCode.GetCode(); + sal_Bool bUsed = sal_False; + sal_Bool bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles + sal_Bool bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace + sal_Bool bDraw = IsDrawTextEdit(); HideNoteMarker(); // Notiz-Anzeige // don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet - BOOL bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() ); - BOOL bHideCursor = ( ( nCode == KEY_RETURN && bInPlace ) || nCode == KEY_TAB ) && bOnRefSheet; + sal_Bool bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() ); + sal_Bool bHideCursor = ( ( nCode == KEY_RETURN && bInPlace ) || nCode == KEY_TAB ) && bOnRefSheet; if (bHideCursor) HideAllCursors(); @@ -1444,17 +1444,17 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) - bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators + bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt )); // accelerators } else if( bAnyEdit ) { - BOOL bIsType = FALSE; - USHORT nModi = aCode.GetModifier(); - USHORT nGroup = aCode.GetGroup(); + sal_Bool bIsType = sal_False; + sal_uInt16 nModi = aCode.GetModifier(); + sal_uInt16 nGroup = aCode.GetGroup(); if ( nGroup == KEYGROUP_NUM || nGroup == KEYGROUP_ALPHA || nGroup == 0 ) if ( !bControl && !bAlt ) - bIsType = TRUE; + bIsType = sal_True; if ( nGroup == KEYGROUP_MISC ) switch ( nCode ) @@ -1477,14 +1477,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) bIsType = (nModi == 0); // nur ohne Modifier break; default: - bIsType = TRUE; + bIsType = sal_True; } if( bIsType ) bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) - bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators + bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt )); // accelerators if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher bUsed = pScMod->InputKeyEvent( rKEvt ); @@ -1502,20 +1502,20 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) !(eFunc == KEYFUNC_COPY && eMarkType == SC_MARK_SIMPLE_FILTERED) ) { ErrorMessage(STR_NOMULTISELECT); - bUsed = TRUE; + bUsed = sal_True; } } if (!bUsed) - bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators + bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt )); // accelerators // #74696# during inplace editing, some slots are handled by the // container app and are executed during Window::KeyInput. // -> don't pass keys to input handler that would be used there // but should call slots instead. - BOOL bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW ); + sal_Bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW ); if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent ) - bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt, sal_True ); // Eingabe } if (!bInPlace && !bUsed && !bDraw) @@ -1524,7 +1524,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { case KEY_RETURN: { - BOOL bNormal = !bControl && !bAlt; + sal_Bool bNormal = !bControl && !bAlt; if ( !bAnyEdit && bNormal ) { // je nach Optionen mit Enter in den Edit-Modus schalten @@ -1533,17 +1533,17 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if ( rOpt.GetEnterEdit() ) { pScMod->SetInputMode( SC_INPUT_TABLE ); - bUsed = TRUE; + bUsed = sal_True; } } - BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter + sal_Bool bEditReturn = bControl && !bShift; // An Edit-Engine weiter if ( !bUsed && !bEditReturn ) { if ( bOnRefSheet ) HideAllCursors(); - BYTE nMode = SC_ENTER_NORMAL; + sal_uInt8 nMode = SC_ENTER_NORMAL; if ( bShift && bControl ) nMode = SC_ENTER_MATRIX; else if ( bAlt ) @@ -1560,7 +1560,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else - UpdateInputHandler(TRUE); + UpdateInputHandler(sal_True); if ( bOnRefSheet ) ShowAllCursors(); @@ -1569,7 +1569,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben // wird! - bUsed = TRUE; + bUsed = sal_True; } } break; @@ -1580,24 +1580,24 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if ( !bUsed && bAlt && !bControl ) { - USHORT nSlotId = 0; + sal_uInt16 nSlotId = 0; switch (nCode) { case KEY_UP: ModifyCellSize( DIR_TOP, bShift ); - bUsed = TRUE; + bUsed = sal_True; break; case KEY_DOWN: ModifyCellSize( DIR_BOTTOM, bShift ); - bUsed = TRUE; + bUsed = sal_True; break; case KEY_LEFT: ModifyCellSize( DIR_LEFT, bShift ); - bUsed = TRUE; + bUsed = sal_True; break; case KEY_RIGHT: ModifyCellSize( DIR_RIGHT, bShift ); - bUsed = TRUE; + bUsed = sal_True; break; case KEY_PAGEUP: nSlotId = bShift ? SID_CURSORPAGELEFT_SEL : SID_CURSORPAGELEFT_; @@ -1609,7 +1609,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if ( nSlotId ) { GetViewData()->GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); - bUsed = TRUE; + bUsed = sal_True; } } @@ -1619,9 +1619,9 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) return bUsed; } -BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) +sal_Bool ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) { - return sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKeyEvent )); + return sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKeyEvent )); } FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) @@ -1657,31 +1657,31 @@ FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) aTarget( this ), \ pDialogDPObject(NULL), \ pNavSettings(NULL), \ - bActiveDrawSh(FALSE), \ - bActiveDrawTextSh(FALSE), \ - bActivePivotSh(FALSE), \ - bActiveAuditingSh(FALSE), \ - bActiveDrawFormSh(FALSE), \ - bActiveOleObjectSh(FALSE), \ - bActiveChartSh(FALSE), \ - bActiveGraphicSh(FALSE), \ - bActiveMediaSh(FALSE), \ - bActiveEditSh(FALSE), \ - bFormShellAtTop(FALSE), \ - bDontSwitch(FALSE), \ - bInFormatDialog(FALSE), \ - bPrintSelected(FALSE), \ - bReadOnly(FALSE), \ + bActiveDrawSh(sal_False), \ + bActiveDrawTextSh(sal_False), \ + bActivePivotSh(sal_False), \ + bActiveAuditingSh(sal_False), \ + bActiveDrawFormSh(sal_False), \ + bActiveOleObjectSh(sal_False), \ + bActiveChartSh(sal_False), \ + bActiveGraphicSh(sal_False), \ + bActiveMediaSh(sal_False), \ + bActiveEditSh(sal_False), \ + bFormShellAtTop(sal_False), \ + bDontSwitch(sal_False), \ + bInFormatDialog(sal_False), \ + bPrintSelected(sal_False), \ + bReadOnly(sal_False), \ pScSbxObject(NULL), \ - /*bChartDlgIsEdit(FALSE),*/ \ - bChartAreaValid(FALSE), \ + /*bChartDlgIsEdit(sal_False),*/ \ + bChartAreaValid(sal_False), \ nCurRefDlgId(0), \ pAccessibilityBroadcaster(NULL) //------------------------------------------------------------------ -void ScTabViewShell::Construct( BYTE nForceDesignMode ) +void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1697,12 +1697,12 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); pPivotSource = new ScArea; - StartListening(*GetViewData()->GetDocShell(),TRUE); - StartListening(*GetViewFrame(),TRUE); - StartListening(*pSfxApp,TRUE); // #i62045# #i62046# application is needed for Calc's own hints + StartListening(*GetViewData()->GetDocShell(),sal_True); + StartListening(*GetViewFrame(),sal_True); + StartListening(*pSfxApp,sal_True); // #i62045# #i62046# application is needed for Calc's own hints SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh); - BOOL bFirstView = !pFirst + sal_Bool bFirstView = !pFirst || (pFirst == GetViewFrame() && !SfxViewFrame::GetNext(*pFirst,pDocSh)); if ( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) @@ -1717,19 +1717,19 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pDoc->SetVisibleTab(nVisTab); } SetTabNo( nVisTab ); - BOOL bNegativePage = pDoc->IsNegativePage( nVisTab ); + sal_Bool bNegativePage = pDoc->IsNegativePage( nVisTab ); // show the right cells GetViewData()->SetScreenPos( bNegativePage ? aVisArea.TopRight() : aVisArea.TopLeft() ); if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace { - pDocSh->SetInplace( TRUE ); // schon so initialisiert + pDocSh->SetInplace( sal_True ); // schon so initialisiert if (pDoc->IsEmbedded()) pDoc->ResetEmbedded(); // keine blaue Markierung } else if ( bFirstView ) { - pDocSh->SetInplace( FALSE ); + pDocSh->SetInplace( sal_False ); GetViewData()->RefreshZoom(); // recalculate PPT if (!pDoc->IsEmbedded()) pDoc->SetEmbedded( aVisArea ); // VisArea markieren @@ -1762,7 +1762,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // wenn die ViewShell noch nicht kostruiert ist... if (pDoc->GetDrawLayer()) MakeDrawView( nForceDesignMode ); - ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an + ViewOptionsHasChanged(sal_False); // legt auch evtl. DrawView an SfxUndoManager* pMgr = pDocSh->GetUndoManager(); SetUndoManager( pMgr ); @@ -1777,7 +1777,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) if ( bFirstView ) // first view? { - pDoc->SetDocVisible( TRUE ); // used when creating new sheets + pDoc->SetDocVisible( sal_True ); // used when creating new sheets if ( pDocSh->IsEmpty() ) { // set first sheet's RTL flag (following will already be initialized because of SetDocVisible) @@ -1791,7 +1791,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pDoc->MakeTable(i,false); } - pDocSh->SetEmpty( FALSE ); // #i6232# make sure this is done only once + pDocSh->SetEmpty( sal_False ); // #i6232# make sure this is done only once } // ReadExtOptions is now in Activate @@ -1812,7 +1812,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) } if (!bLink) if (pDoc->HasDdeLinks() || pDoc->HasAreaLinks()) - bLink = TRUE; + bLink = sal_True; if (bLink) { if ( !pFirst ) @@ -1825,17 +1825,17 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) } } - BOOL bReImport = FALSE; // importierte Daten aktualisieren + sal_Bool bReImport = sal_False; // importierte Daten aktualisieren ScDBCollection* pDBColl = pDoc->GetDBCollection(); if ( pDBColl ) { - USHORT nCount = pDBColl->GetCount(); - for (USHORT i=0; i<nCount && !bReImport; i++) + sal_uInt16 nCount = pDBColl->GetCount(); + for (sal_uInt16 i=0; i<nCount && !bReImport; i++) { ScDBData* pData = (*pDBColl)[i]; if ( pData->IsStripData() && pData->HasImportParam() && !pData->HasImportSelection() ) - bReImport = TRUE; + bReImport = sal_True; } } if (bReImport) @@ -1856,10 +1856,10 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // ScDispatchProviderInterceptor registers itself in ctor xDisProvInterceptor = new ScDispatchProviderInterceptor( this ); - bFirstActivate = TRUE; // NavigatorUpdate aufschieben bis Activate() + bFirstActivate = sal_True; // NavigatorUpdate aufschieben bis Activate() // #105575#; update only in the first creation of the ViewShell - pDocSh->SetUpdateEnabled(FALSE); + pDocSh->SetUpdateEnabled(sal_False); if ( GetViewFrame()->GetFrame().IsInPlace() ) UpdateHeaderWidth(); // The implace activation requires headers to be calculated @@ -1913,7 +1913,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. // #106334# old DesignMode state from form layer must be restored, too - BYTE nForceDesignMode = SC_FORCEMODE_NONE; + sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE; if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) { ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh); @@ -1925,13 +1925,13 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, if ( GetViewData()->GetDocShell()->IsPreview() ) { // preview for template dialog: always show whole page - SetZoomType( SVX_ZOOM_WHOLEPAGE, TRUE ); // zoom value is recalculated at next Resize + SetZoomType( SVX_ZOOM_WHOLEPAGE, sal_True ); // zoom value is recalculated at next Resize } else { Fraction aFract( rAppOpt.GetZoom(), 100 ); - SetZoom( aFract, aFract, TRUE ); - SetZoomType( rAppOpt.GetZoomType(), TRUE ); + SetZoom( aFract, aFract, sal_True ); + SetZoomType( rAppOpt.GetZoomType(), sal_True ); } /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface(); @@ -2029,7 +2029,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { - bChartAreaValid = TRUE; + bChartAreaValid = sal_True; aChartSource = rSource; aChartPos = rDest; nChartDestTab = GetViewData()->GetTabNo(); @@ -2037,10 +2037,10 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl //UNUSED2008-05 void ScTabViewShell::ResetChartArea() //UNUSED2008-05 { -//UNUSED2008-05 bChartAreaValid = FALSE; +//UNUSED2008-05 bChartAreaValid = sal_False; //UNUSED2008-05 } -BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const +sal_Bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { rSource = aChartSource; rDest = aChartPos; @@ -2048,7 +2048,7 @@ BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC return bChartAreaValid; } -//UNUSED2008-05 BOOL ScTabViewShell::IsChartDlgEdit() const +//UNUSED2008-05 sal_Bool ScTabViewShell::IsChartDlgEdit() const //UNUSED2008-05 { //UNUSED2008-05 return bChartDlgIsEdit; //UNUSED2008-05 } @@ -2071,10 +2071,10 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() void ScTabViewShell::ExecTbx( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem = NULL; if ( pReqArgs ) - pReqArgs->GetItemState( nSlot, TRUE, &pItem ); + pReqArgs->GetItemState( nSlot, sal_True, &pItem ); switch ( nSlot ) { |