summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-16 12:52:47 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-16 12:52:47 +0000
commit2f6b41c00f23cc108d5c003cb1f956e50b7fc00c (patch)
tree469cd9ddd6651223b87e21b119b975fdfc6749e3
parent056eceded23249bbd86f432d2bb620729a54f78c (diff)
INTEGRATION: CWS rptchart02 (1.14.10); FILE MERGED
2008/04/18 08:45:51 oj 1.14.10.1: #i86850# use of ComponentContext
-rw-r--r--svtools/source/uno/genericunodialog.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index a5858192bd09..a5899834fd59 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: genericunodialog.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -67,7 +67,7 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XMultiServiceFactory >& _r
,m_bTitleAmbiguous(sal_True)
,m_bInitialized( false )
,m_bNeedInitialization( false )
- ,m_xORB( _rxORB )
+ ,m_aContext( _rxORB )
{
registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));
@@ -84,8 +84,7 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo
,m_bTitleAmbiguous(sal_True)
,m_bInitialized( false )
,m_bNeedInitialization( false )
- ,m_xORB( _rxContext->getServiceManager(), UNO_QUERY_THROW )
- ,m_xContext(_rxContext)
+ ,m_aContext(_rxContext)
{
registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));