From c9e236cc230d6efe3b8734a3ffd2c46d052736a8 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 1 Dec 2009 09:53:35 +0000 Subject: CWS-TOOLING: integrate CWS dba32j 2009-11-26 09:30:10 +0100 msc r277648 : #100000 fix urgent testscript error 2009-11-25 10:27:56 +0100 msc r277625 : #i100000 fix urgent testscript error 2009-11-17 22:16:46 +0100 fs r277544 : CWS-TOOLING: rebase CWS dba32j to branches/OOO320@277531 (milestone: OOO320:m5) 2009-11-17 14:26:47 +0100 fs r277535 : ooops, didn't mean to commit this uncommented line 2009-11-14 20:50:29 +0100 fs r277505 : add a --disable-pango switch to SM's configure options, and add a patch which makes certain code respect it (well, respect it better than currently, by not using some pango_x_* functions, which are not always available, even when pango itself is present) 2009-11-14 20:47:41 +0100 fs r277504 : spelling 2009-11-13 14:04:00 +0100 fs r277502 : #i100764# (commit approved by ab@openoffice.org): getModelFromBasic: do not start with the parent's parent when looking for ThisComponent, but walk up the anchestor chain, starting with the immediate parent 2009-11-13 11:04:15 +0100 fs r277496 : #i100764# better heuristics for determining whether or not to participate in the ThisComponent game 2009-11-13 11:02:30 +0100 fs r277495 : #i100764# set the WB_EXT_DOCUMENT style at the backing component's container window, when creating it without the TaskCreator (which would normally do this) 2009-11-11 13:49:11 +0100 fs r277452 : #i106816# 2009-11-11 13:48:53 +0100 fs r277451 : fix the CREATETARBAL target, which is expected to create the zips used as prebuilts. The *inc.zip missed the NSS files in case NSS was built externally 2009-11-11 12:15:34 +0100 fs r277449 : update ignore list 2009-11-11 12:09:23 +0100 fs r277448 : add a link to the Mozilla build tools download location 2009-11-11 12:07:16 +0100 fs r277447 : add a link to the Mozilla build tools download location 2009-11-06 16:23:12 +0100 fs r277393 : #i106643# 2009-11-03 23:20:29 +0100 fs r277328 : #i106574# reverted the recent fix for issue #i105235#, and implemented a better one. 2009-11-02 12:59:48 +0100 fs r277294 : #i106550# errorOccured: also display the error when we're not in a nested form action - form actions are allowed to be triggered by other instances as well --- forms/source/component/ComboBox.cxx | 7 +++++++ forms/source/component/ComboBox.hxx | 2 ++ forms/source/component/Currency.cxx | 7 +++++++ forms/source/component/Currency.hxx | 2 ++ forms/source/component/Date.cxx | 7 +++++++ forms/source/component/Date.hxx | 2 ++ forms/source/component/Edit.cxx | 7 +++++++ forms/source/component/Edit.hxx | 2 ++ forms/source/component/FormComponent.cxx | 8 -------- forms/source/component/FormattedField.cxx | 7 +++++++ forms/source/component/FormattedField.hxx | 1 + forms/source/component/ListBox.cxx | 11 +++++++++-- forms/source/component/ListBox.hxx | 1 + forms/source/component/Numeric.cxx | 7 +++++++ forms/source/component/Numeric.hxx | 1 + forms/source/component/Pattern.cxx | 7 +++++++ forms/source/component/Pattern.hxx | 1 + forms/source/component/Time.cxx | 7 +++++++ forms/source/component/Time.hxx | 1 + 19 files changed, 78 insertions(+), 10 deletions(-) (limited to 'forms/source/component') diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 1d6d204ea977..432bc5124775 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -747,6 +747,13 @@ void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(Runtim loadData( false ); } +//------------------------------------------------------------------------------ +void OComboBoxModel::resetNoBroadcast() +{ + OBoundControlModel::resetNoBroadcast(); + m_aLastKnownValue.clear(); +} + //----------------------------------------------------------------------------- sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) { diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 835099a7637c..068f4fd97163 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -145,6 +145,8 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); + // OEntryListHelper overriables virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ); virtual void connectedExternalListSource( ); diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 1b19b794d273..963e8fa165b7 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -257,6 +257,13 @@ Any OCurrencyModel::getDefaultForReset() const return aValue; } +//------------------------------------------------------------------------------ +void OCurrencyModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aSaveValue.clear(); +} + //......................................................................... } // namespace frm //......................................................................... diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index 91eb109d6a14..3e968dcf3bc7 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -73,6 +73,8 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); + protected: DECLARE_XCLONEABLE(); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 33332ae82908..5d0d3f21ce7a 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -347,6 +347,13 @@ Any ODateModel::getDefaultForReset() const return m_aDefault; } +//------------------------------------------------------------------------------ +void ODateModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aSaveValue.clear(); +} + //------------------------------------------------------------------------------ Sequence< Type > ODateModel::getSupportedBindingTypes() { diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 4c4e84e2822f..7eb1acfabf75 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -96,6 +96,8 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); + virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); protected: diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 0f4abd687d65..4eca9402fef8 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -674,6 +674,13 @@ sal_Bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType ) return OEditBaseModel::approveDbColumnType( _nColumnType ); } +//------------------------------------------------------------------------------ +void OEditModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aLastKnownValue.clear(); +} + //------------------------------------------------------------------------------ sal_Bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) { diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index cb8d5c6300e4..774944eda939 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -118,6 +118,8 @@ protected: virtual sal_Bool approveDbColumnType( sal_Int32 _nColumnType ); + virtual void resetNoBroadcast(); + protected: virtual sal_uInt16 getPersistenceFlags() const; diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 3b6a6afaf5de..2e46fa0c00f3 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -2266,14 +2266,6 @@ void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload m_bLoaded = sal_True; onConnectedDbColumn( xRowSet ); - // Some derived classes decide to cache the "current" (resp. "last known") control value, so operations like - // commitControlValueToDbColumn can be made a no-op when nothing actually changed. - // Normally, this cache is kept in sync with the column value, but during a reload, this synchronization is - // temporarily disable. To allow the derived classes to update their cache from the current column value, - // we call translateDbColumnToControlValue. - if ( _bFromReload && hasField() ) - translateDbColumnToControlValue(); - // initially transfer the db column value to the control, if we successfully connected to a database column if ( hasField() ) initFromField( xRowSet ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index bc0e952f1735..0edbf781e786 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -1248,6 +1248,13 @@ Any OFormattedModel::getDefaultForReset() const return m_xAggregateSet->getPropertyValue( PROPERTY_EFFECTIVE_DEFAULT ); } +//------------------------------------------------------------------------------ +void OFormattedModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aSaveValue.clear(); +} + //......................................................................... } //......................................................................... diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 0e728288aaba..4a25d10c5c81 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -141,6 +141,7 @@ namespace frm virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); virtual void onDisconnectedDbColumn(); diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 0a25f66fe401..4bbf42381900 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1037,10 +1037,10 @@ namespace frm Sequence< sal_Int16 > aSelectionIndicies; - // Bei NULL-Eintraegen Selektion aufheben! ORowSetValue aCurrentValue; - aCurrentValue.fill( xBoundField->getPropertyValue( PROPERTY_VALUE ) ); + aCurrentValue.fill( getFieldType(), m_xColumn ); + // reset selection for NULL values if ( aCurrentValue.isNull() ) { if ( m_nNULLPos != -1 ) @@ -1087,6 +1087,13 @@ namespace frm return aValue; } + //-------------------------------------------------------------------- + void OListBoxModel::resetNoBroadcast() + { + OBoundControlModel::resetNoBroadcast(); + m_aSaveValue.setNull(); + } + //-------------------------------------------------------------------- void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException ) { diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 60bd63b3712d..308fb618e18a 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -157,6 +157,7 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); virtual ::com::sun::star::uno::Any getCurrentFormComponentValue() const; diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 2ec1f0cfcfdc..2eba2daae067 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -212,6 +212,13 @@ Any ONumericModel::getDefaultForReset() const return aValue; } +//------------------------------------------------------------------------------ +void ONumericModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aSaveValue.clear(); +} + //......................................................................... } // namespace frm //......................................................................... diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index 45b096afef50..5599707e86d5 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -72,6 +72,7 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); protected: DECLARE_XCLONEABLE(); diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 64f5ea0e5e75..166522c18359 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -252,6 +252,13 @@ Any OPatternModel::getDefaultForReset() const return makeAny( m_aDefaultText ); } +//------------------------------------------------------------------------------ +void OPatternModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aLastKnownValue.clear(); +} + //......................................................................... } // namespace frm //......................................................................... diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 8b2bf3b878c2..9e0bc3b68d77 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -81,6 +81,7 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); protected: DECLARE_XCLONEABLE(); diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 85ce1670572d..6a63724829d1 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -349,6 +349,13 @@ Any OTimeModel::getDefaultForReset() const return m_aDefault; } +//------------------------------------------------------------------------------ +void OTimeModel::resetNoBroadcast() +{ + OEditBaseModel::resetNoBroadcast(); + m_aSaveValue.clear(); +} + //------------------------------------------------------------------------------ Sequence< Type > OTimeModel::getSupportedBindingTypes() { diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index d2ba5381f466..7a7ce373b363 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -96,6 +96,7 @@ protected: virtual ::com::sun::star::uno::Any getDefaultForReset() const; + virtual void resetNoBroadcast(); virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); -- cgit