From 8638f1e72a3fe830c0e8dcc1bd847d4fb9e599ee Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 21 Aug 2012 08:07:58 +0200 Subject: fdo#46808, Adapt script::Converter service code to new style Change-Id: I19b3ba7c978e02ce865360f0411007525012149c --- reportdesign/source/ui/inspection/DataProviderHandler.cxx | 3 ++- reportdesign/source/ui/inspection/GeometryHandler.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'reportdesign') 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 #include #include +#include #include #include #include @@ -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 #include #include +#include #include #include #include @@ -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&) -- cgit o/collabora/cp-4.2'>distro/collabora/cp-4.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/smoketest/Module_smoketest.mk
AgeCommit message (Expand)Author
2013-10-18Remove *_Test product, so cppunittester can be NONE againStephan Bergmann
2013-08-30ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist
2013-08-18Actually the smoketest does not work for a sandboxed soffice on OS XTor Lillqvist
2013-05-07Exempt smoketest.jar from "non-cross-compiling only"Stephan Bergmann
2013-05-07Extract SmoketestCommandEnvironment.java from juh.jarStephan Bergmann
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-21gbuild: use Package for delivering smoketestdoc.sxwDavid Tardon
2013-04-21gbuild: use ExtensionDavid Tardon