diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-13 13:30:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 14:28:22 +0200 |
| commit | 900d60b3cd648be79aaaa84c992edf9953c0c7f9 (patch) | |
| tree | 8d2c6eb55fa57ee8917b6f2c27663ad92a17f2ad /basic | |
| parent | e3c05e34fddcecb81a8bd1f625ebcd601a0c0238 (diff) | |
fdo#46808, Adapt bridge::BridgeFactory UNO service to new style
Create a merged XBridgeFactory2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Change-Id: I7309f4d30f0e772bc203c701eb3407b920ffafcc
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index ea1b0f7c11d6..aa595157807a 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -41,6 +41,8 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> +#include <com/sun/star/bridge/BridgeFactory.hpp> +#include <com/sun/star/bridge/XBridge.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> @@ -52,8 +54,6 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/bridge/XBridge.hpp> -#include <com/sun/star/bridge/XBridgeFactory.hpp> using namespace comphelper; using namespace com::sun::star::uno; @@ -214,19 +214,11 @@ bool needSecurityRestrictions( void ) return true; } - Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory(); - if( !xSMgr.is() ) - return true; - Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance - ( ::rtl::OUString("com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY ); + Reference< XComponentContext > xContext = getProcessComponentContext(); + Reference< XBridgeFactory2 > xBridgeFac( BridgeFactory::create(xContext) ); - Sequence< Reference< XBridge > > aBridgeSeq; - sal_Int32 nBridgeCount = 0; - if( xBridgeFac.is() ) - { - aBridgeSeq = xBridgeFac->getExistingBridges(); - nBridgeCount = aBridgeSeq.getLength(); - } + Sequence< Reference< XBridge > > aBridgeSeq = xBridgeFac->getExistingBridges(); + sal_Int32 nBridgeCount = aBridgeSeq.getLength(); if( nBridgeCount == 0 ) { |