dba33d: merge

1 files changed, 1 insertions, 17 deletions

diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index f599f196ee32..58f22f0c95e4 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -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
         }
     }