summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/fmcomp')
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/gridcell.cxx26
-rw-r--r--svx/source/fmcomp/gridctrl.cxx16
4 files changed, 27 insertions, 27 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 0a6e36219ed3..9b5b6eae07f4 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -391,7 +391,7 @@ namespace svx
{
Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
_pContainer->CopyAny(
- sal::static_int_cast< USHORT >( getDescriptorFormatId() ),
+ sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ),
aContent );
}
}
@@ -497,7 +497,7 @@ namespace svx
// -----------------------------------------------------------------------------
sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
{
- ULONG nFormat = SotExchange::GetFormat(rFlavor);
+ sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
switch (nFormat)
{
case SOT_FORMATSTR_ID_DBACCESS_TABLE:
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 618c2135652a..b974fe3ff5f3 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -988,7 +988,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if ( eInspectorAction != eNone )
{
FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
- SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE );
+ SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
&aIFaceItem, &aShowItem, 0L );
@@ -1061,7 +1061,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
if ( 1 == GetSelectColumnCount() || IsDesignMode() )
{
sal_uInt16 nSelId = GetColumnId(
- sal::static_int_cast< USHORT >( FirstSelectedColumn() ) );
+ sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
@@ -1273,7 +1273,7 @@ void FmGridControl::DeleteSelectedRows()
// now delete the row
Sequence <sal_Int32> aDeletedRows;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
try
{
aDeletedRows = xDeleteThem->deleteRows(aBookmarks);
@@ -1281,7 +1281,7 @@ void FmGridControl::DeleteSelectedRows()
catch(SQLException&)
{
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
// how many rows are deleted?
sal_Int32 nDeletedRows = 0;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7fb9d8330cf6..374000f68068 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -898,7 +898,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
{
sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY;
OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior );
- USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
+ sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
switch ( nWheelBehavior )
{
case MouseWheelBehavior::SCROLL_DISABLED: nVclSetting = MOUSE_WHEEL_DISABLE; break;
@@ -913,7 +913,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetWheelBehavior( nVclSetting );
aSettings.SetMouseSettings( aMouseSettings );
- m_pWindow->SetSettings( aSettings, TRUE );
+ m_pWindow->SetSettings( aSettings, sal_True );
}
}
catch( const Exception& )
@@ -986,7 +986,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
Font aFont( _rDev.GetFont() );
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
m_pPainter->SetFont( aFont );
m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
@@ -1653,7 +1653,7 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
namespace
{
- void setCheckBoxStyle( Window* _pWindow, USHORT nStyle )
+ void setCheckBoxStyle( Window* _pWindow, sal_uInt16 nStyle )
{
AllSettings aSettings = _pWindow->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -2271,13 +2271,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
static_cast< DateField* >( m_pWindow )->SetMin( nMin );
static_cast< DateField* >( m_pWindow )->SetMax( nMax );
static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict );
- static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+ static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat );
static_cast< DateField* >( m_pPainter )->SetMin( nMin );
static_cast< DateField* >( m_pPainter )->SetMax( nMax );
static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict );
- static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+ static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
}
}
@@ -2381,13 +2381,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
static_cast< TimeField* >( m_pWindow )->SetMin( nMin );
static_cast< TimeField* >( m_pWindow )->SetMax( nMax );
static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict );
- static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+ static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
static_cast< TimeField* >( m_pPainter )->SetMin( nMin );
static_cast< TimeField* >( m_pPainter )->SetMax( nMax );
static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict );
- static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+ static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
}
}
@@ -3496,7 +3496,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
}
//------------------------------------------------------------------------------
-void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -3905,7 +3905,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
}
//------------------------------------------------------------------------------
-void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -4063,7 +4063,7 @@ Window* FmXCheckBoxCell::getEventWindow() const
}
//------------------------------------------------------------------
-void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -4400,7 +4400,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
}
//------------------------------------------------------------------
-void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
if ( ( &_rWindow == m_pBox )
&& ( _nEventId == VCLEVENT_LISTBOX_SELECT )
@@ -4614,7 +4614,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
}
//------------------------------------------------------------------------------
-void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d54b091c6bd2..38342bf355ea 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -784,7 +784,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
{
case STATE_CHANGE_MIRRORING:
{
- BOOL bIsRTLEnabled = IsRTLEnabled();
+ sal_Bool bIsRTLEnabled = IsRTLEnabled();
for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i )
pWindows[i]->EnableRTL( bIsRTLEnabled );
}
@@ -945,7 +945,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)
@@ -2323,7 +2323,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)
@@ -2341,7 +2341,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();
@@ -2734,7 +2734,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
}
}
// -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const
+String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
DbGridColumn* pColumn = m_aColumns.GetObject( GetModelColumnPos( _nColId ) );
String sRet;
@@ -3630,7 +3630,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);
@@ -3862,7 +3862,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 );
DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId));
if ( pColumn )
{
@@ -3883,7 +3883,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 );
generated by cgit (git 2.34.1) at 2024-08-07 16:34:31 +0000