diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-05 14:55:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-05 14:55:06 +0000 |
| commit | 8852630686e9b7357410f7b94ed9322321ff9e53 (patch) | |
| tree | d2a1d0c2e704e9cf57ee55c742d2cdc52803f4a7 /toolkit | |
| parent | f6d9118f9e15f109c3a3994c88662552f9b161a1 (diff) | |
INTEGRATION: CWS frmcontrols04 (1.35.6); FILE MERGED
2004/06/16 04:34:53 fs 1.35.6.4: RESYNC: (1.35-1.36); FILE MERGED
2004/05/06 13:31:36 fs 1.35.6.3: WB_CENTER not necessary anymore for buttons
2004/05/03 15:56:45 fs 1.35.6.2: WB_WCENTER flag is respected by push buttons since #i26047#
2004/03/03 13:35:15 dv 1.35.6.1: #i24682# Since the type WinBits is 64 bits long, the type itself should be used instead of SALUINT32
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 80dced365e0f..85365d78aecc 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vclxtoolkit.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: hr $ $Date: 2004-05-10 16:13:38 $ + * last change: $Author: obo $ $Date: 2004-07-05 15:55:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -274,9 +274,9 @@ namespace css = ::com::sun::star; #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 #endif -sal_uInt32 ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType ) +WinBits ImplGetWinBits( sal_uInt32 nComponentAttribs, sal_uInt16 nCompType ) { - sal_uInt32 nWinBits = 0; + WinBits nWinBits = 0; sal_Bool bMessBox = sal_False; if ( ( nCompType == WINDOW_INFOBOX ) || @@ -689,7 +689,7 @@ void SAL_CALL VCLXToolkit::disposing() pParent = pParentComponent->GetWindow(); } - sal_uInt32 nWinBits = ImplGetWinBits( rDescriptor.WindowAttributes, + WinBits nWinBits = ImplGetWinBits( rDescriptor.WindowAttributes, ImplGetComponentType( rDescriptor.WindowServiceName ) ); VCLXWindow* pNewComp = NULL; @@ -821,7 +821,8 @@ void SAL_CALL VCLXToolkit::disposing() } Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, - const ::com::sun::star::awt::WindowDescriptor& rDescriptor, Window* pParent, sal_uInt32 nWinBits ) + const ::com::sun::star::awt::WindowDescriptor& rDescriptor, + Window* pParent, WinBits nWinBits ) { String aServiceName( rDescriptor.WindowServiceName ); aServiceName.ToLowerAscii(); |