From ee869a3ad7395b639ba4d59ff77efa03c52d6aa4 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 14 Jan 2008 16:27:38 +0000 Subject: [PATCH] INTEGRATION: CWS fwk79 (1.71.34); FILE MERGED 2007/12/09 15:48:43 pb 1.71.34.1: fix: #i83757# transport SID_OPTIONS_PAGEURL of slot SID_OPTIONS_TREEDIALOG --- sfx2/source/appl/appserv.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index ac07ac7a90f1..746136f10ea4 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appserv.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: vg $ $Date: 2007-10-15 13:17:44 $ + * last change: $Author: ihi $ $Date: 2008-01-14 17:27:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -838,6 +838,10 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) { case SID_OPTIONS_TREEDIALOG: { + String sPageURL; + SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_OPTIONS_PAGEURL, sal_False ); + if ( pURLItem ) + sPageURL = pURLItem->GetValue(); const SfxItemSet* pArgs = rReq.GetInternalArgs_Impl(); const SfxPoolItem* pItem = NULL; Reference < XFrame > xFrame; @@ -846,7 +850,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - VclAbstractDialog* pDlg = pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot() ); + VclAbstractDialog* pDlg = + pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL ); pDlg->Execute(); delete pDlg; }