diff options
Diffstat (limited to 'sc/source/ui/optdlg/tpusrlst.cxx')
-rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index eb7c8a6635eb..535e60e72f28 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -63,7 +63,7 @@ #define CR (sal_Unicode)13 #define LF (sal_Unicode)10 -static USHORT pUserListsRanges[] = +static sal_uInt16 pUserListsRanges[] = { SID_SCUSERLISTS, SID_SCUSERLISTS, @@ -107,9 +107,9 @@ ScTpUserLists::ScTpUserLists( Window* pParent, pDoc ( NULL ), pViewData ( NULL ), pRangeUtil ( new ScRangeUtil ), - bModifyMode ( FALSE ), - bCancelMode ( FALSE ), - bCopyDone ( FALSE ), + bModifyMode ( sal_False ), + bCancelMode ( sal_False ), + bCopyDone ( sal_False ), nCancelPos ( 0 ) { SetExchangeSupport(); @@ -177,7 +177,7 @@ void ScTpUserLists::Init() // ----------------------------------------------------------------------- -USHORT* __EXPORT ScTpUserLists::GetRanges() +sal_uInt16* __EXPORT ScTpUserLists::GetRanges() { return pUserListsRanges; } @@ -242,7 +242,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) // ----------------------------------------------------------------------- -BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +sal_Bool __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren @@ -254,18 +254,18 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) GetItemSet().Get( nWhichUserLists ); ScUserList* pCoreList = rUserListItem.GetUserList(); - BOOL bDataModified = FALSE; + sal_Bool bDataModified = sal_False; if ( (pUserLists == NULL) && (pCoreList == NULL) ) { - bDataModified = FALSE; + bDataModified = sal_False; } else if ( pUserLists != NULL ) { if ( pCoreList != NULL ) bDataModified = (*pUserLists != *pCoreList); else - bDataModified = TRUE; + bDataModified = sal_True; } if ( bDataModified ) @@ -293,7 +293,7 @@ int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) // ----------------------------------------------------------------------- -USHORT ScTpUserLists::UpdateUserListBox() +sal_uInt16 ScTpUserLists::UpdateUserListBox() { aLbLists.Clear(); @@ -301,12 +301,12 @@ USHORT ScTpUserLists::UpdateUserListBox() //---------------------------------------------------------- - USHORT nCount = pUserLists->GetCount(); + sal_uInt16 nCount = pUserLists->GetCount(); String aEntry; if ( nCount > 0 ) { - for ( USHORT i=0; i<nCount; i++ ) + for ( sal_uInt16 i=0; i<nCount; i++ ) { aEntry = (*pUserLists)[i]->GetString(); DBG_ASSERT( aEntry.Len() > 0, "Empty UserList-entry :-/" ); @@ -319,7 +319,7 @@ USHORT ScTpUserLists::UpdateUserListBox() // ----------------------------------------------------------------------- -void ScTpUserLists::UpdateEntries( USHORT nList ) +void ScTpUserLists::UpdateEntries( sal_uInt16 nList ) { if ( !pUserLists ) return; @@ -328,10 +328,10 @@ void ScTpUserLists::UpdateEntries( USHORT nList ) if ( nList < pUserLists->GetCount() ) { ScUserListData* pList = (*pUserLists)[nList]; - USHORT nSubCount = pList->GetSubCount(); + sal_uInt16 nSubCount = pList->GetSubCount(); String aEntryListStr; - for ( USHORT i=0; i<nSubCount; i++ ) + for ( sal_uInt16 i=0; i<nSubCount; i++ ) { if ( i!=0 ) aEntryListStr += CR; @@ -438,8 +438,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, SCROW nStartRow = rStartPos.Row(); SCCOL nEndCol = rEndPos.Col(); SCROW nEndRow = rEndPos.Row(); - USHORT nCellDir = SCRET_COLS; - BOOL bValueIgnored = FALSE; + sal_uInt16 nCellDir = SCRET_COLS; + sal_Bool bValueIgnored = sal_False; if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) ) { @@ -479,7 +479,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, } } else - bValueIgnored = TRUE; + bValueIgnored = sal_True; } if ( aStrList.Len() > 0 ) AddNewList( aStrList ); @@ -503,7 +503,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, } } else - bValueIgnored = TRUE; + bValueIgnored = sal_True; } if ( aStrList.Len() > 0 ) AddNewList( aStrList ); @@ -519,13 +519,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, //---------------------------------------------------------- - bCopyDone = TRUE; + bCopyDone = sal_True; } // ----------------------------------------------------------------------- -void ScTpUserLists::ModifyList( USHORT nSelList, +void ScTpUserLists::ModifyList( sal_uInt16 nSelList, const String& rEntriesStr ) { if ( !pUserLists ) return; @@ -541,7 +541,7 @@ void ScTpUserLists::ModifyList( USHORT nSelList, // ----------------------------------------------------------------------- -void ScTpUserLists::RemoveList( USHORT nList ) +void ScTpUserLists::RemoveList( sal_uInt16 nList ) { if ( pUserLists ) pUserLists->AtFree( nList ); } @@ -554,7 +554,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) { if ( pLb == &aLbLists ) { - USHORT nSelPos = aLbLists.GetSelectEntryPos(); + sal_uInt16 nSelPos = aLbLists.GetSelectEntryPos(); if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable(); @@ -597,7 +597,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) aEdCopyFrom.Disable(); } aBtnNew.SetText( aStrCancel ); - bCancelMode = TRUE; + bCancelMode = sal_True; } else // if ( bCancelMode ) { @@ -624,8 +624,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) aEdCopyFrom.Enable(); } aBtnNew.SetText( aStrNew ); - bCancelMode = FALSE; - bModifyMode = FALSE; + bCancelMode = sal_False; + bModifyMode = sal_False; } } else if ( pBtn == &aBtnAdd ) @@ -657,11 +657,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) aBtnAdd.Disable(); aBtnRemove.Enable(); aBtnNew.SetText( aStrNew ); - bCancelMode = FALSE; + bCancelMode = sal_False; } else // if ( bModifyMode ) { - USHORT nSelList = aLbLists.GetSelectEntryPos(); + sal_uInt16 nSelList = aLbLists.GetSelectEntryPos(); DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" ); @@ -677,8 +677,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) LbSelectHdl( &aLbLists ); } - aBtnNew.SetText( aStrNew ); bCancelMode = FALSE; - aBtnAdd.SetText( aStrAdd ); bModifyMode = FALSE; + aBtnNew.SetText( aStrNew ); bCancelMode = sal_False; + aBtnAdd.SetText( aStrAdd ); bModifyMode = sal_False; aBtnAdd.Disable(); aBtnRemove.Enable(); aFtLists.Enable(); @@ -696,7 +696,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { if ( aLbLists.GetEntryCount() > 0 ) { - USHORT nRemovePos = aLbLists.GetSelectEntryPos(); + sal_uInt16 nRemovePos = aLbLists.GetSelectEntryPos(); String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) ); aMsg += aLbLists.GetEntry( nRemovePos ); @@ -748,7 +748,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) ScRefAddress theStartPos; ScRefAddress theEndPos; String theAreaStr( aEdCopyFrom.GetText() ); - BOOL bAreaOk = FALSE; + sal_Bool bAreaOk = sal_False; if ( theAreaStr.Len() > 0 ) { @@ -815,8 +815,8 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd ) { if ( !bCancelMode && !bModifyMode ) { - aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE; - aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE; + aBtnNew.SetText( aStrCancel ); bCancelMode = sal_True; + aBtnAdd.SetText( aStrModify ); bModifyMode = sal_True; aBtnAdd.Enable(); aBtnRemove.Disable(); aFtLists.Disable(); |