From 94ff531ca59a495547530f5c080d8e04e1f34ace Mon Sep 17 00:00:00 2001
From: Xiaofei Zhang <Zhangxiaofei@openoffice.org>
Date: Wed, 29 Sep 2010 15:46:40 +0800
Subject: removetooltypes: #i112600# some more changes in vcl and tools,
 reverted config strings in l10ntools and rsc

---
 vcl/source/app/session.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'vcl/source/app/session.cxx')

diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index c65eb13224e1..986db388df79 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -146,7 +146,7 @@ void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable )
         }
     }
 
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->doSave( bShutdown, bCancelable );
     Application::AcquireSolarMutex( nAcquireCount );
@@ -174,7 +174,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted )
         }
     }
 
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->approveInteraction( bInteractionGranted );
 
@@ -192,7 +192,7 @@ void VCLSession::callShutdownCancelled()
         m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false;
     }
 
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->shutdownCanceled();
     Application::AcquireSolarMutex( nAcquireCount );
@@ -209,7 +209,7 @@ void VCLSession::callQuit()
         m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false;
     }
 
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
     {
         Reference< XSessionManagerListener2 > xListener2( it->m_xListener, UNO_QUERY );
-- 
cgit 


From b7f5f44df674c7e47a8c1597bf082a8292b14efd Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Wed, 12 Jan 2011 15:07:10 +0100
Subject: removetooltypes01: Exchange misleading type sal_uIntPtr with
 sal_uLong

---
 vcl/source/app/session.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'vcl/source/app/session.cxx')

diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 986db388df79..066d58ce4eec 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -146,7 +146,7 @@ void VCLSession::callSaveRequested( bool bShutdown, bool bCancelable )
         }
     }
 
-    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->doSave( bShutdown, bCancelable );
     Application::AcquireSolarMutex( nAcquireCount );
@@ -174,7 +174,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted )
         }
     }
 
-    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->approveInteraction( bInteractionGranted );
 
@@ -192,7 +192,7 @@ void VCLSession::callShutdownCancelled()
         m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false;
     }
 
-    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
         it->m_xListener->shutdownCanceled();
     Application::AcquireSolarMutex( nAcquireCount );
@@ -209,7 +209,7 @@ void VCLSession::callQuit()
         m_bInteractionRequested = m_bInteractionDone = m_bInteractionGranted = false;
     }
 
-    sal_uIntPtr nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     for( std::list< Listener >::const_iterator it = aListeners.begin(); it != aListeners.end(); ++it )
     {
         Reference< XSessionManagerListener2 > xListener2( it->m_xListener, UNO_QUERY );
-- 
cgit