mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extensions: remove code specific to oleautobridge2

Browse Source 
Change-Id: I88ecfceba0d08ef7136d6db49da1e62c61518d2b
This commit is contained in:
Michael Stahl
2013-02-28 23:00:34 +01:00
parent 5a68f57606
commit ffa3735570
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/source/ole/servprov.cxx
View File

@@ -50,15 +50,9 @@ namespace ole_adapter
#include <initguid.h> #include <initguid.h>
#ifndef OWNGUID
// GUID used since 5.2 ( src569 m) // GUID used since 5.2 ( src569 m)
// {82154420-0FBF-11d4-8313-005004526AB4} // {82154420-0FBF-11d4-8313-005004526AB4}
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4); DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4);
#else
// Alternative GUID
// {D9BB9D1D-BFA9-4357-9F11-9A2E9061F06E}
DEFINE_GUID(OID_ServiceManager, 0xd9bb9d1d, 0xbfa9, 0x4357, 0x9f, 0x11, 0x9a, 0x2e, 0x90, 0x61, 0xf0, 0x6e);
#endif
extern rtl_StandardModuleCount globalModuleCount; extern rtl_StandardModuleCount globalModuleCount;
@@ -205,12 +199,10 @@ STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/)
OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
const Reference<XInterface>& xInst, const Reference<XInterface>& xInst,
GUID* pGuid, GUID* pGuid )
sal_Bool bAsApplication )
: m_xInst(xInst), m_refCount(0), : m_xInst(xInst), m_refCount(0),
m_smgr( smgr), m_smgr( smgr),
m_factoryHandle( 0 ), m_factoryHandle( 0 ),
m_bAsApplication( bAsApplication ),
m_nApplRegHandle( 0 ) m_nApplRegHandle( 0 )
{ {
m_guid = *pGuid; m_guid = *pGuid;
@@ -242,17 +234,12 @@ sal_Bool OneInstanceOleWrapper_Impl::registerClass()
REGCLS_MULTIPLEUSE, REGCLS_MULTIPLEUSE,
&m_factoryHandle); &m_factoryHandle);
if ( hresult == NOERROR && m_bAsApplication )
hresult = RegisterActiveObject( this, m_guid, ACTIVEOBJECT_WEAK, &m_nApplRegHandle );
return (hresult == NOERROR); return (hresult == NOERROR);
} }
sal_Bool OneInstanceOleWrapper_Impl::deregisterClass() sal_Bool OneInstanceOleWrapper_Impl::deregisterClass()
{ {
HRESULT hresult1 = NOERROR; HRESULT hresult1 = NOERROR;
if ( m_bAsApplication )
hresult1 = RevokeActiveObject( m_nApplRegHandle, NULL );
HRESULT hresult2 = CoRevokeClassObject(m_factoryHandle); HRESULT hresult2 = CoRevokeClassObject(m_factoryHandle);
@@ -635,12 +622,7 @@ OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr):
a >>= m_bridgeSupplier; a >>= m_bridgeSupplier;
} }
#ifndef OWNGUID sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager );
sal_Bool bOLERegister = sal_False;
#else
sal_Bool bOLERegister = sal_True;
#endif
sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister );
(void)ret; (void)ret;
} }
@@ -718,9 +700,10 @@ sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>&
return pFac->registerClass(); return pFac->registerClass();
} }
sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication ) sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid)
{ {
IClassFactoryWrapper* pFac = new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid, bAsApplication ); IClassFactoryWrapper* pFac =
new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid );
pFac->AddRef(); pFac->AddRef();
m_wrapperList.push_back(pFac); m_wrapperList.push_back(pFac);

5
extensions/source/ole/servprov.hxx
View File

@@ -121,7 +121,7 @@ class OneInstanceOleWrapper_Impl : public IClassFactoryWrapper
{ {
public: public:
OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid, sal_Bool bAsApplication ); OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid );
virtual ~OneInstanceOleWrapper_Impl(); virtual ~OneInstanceOleWrapper_Impl();
sal_Bool registerClass(); sal_Bool registerClass();
@@ -145,7 +145,6 @@ protected:
Reference<XBridgeSupplier2> m_bridgeSupplier; Reference<XBridgeSupplier2> m_bridgeSupplier;
Reference<XMultiServiceFactory> m_smgr; Reference<XMultiServiceFactory> m_smgr;
unsigned long m_nApplRegHandle; unsigned long m_nApplRegHandle;
sal_Bool m_bAsApplication;
}; };
/***************************************************************************** /*****************************************************************************
@@ -253,7 +252,7 @@ public:
protected: protected:
sal_Bool provideService(const Reference<XSingleServiceFactory>& xMulFact, GUID* guid); sal_Bool provideService(const Reference<XSingleServiceFactory>& xMulFact, GUID* guid);
sal_Bool provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication ); sal_Bool provideInstance(const Reference<XInterface>& xInst, GUID* guid);
list< IClassFactoryWrapper* > m_wrapperList; list< IClassFactoryWrapper* > m_wrapperList;
Reference< XBridgeSupplier2 > m_bridgeSupplier; Reference< XBridgeSupplier2 > m_bridgeSupplier;