summaryrefslogtreecommitdiff
path: root/framework/source/classes
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/classes')
-rw-r--r--framework/source/classes/droptargetlistener.cxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx12
-rwxr-xr-xframework/source/classes/fwlresid.cxx2
-rw-r--r--framework/source/classes/menumanager.cxx62
4 files changed, 39 insertions, 39 deletions
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 69226cba3162..d3aad90c5c0d 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -107,7 +107,7 @@ void SAL_CALL DropTargetListener::drop( const css::datatransfer::dnd::DropTarget
// at first check filelist format
if ( aHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList ) )
{
- ULONG i, nCount = aFileList.Count();
+ sal_uLong i, nCount = aFileList.Count();
for ( i = 0; i < nCount; ++i )
implts_OpenFile( aFileList.GetFile(i) );
bFormatFound = sal_True;
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;
}
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index e3f3e26ce995..8a555d52f820 100755
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -56,7 +56,7 @@ ResMgr* FwlResId::GetResManager()
// -----------------------------------------------------------------------
-FwlResId::FwlResId( USHORT nId ) :
+FwlResId::FwlResId( sal_uInt16 nId ) :
ResId( nId, *FwlResId::GetResManager() )
{
}
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 493ac9dfb4a1..cf4d772f6044 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -159,15 +159,15 @@ MenuManager::MenuManager(
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
#if 0
- ::std::vector< USHORT > aQueryLabelItemIdVector;
+ ::std::vector< sal_uInt16 > aQueryLabelItemIdVector;
#endif
- USHORT nItemCount = pMenu->GetItemCount();
+ sal_uInt16 nItemCount = pMenu->GetItemCount();
m_aMenuItemHandlerVector.reserve(nItemCount);
::rtl::OUString aItemCommand;
- for ( USHORT i = 0; i < nItemCount; i++ )
+ for ( sal_uInt16 i = 0; i < nItemCount; i++ )
{
- USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+ sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
bool bShowMenuImages( m_bShowMenuImages );
MenuItemBits nBits = pMenu->GetItemBits( nItemId );
// overwrite the default?
@@ -194,7 +194,7 @@ MenuManager::MenuManager(
aItemCommand == aSlotSpecialToolsMenu ) &&
AddonMenuManager::HasAddonMenuElements() )
{
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame );
if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
{
@@ -222,7 +222,7 @@ MenuManager::MenuManager(
// Set image for the addon popup menu item
if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
if ( !!aImage )
pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
}
@@ -254,7 +254,7 @@ MenuManager::MenuManager(
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -279,7 +279,7 @@ MenuManager::MenuManager(
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -300,14 +300,14 @@ MenuManager::MenuManager(
if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
{
// Retrieve image id from menu attributes
- aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( rFrame, aImageId, sal_False, m_bWasHiContrast );
}
if ( !aImage )
{
- aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
if ( !aImage )
- aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = AddonsOptions().GetImageFromURL( aItemCommand, sal_False, m_bWasHiContrast );
}
if ( !!aImage )
@@ -315,7 +315,7 @@ MenuManager::MenuManager(
}
else if ( !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, sal_False, m_bWasHiContrast );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -340,7 +340,7 @@ MenuManager::MenuManager(
Sequence< ::rtl::OUString > aLabelSequence( aQueryLabelItemIdVector.size() );
sal_uInt32 nPos = 0;
- ::std::vector< USHORT >::iterator p;
+ ::std::vector< sal_uInt16 >::iterator p;
for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
aURLSequence[nPos++] = pMenu->GetItemCommand( *p );
@@ -379,12 +379,12 @@ MenuManager::MenuManager(
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
- USHORT nItemCount = pAddonMenu->GetItemCount();
+ sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
m_aMenuItemHandlerVector.reserve(nItemCount);
::rtl::OUString aItemCommand;
- for ( USHORT i = 0; i < nItemCount; i++ )
+ for ( sal_uInt16 i = 0; i < nItemCount; i++ )
{
- USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
+ sal_uInt16 nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
if ( pPopupMenu )
@@ -444,7 +444,7 @@ MenuManager::~MenuManager()
}
-MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( USHORT nItemId )
+MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId )
{
ResetableGuard aGuard( m_aLock );
@@ -611,7 +611,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
::std::vector< MenuItemHandler* > aNewPickVector;
Reference< XStringWidth > xStringLength( new StringLength );
- USHORT nPickItemId = START_ITEMID_PICKLIST;
+ sal_uInt16 nPickItemId = START_ITEMID_PICKLIST;
int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
aNewPickVector.reserve(nPickListMenuItems);
@@ -779,8 +779,8 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe
// #110897#
Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
- USHORT nActiveItemId = 0;
- USHORT nItemId = START_ITEMID_WINDOWLIST;
+ sal_uInt16 nActiveItemId = 0;
+ sal_uInt16 nItemId = START_ITEMID_WINDOWLIST;
if ( xDesktop.is() )
{
@@ -905,7 +905,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
if ( m_bActive )
return 0;
- m_bActive = TRUE;
+ m_bActive = sal_True;
::rtl::OUString aCommand( m_aMenuItemCommand );
if ( m_aMenuItemCommand.matchIgnoreAsciiCase( UNO_COMMAND, 0 ))
@@ -1015,7 +1015,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
{
ResetableGuard aGuard( m_aLock );
- USHORT nCurItemId = pMenu->GetCurItemId();
+ sal_uInt16 nCurItemId = pMenu->GetCurItemId();
if ( pMenu == m_pVCLMenu &&
pMenu->GetItemType( nCurItemId ) != MENUITEM_SEPARATOR )
{
@@ -1031,7 +1031,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
if ( xDesktop.is() )
{
- USHORT nTaskId = START_ITEMID_WINDOWLIST;
+ sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
sal_Int32 nCount = xList->getCount();
for ( sal_Int32 i=0; i<nCount; ++i )
@@ -1098,7 +1098,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFac
return mxServiceFactory;
}
-void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
+void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
{
MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren );
@@ -1113,9 +1113,9 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCo
m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
}
-USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const
{
- USHORT nItemId = _pMenu->GetItemId( _nIndex );
+ sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
_rItemCommand = _pMenu->GetItemCommand( nItemId );
if ( !_rItemCommand.getLength() )
@@ -1131,9 +1131,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
{
AddonsOptions aAddonOptions;
- for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
+ for ( sal_uInt16 nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
{
- USHORT nId = _pMenu->GetItemId( nPos );
+ sal_uInt16 nId = _pMenu->GetItemId( nPos );
if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
{
bool bTmpShowMenuImages( bShowMenuImages );
@@ -1155,7 +1155,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
if ( aImageId.getLength() > 0 )
{
- Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast );
+ Image aImage = GetImageFromURL( _xFrame, aImageId, sal_False, bIsHiContrast );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -1166,9 +1166,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
if ( !bImageSet )
{
rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
- Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
+ Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, sal_False, bIsHiContrast );
if ( !aImage )
- aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
+ aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, sal_False, bIsHiContrast );
_pMenu->SetItemImage( nId, aImage );
}
generated by cgit (git 2.34.1) at 2025-03-21 23:26:42 +0000