[PATCH] stoc: do not use rtl/unload.h functionality

[Matúš Kukan (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3316

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/3316/1

stoc: do not use rtl/unload.h functionality

Change-Id: I7bddfbabc6e7e3a672681962f82e64ff4082e8b5
---
M stoc/source/servicemanager/servicemanager.cxx
1 file changed, 0 insertions(+), 11 deletions(-)



diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 93923c2..871429a 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -32,7 +32,6 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <rtl/unload.h>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/compbase6.hxx>
@@ -527,8 +526,6 @@
 
     Reference< beans::XPropertySetInfo > m_xPropertyInfo;
 
-    sal_Int32 m_nUnloadingListenerId;
-
     // Does clean up when the unloading mechanism has been set off. It is called from
     // the listener function smgrUnloadingListener.
     void onUnloadingNotify();
@@ -765,7 +762,6 @@
     , m_bInDisposing( false )
 {
     g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-    m_nUnloadingListenerId= rtl_addUnloadingListener( smgrUnloadingListener, this);
 }
 
 /**
@@ -773,9 +769,6 @@
  */
 OServiceManager::~OServiceManager()
 {
-    if( m_nUnloadingListenerId != 0)
-        rtl_removeUnloadingListener( m_nUnloadingListenerId );
-
     g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
 
@@ -929,10 +922,6 @@
 
     // not only the Event should hold the object
     OSL_ASSERT( m_refCount != 1 );
-
-    // Revoke this service manager as unloading listener
-    rtl_removeUnloadingListener( m_nUnloadingListenerId);
-    m_nUnloadingListenerId=0;
 }
 
 // XPropertySet

-- 
To view, visit https://gerrit.libreoffice.org/3316
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bddfbabc6e7e3a672681962f82e64ff4082e8b5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>