diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 10:55:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 10:55:41 +0000 |
| commit | d5f2d6a2ee627ec093b2d979f25c653896c131df (patch) | |
| tree | ac18db2f6d0a676fd20073ced096f7073ec43811 /sfx2/source/appl/childwin.cxx | |
| parent | d575dbd4cfc1cbae924a4579580e906247e148b3 (diff) | |
INTEGRATION: CWS formdesign01 (1.13.208); FILE MERGED
2004/02/25 18:22:18 fs 1.13.208.2: RESYNC: (1.13-1.14); FILE MERGED
2003/12/04 14:55:00 fs 1.13.208.1: during #i23190#: QueryClose: care for the result of the XController::suspend call
Diffstat (limited to 'sfx2/source/appl/childwin.cxx')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b37e0cef5d..9a2d24bfe6 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: childwin.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2004-02-26 13:02:48 $ + * last change: $Author: obo $ $Date: 2004-03-19 11:55:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -800,14 +800,16 @@ void SfxChildWindow::Deactivate_Impl() sal_Bool SfxChildWindow::QueryClose() { + sal_Bool bAllow = sal_True; + if ( pImp->xFrame.is() ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xCtrl = pImp->xFrame->getController(); if ( xCtrl.is() ) - xCtrl->suspend( sal_True ); + bAllow = xCtrl->suspend( sal_True ); } - return sal_True; + return bAllow; } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxChildWindow::GetFrame() |