mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS eforms2 (1.31.26); FILE MERGED

Browse Source 
2004/10/08 15:20:02 dvo 1.31.26.3: RESYNC: (1.32-1.33); FILE MERGED
2004/07/27 14:13:32 fs 1.31.26.2: RESYNC: (1.31-1.32); FILE MERGED
2004/07/19 15:18:41 fs 1.31.26.1: during #114856#: properly determine who instigated a setControlValue, so that we can propagate the values to appropriate interested parties / while we were here: make some attributes private ...
This commit is contained in:
Oliver Bolte
2004-11-16 09:37:51 +00:00
parent 3140f68074
commit 9e2eb9787f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forms/source/component/FormattedField.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: FormattedField.cxx,v $ * $RCSfile: FormattedField.cxx,v $
* *
* $Revision: 1.33 $ * $Revision: 1.34 $
* *
* last change: $Author: obo $ $Date: 2004-08-12 09:33:53 $ * last change: $Author: obo $ $Date: 2004-11-16 10:37:51 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -687,7 +687,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
if ( m_xColumn.is() && m_xAggregateFastSet.is() ) if ( m_xColumn.is() && m_xAggregateFastSet.is() )
{ {
::osl::MutexGuard aGuard( m_aMutex ); // setControlValue expects that ::osl::MutexGuard aGuard( m_aMutex ); // setControlValue expects that
setControlValue( translateDbColumnToControlValue() ); setControlValue( translateDbColumnToControlValue(), eOther );
} }
} }
catch(Exception&) catch(Exception&)
@@ -955,7 +955,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
} }
aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY); aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY);
bVoidKey = (!xSupplier.is() || !aFmtKey.hasValue()) || (m_bLoaded && m_xOriginalFormatter.is()); bVoidKey = (!xSupplier.is() || !aFmtKey.hasValue()) || (isLoaded() && m_xOriginalFormatter.is());
// (kein Fomatter und/oder Key) oder (loaded und faked Formatter) // (kein Fomatter und/oder Key) oder (loaded und faked Formatter)
} }
@@ -1114,7 +1114,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
// this property is only to be set if we have no control source : in all other cases the base class did a // this property is only to be set if we have no control source : in all other cases the base class did a
// reset after it's read and this set the effective value to a default value // reset after it's read and this set the effective value to a default value
if (m_xAggregateSet.is() && (m_aControlSource.getLength() == 0)) if ( m_xAggregateSet.is() && ( getControlSource().getLength() == 0 ) )
{ {
try try
{ {
@@ -1212,12 +1212,12 @@ sal_Bool OFormattedModel::commitControlValueToDbColumn( bool _bPostReset )
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Any OFormattedModel::translateExternalValueToControlValue( ) Any OFormattedModel::translateExternalValueToControlValue( )
{ {
OSL_PRECOND( m_xExternalBinding.is(), OSL_PRECOND( hasExternalValueBinding(),
"OFormattedModel::translateExternalValueToControlValue: precondition not met!" ); "OFormattedModel::translateExternalValueToControlValue: precondition not met!" );
Any aReturn; Any aReturn;
if ( m_xExternalBinding.is() ) if ( hasExternalValueBinding() )
aReturn = m_xExternalBinding->getValue( ::getCppuType( static_cast< double* >( NULL ) ) ); aReturn = getExternalValueBinding()->getValue( ::getCppuType( static_cast< double* >( NULL ) ) );
return aReturn; return aReturn;
} }