diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-18 13:24:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-18 13:24:20 +0000 |
| commit | d716c1a47604a36efece28f7c6e351dfd8f54ccd (patch) | |
| tree | 58632c117ed26acf5c5e2d8778ce258e43a18d60 /basctl/source | |
| parent | 9ac4bafaa93741f1eeab6d7fa166be5f86103ccc (diff) | |
INTEGRATION: CWS olefix (1.33.36); FILE MERGED
2005/04/11 13:35:22 tbe 1.33.36.1: #i47002# API: calling oDoc.printPages(); oDoc.close(true) crashes the office
Diffstat (limited to 'basctl/source')
| -rw-r--r-- | basctl/source/basicide/baside2.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 62def7aa326a..62d7293779c2 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: baside2.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2005-04-13 09:49:28 $ + * last change: $Author: obo $ $Date: 2005-04-18 14:24:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,6 +97,9 @@ #include <com/sun/star/document/MacroExecMode.hpp> #endif +#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ +#include <toolkit/helper/vclunohelper.hxx> +#endif #ifndef _SFXDOCFILE_HXX //autogen #include <sfx2/docfile.hxx> #endif @@ -751,7 +754,17 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic ) aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE ); // ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute(); // ErrorHandler::HandleError( pBasic->GetErrorCode() ); + + // #i47002# + Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this ); + ErrorHandler::HandleError( StarBASIC::GetErrorCode() ); + + // #i47002# + Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + if ( !pWindow ) + return FALSE; + if ( bMarkError ) aXEditorWindow.GetBrkWindow().SetMarkerPos( MARKER_NOMARKER ); return FALSE; |