diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:05:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 14:05:25 +0000 |
| commit | ad8f334384e48c4ade57c3533745c289155beab5 (patch) | |
| tree | 25861dbebf75ced68dcaf0fceb395929a0780f4f | |
| parent | 539afa89737c24d670405485703b80f07f3136de (diff) | |
INTEGRATION: CWS fwk80_SRC680 (1.64.12); FILE MERGED
2008/01/24 07:50:44 pb 1.64.12.5: RESYNC: (1.66-1.66.4.1); FILE MERGED
2008/01/11 15:02:44 pb 1.64.12.4: fix: #i83756# DBG_ERRORFILE
2007/12/17 08:09:41 cd 1.64.12.3: #i79327# Fix build problem on Linux
2007/12/14 13:08:10 cd 1.64.12.2: RESYNC: (1.64-1.66); FILE MERGED
2007/12/10 13:07:43 cd 1.64.12.1: #i79327# Map com::sun::star::awt::DEFAULT_BUTTON_IGNORE to the correct WinBits to support it.
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 667b6f9f309e..ace3ef92cc1a 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxtoolkit.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 12:56:48 $ + * last change: $Author: rt $ $Date: 2008-01-29 15:05:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1103,7 +1103,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, *ppNewComp = new ::toolkit::XThrobber; } break; - default: DBG_ERROR( "UNO3!" ); + default: DBG_ERRORFILE( "UNO3!" ); } } @@ -1346,6 +1346,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( WinBits nAddWinBits( 0 ); if (( aButtons & 0x0000ffffL ) == css::awt::MessageBoxButtons::BUTTONS_ABORT_IGNORE_RETRY ) nAddWinBits |= WB_ABORT_RETRY_IGNORE; + if ( sal_Int32( aButtons & 0xffff0000L ) == css::awt::MessageBoxButtons::DEFAULT_BUTTON_IGNORE ) + nAddWinBits |= WB_DEF_IGNORE; aDescriptor.Type = css::awt::WindowClass_MODALTOP; aDescriptor.WindowServiceName = aType; |