Kaydet (Commit) 40c8121f authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann Kaydeden (comit) Caolán McNamara

Resolves: #i124474# on change of User Field via UNO-API...

trigger update to get dependent Input Fields updated.

(cherry picked from commit fc0c91c2)

Conflicts:
	sw/source/core/unocore/unofield.cxx

Change-Id: I0ead765729c93992103baca53924b7a127936b38
üst cbce7443
...@@ -577,18 +577,29 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, ...@@ -577,18 +577,29 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
} }
} }
} }
if( bSetValue ) if ( bSetValue )
{ {
// nothing special to be done here for the properties // nothing special to be done here for the properties
// UNO_NAME_DATA_BASE_NAME and UNO_NAME_DATA_BASE_URL. // UNO_NAME_DATA_BASE_NAME and UNO_NAME_DATA_BASE_URL.
// We just call PutValue (empty string is allowed). // We just call PutValue (empty string is allowed).
// Thus the last property set will be used as Data Source. // Thus the last property set will be used as Data Source.
sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType ); const sal_uInt16 nMemberValueId = GetFieldTypeMId( rPropertyName, *pType );
if( USHRT_MAX != nMId ) if ( USHRT_MAX != nMemberValueId )
pType->PutValue( rValue, nMId ); {
pType->PutValue( rValue, nMemberValueId );
if ( pType->Which() == RES_USERFLD )
{
// trigger update of User field in order to get depending Input Fields updated.
pType->UpdateFlds();
}
}
else else
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); {
throw beans::UnknownPropertyException(
OUString( "Unknown property: " ) + rPropertyName,
static_cast< cppu::OWeakObject * >( this ) );
}
} }
} }
else if (!pType && m_pImpl->m_pDoc && rPropertyName == UNO_NAME_NAME) else if (!pType && m_pImpl->m_pDoc && rPropertyName == UNO_NAME_NAME)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment