From fd5d46a152bd47f71ee2662700a321a4e61bc269 Mon Sep 17 00:00:00 2001
From: "Ocke Janssen [oj]" <Ocke.Janssen@sun.com>
Date: Thu, 10 Dec 2009 12:05:57 +0100
Subject: dba33d: merge

---
 forms/source/solar/control/navtoolbar.cxx | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'forms')

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
         }
     }
 
-- 
cgit v1.2.3


From 03a36337afdb951f7912e4b7b9bf8c365b310ccc Mon Sep 17 00:00:00 2001
From: "Ocke Janssen [oj]" <Ocke.Janssen@sun.com>
Date: Fri, 15 Jan 2010 07:55:20 +0100
Subject: dba33d: set the control only when not before or after last row

---
 forms/source/component/FormattedField.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'forms')

diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 0edbf781e786..e8c61ecded7e 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -583,7 +583,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
 
                     // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
                     // to recalc it, which is done by translateDbColumnToControlValue
-                    if ( m_xColumn.is() && m_xAggregateFastSet.is() )
+                    if ( m_xColumn.is() && m_xAggregateFastSet.is() && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
                     {
                         setControlValue( translateDbColumnToControlValue(), eOther );
                     }
-- 
cgit v1.2.3