diff options
Diffstat (limited to 'basctl/source')
4 files changed, 8 insertions, 10 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index c56bb1c70ab0..9a69d2d7ff2d 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -30,7 +30,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> @@ -51,7 +50,7 @@ using namespace ::comphelper; AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj) - :OAccessibleExtendedComponentHelper( new VCLExternalSolarLock ) + :OAccessibleExtendedComponentHelper( &m_aLock ) ,m_pDialogWindow( pDialogWindow ) ,m_pDlgEdObj( pDlgEdObj ) { @@ -71,8 +70,6 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape() { if ( m_xControlModel.is() ) m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); - - delete getExternalLock(); } diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index b44509e0c1c2..1cedd99d61b8 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -34,7 +34,6 @@ #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <toolkit/helper/externallock.hxx> #include <toolkit/helper/convert.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -100,7 +99,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow) - : OAccessibleExtendedComponentHelper( new VCLExternalSolarLock ) + : OAccessibleExtendedComponentHelper( &m_aLock) , m_pDialogWindow(pDialogWindow) , m_pDlgEditor(nullptr) , m_pDlgEdModel(nullptr) @@ -140,8 +139,6 @@ AccessibleDialogWindow::~AccessibleDialogWindow() if ( m_pDlgEdModel ) EndListening( *m_pDlgEdModel ); - - delete getExternalLock(); } diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 4830032599d3..aba1a83ec32c 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -25,6 +25,7 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> #include <vcl/vclptr.hxx> +#include <toolkit/helper/externallock.hxx> namespace vcl { class Window; } @@ -46,7 +47,8 @@ typedef ::cppu::ImplHelper3< css::lang::XServiceInfo, css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; -class AccessibleDialogControlShape : public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogControlShape : private BaseVCLExternalSolarLock, + public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogControlShape_BASE { friend class AccessibleDialogWindow; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index badcabda17d3..2524e42deeee 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -27,6 +27,7 @@ #include <svl/lstner.hxx> #include <tools/link.hxx> #include <vcl/vclptr.hxx> +#include <toolkit/helper/externallock.hxx> class VclSimpleEvent; class VclWindowEvent; @@ -51,7 +52,8 @@ typedef ::cppu::ImplHelper3 < css::accessibility::XAccessibleSelection, css::lang::XServiceInfo > AccessibleDialogWindow_BASE; -class AccessibleDialogWindow : public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogWindow : private BaseVCLExternalSolarLock, + public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogWindow_BASE, public SfxListener { |