summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/control/toolboxcontroller.cxx
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-14 15:00:11 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-14 15:00:11 +0100
commit409873c1c1267b71eb53e4d5536fc240510438d9 (patch)
treefae3b8b1e8fb79bb7fe873bd81bd53f5a77c1e60 /dbaccess/source/ui/control/toolboxcontroller.cxx
parente1ac951c62beaadf44722d8a43b4dd0c6f6d7e29 (diff)
removetooltypes01: #i112600# remove tooltypes from dbaccess
Diffstat (limited to 'dbaccess/source/ui/control/toolboxcontroller.cxx')
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 4806ca814c0c..354446c7e9df 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -106,7 +106,7 @@ namespace dbaui
namespace
{
- void lcl_copy(Menu* _pMenu,USHORT _nMenuId,USHORT _nMenuPos,ToolBox* _pToolBox,USHORT _nToolId,const ::rtl::OUString& _sCommand)
+ void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const ::rtl::OUString& _sCommand)
{
if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING )
_pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId));
@@ -179,10 +179,10 @@ namespace dbaui
ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
if ( pToolBox )
{
- USHORT nCount = pToolBox->GetItemCount();
- for (USHORT nPos = 0; nPos < nCount; ++nPos)
+ sal_uInt16 nCount = pToolBox->GetItemCount();
+ for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
{
- USHORT nItemId = pToolBox->GetItemId(nPos);
+ sal_uInt16 nItemId = pToolBox->GetItemId(nPos);
if ( pToolBox->GetItemCommand(nItemId) == String(m_aCommandURL) )
{
m_nToolBoxId = nItemId;
@@ -206,10 +206,10 @@ namespace dbaui
if ( m_aCommandURL == aFind->first && !Event.IsEnabled )
{
::std::auto_ptr<PopupMenu> pMenu = getMenu();
- USHORT nCount = pMenu->GetItemCount();
- for (USHORT i = 0; i < nCount; ++i)
+ sal_uInt16 nCount = pMenu->GetItemCount();
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
- USHORT nItemId = pMenu->GetItemId(i);
+ sal_uInt16 nItemId = pMenu->GetItemId(i);
aFind = m_aStates.find(pMenu->GetItemCommand(nItemId));
if ( aFind != m_aStates.end() && aFind->second )
{
@@ -245,13 +245,13 @@ namespace dbaui
nImageType |= ImageType::COLOR_HIGHCONTRAST;
Sequence< ::rtl::OUString> aSeq(1);
- USHORT nCount = pMenu->GetItemCount();
- for (USHORT nPos = 0; nPos < nCount; ++nPos)
+ sal_uInt16 nCount = pMenu->GetItemCount();
+ for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
{
if ( pMenu->GetItemType( nPos ) == MENUITEM_SEPARATOR )
continue;
- USHORT nItemId = pMenu->GetItemId(nPos);
+ sal_uInt16 nItemId = pMenu->GetItemId(nPos);
aSeq[0] = pMenu->GetItemCommand(nItemId);
Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(nImageType,aSeq);
@@ -285,7 +285,7 @@ namespace dbaui
ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
::std::auto_ptr<PopupMenu> pMenu = getMenu();
- USHORT nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
+ sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
// "cleanup" the toolbox state
Point aPoint = pToolBox->GetItemRect( m_nToolBoxId ).TopLeft();
MouseEvent aLeave( aPoint, 0, MOUSE_LEAVEWINDOW | MOUSE_SYNTHETIC );