diff options
Diffstat (limited to 'svx/source/fmcomp/gridctrl.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/fmcomp/gridctrl.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 43555328a9d2..e6b050024d1d 100644..100755 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -58,7 +58,7 @@ #include <vcl/sound.hxx> #include <vcl/menu.hxx> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <tools/shl.hxx> @@ -777,7 +777,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { case STATE_CHANGE_MIRRORING: { - BOOL bIsRTLEnabled = IsRTLEnabled(); + sal_Bool bIsRTLEnabled = IsRTLEnabled(); for ( size_t i=0; i < SAL_N_ELEMENTS( pWindows ); ++i ) pWindows[i]->EnableRTL( bIsRTLEnabled ); } @@ -938,7 +938,7 @@ DbGridControl::DbGridControl( ,m_nDeleteEvent(0) ,m_nOptions(OPT_READONLY) ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE) - ,m_nLastColId((USHORT)-1) + ,m_nLastColId((sal_uInt16)-1) ,m_nLastRowId(-1) ,m_bDesignMode(sal_False) ,m_bRecordCountFinal(sal_False) @@ -2334,7 +2334,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull) if (nNewPos < 0) // keine Position gefunden return; - m_bInAdjustDataSource = TRUE; + m_bInAdjustDataSource = sal_True; if (nNewPos != m_nCurrentPos) { if (m_bSynchDisplay) @@ -2352,7 +2352,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull) SetCurrent(nNewPos); RowModified(nNewPos); } - m_bInAdjustDataSource = FALSE; + m_bInAdjustDataSource = sal_False; // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben SetNoSelection(); @@ -2745,7 +2745,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode) } } // ----------------------------------------------------------------------------- -String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const +String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { size_t Location = GetModelColumnPos( _nColId ); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; @@ -3649,7 +3649,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const } //------------------------------------------------------------------------------ -void DbGridControl::implAdjustInSolarThread(BOOL _bRows) +void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows) { TRACE_RANGE("DbGridControl::implAdjustInSolarThread"); ::osl::MutexGuard aGuard(m_aAdjustSafety); @@ -3882,7 +3882,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde // ----------------------------------------------------------------------------- Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { - USHORT nColumnId = GetColumnId( _nColumnPos ); + sal_uInt16 nColumnId = GetColumnId( _nColumnPos ); size_t Location = GetModelColumnPos(nColumnId); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if ( pColumn ) @@ -3904,7 +3904,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s eValue = STATE_DONTKNOW; break; } - return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE ); + return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True ); } } return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos ); |