strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dba33d: merge

Browse source
This commit is contained in:
Ocke Janssen [oj] 2009-12-10 12:05:57 +01:00
parent 5005736eb6
commit fd5d46a152
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
forms/source/solar/control/navtoolbar.cxx
View file

@ -74,12 +74,6 @@ namespace frm
sLabel += String::CreateFromAscii( " " );
return sLabel;
}
<<<<<<< local
static bool lcl_isHighContrast( const Color& _rColor )
{
return _rColor.IsDark();
}
::rtl::OUString lcl_getCommandURL( const sal_Int16 _nFormFeature )
{
@ -112,8 +106,6 @@ namespace frm
OSL_ENSURE( false, "lcl_getCommandURL: unknown FormFeature!" );
return ::rtl::OUString();
}
=======
>>>>>>> other
}
//=====================================================================
@ -378,7 +370,7 @@ namespace frm
if ( !m_pImageProvider )
return;
const bool bIsHighContrast = lcl_isHighContrast( GetBackground().GetColor() );
const bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
const USHORT nItemCount = m_pToolbar->GetItemCount();
@ -427,15 +419,7 @@ namespace frm
if ( _eSize != m_eImageSize )
{
m_eImageSize = _eSize;
<<<<<<< local
implUpdateImages();
=======
::std::auto_ptr< SfxImageManager > pImageManager( new SfxImageManager( NULL ) );
pImageManager->SetImagesForceSize( *m_pToolbar, GetSettings().GetStyleSettings().GetHighContrastMode(), m_eImageSize == eLarge );
// parts of our layout is dependent on the size of our icons
Resize();
>>>>>>> other
}
}