From 5f6e4a28dbb326958a834ce3412c62f546a4067a Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 16 Jun 2008 11:39:38 +0000 Subject: INTEGRATION: CWS rptchart02 (1.3.2); FILE MERGED 2008/04/18 08:57:34 oj 1.3.2.1: #i86850# use of ComponentContext --- extensions/source/preload/unoautopilot.inl | 4 ++-- extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/source/preload/unoautopilot.inl b/extensions/source/preload/unoautopilot.inl index a10b25fda..f038a6317 100644 --- a/extensions/source/preload/unoautopilot.inl +++ b/extensions/source/preload/unoautopilot.inl @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoautopilot.inl,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -116,7 +116,7 @@ template template Dialog* OUnoAutoPilot::createDialog(Window* _pParent) { - return new TYPE(_pParent, m_xObjectModel, m_xORB); + return new TYPE(_pParent, m_xObjectModel, m_aContext.getLegacyServiceFactory()); } //-------------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 19d6fe94d..c8e903142 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MasterDetailLinkDialog.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -117,7 +117,7 @@ namespace pcr //-------------------------------------------------------------------------- Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent) { - return new FormLinkDialog(_pParent,m_xDetail,m_xMaster,Reference< XMultiServiceFactory >( m_xContext->getServiceManager(),UNO_QUERY) + return new FormLinkDialog(_pParent,m_xDetail,m_xMaster,m_aContext.getLegacyServiceFactory() ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); } //--------------------------------------------------------------------- -- cgit v1.2.3