diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-27 09:26:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-27 09:26:15 +0000 |
| commit | 0c01e12afe1e7360ad81c2eeb8f6b80cb90677cf (patch) | |
| tree | 01f1d1f3a6e9a2d6d659935ce4cafc2cb9bf0a44 /toolkit | |
| parent | 6f67c1b6f7fb76e886c341c3209ec05294320a7e (diff) | |
INTEGRATION: CWS formpdfexportfix_DEV300 (1.52.46); FILE MERGED
2008/02/25 09:48:27 fs 1.52.46.1: #i86396# ::isVisible/::isEnabled: fall back to the value known in the component infos, when we don't have a peer
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 3cc8b809e128..dbcd1365096c 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unocontrol.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: ihi $ $Date: 2007-11-27 11:44:37 $ + * last change: $Author: obo $ $Date: 2008-02-27 10:26:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -825,7 +825,7 @@ awt::Size SAL_CALL UnoControl::getOutputSize( ) throw (RuntimeException) ::sal_Bool SAL_CALL UnoControl::isVisible( ) throw (RuntimeException) { - return lcl_askPeer( getPeer(), &XWindow2::isVisible, sal_False ); + return lcl_askPeer( getPeer(), &XWindow2::isVisible, maComponentInfos.bVisible ); } ::sal_Bool SAL_CALL UnoControl::isActive( ) throw (RuntimeException) @@ -835,7 +835,7 @@ awt::Size SAL_CALL UnoControl::getOutputSize( ) throw (RuntimeException) ::sal_Bool SAL_CALL UnoControl::isEnabled( ) throw (RuntimeException) { - return lcl_askPeer( getPeer(), &XWindow2::isEnabled, sal_False ); + return lcl_askPeer( getPeer(), &XWindow2::isEnabled, maComponentInfos.bEnable ); } ::sal_Bool SAL_CALL UnoControl::hasFocus( ) throw (RuntimeException) |