diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-06 17:11:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-10 10:20:45 +0200 |
| commit | 177f01b9fe7ef0d4ea08b5c6fb8afa82a51c8d1d (patch) | |
| tree | 553bc28268c55e39ca9a704dc3347d674c5c6be2 /reportdesign | |
| parent | 9db162b6048284ae43dd0be45694ade2d0800bd7 (diff) | |
fdo#46808, Convert form::inspection::FormComponentPropertyHandler
.. to new style service
Change-Id: Iee4681f94dc9874271dc8a1d5d74e161d7691a29
Diffstat (limited to 'reportdesign')
3 files changed, 8 insertions, 6 deletions
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 72842e752278..261c6b573e7a 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -25,6 +25,7 @@ #include "uistrings.hrc" #include <toolkit/helper/vclunohelper.hxx> #include <unotools/syslocale.hxx> +#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> @@ -63,8 +64,8 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); - m_xTypeConverter.set(script::Converter::create(m_xContext)); + m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext); + m_xTypeConverter = script::Converter::create(m_xContext); }catch(const uno::Exception &) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index ece222b96789..3c9339bc61e1 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -34,6 +34,7 @@ #include <tools/diagnose_ex.h> #include <tools/StringListResource.hxx> #include <com/sun/star/lang/XInitialization.hpp> +#include "com/sun/star/form/inspection/FormComponentPropertyHandler.hpp" #include "com/sun/star/inspection/StringRepresentation.hpp" #include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> @@ -238,9 +239,8 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const DBG_CTOR(rpt_GeometryHandler,NULL); try { - const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager(); - m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); - m_xTypeConverter.set(script::Converter::create(context)); + m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext); + m_xTypeConverter = script::Converter::create(context); loadDefaultFunctions(); } catch(const uno::Exception&) diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index df01a77b1118..2aa83e75a77a 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -23,6 +23,7 @@ #include <comphelper/types.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/syslocale.hxx> +#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XSection.hpp> @@ -45,7 +46,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext); }catch(const uno::Exception &) { |