Remove all allocation of VCLExternalSolarLock.

This patch is graciously offered by Arnaud Versini.

Change-Id: I3ed5e1758d09542a2ca0533e3f4a6ceb2dbb6346
Reviewed-on: https://gerrit.libreoffice.org/38404
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 10 insertions, 10 deletions

diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 579cf6e6e1f5..dc6c6d45a6b6 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <toolkit/helper/externallock.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <osl/interlck.h>
 #include <svx/dialmgr.hxx>
@@ -42,7 +41,7 @@ namespace svx
     using namespace ::com::sun::star::accessibility;
 
 
-SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock)
+SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(&m_aLock)
 ,mpParent( pParent )
 {
     osl_atomic_increment(&m_refCount);
@@ -56,7 +55,6 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) :
 SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc()
 {
     ensureDisposed();
-    delete getExternalLock();
 }
 
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 )
@@ -255,7 +253,7 @@ uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessi
 
 
 
-SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock)
+SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(&m_aLock)
   ,m_pParent( _pParent )
 {
     osl_atomic_increment(&m_refCount);
@@ -269,7 +267,6 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc
 SvxShowCharSetAcc::~SvxShowCharSetAcc()
 {
     ensureDisposed();
-    delete getExternalLock();
 }
 
 void SAL_CALL SvxShowCharSetAcc::disposing()
@@ -561,7 +558,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex
 }
 
 
-SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock)
+SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(&m_aLock)
 ,mpParent( pParent )
 {
     OSL_ENSURE(pParent,"NO parent supplied!");
@@ -576,7 +573,6 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA
 SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc()
 {
     ensureDisposed();
-    delete getExternalLock();
 }
 
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 6783b5504752..83cd41dfff25 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -25,6 +25,7 @@
 #include <comphelper/accessibleselectionhelper.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <toolkit/helper/externallock.hxx>
 
 #include <vector>
 class SvxShowCharSet;
@@ -38,7 +39,8 @@ namespace svx
     /** The class SvxShowCharSetVirtualAcc is used as a virtual class which contains the table and the scrollbar.
         In the vcl control, the table and the scrollbar exists in one class. This is not feasible for the accessibility api.
     */
-    class SvxShowCharSetVirtualAcc : public ::comphelper::OAccessibleComponentHelper,
+    class SvxShowCharSetVirtualAcc : private BaseVCLExternalSolarLock,
+                                     public ::comphelper::OAccessibleComponentHelper,
                                      public OAccessibleHelper_Base_2
     {
         VclPtr<SvxShowCharSet>             mpParent; // the vcl control
@@ -120,7 +122,8 @@ namespace svx
     /** The table implementation of the vcl control.
     */
 
-    class SvxShowCharSetAcc : public ::comphelper::OAccessibleSelectionHelper,
+    class SvxShowCharSetAcc : private BaseVCLExternalSolarLock,
+                              public ::comphelper::OAccessibleSelectionHelper,
                               public OAccessibleHelper_Base
     {
         ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren;
@@ -209,7 +212,8 @@ namespace svx
 
     /** The child implementation of the table.
     */
-    class SvxShowCharSetItemAcc : public ::comphelper::OAccessibleComponentHelper,
+    class SvxShowCharSetItemAcc : private BaseVCLExternalSolarLock,
+                                  public ::comphelper::OAccessibleComponentHelper,
                                   public OAccessibleHelper_Base_3
     {
     private: