strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS dba32h

Browse source 
2009-10-12 12:21:44 +0200 msc  r276827 : remove warning for issue 102712 because the issue is fixed
2009-10-05 07:14:20 +0200 oj  r276658 : #105585# add missing dependency for OOO_UI
2009-10-02 12:50:19 +0200 fs  r276632 : #i105505#
If a model is created, and is a revenant of a previous incarnation, then ensure it is properly initialized.
In particular, in its ctor, set the state to "Initializing", not "Initialized", and then let the ModelImpl
call attachResource. This ensures that the model is initialized completely, including firing the necessary
events.
2009-10-02 12:46:12 +0200 fs  r276631 : #i105505# always do an attachResource at the newly loaded model, even if it (internally) was not really loaded, but only a revenant of a previous incarnation of this document
2009-10-01 13:09:07 +0200 fs  r276596 : do not rely on the name 'Standard' for the one and only form in a document
2009-10-01 12:35:56 +0200 fs  r276589 : #i105509# don't rely on default form component names, use indexes
2009-10-01 11:19:18 +0200 fs  r276584 : copying the fix for #i105082# into this CWS
2009-10-01 11:13:22 +0200 fs  r276583 : improved logs
2009-10-01 11:10:44 +0200 fs  r276581 : #i105505#
2009-10-01 08:07:57 +0200 fs  r276575 : manual merge of trunk, to allow cwslocalize to run
2009-09-30 22:48:30 +0200 fs  r276574 : removed that strange ONLOAD definition
2009-09-30 12:58:18 +0200 fs  r276553 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 12:56:45 +0200 fs  r276552 : copy fix for #i105387# into this CWS, as the issue prevents us from finalizing the CWS
2009-09-30 11:47:45 +0200 fs  r276549 : #i105235#
2009-09-29 12:27:40 +0200 fs  r276521 : #i105367#
2009-09-28 12:08:17 +0200 oj  r276485 : #i105371# export version in manifest.xml as well
2009-09-28 12:07:02 +0200 oj  r276484 : #i105371# export version in manifest.xml as well
2009-09-28 09:48:01 +0200 oj  r276481 : #i105366# init drivers when not empty
2009-09-25 14:31:27 +0200 fs  r276466 : CWS-TOOLING: rebase CWS dba32h to trunk@276429 (milestone: DEV300:m60)
2009-09-24 13:52:54 +0200 fs  r276422 : #i105234# do not zoom the control when they view information is still uninitialized (happens at least in Writer when opening a form document)
2009-09-24 11:42:03 +0200 fs  r276413 : #i105234# proper zoom handling for the nav bar
2009-09-24 11:41:40 +0200 fs  r276412 : #i105234# setZoom: care for precision errors caused by implicit conversion float->double
2009-09-23 12:21:22 +0200 oj  r276377 : remove dos lineends
2009-09-23 11:44:52 +0200 oj  r276376 : #i105216# load config on demand
2009-09-23 11:44:19 +0200 oj  r276375 : #i105216# load config on demand
2009-09-23 11:43:35 +0200 oj  r276374 : #i105216# load config on demand
2009-09-21 09:13:03 +0200 oj  r276307 : #i105158# use Thread support
2009-09-18 13:06:50 +0200 fs  r276277 : #i105147#
2009-09-18 11:48:23 +0200 oj  r276271 : #i105158# new method for thread safety
2009-09-18 10:42:56 +0200 fs  r276266 : CWS-TOOLING: rebase CWS dba32h to trunk@276192 (milestone: DEV300:m59)
2009-09-18 08:30:03 +0200 oj  r276263 : #i105016# load correct ldap so
2009-09-17 13:42:31 +0200 oj  r276240 : change count of check boxes
2009-09-17 13:32:59 +0200 oj  r276239 : revert false to true for currency
2009-09-17 09:14:46 +0200 oj  r276220 : #i104901# add patch for every issue
2009-09-17 09:10:29 +0200 oj  r276219 : #i104901# add patch for every issue
2009-09-11 13:47:49 +0200 oj  r276060 : #i104901# fix for indentity
2009-09-11 12:14:14 +0200 fs  r276056 : #i104594# allow to render controls without an SdrPageView
2009-09-11 11:49:31 +0200 fs  r276055 : CWS-TOOLING: rebase CWS dba32h to trunk@276043 (milestone: DEV300:m58)
2009-09-10 08:41:40 +0200 oj  r276021 : #i104911# export variable-set not for repeating sections
This commit is contained in:
Kurt Zenker 2009-10-14 18:48:09 +00:00
parent 6e36b034ab
commit 350d5ca980
5 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extensions/source/config/ldap/ldapaccess.cxx
View file

