diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 10:19:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-27 10:30:42 +0200 |
commit | 272f0e97b12e634cdf49a1bff45e1b9068af7d9c (patch) | |
tree | d3ba7bf2885c4d5e2285caf3bb89aaedacc08a4c /filter/source | |
parent | cd693ff598bbabba66d8ca353a32bcbd81a5b12b (diff) |
Improvements on previous commit
* Made XGlobalEventBroadcaster inherit document::XDocumentEventBroadcaster/
Listener replacements for obsolete document::XEventBroadcaster/Listener. This
means some client sides unfortunately still need to use UNO_QUERY_THROW to
obtain the obsolete interfaces; those client sides should be cleaned up to use
the replacement interfaces instead.
* Added @since tag (even to unpublished entities, on "it doesn't hurt" grounds).
* Made client sides use XGlobalEventBroadcaster directly instead of querying for
its super-interfaces.
* Replaced new uses of comphelper::ComponentContext::getUNOContext with
comphelper::getComponentContext (see 03a9f139bd9ea1a4f9096fc982e6b326def58532
"ComponentContext::getUnoContext -> getComponentContext simplification;" I
intend to get rid of comphelper/componentcontext.hxx much sooner than of
comphelper/processfactory.hxx).
Change-Id: I6d971ebdaea83d0c3fa9ba299fb6b37e58cdfe9b
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 3 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index b7c3474259a7..764c085d98c2 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> -#include <comphelper/componentcontext.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/locale.hxx> #include <comphelper/processfactory.hxx> @@ -250,7 +249,7 @@ void FilterCache::load(EFillState eRequired, // and starts a thread, which calls loadAll() at this filter cache. // Note: Its not a leak to create this listener with new here. // It kills itself after working! - /* LateInitListener* pLateInit = */ new LateInitListener(comphelper::ComponentContext(m_xSMGR).getUNOContext()); + /* LateInitListener* pLateInit = */ new LateInitListener(comphelper::getComponentContext(m_xSMGR)); } // ------------------------------------------ diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index f177653ce6fa..2dff65f92db3 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/xml/XExportFilter.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <comphelper/componentcontext.hxx> #include <comphelper/oslfile2streamwrap.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> @@ -188,7 +187,7 @@ XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, cons if( xCfgMgr.is() ) sDTDPath = xCfgMgr->substituteVariables( sDTDPath ); - mxGlobalBroadcaster = Reference < XEventBroadcaster >( GlobalEventBroadcaster::create(comphelper::ComponentContext(mxMSF).getUNOContext()), UNO_QUERY_THROW ); + mxGlobalBroadcaster = Reference < XEventBroadcaster >( GlobalEventBroadcaster::create(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW ); mxGlobalEventListener = new GlobalEventListenerImpl( this ); mxGlobalBroadcaster->addEventListener( mxGlobalEventListener ); } |