diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:39:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:39:38 +0000 |
| commit | 5f6e4a28dbb326958a834ce3412c62f546a4067a (patch) | |
| tree | efea737063f535a78695630911298476c58c0053 | |
| parent | 2cf783c32ab4d5c6a7ef83e6384bac7a24e3fd06 (diff) | |
INTEGRATION: CWS rptchart02 (1.3.2); FILE MERGED
2008/04/18 08:57:34 oj 1.3.2.1: #i86850# use of ComponentContext
| -rw-r--r-- | extensions/source/preload/unoautopilot.inl | 4 | ||||
| -rw-r--r-- | 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 <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::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); } //--------------------------------------------------------------------- |