diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:26:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:26:08 +0000 |
| commit | 5b81ed7f29ff5ddccd39277f11cdf548f32ff781 (patch) | |
| tree | 2770cd3667484f17759f462d49fcbdc29fc01aa7 /sfx2 | |
| parent | 0fe5ddcd21add79ef4062b091628040c0e9f33c0 (diff) | |
INTEGRATION: CWS printhelpfix_SRC680 (1.121.92); FILE MERGED
2007/04/04 06:57:49 pb 1.121.92.1: fix: #134037# If a print job runs do not open a new page
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 819a8845d0de..b94aa45511a0 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.122 $ + * $Revision: 1.123 $ * - * last change: $Author: rt $ $Date: 2007-04-26 10:07:12 $ + * last change: $Author: kz $ $Date: 2007-05-09 13:26:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1644,6 +1644,16 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo if (!xLoader.is()) return; + // --> PB 2007-03-12 #134037# + // If a print job runs do not open a new page + Reference< XFrame > xFrame = pTextWin->getFrame(); + if ( xFrame->getController().is() && !xFrame->getController()->suspend( sal_True ) ) + { + xFrame->getController()->suspend( sal_False ); + return; + } + // <-- + // save url to history if (bAddToHistory) pHelpInterceptor->addURL(sHelpURL); |