diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-19 08:40:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-19 08:40:53 +0000 |
| commit | 1f599f63bcf426d33154ca1040c74454657e1556 (patch) | |
| tree | f382d8dc087e20bbba1fc279d9fa126ae23810f8 /forms/source | |
| parent | ed0e2ea843c775412a4da41efd41143f580416bf (diff) | |
INTEGRATION: CWS oooicons (1.2.64); FILE MERGED
2004/10/29 15:30:45 cd 1.2.64.1: #i35368# Adapt code to use static sfx imagelist
Diffstat (limited to 'forms/source')
| -rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index c6b2aae1abf4..314e4d158e4b 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: navtoolbar.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-11-17 14:23:45 $ + * last change: $Author: obo $ $Date: 2004-11-19 09:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef FORMS_SOLAR_CONTROL_NAVTOOLBAR_HXX #include "navtoolbar.hxx" #endif @@ -391,7 +390,7 @@ namespace frm // the image of the item ::std::auto_ptr< SfxImageManager > pImageManager( new SfxImageManager( NULL ) ); - pImageManager->SetImagesForceSize( *m_pToolbar, NULL, FALSE, m_eImageSize == eLarge ); + pImageManager->SetImagesForceSize( *m_pToolbar, FALSE, m_eImageSize == eLarge ); } //--------------------------------------------------------------------- @@ -401,7 +400,7 @@ namespace frm { m_eImageSize = _eSize; ::std::auto_ptr< SfxImageManager > pImageManager( new SfxImageManager( NULL ) ); - pImageManager->SetImagesForceSize( *m_pToolbar, NULL, lcl_isHighContrast( GetBackground().GetColor() ), m_eImageSize == eLarge ); + pImageManager->SetImagesForceSize( *m_pToolbar, lcl_isHighContrast( GetBackground().GetColor() ), m_eImageSize == eLarge ); // parts of our layout is dependent on the size of our icons Resize(); |