diff options
Diffstat (limited to 'sfx2/source/dialog/srchdlg.cxx')
-rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index f4d2392c9017..ff3cd08b01c8 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno; namespace sfx2 { #define USERITEM_NAME DEFINE_CONST_OUSTRING("UserItem") -#define MAX_SAVE_COUNT (USHORT)10 +#define MAX_SAVE_COUNT (sal_uInt16)10 // ============================================================================ // SearchDialog @@ -113,7 +113,7 @@ void SearchDialog::LoadConfig() } } else - m_aWrapAroundBox.Check( TRUE ); + m_aWrapAroundBox.Check( sal_True ); } void SearchDialog::SaveConfig() @@ -121,7 +121,7 @@ void SearchDialog::SaveConfig() SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); aViewOpt.SetWindowState( rtl::OUString::createFromAscii( m_sWinState.GetBuffer() ) ); String sUserData; - USHORT i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT ); + sal_uInt16 i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT ); for ( ; i < nCount; ++i ) { sUserData += m_aSearchEdit.GetEntry(i); @@ -144,7 +144,7 @@ void SearchDialog::SaveConfig() IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG ) { String sSrchTxt = m_aSearchEdit.GetText(); - USHORT nPos = m_aSearchEdit.GetEntryPos( sSrchTxt ); + sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt ); if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND ) m_aSearchEdit.RemoveEntry( nPos ); if ( nPos > 0 ) @@ -168,9 +168,9 @@ void SearchDialog::SetFocusOnEdit() m_aSearchEdit.GrabFocus(); } -BOOL SearchDialog::Close() +sal_Bool SearchDialog::Close() { - BOOL bRet = ModelessDialog::Close(); + sal_Bool bRet = ModelessDialog::Close(); m_aCloseHdl.Call( this ); return bRet; } @@ -181,7 +181,7 @@ void SearchDialog::StateChanged( StateChangedType nStateChange ) { if ( m_sWinState.Len() ) SetWindowState( m_sWinState ); - m_bIsConstructed = TRUE; + m_bIsConstructed = sal_True; } ModelessDialog::StateChanged( nStateChange ); |