@ -315,14 +315,17 @@ void LdapConnection::loadModule()
if ( !s_Ldap_Module ) if ( !s_Ldap_Module )
{ {
#if defined(WIN) || defined(WNT) #if defined(WIN) || defined(WNT)
const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll")); # define LIBLDAP "nsldap32v50.dll"
#else #else
#ifdef WITH_OPENLDAP # ifdef WITH_OPENLDAP
const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so")); # define xstr(s) str(s)
#else # define str(s) #s
const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so")); # define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
#endif # else
# define LIBLDAP "libldap50.so"
# endif
#endif #endif
const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
// load the dbtools library // load the dbtools library
s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);

6
extensions/source/config/ldap/wrapldapinclude.hxx
View file

@ -35,6 +35,12 @@
#ifdef WITH_OPENLDAP #ifdef WITH_OPENLDAP
#include <ldap.h> #include <ldap.h>
#ifndef LDAP_API
# define LDAP_API(rt) rt
#endif
#ifndef LDAP_CALL
# define LDAP_CALL
#endif
#else #else
#ifndef LDAP_INCLUDED #ifndef LDAP_INCLUDED
#define LDAP_INCLUDED #define LDAP_INCLUDED

22
forms/qa/integration/forms/FormLayer.java
View file

@ -310,7 +310,27 @@ public class FormLayer
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/** retrieves a control model with a given access path /** retrieves a control model with a given (integer) access path
*/
public XPropertySet getControlModel( int[] _accessPath ) throws com.sun.star.uno.Exception
{
XIndexAccess indexAcc = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
m_document.getFormComponentTreeRoot() );
XPropertySet controlModel = null;
int i=0;
while ( ( indexAcc != null ) && ( i < _accessPath.length ) )
{
controlModel = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
indexAcc.getByIndex( _accessPath[i] ) );
indexAcc = (XIndexAccess)UnoRuntime.queryInterface( XIndexAccess.class,
controlModel );
++i;
}
return controlModel;
}
/* ------------------------------------------------------------------ */
/** retrieves a control model with a given (string) access path
*/ */
public XPropertySet getControlModel( String[] _accessPath ) throws com.sun.star.uno.Exception public XPropertySet getControlModel( String[] _accessPath ) throws com.sun.star.uno.Exception
{ {

2
forms/qa/integration/forms/FormPropertyBags.java
View file

@ -180,7 +180,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro
m_document = DocumentHelper.loadDocument( m_orb, documentURL ); m_document = DocumentHelper.loadDocument( m_orb, documentURL );
m_formLayer = new FormLayer( m_document ); m_formLayer = new FormLayer( m_document );
XPropertySet textFieldModel = m_formLayer.getControlModel( new String[] { "Standard", "TextBox" } ); XPropertySet textFieldModel = m_formLayer.getControlModel( new int[] { 0, 0 } );
// all persistent properties should have the expected values // all persistent properties should have the expected values
assure( "persistent properties did not survive reload (1)!", ((String)textFieldModel.getPropertyValue( "SomeBoundText" )).equals( "ChangedBoundText" ) ); assure( "persistent properties did not survive reload (1)!", ((String)textFieldModel.getPropertyValue( "SomeBoundText" )).equals( "ChangedBoundText" ) );

9
forms/source/component/FormComponent.cxx
View file

@ -1977,7 +1977,6 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
{ {
// RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "forms", "dev@dba.openoffice.org", "OControlModel::setFastPropertyValue_NoBroadcast" );
// if the DBColumn value changed, transfer it to the control // if the DBColumn value changed, transfer it to the control
if ( evt.PropertyName.equals( PROPERTY_VALUE ) ) if ( evt.PropertyName.equals( PROPERTY_VALUE ) )
{ {
@ -2267,6 +2266,14 @@ void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload
m_bLoaded = sal_True; m_bLoaded = sal_True;
onConnectedDbColumn( xRowSet ); 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 // initially transfer the db column value to the control, if we successfully connected to a database column
if ( hasField() ) if ( hasField() )
initFromField( xRowSet ); initFromField( xRowSet );