diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:15:15 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:16:38 +0200 |
commit | 03a9f139bd9ea1a4f9096fc982e6b326def58532 (patch) | |
tree | bfb7a08bb4831a1a46b48c3bb49afa77ca436349 /dbaccess/source/ui/misc | |
parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'dbaccess/source/ui/misc')
-rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 286650f5c8a8..ad091cc66c21 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -25,6 +25,7 @@ #include "HtmlReader.hxx" #include "dbustrings.hrc" #include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> @@ -730,7 +731,7 @@ void OHTMLImportExport::WriteHeader() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteHeader" ); uno::Reference<document::XDocumentProperties> xDocProps( - document::DocumentProperties::create( comphelper::ComponentContext(m_xFactory).getUNOContext() ) ); + document::DocumentProperties::create( comphelper::getComponentContext(m_xFactory) ) ); if (xDocProps.is()) { xDocProps->setTitle(m_sName); } diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 578e6e054113..4131abc204e0 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1627,7 +1627,7 @@ Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >& { // create a new formatter xFormatter = Reference< util::XNumberFormatter > ( - util::NumberFormatter::create(comphelper::ComponentContext(_rMF).getUNOContext()), UNO_QUERY_THROW); + util::NumberFormatter::create(comphelper::getComponentContext(_rMF)), UNO_QUERY_THROW); xFormatter->attachNumberFormatsSupplier(xSupplier); } } diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 785b31b8859c..09718e39b6d4 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> @@ -298,7 +298,7 @@ namespace dbaui if(xSupplier.is()) { m_pImpl->m_xFormatter = Reference< XNumberFormatter >( - NumberFormatter::create(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW); + NumberFormatter::create(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW); m_pImpl->m_xFormatter->attachNumberFormatsSupplier(xSupplier); } OSL_ENSURE(m_pImpl->m_xFormatter.is(),"No NumberFormatter!"); |