diff options
Diffstat (limited to 'extensions/source/propctrlr/standardcontrol.cxx')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 5dea67099f86..c8217a734fae 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -46,7 +46,7 @@ // ugly dependencies for the OColorControl #include <svx/svxids.hrc> #include <svx/drawitem.hxx> -#include <xtable.hxx> +#include <svx/xtable.hxx> //================================================================== #include <vcl/floatwin.hxx> #include <svtools/svmedit.hxx> @@ -278,7 +278,7 @@ namespace pcr getTypedControlWindow()->SetFormatter( getTypedControlWindow()->StandardFormatter() ); SvNumberFormatter* pFormatter = getTypedControlWindow()->GetFormatter(); - ULONG nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage ); + sal_uLong nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage ); getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat ); } @@ -712,8 +712,8 @@ namespace pcr getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); if ( ( nWinStyle & WB_READONLY ) != 0 ) { - getTypedControlWindow()->SetReadOnly( TRUE ); - getTypedControlWindow()->Enable( TRUE ); + getTypedControlWindow()->SetReadOnly( sal_True ); + getTypedControlWindow()->Enable( sal_True ); } } @@ -821,8 +821,8 @@ namespace pcr getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); if ( ( nWinStyle & WB_READONLY ) != 0 ) { - getTypedControlWindow()->SetReadOnly( TRUE ); - getTypedControlWindow()->Enable( TRUE ); + getTypedControlWindow()->SetReadOnly( sal_True ); + getTypedControlWindow()->Enable( sal_True ); } } @@ -884,10 +884,10 @@ namespace pcr //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) { - const USHORT nCount = getTypedControlWindow()->GetEntryCount(); + const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< ::rtl::OUString > aRet(nCount); ::rtl::OUString* pIter = aRet.getArray(); - for (USHORT i = 0; i < nCount ; ++i,++pIter) + for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); return aRet; @@ -954,10 +954,10 @@ namespace pcr //------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) { - const USHORT nCount = getTypedControlWindow()->GetEntryCount(); + const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< ::rtl::OUString > aRet(nCount); ::rtl::OUString* pIter = aRet.getArray(); - for (USHORT i = 0; i < nCount ; ++i,++pIter) + for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); return aRet; @@ -1047,7 +1047,7 @@ namespace pcr ,m_nOperationMode( eStringList ) ,m_bDropdown( sal_False ) { - SetCompoundControl( TRUE ); + SetCompoundControl( sal_True ); m_pImplEdit = new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) ); SetSubEdit( m_pImplEdit ); |