sw/source/core/unocore/unofield.cxx | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
New commits: commit 40c8121fbeb89403418a90c77b88d13ad268d347 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri Mar 21 12:32:09 2014 +0000 Resolves: #i124474# on change of User Field via UNO-API... trigger update to get dependent Input Fields updated. (cherry picked from commit fc0c91c2d00157cb02cbe7b1d09cb950762e8145) Conflicts: sw/source/core/unocore/unofield.cxx Change-Id: I0ead765729c93992103baca53924b7a127936b38 diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 044dcb1..a416963 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -577,18 +577,29 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } } } - if( bSetValue ) + if ( bSetValue ) { // nothing special to be done here for the properties // UNO_NAME_DATA_BASE_NAME and UNO_NAME_DATA_BASE_URL. // We just call PutValue (empty string is allowed). // Thus the last property set will be used as Data Source. - sal_uInt16 nMId = GetFieldTypeMId( rPropertyName, *pType ); - if( USHRT_MAX != nMId ) - pType->PutValue( rValue, nMId ); + const sal_uInt16 nMemberValueId = GetFieldTypeMId( rPropertyName, *pType ); + if ( USHRT_MAX != nMemberValueId ) + { + 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 - 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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits