No WIN_ULONG needed any moreintegration/dev300_m101

4 files changed, 15 insertions, 15 deletions

diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index e27969423..d939927b4 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -151,15 +151,15 @@ STDMETHODIMP ProviderOleWrapper_Impl::QueryInterface(REFIID riid, void FAR* FAR*
     return ResultFromScode(E_NOINTERFACE);
 }
 
-STDMETHODIMP_(WIN_ULONG) ProviderOleWrapper_Impl::AddRef()
+STDMETHODIMP_(ULONG) ProviderOleWrapper_Impl::AddRef()
 {
     return osl_incrementInterlockedCount( &m_refCount);
 }
 
-STDMETHODIMP_(WIN_ULONG) ProviderOleWrapper_Impl::Release()
+STDMETHODIMP_(ULONG) ProviderOleWrapper_Impl::Release()
 {
     MutexGuard aGuard( Mutex::getGlobalMutex());
-    WIN_ULONG refCount = --m_refCount;
+    ULONG refCount = --m_refCount;
     if (m_refCount == 0)
     {
         delete this;
@@ -297,15 +297,15 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::QueryInterface(REFIID riid, void FAR* F
     return ResultFromScode(E_NOINTERFACE);
 }
 
-STDMETHODIMP_(WIN_ULONG) OneInstanceOleWrapper_Impl::AddRef()
+STDMETHODIMP_(ULONG) OneInstanceOleWrapper_Impl::AddRef()
 {
     return osl_incrementInterlockedCount( &m_refCount);
 }
 
-STDMETHODIMP_(WIN_ULONG) OneInstanceOleWrapper_Impl::Release()
+STDMETHODIMP_(ULONG) OneInstanceOleWrapper_Impl::Release()
 {
     MutexGuard oGuard( Mutex::getGlobalMutex());
-    WIN_ULONG refCount = --m_refCount;
+    ULONG refCount = --m_refCount;
     if ( m_refCount == 0)
     {
         delete this;
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index c2d683c55..9b4264fb4 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -96,8 +96,8 @@ public:
     
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
-    STDMETHOD_(WIN_ULONG, AddRef)();
-    STDMETHOD_(WIN_ULONG, Release)();
+    STDMETHOD_(ULONG, AddRef)();
+    STDMETHOD_(ULONG, Release)();
 
     /* IClassFactory methods */
     STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv);
@@ -138,8 +138,8 @@ public:
     
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
-    STDMETHOD_(WIN_ULONG, AddRef)();
-    STDMETHOD_(WIN_ULONG, Release)();
+    STDMETHOD_(ULONG, AddRef)();
+    STDMETHOD_(ULONG, Release)();
 
     /* IClassFactory methods */
     STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv);
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 5c1596582..e761606b5 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -156,7 +156,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR *
     return ret;
 }	
 
-STDMETHODIMP_(WIN_ULONG) InterfaceOleWrapper_Impl::AddRef()
+STDMETHODIMP_(ULONG) InterfaceOleWrapper_Impl::AddRef()
 {
     acquire();
     // does not need to guard because one should not rely on the return value of
@@ -164,9 +164,9 @@ STDMETHODIMP_(WIN_ULONG) InterfaceOleWrapper_Impl::AddRef()
     return m_refCount;
 }	
 
-STDMETHODIMP_(WIN_ULONG) InterfaceOleWrapper_Impl::Release()
+STDMETHODIMP_(ULONG) InterfaceOleWrapper_Impl::Release()
 {
-    WIN_ULONG n= m_refCount;
+    ULONG n= m_refCount;
     release();
     return n - 1;
 }	
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index c13250fb0..7d7bca7c4 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -127,8 +127,8 @@ public:
 
     /* IUnknown methods */
     STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj);
-    STDMETHOD_(WIN_ULONG, AddRef)();
-    STDMETHOD_(WIN_ULONG, Release)();
+    STDMETHOD_(ULONG, AddRef)();
+    STDMETHOD_(ULONG, Release)();
 
     /* IDispatch methods */
     STDMETHOD( GetTypeInfoCount )( unsigned int * pctinfo );