diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-29 09:32:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-03 15:55:06 +0200 |
| commit | 3a36408b73d8a9be43cd9f4570537ff1d80c0114 (patch) | |
| tree | f46fe36878b77836f9ef3606e162e87ab84bdcb2 /dbaccess/source/ui/misc | |
| parent | bc00717bb7a2b48885ca356fb0a966acbe72dca9 (diff) | |
fdo#46808, Adapt util::NumberFormatter UNO service to new style
Create a merged XNumberFormatter2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Change-Id: I57f35cde0a9dbbe91c1d2c3d068cb3a97c7245e3
Diffstat (limited to 'dbaccess/source/ui/misc')
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index e2af63da73a8..6f61a4bbf7af 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -86,6 +86,7 @@ #include "dlgattr.hxx" #include <vcl/msgbox.hxx> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include "dbu_misc.hrc" @@ -114,6 +115,7 @@ namespace dbaui // ......................................................................... using namespace ::dbtools; using namespace ::comphelper; +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::sdbcx; @@ -1622,10 +1624,9 @@ Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >& if ( xSupplier.is() ) { // create a new formatter - xFormatter = Reference< ::com::sun::star::util::XNumberFormatter > ( - _rMF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))), UNO_QUERY); - if ( xFormatter.is() ) - xFormatter->attachNumberFormatsSupplier(xSupplier); + xFormatter = Reference< util::XNumberFormatter > ( + util::NumberFormatter::create(comphelper::ComponentContext(_rMF).getUNOContext()), UNO_QUERY_THROW); + xFormatter->attachNumberFormatsSupplier(xSupplier); } } catch(const Exception&) diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index fb86ac82443d..785b31b8859c 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -33,8 +33,10 @@ #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> +#include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <comphelper/componentcontext.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> @@ -64,6 +66,7 @@ namespace dbaui using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::container::XChild; using ::com::sun::star::sdbc::XDataSource; + using ::com::sun::star::util::NumberFormatter; using ::com::sun::star::util::XNumberFormatter; using ::com::sun::star::util::XNumberFormatsSupplier; using ::com::sun::star::frame::XFrame; @@ -294,8 +297,8 @@ namespace dbaui Reference< XNumberFormatsSupplier> xSupplier = ::dbtools::getNumberFormats(m_pImpl->m_xConnection); if(xSupplier.is()) { - m_pImpl->m_xFormatter = Reference< XNumberFormatter >(getORB() - ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))), UNO_QUERY); + m_pImpl->m_xFormatter = Reference< XNumberFormatter >( + NumberFormatter::create(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW); m_pImpl->m_xFormatter->attachNumberFormatsSupplier(xSupplier); } OSL_ENSURE(m_pImpl->m_xFormatter.is(),"No NumberFormatter!"); |