From 1e8efdcec6dce067c60c78a23b3334012b7d0f7d Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 16 Nov 2004 09:39:39 +0000 Subject: [PATCH] INTEGRATION: CWS eforms2 (1.34.26); FILE MERGED 2004/10/08 15:20:28 dvo 1.34.26.3: RESYNC: (1.35-1.36); FILE MERGED 2004/08/16 17:09:13 dvo 1.34.26.2: RESYNC: (1.34-1.35); FILE MERGED 2004/07/19 15:18:41 fs 1.34.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 ... --- forms/source/component/ImageControl.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 9453da97871d..d10168ef4ba1 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImageControl.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: hr $ $Date: 2004-09-08 17:43:03 $ + * last change: $Author: obo $ $Date: 2004-11-16 10:39:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -423,7 +423,7 @@ void OImageControlModel::read(const Reference& _rxInStream) break; } // Nach dem Lesen die Defaultwerte anzeigen - if (m_aControlSource.getLength()) + if ( getControlSource().getLength() ) { // (not if we don't have a control source - the "State" property acts like it is persistent, then ::osl::MutexGuard aGuard(m_aMutex); // resetNoBroadcast expects this mutex guarding resetNoBroadcast();