summaryrefslogtreecommitdiff
path: root/sc/source/ui/navipi/navipi.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/navipi/navipi.cxx')
-rw-r--r--sc/source/ui/navipi/navipi.cxx84
1 files changed, 44 insertions, 40 deletions
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 670cd0d02125..c2988f6826b0 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -114,7 +114,7 @@ long ColumnEdit::Notify( NotifyEvent& rNEvt )
{
long nHandled = SpinField::Notify( rNEvt );
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( nType == EVENT_KEYINPUT )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -406,7 +406,7 @@ CommandToolBox::~CommandToolBox()
//------------------------------------------------------------------------
-void CommandToolBox::Select( USHORT nSelId )
+void CommandToolBox::Select( sal_uInt16 nSelId )
{
// Modus umschalten ?
@@ -474,7 +474,7 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG )
ScPopupMenu aPop( ScResId( RID_POPUP_DROPMODE ) );
aPop.CheckItem( RID_DROPMODE_URL + rDlg.GetDropMode() );
aPop.Execute( this, GetItemRect(IID_DROPMODE), POPUPMENU_EXECUTE_DOWN );
- USHORT nId = aPop.GetSelected();
+ sal_uInt16 nId = aPop.GetSelected();
EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage)
@@ -501,17 +501,17 @@ void CommandToolBox::UpdateButtons()
// Umschalten-Button:
if ( eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE )
{
- EnableItem( IID_CHANGEROOT, FALSE );
- CheckItem( IID_CHANGEROOT, FALSE );
+ EnableItem( IID_CHANGEROOT, false );
+ CheckItem( IID_CHANGEROOT, false );
}
else
{
- EnableItem( IID_CHANGEROOT, TRUE );
- BOOL bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
+ EnableItem( IID_CHANGEROOT, sal_True );
+ sal_Bool bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
CheckItem( IID_CHANGEROOT, bRootSet );
}
- USHORT nImageId = 0;
+ sal_uInt16 nImageId = 0;
switch ( rDlg.nDropMode )
{
case SC_DROPMODE_URL: nImageId = RID_IMG_DROP_URL; break;
@@ -525,10 +525,10 @@ void CommandToolBox::InitImageList()
{
ImageList& rImgLst = rDlg.aCmdImageList;
- USHORT nCount = GetItemCount();
- for (USHORT i = 0; i < nCount; i++)
+ sal_uInt16 nCount = GetItemCount();
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
- USHORT nId = GetItemId(i);
+ sal_uInt16 nId = GetItemId(i);
SetItemImage( nId, rImgLst.GetImage( nId ) );
}
}
@@ -551,7 +551,7 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt )
//==================================================================
ScNavigatorSettings::ScNavigatorSettings() :
- maExpandedVec( SC_CONTENT_COUNT, FALSE ),
+ maExpandedVec( SC_CONTENT_COUNT, false ),
mnRootSelected( SC_CONTENT_ROOT ),
mnChildSelected( SC_CONTENT_NOCHILD )
{
@@ -567,7 +567,7 @@ SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )
ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
Window* pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBind,
SfxChildWinInfo* /* pInfo */ ) :
SfxChildWindowContext( nId )
@@ -589,7 +589,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
// deshalb muessen in Abhaengigkeit von der momentanen Groesse die
// Inhalte eingeblendet werden oder nicht
- BOOL bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL );
+ sal_Bool bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL );
NavListMode eNavMode = NAV_LMODE_NONE;
if (!bSmall)
{
@@ -603,12 +603,12 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
eNavMode = NAV_LMODE_AREAS;
}
- // Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der
+ // Die Groesse des Floats nicht neu setzen (sal_False bei SetListMode), damit der
// Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#).
- pNavigator->SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
+ pNavigator->SetListMode( eNavMode, false ); // FALSE: Groesse des Float nicht setzen
- USHORT nCmdId;
+ sal_uInt16 nCmdId;
switch (eNavMode)
{
case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break;
@@ -665,7 +665,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
nCurCol ( 0 ),
nCurRow ( 0 ),
nCurTab ( 0 ),
- bFirstBig ( FALSE )
+ bFirstBig ( false )
{
ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
nDropMode = rCfg.GetDragMode();
@@ -715,7 +715,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht
- aLbEntries.InitWindowBits(TRUE);
+ aLbEntries.InitWindowBits(sal_True);
aLbEntries.SetSpaceBetweenEntries(0);
aLbEntries.SetSelectionMode( SINGLE_SELECTION );
@@ -724,7 +724,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
SV_DRAGDROP_ENABLE_TOP );
// war eine Kategorie als Root ausgewaehlt?
- USHORT nLastRoot = rCfg.GetRootType();
+ sal_uInt16 nLastRoot = rCfg.GetRootType();
if ( nLastRoot )
aLbEntries.SetRootType( nLastRoot );
@@ -744,6 +744,10 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
aContentTimer.SetTimeout( SC_CONTENT_TIMEOUT );
FreeResource();
+
+ aLbEntries.SetAccessibleRelationLabeledBy(&aLbEntries);
+ aTbxCmd.SetAccessibleRelationLabeledBy(&aTbxCmd);
+ aLbDocuments.SetAccessibleName(aStrActiveWin);
}
//------------------------------------------------------------------------
@@ -752,7 +756,7 @@ ScNavigatorDlg::~ScNavigatorDlg()
{
aContentTimer.Stop();
- USHORT i;
+ sal_uInt16 i;
for ( i=0; i<CTRL_ITEMS; i++ )
delete ppBoundItems[i];
@@ -828,18 +832,18 @@ void ScNavigatorDlg::DoResize()
// bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt,
// dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten
- BOOL bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL );
+ sal_Bool bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL );
if ( !bSmall && bFirstBig )
{
// Inhalte laut Config wieder einschalten
- bFirstBig = FALSE;
+ bFirstBig = false;
NavListMode eNavMode = NAV_LMODE_AREAS;
ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
NavListMode eLastMode = (NavListMode) rCfg.GetListMode();
if ( eLastMode == NAV_LMODE_SCENARIOS )
eNavMode = NAV_LMODE_SCENARIOS;
- SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
+ SetListMode( eNavMode, false ); // FALSE: Groesse des Float nicht setzen
}
// auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen,
@@ -868,7 +872,7 @@ void ScNavigatorDlg::DoResize()
aWndScenarios.SetSizePixel( aNewSize );
aLbDocuments.SetSizePixel( aDocSize );
- BOOL bListMode = (eListMode != NAV_LMODE_NONE);
+ sal_Bool bListMode = (eListMode != NAV_LMODE_NONE);
FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
if ( pFloat && bListMode )
nListModeHeight = nTotalHeight;
@@ -880,7 +884,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA(SfxSimpleHint) )
{
- ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
+ sal_uLong nHintId = ((SfxSimpleHint&)rHint).GetId();
if ( nHintId == SC_HINT_DOCNAME_CHANGED )
{
@@ -934,7 +938,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( rHint.ISA(SfxEventHint) )
{
- ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
+ sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId();
if ( nEventId == SFX_EVENT_ACTIVATEDOC )
{
aLbEntries.ActiveDocChanged();
@@ -956,7 +960,7 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer )
//------------------------------------------------------------------------
-void ScNavigatorDlg::SetDropMode(USHORT nNew)
+void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
{
nDropMode = nNew;
aTbxCmd.UpdateButtons();
@@ -989,7 +993,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
String aAddr;
aScAddress.Format( aAddr, SCA_ABS );
- BOOL bUnmark = FALSE;
+ sal_Bool bUnmark = false;
if ( GetViewData() )
bUnmark = !pViewData->GetMarkData().IsCellMarked( nColNo, nRowNo );
@@ -1089,7 +1093,7 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings()
//------------------------------------------------------------------------
-BOOL ScNavigatorDlg::GetViewData()
+sal_Bool ScNavigatorDlg::GetViewData()
{
ScTabViewShell* pViewSh = GetTabViewShell();
pViewData = pViewSh ? pViewSh->GetViewData() : NULL;
@@ -1160,30 +1164,30 @@ void ScNavigatorDlg::UpdateAll()
//------------------------------------------------------------------------
-void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
+void ScNavigatorDlg::SetListMode( NavListMode eMode, sal_Bool bSetSize )
{
if ( eMode != eListMode )
{
if ( eMode != NAV_LMODE_NONE )
- bFirstBig = FALSE; // nicht mehr automatisch umschalten
+ bFirstBig = false; // nicht mehr automatisch umschalten
eListMode = eMode;
switch ( eMode )
{
case NAV_LMODE_NONE:
- ShowList( FALSE, bSetSize );
+ ShowList( false, bSetSize );
break;
case NAV_LMODE_AREAS:
case NAV_LMODE_DBAREAS:
case NAV_LMODE_DOCS:
aLbEntries.Refresh();
- ShowList( TRUE, bSetSize );
+ ShowList( sal_True, bSetSize );
break;
case NAV_LMODE_SCENARIOS:
- ShowScenarios( TRUE, bSetSize );
+ ShowScenarios( sal_True, bSetSize );
break;
}
@@ -1192,7 +1196,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
if ( eMode != NAV_LMODE_NONE )
{
ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
- rCfg.SetListMode( (USHORT) eMode );
+ rCfg.SetListMode( (sal_uInt16) eMode );
}
}
@@ -1202,7 +1206,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
//------------------------------------------------------------------------
-void ScNavigatorDlg::ShowList( BOOL bShow, BOOL bSetSize )
+void ScNavigatorDlg::ShowList( sal_Bool bShow, sal_Bool bSetSize )
{
FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
Size aSize = GetParent()->GetOutputSizePixel();
@@ -1247,7 +1251,7 @@ void ScNavigatorDlg::ShowList( BOOL bShow, BOOL bSetSize )
//------------------------------------------------------------------------
-void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize )
+void ScNavigatorDlg::ShowScenarios( sal_Bool bShow, sal_Bool bSetSize )
{
FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
Size aSize = GetParent()->GetOutputSizePixel();
@@ -1303,7 +1307,7 @@ void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize )
void ScNavigatorDlg::GetDocNames( const String* pManualSel )
{
aLbDocuments.Clear();
- aLbDocuments.SetUpdateMode( FALSE );
+ aLbDocuments.SetUpdateMode( false );
ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
@@ -1342,7 +1346,7 @@ void ScNavigatorDlg::GetDocNames( const String* pManualSel )
aSelEntry = aEntry;
}
- aLbDocuments.SetUpdateMode( TRUE );
+ aLbDocuments.SetUpdateMode( sal_True );
aLbDocuments.SelectEntry( aSelEntry );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 23:40:44 +0000