CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 37 insertions, 12 deletions

diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 1b3e9578a592..fc8cd78fdfde 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -748,14 +748,22 @@ void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(Runtim
 //-----------------------------------------------------------------------------
 sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
 {
-    ::rtl::OUString aNewValue;
-    m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) >>= aNewValue;
-    sal_Bool bModified = ( aNewValue != m_aSaveValue );
+    Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
 
+    ::rtl::OUString sNewValue;
+    aNewValue >>= sNewValue;
+
+    bool bModified = ( aNewValue != m_aLastKnownValue );
     if ( bModified )
     {
-        if (!aNewValue.getLength() && !isRequired() && m_bEmptyIsNull)
+        if  (   !aNewValue.hasValue()
+            ||  (   !sNewValue.getLength()      // an empty string
+                &&  m_bEmptyIsNull              // which should be interpreted as NULL
+                )
+            )
+        {
             m_xColumnUpdate->updateNull();
+        }
         else
         {
             try
@@ -763,18 +771,19 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
                 OSL_PRECOND( m_pValueFormatter.get(), "OComboBoxModel::commitControlValueToDbColumn: no value formatter!" );
                 if ( m_pValueFormatter.get() )
                 {
-                    if ( !m_pValueFormatter->setFormattedValue( aNewValue ) )
+                    if ( !m_pValueFormatter->setFormattedValue( sNewValue ) )
                         return sal_False;
                 }
                 else
-                    m_xColumnUpdate->updateString( aNewValue );
+                    m_xColumnUpdate->updateString( sNewValue );
             }
             catch ( const Exception& )
             {
                 return sal_False;
             }
         }
-        m_aSaveValue = aNewValue;
+
+        m_aLastKnownValue = aNewValue;
     }
 
     // add the new value to the list
@@ -790,7 +799,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
             sal_Int32 i;
             for (i=0; i<aStringItemList.getLength(); ++i, ++pStringItems)
             {
-                if (pStringItems->equals(aNewValue))
+                if ( pStringItems->equals( sNewValue ) )
                     break;
             }
 
@@ -799,7 +808,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
             {
                 sal_Int32 nOldLen = aStringItemList.getLength();
                 aStringItemList.realloc( nOldLen + 1 );
-                aStringItemList.getArray()[ nOldLen ] = aNewValue;
+                aStringItemList.getArray()[ nOldLen ] = sNewValue;
 
                 setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( aStringItemList ) );
             }
@@ -815,10 +824,26 @@ Any OComboBoxModel::translateDbColumnToControlValue()
 {
     OSL_PRECOND( m_pValueFormatter.get(), "OComboBoxModel::translateDbColumnToControlValue: no value formatter!" );
     if ( m_pValueFormatter.get() )
-        m_aSaveValue = m_pValueFormatter->getFormattedValue();
+    {
+        ::rtl::OUString sValue( m_pValueFormatter->getFormattedValue() );
+        if  (   !sValue.getLength()
+            &&  m_pValueFormatter->getColumn().is()
+            &&  m_pValueFormatter->getColumn()->wasNull()
+            )
+        {
+            m_aLastKnownValue.clear();
+        }
+        else
+        {
+
+            m_aLastKnownValue <<= sValue;
+        }
+    }
     else
-        m_aSaveValue = ::rtl::OUString();
-    return makeAny( m_aSaveValue );
+        m_aLastKnownValue.clear();
+
+    return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( ::rtl::OUString() );
+        // (m_aLastKnownValue is alllowed to be VOID, the control value isn't)
 }
 
 //------------------------------------------------------------------------------