diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-21 08:07:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 15:40:07 +0200 |
| commit | 8638f1e72a3fe830c0e8dcc1bd847d4fb9e599ee (patch) | |
| tree | d398e9c43b4dd1570145210690a75762d81f4dc4 /reportdesign | |
| parent | 4381f3dd5ae9e042840a16f69d07267208160420 (diff) | |
fdo#46808, Adapt script::Converter service code to new style
Change-Id: I19b3ba7c978e02ce865360f0411007525012149c
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inspection/DataProviderHandler.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 8866591f1d78..f044ace483b4 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XSection.hpp> +#include <com/sun/star/script/Converter.hpp> #include <com/sun/star/inspection/XNumericControl.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/MeasureUnit.hpp> @@ -73,7 +74,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext try { m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW); - m_xTypeConverter.set(m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter" )),m_xContext),uno::UNO_QUERY_THROW); + m_xTypeConverter.set(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 2f8dc63133db..796ebd8c7841 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/report/XSection.hpp> #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/report/XFixedLine.hpp> +#include <com/sun/star/script/Converter.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/SQLContext.hpp> @@ -256,7 +257,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const { const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager(); m_xFormComponentHandler.set(xFac->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW); - m_xTypeConverter.set(xFac->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter" )),m_xContext),uno::UNO_QUERY_THROW); + m_xTypeConverter.set(script::Converter::create(context)); loadDefaultFunctions(); } catch(const uno::Exception&) |