[Libreoffice-commits] core.git: include/vcl

[Noel Grandin]

 include/vcl/svapp.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 44eedb0487bd88aa56d99234657cba153bb06631
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jan 9 12:51:33 2015 +0200

    SolarMutexClearableGuard and SolarMutexResettableGuard are never overriden
    
    so make them final and make their destructors non-virtual
    
    Change-Id: I94453786d2befb885996996040a766bc4ccbb4e3

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 8ef0812..72118ee 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1550,7 +1550,7 @@ class VCL_DLLPUBLIC SolarMutexGuard
     }
 };
 
-class VCL_DLLPUBLIC SolarMutexClearableGuard
+class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
 {
     SolarMutexClearableGuard( const SolarMutexClearableGuard& );
     const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& );
@@ -1566,7 +1566,7 @@ public:
         }
 
     /** Releases mutex. */
-    virtual ~SolarMutexClearableGuard()
+    ~SolarMutexClearableGuard()
         {
             if( !m_bCleared )
             {
@@ -1587,7 +1587,7 @@ protected:
     comphelper::SolarMutex& m_solarMutex;
 };
 
-class VCL_DLLPUBLIC SolarMutexResettableGuard
+class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
 {
     SolarMutexResettableGuard( const SolarMutexResettableGuard& );
     const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& );
@@ -1603,7 +1603,7 @@ public:
         }
 
     /** Releases mutex. */
-    virtual ~SolarMutexResettableGuard()
+    ~SolarMutexResettableGuard()
         {
             if( !m_bCleared )
             {