diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 12:10:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 12:10:04 +0000 |
| commit | 2b11b575e155c3ccc4d88d058c67d9e2869880f1 (patch) | |
| tree | 36af0f823287ece0fff69cb88a0254e5b800d9bf /toolkit | |
| parent | 5b6ac3ed5b16dfb434484036c2631833df7a7b58 (diff) | |
INTEGRATION: CWS vcl35 (1.39.18); FILE MERGED
2005/01/21 09:58:18 pl 1.39.18.2: RESYNC: (1.39-1.40); FILE MERGED
2005/01/19 13:02:58 ssa 1.39.18.1: #118908# check for runtime exception when creating system child window
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 4dbbf8af340d..75468b84bef3 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vclxtoolkit.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2005-01-11 14:07:13 $ + * last change: $Author: rt $ $Date: 2005-01-31 13:10:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1162,7 +1162,19 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); aParentData.aWindow = x11_id; osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() ); - pChildWindow = new WorkWindow( &aParentData ); + try + { + pChildWindow = new WorkWindow( &aParentData ); + } + catch ( ::com::sun::star::uno::RuntimeException & rEx ) + { + // system child window could not be created + OSL_TRACE( + "VCLXToolkit::createSystemChild: caught %s\n", + ::rtl::OUStringToOString( + rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); + pChildWindow = NULL; + } } #elif defined WNT sal_Int32 hWnd; @@ -1173,7 +1185,19 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, aParentData.nSize = sizeof( aParentData ); aParentData.hWnd = (HWND)hWnd; osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() ); - pChildWindow = new WorkWindow( &aParentData ); + try + { + pChildWindow = new WorkWindow( &aParentData ); + } + catch ( ::com::sun::star::uno::RuntimeException & rEx ) + { + // system child window could not be created + OSL_TRACE( + "VCLXToolkit::createSystemChild: caught %s\n", + ::rtl::OUStringToOString( + rEx.Message, RTL_TEXTENCODING_UTF8).getStr()); + pChildWindow = NULL; + } } #endif } |