diff options
Diffstat (limited to 'dbaccess/source/ui/misc/imageprovider.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/imageprovider.cxx | 62 |
1 files changed, 26 insertions, 36 deletions
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 4be0472a12f2..d46d540cb462 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,15 +82,12 @@ namespace dbaui { //................................................................ static void lcl_getConnectionProvidedTableIcon_nothrow( const ImageProvider_Data& _rData, - const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic, Reference< XGraphic >& _out_rxGraphicHC ) + const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic ) { try { if ( _rData.xTableUI.is() ) - { _out_rxGraphic = _rData.xTableUI->getTableIcon( _rName, GraphicColorMode::NORMAL ); - _out_rxGraphicHC = _rData.xTableUI->getTableIcon( _rName, GraphicColorMode::HIGH_CONTRAST ); - } } catch( const Exception& ) { @@ -99,21 +97,19 @@ namespace dbaui //................................................................ static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName, - sal_uInt16& _out_rResourceID, sal_uInt16& _out_rResourceID_HC ) + sal_uInt16& _out_rResourceID) { - _out_rResourceID = _out_rResourceID_HC = 0; + _out_rResourceID = 0; try { bool bIsView = _rData.xViews.is() && _rData.xViews->hasByName( _rName ); if ( bIsView ) { _out_rResourceID = VIEW_TREE_ICON; - _out_rResourceID_HC = VIEW_TREE_ICON_SCH; } else { _out_rResourceID = TABLE_TREE_ICON; - _out_rResourceID_HC = TABLE_TREE_ICON_SCH; } } catch( const Exception& ) @@ -151,95 +147,88 @@ namespace dbaui } //-------------------------------------------------------------------- - void ImageProvider::getImages( const String& _rName, const sal_Int32 _nDatabaseObjectType, Image& _out_rImage, Image& _out_rImageHC ) + void ImageProvider::getImages( const String& _rName, const sal_Int32 _nDatabaseObjectType, Image& _out_rImage ) { if ( _nDatabaseObjectType != DatabaseObject::TABLE ) { // for types other than tables, the icon does not depend on the concrete object - _out_rImage = getDefaultImage( _nDatabaseObjectType, false ); - _out_rImageHC = getDefaultImage( _nDatabaseObjectType, true ); + _out_rImage = getDefaultImage( _nDatabaseObjectType ); } else { // check whether the connection can give us an icon Reference< XGraphic > xGraphic; - Reference< XGraphic > xGraphicHC; - lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic, xGraphicHC ); + lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic ); if ( xGraphic.is() ) _out_rImage = Image( xGraphic ); - if ( xGraphicHC.is() ) - _out_rImageHC = Image( xGraphicHC ); - if ( !_out_rImage || !_out_rImageHC ) + if ( !_out_rImage ) { // no -> determine by type sal_uInt16 nImageResourceID = 0; - sal_uInt16 nImageResourceID_HC = 0; - lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID, nImageResourceID_HC ); + lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID ); if ( nImageResourceID && !_out_rImage ) _out_rImage = Image( ModuleRes( nImageResourceID ) ); - if ( nImageResourceID_HC && !_out_rImageHC ) - _out_rImageHC = Image( ModuleRes( nImageResourceID_HC ) ); } } } //-------------------------------------------------------------------- - Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast ) + Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType ) { Image aObjectImage; - sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) ); + sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType) ); if ( nImageResourceID ) aObjectImage = Image( ModuleRes( nImageResourceID ) ); return aObjectImage; } //-------------------------------------------------------------------- - sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast ) + sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType) { sal_uInt16 nImageResourceID( 0 ); switch ( _nDatabaseObjectType ) { case DatabaseObject::QUERY: - nImageResourceID = _bHighContrast ? QUERY_TREE_ICON_SCH : QUERY_TREE_ICON; + nImageResourceID = QUERY_TREE_ICON; break; case DatabaseObject::FORM: - nImageResourceID = _bHighContrast ? FORM_TREE_ICON_SCH : FORM_TREE_ICON; + nImageResourceID = FORM_TREE_ICON; break; case DatabaseObject::REPORT: - nImageResourceID = _bHighContrast ? REPORT_TREE_ICON_SCH : REPORT_TREE_ICON; + nImageResourceID = REPORT_TREE_ICON; break; case DatabaseObject::TABLE: - nImageResourceID = _bHighContrast ? TABLE_TREE_ICON_SCH : TABLE_TREE_ICON; + nImageResourceID = TABLE_TREE_ICON; break; default: - OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" ); + OSL_FAIL( "ImageProvider::getDefaultImage: invalid database object type!" ); break; } return nImageResourceID; } //-------------------------------------------------------------------- - Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast ) + Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType ) { sal_uInt16 nImageResourceID( 0 ); switch ( _nDatabaseObjectType ) { case DatabaseObject::QUERY: - nImageResourceID = _bHighContrast ? QUERYFOLDER_TREE_ICON_SCH : QUERYFOLDER_TREE_ICON; + nImageResourceID = QUERYFOLDER_TREE_ICON; break; case DatabaseObject::FORM: - nImageResourceID = _bHighContrast ? FORMFOLDER_TREE_ICON_SCH : FORMFOLDER_TREE_ICON; + nImageResourceID = FORMFOLDER_TREE_ICON; break; case DatabaseObject::REPORT: - nImageResourceID = _bHighContrast ? REPORTFOLDER_TREE_ICON_SCH : REPORTFOLDER_TREE_ICON; + nImageResourceID = REPORTFOLDER_TREE_ICON; break; case DatabaseObject::TABLE: - nImageResourceID = _bHighContrast ? TABLEFOLDER_TREE_ICON_SCH : TABLEFOLDER_TREE_ICON; + nImageResourceID = TABLEFOLDER_TREE_ICON; break; default: - OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" ); + OSL_FAIL( "ImageProvider::getDefaultImage: invalid database object type!" ); break; } @@ -250,12 +239,13 @@ namespace dbaui } //-------------------------------------------------------------------- - Image ImageProvider::getDatabaseImage( bool _bHighContrast ) + Image ImageProvider::getDatabaseImage() { - return Image( ModuleRes( _bHighContrast ? DATABASE_TREE_ICON_SCH : DATABASE_TREE_ICON ) ); + return Image( ModuleRes( DATABASE_TREE_ICON ) ); } //........................................................................ } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |