Remove any remaining remnants of unused component_canUnload feature

Change-Id: I635fd006b5ba9f5fb0091748ee2ff9bc3c1a2d2a

5 files changed, 15 insertions, 37 deletions

diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 7a1b72059de2..ff734fa0148f 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::registry;
 
 namespace io_TextInputStream
 {
-    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
 //===========================================================================
 // Implementation XTextInputStream
 
@@ -120,7 +118,6 @@ OTextInputStream::OTextInputStream()
     : mSeqSource( READ_BYTE_COUNT ), mpBuffer( NULL ), mnBufferSize( 0 )
     , mnCharsInBuffer( 0 ), mbReachedEOF( sal_False )
 {
-    g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
     mbEncodingInitialized = false;
 }
 
@@ -131,7 +128,6 @@ OTextInputStream::~OTextInputStream()
         rtl_destroyUnicodeToTextContext( mConvText2Unicode, mContextText2Unicode );
         rtl_destroyUnicodeToTextConverter( mConvText2Unicode );
     }
-    g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
 }
 
 void OTextInputStream::implResizeBuffer( void )
@@ -477,7 +473,7 @@ static struct ImplementationEntry g_entries[] =
     {
         TextInputStream_CreateInstance, TextInputStream_getImplementationName ,
         TextInputStream_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 36f332779188..48db4a93fa00 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::registry;
 
 namespace io_TextOutputStream
 {
-    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 //===========================================================================
 // Implementation XTextOutputStream
 
@@ -277,7 +276,7 @@ static struct ImplementationEntry g_entries[] =
     {
         TextOutputStream_CreateInstance, TextOutputStream_getImplementationName ,
         TextOutputStream_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index ca66e6efea5c..bf28d7b359ba 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -45,8 +45,6 @@ using namespace ::com::sun::star::connection;
 
 namespace io_acceptor
 {
-    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
     class OAcceptor : public WeakImplHelper2< XAcceptor, XServiceInfo >
     {
     public:
@@ -85,9 +83,7 @@ namespace io_acceptor
         , m_bInAccept( sal_False )
         , _xSMgr( xCtx->getServiceManager() )
         , _xCtx( xCtx )
-    {
-        g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-    }
+    {}
 
     OAcceptor::~OAcceptor()
     {
@@ -99,7 +95,6 @@ namespace io_acceptor
         {
             delete m_pSocket;
         }
-        g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
     }
 
     struct BeingInAccept
@@ -321,7 +316,7 @@ static struct ImplementationEntry g_entries[] =
     {
         acceptor_CreateInstance, acceptor_getImplementationName ,
         acceptor_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 0d6571702bba..e6df22775a70 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::connection;
 
 namespace stoc_connector
 {
-    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
     class OConnector : public WeakImplHelper2< XConnector, XServiceInfo >
     {
         Reference< XMultiComponentFactory > _xSMgr;
@@ -69,14 +67,9 @@ namespace stoc_connector
     OConnector::OConnector(const Reference< XComponentContext > &xCtx)
         : _xSMgr( xCtx->getServiceManager() )
         , _xCtx( xCtx )
-    {
-        g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
-    }
+    {}
 
-    OConnector::~OConnector()
-    {
-        g_moduleCount.modCnt.release( &g_moduleCount.modCnt );
-    }
+    OConnector::~OConnector() {}
 
     Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnectionDescription )
         throw( NoConnectException, ConnectionSetupException, RuntimeException)
@@ -228,7 +221,7 @@ static struct ImplementationEntry g_entries[] =
     {
         connector_CreateInstance, connector_getImplementationName ,
         connector_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index 69f7e6d34837..935f2a5c6085 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -32,11 +32,6 @@ using namespace ::com::sun::star::registry;
 
 #include "factreg.hxx"
 
-namespace io_stm
-{
-    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-}
-
 using namespace io_stm;
 
 static struct ImplementationEntry g_entries[] =
@@ -44,42 +39,42 @@ static struct ImplementationEntry g_entries[] =
     {
         OPipeImpl_CreateInstance, OPipeImpl_getImplementationName ,
         OPipeImpl_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     {
         OPumpImpl_CreateInstance, OPumpImpl_getImplementationName ,
         OPumpImpl_getSupportedServiceNames, createSingleComponentFactory ,
-        &g_moduleCount.modCnt , 0
+        0, 0
     },
     {
         ODataInputStream_CreateInstance, ODataInputStream_getImplementationName,
         ODataInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     {
         ODataOutputStream_CreateInstance, ODataOutputStream_getImplementationName,
         ODataOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     {
         OObjectInputStream_CreateInstance, OObjectInputStream_getImplementationName,
         OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     {
         OObjectOutputStream_CreateInstance, OObjectOutputStream_getImplementationName,
         OObjectOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     {
         OMarkableInputStream_CreateInstance, OMarkableInputStream_getImplementationName,
         OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     {
         OMarkableOutputStream_CreateInstance, OMarkableOutputStream_getImplementationName,
         OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory,
-        &g_moduleCount.modCnt, 0
+        0, 0
     },
     { 0, 0, 0, 0, 0, 0 }