From 409873c1c1267b71eb53e4d5536fc240510438d9 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 14 Jan 2011 15:00:11 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from dbaccess

---
 dbaccess/source/ui/misc/imageprovider.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'dbaccess/source/ui/misc/imageprovider.cxx')

diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index fb35bdcc9e73..ffeb18583ea9 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -99,7 +99,7 @@ namespace dbaui
 
         //................................................................
         static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName,
-            USHORT& _out_rResourceID, USHORT& _out_rResourceID_HC )
+            sal_uInt16& _out_rResourceID, sal_uInt16& _out_rResourceID_HC )
         {
             _out_rResourceID = _out_rResourceID_HC = 0;
             try
@@ -173,8 +173,8 @@ namespace dbaui
             if ( !_out_rImage || !_out_rImageHC )
             {
                 // no -> determine by type
-                USHORT nImageResourceID = 0;
-                USHORT nImageResourceID_HC = 0;
+                sal_uInt16 nImageResourceID = 0;
+                sal_uInt16 nImageResourceID_HC = 0;
                 lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID, nImageResourceID_HC );
 
                 if ( nImageResourceID && !_out_rImage )
@@ -189,16 +189,16 @@ namespace dbaui
     Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
         Image aObjectImage;
-        USHORT nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
+        sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
         if ( nImageResourceID )
             aObjectImage = Image( ModuleRes( nImageResourceID ) );
         return aObjectImage;
     }
 
     //--------------------------------------------------------------------
-    USHORT ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+    sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
-        USHORT nImageResourceID( 0 );
+        sal_uInt16 nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
@@ -223,7 +223,7 @@ namespace dbaui
     //--------------------------------------------------------------------
     Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
-        USHORT nImageResourceID( 0 );
+        sal_uInt16 nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
-- 
cgit