diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 13:27:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 13:27:25 +0000 |
| commit | 591144bd8fba78bcc5ce2a0a07eb7cd67ef34a9e (patch) | |
| tree | b8aec2671bd4f561fb8aa566f7a8d8e799a906fa /toolkit | |
| parent | b8edca0d052ccd4d7805ec0e8bd0c6223938a7e6 (diff) | |
INTEGRATION: CWS updchk06 (1.47.34); FILE MERGED
2007/06/25 06:12:02 dv 1.47.34.2: Added support for property DesktopAsParent
2007/06/08 06:54:55 dv 1.47.34.1: #i70588# Added support for autovscroll and painttransparent to edit
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index b78c1b7f1fe6..06752d7a08e6 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unocontrol.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2007-02-14 15:34:26 $ + * last change: $Author: rt $ $Date: 2007-07-06 14:27:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -623,9 +623,12 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent || ( nPType == BASEPROPERTY_DROPDOWN ) || ( nPType == BASEPROPERTY_HSCROLL ) || ( nPType == BASEPROPERTY_VSCROLL ) + || ( nPType == BASEPROPERTY_AUTOHSCROLL ) + || ( nPType == BASEPROPERTY_AUTOVSCROLL ) || ( nPType == BASEPROPERTY_ORIENTATION ) || ( nPType == BASEPROPERTY_SPIN ) - || ( nPType == BASEPROPERTY_ALIGN ); + || ( nPType == BASEPROPERTY_ALIGN ) + || ( nPType == BASEPROPERTY_PAINTTRANSPARENT ); else bNeedNewPeer = requiresNewPeer( pEvents->PropertyName ); @@ -1240,6 +1243,18 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } } + // DESKTOP_AS_PARENT + if ( aDescr.Type == WindowClass_TOP ) + { + aPropName = GetPropertyName( BASEPROPERTY_DESKTOP_AS_PARENT ); + if ( xInfo->hasPropertyByName( aPropName ) ) + { + aVal = xPSet->getPropertyValue( aPropName ); + sal_Bool b = sal_Bool(); + if ( ( aVal >>= b ) && b) + aDescr.ParentIndex = -1; + } + } // Moveable aPropName = GetPropertyName( BASEPROPERTY_MOVEABLE ); if ( xInfo->hasPropertyByName( aPropName ) ) @@ -1300,6 +1315,26 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer aDescr.WindowAttributes |= VclWindowPeerAttribute::VSCROLL; } + // AutoHScroll + aPropName = GetPropertyName( BASEPROPERTY_AUTOHSCROLL ); + if ( xInfo->hasPropertyByName( aPropName ) ) + { + aVal = xPSet->getPropertyValue( aPropName ); + sal_Bool b = sal_Bool(); + if ( ( aVal >>= b ) && b) + aDescr.WindowAttributes |= VclWindowPeerAttribute::AUTOHSCROLL; + } + + // AutoVScroll + aPropName = GetPropertyName( BASEPROPERTY_AUTOVSCROLL ); + if ( xInfo->hasPropertyByName( aPropName ) ) + { + aVal = xPSet->getPropertyValue( aPropName ); + sal_Bool b = sal_Bool(); + if ( ( aVal >>= b ) && b) + aDescr.WindowAttributes |= VclWindowPeerAttribute::AUTOVSCROLL; + } + // Align aPropName = GetPropertyName( BASEPROPERTY_ALIGN ); if ( xInfo->hasPropertyByName( aPropName ) ) |