diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-13 00:33:43 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2010-11-13 00:33:43 -0800 |
| commit | 9d6314c5ecb057361b7a4d932c9cffd9b05fc1cb (patch) | |
| tree | ed9d1355e281443b417ae32cb6d506b97e18b1a4 /extensions | |
| parent | 88bfb5f2ada34cc3968462376c5dfc434dc1ea9c (diff) | |
Purged BmpColorMode from libs-gui - components
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 17 | ||||
| -rw-r--r-- | extensions/source/propctrlr/browserline.hxx | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 894a462a8108..2a9ea8c493e8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -412,10 +412,8 @@ namespace pcr return *rpButton; } -/** - * @param _out_rHCImage is unused now as there are no highcontrast variants - */ - 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 { @@ -427,7 +425,7 @@ namespace pcr aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); - _out_rImage = _out_rHCImage = Image( xGraphic ); + _out_rImage = Image( xGraphic ); } catch( const Exception& ) { @@ -441,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 ) diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index fd091c712e78..2e0273c4760a 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -131,7 +131,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ); + void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ |