diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-04 11:20:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-01-09 08:08:15 +0200 |
| commit | 77d215ae2ed9bd08444a5128729066b6025bef27 (patch) | |
| tree | 581ee6dc7eaaedd2cea591f64cbed17e3da507ac /reportdesign | |
| parent | fd5a2eb07011e8aedfd5ef0a82edaf07221554ba (diff) | |
fdo#46808, use new method OConfigurationTreeRoot::createWithComponentContext
.. everywhere that was using createWithServiceFactory, and delete the old
method.
Change-Id: I02cb2bfbcc2390494383579d2f14caa4fc5b8014
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a8e7bcf3736f..22fec5990be5 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4001,7 +4001,7 @@ void OReportController::checkChartEnabled() try { ::utl::OConfigurationTreeRoot aConfiguration( - ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xServiceFactory, sConfigName ) ); + ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigName ) ); sal_Bool bChartEnabled = sal_False; if ( aConfiguration.hasByHierarchicalName(sPropertyName) ) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 719691817efd..213a3985cd7a 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -70,13 +70,13 @@ using namespace ::comphelper; //----------------------------------------------------------------------- namespace { - static bool lcl_shouldEnableHelpSection( const Reference< XMultiServiceFactory >& _rxFactory ) + static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ) ); const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "DirectHelp" ) ); ::utl::OConfigurationTreeRoot aConfiguration( - ::utl::OConfigurationTreeRoot::createWithServiceFactory( _rxFactory, sConfigName ) ); + ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); bool bEnabled = false; OSL_VERIFY( aConfiguration.getNodeValue( sPropertyName ) >>= bEnabled ); @@ -137,7 +137,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xOwnContext ) ); // create a property browser controller - bool bEnableHelpSection = lcl_shouldEnableHelpSection( m_xORB ); + bool bEnableHelpSection = lcl_shouldEnableHelpSection( xOwnContext ); Reference< inspection::XObjectInspectorModel> xInspectorModel( bEnableHelpSection ? report::inspection::DefaultComponentInspectorModel::createWithHelpSection( m_xInspectorContext, 3, 8 ) : report::inspection::DefaultComponentInspectorModel::createDefault( m_xInspectorContext ) ); |