summaryrefslogtreecommitdiff
path: root/framework/source/classes/fwktabwindow.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/classes/fwktabwindow.cxx')
-rw-r--r--framework/source/classes/fwktabwindow.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a441f251a592..d7868a3a0857 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -70,10 +70,10 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
// -----------------------------------------------------------------------
-void FwkTabControl::BroadcastEvent( ULONG nEvent )
+void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
{
if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
- ImplCallEventListeners( nEvent, (void*)(ULONG)GetCurPageId() );
+ ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
else
{
DBG_ERRORFILE( "FwkTabControl::BroadcastEvent(): illegal event" );
@@ -289,7 +289,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
{
- const USHORT nId = m_aTabCtrl.GetCurPageId();
+ const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) );
if ( !pTabPage )
{
@@ -368,7 +368,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
TabEntry* pEntry = new TabEntry( nIndex, sPageURL, xEventHdl );
m_TabList.push_back( pEntry );
- USHORT nIdx = static_cast< USHORT >( nIndex );
+ sal_uInt16 nIdx = static_cast< sal_uInt16 >( nIndex );
m_aTabCtrl.InsertPage( nIdx, sTitle );
if ( sToolTip.getLength() > 0 )
m_aTabCtrl.SetHelpText( nIdx, sToolTip );
@@ -384,7 +384,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
{
- m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nIndex ) );
+ m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
ActivatePageHdl( &m_aTabCtrl );
}
@@ -395,7 +395,7 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex )
TabEntry* pEntry = FindEntry(nIndex);
if ( pEntry )
{
- m_aTabCtrl.RemovePage( static_cast< USHORT >( nIndex ) );
+ m_aTabCtrl.RemovePage( static_cast< sal_uInt16 >( nIndex ) );
if (RemoveEntry(nIndex))
delete pEntry;
}