diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 16:29:45 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-19 16:52:03 +0200 |
commit | eeaa2ecd1e1f6e0f468854b891de0caa28c470e6 (patch) | |
tree | 8301967148dea710244b57c008b4fa18d176965a /extensions | |
parent | ef08518fcfdab0e5fd5c61aa4fb4f7907fcb8355 (diff) |
remove unused component_canUnload functions
Change-Id: Id3f41e2a620c47bb848718d0fc994739be2d64fc
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/ole/servprov.cxx | 17 | ||||
-rw-r--r-- | extensions/source/ole/servreg.cxx | 8 |
2 files changed, 0 insertions, 25 deletions
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index f540ef94a9a1..9e799071d857 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -33,8 +33,6 @@ #include "servprov.hxx" #include "unoobjw.hxx" #include "oleobjw.hxx" -#include <rtl/unload.h> - using namespace cppu; using namespace osl; @@ -53,8 +51,6 @@ namespace ole_adapter // {82154420-0FBF-11d4-8313-005004526AB4} DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4); -extern rtl_StandardModuleCount globalModuleCount; - /***************************************************************************** class implementation ProviderOleWrapper_Impl @@ -332,8 +328,6 @@ OleConverter_Impl2::OleConverter_Impl2( const Reference<XMultiServiceFactory> &s UnoConversionUtilities<OleConverter_Impl2>( smgr) { - // library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); } // The XMultiServiceFactory is later set by XInitialization @@ -341,13 +335,10 @@ OleConverter_Impl2::OleConverter_Impl2( const Reference<XMultiServiceFactory>& UnoConversionUtilities<OleConverter_Impl2>( smgr, unoWrapperClass, comWrapperClass ) { - //library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); } OleConverter_Impl2::~OleConverter_Impl2() { - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } // XBridgeSupplier -------------------------------------------------------------- @@ -490,8 +481,6 @@ Reference< XInterface > OleConverter_Impl2::createComWrapperInstance() OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr): UnoConversionUtilities<OleClient_Impl>( smgr) { - // library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); Reference<XInterface> xInt;// = m_smgr->createInstance(L"com.sun.star.bridge.OleBridgeSupplier2"); if (xInt.is()) @@ -504,8 +493,6 @@ OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr): OleClient_Impl::~OleClient_Impl() { - // library unloading support - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } Sequence< OUString > SAL_CALL OleClient_Impl::getAvailableServiceNames() throw( RuntimeException ) @@ -610,8 +597,6 @@ Reference< XInterface > OleClient_Impl::createComWrapperInstance( ) OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr): m_smgr( smgr) { - //library unloading support - globalModuleCount.modCnt.acquire( &globalModuleCount.modCnt); Reference<XInterface> xInt = m_smgr->createInstance(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.BridgeSupplier")); if (xInt.is()) @@ -633,8 +618,6 @@ OleServer_Impl::~OleServer_Impl() (*m_wrapperList.begin())->Release(); m_wrapperList.pop_front(); } - //library unloading support - globalModuleCount.modCnt.release( &globalModuleCount.modCnt); } // XInterface -------------------------------------------------- Any SAL_CALL OleServer_Impl::queryInterface( const Type& aType ) throw(RuntimeException) diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index a9bc8c3b4313..e9ce4771af72 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -20,8 +20,6 @@ // http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 #define _WIN32_WINNT 0x0403 - -#include <rtl/unload.h> #include <osl/time.h> #include "ole2uno.hxx" #include "servprov.hxx" @@ -112,10 +110,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL oleautobridge_component_getFacto return pRet; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL -oleautobridge_component_canUnload( TimeValue* libUnused) -{ - return globalModuleCount.canUnload( &globalModuleCount, libUnused); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |