summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui/app/AppIconControl.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/app/AppIconControl.cxx
parentremovetooltypes01: rebase to DEV300_m96 (diff)
downloadcore-409873c1c1267b71eb53e4d5536fc240510438d9.tar.gz
core-409873c1c1267b71eb53e4d5536fc240510438d9.zip
removetooltypes01: #i112600# remove tooltypes from dbaccess
Diffstat (limited to 'dbaccess/source/ui/app/AppIconControl.cxx')
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 0e553cc1ffee..5476d3a2b6d1 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -68,10 +68,10 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
struct CategoryDescriptor
{
- USHORT nLabelResId;
+ sal_uInt16 nLabelResId;
ElementType eType;
- USHORT nImageResId;
- USHORT nImageResIdHC;
+ sal_uInt16 nImageResId;
+ sal_uInt16 nImageResIdHC;
} aCategories[] = {
{ RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L, IMG_TABLEFOLDER_TREE_LHC },
{ RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L, IMG_QUERYFOLDER_TREE_LHC },
@@ -88,14 +88,14 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
- SetChoiceWithCursor( TRUE );
+ SetChoiceWithCursor( sal_True );
SetSelectionMode(SINGLE_SELECTION);
}
// -----------------------------------------------------------------------------
OApplicationIconControl::~OApplicationIconControl()
{
- ULONG nCount = GetEntryCount();
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uLong nCount = GetEntryCount();
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
if ( pEntry )