diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
| commit | b050c687ee7cf0d9e6f113fb37df3f4e66db5423 (patch) | |
| tree | 18e08af40d99dc0d8661c5bd05064236cbd29719 /dbaccess/source/ui/misc/imageprovider.cxx | |
| parent | c911fa774343a714d6c26bbbb69ea08bf95b8fc9 (diff) | |
| parent | f0539ca73e451988047d57c61e6a1181489ba6af (diff) | |
gridsort: pulled and merged DEV300_m100
Diffstat (limited to 'dbaccess/source/ui/misc/imageprovider.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/imageprovider.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 9cfa08f65..da4ce39ad 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: |