diff options
Diffstat (limited to 'extensions/source/propctrlr/browserline.cxx')
-rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ad43e61ca7f9..2a9ea8c493e8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -413,7 +413,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) { try { @@ -425,24 +425,7 @@ namespace pcr aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); - _out_rImage = _out_rHCImage = Image( xGraphic ); - - // see if we find an HC version beside the normal graphic - INetURLObject aURL( _rImageURL ); - ::rtl::OUString sBaseName( aURL.getBase() ); - aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) ); - ::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - - Reference< XGraphic > xHCGraphic; - try - { - aMediaProperties[0].Value <<= sHCImageURL; - xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties ); - } - catch( const Exception& ) { } - - if ( xHCGraphic.is() ) - _out_rHCImage = Image( xHCGraphic ); + _out_rImage = Image( xGraphic ); } catch( const Exception& ) { @@ -456,12 +439,11 @@ namespace pcr PushButton& rButton( impl_ensureButton( _bPrimary ) ); OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" ); - Image aImage, aHCImage; - impl_getImagesFromURL_nothrow( _rImageURL, aImage, aHCImage ); + Image aImage; + impl_getImagesFromURL_nothrow( _rImageURL, aImage ); - rButton.SetModeImage( aImage, BMP_COLOR_NORMAL ); - rButton.SetModeImage( aHCImage, BMP_COLOR_HIGHCONTRAST ); - } + rButton.SetModeImage( aImage ); + } //------------------------------------------------------------------ void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ) |