basctl/source/accessibility/accessibledialogcontrolshape.cxx | 5 +---- basctl/source/accessibility/accessibledialogwindow.cxx | 5 +---- basctl/source/inc/accessibledialogcontrolshape.hxx | 2 -- basctl/source/inc/accessibledialogwindow.hxx | 2 -- include/toolkit/awt/vclxaccessiblecomponent.hxx | 4 ---- svtools/inc/vclxaccessibleheaderbaritem.hxx | 1 - svtools/source/control/vclxaccessibleheaderbaritem.cxx | 2 +- toolkit/source/awt/vclxaccessiblecomponent.cxx | 5 +---- 8 files changed, 4 insertions(+), 22 deletions(-)
New commits: commit 2e5db24f63edbfced178dc7ff274e9eeeea9de68 Author: Jochen Nitschke <[email protected]> Date: Tue May 23 13:39:02 2017 +0200 remove VCLExternalSolarLock* members from .. .. classes with OAccessibleContextHelper base. Change-Id: I3187e88bf485e78fb78550870a87db29d958dbc0 Reviewed-on: https://gerrit.libreoffice.org/37948 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Jochen Nitschke <[email protected]> diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 83b25d5cfa9c..c56bb1c70ab0 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -55,8 +55,6 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo ,m_pDialogWindow( pDialogWindow ) ,m_pDlgEdObj( pDlgEdObj ) { - m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); - if ( m_pDlgEdObj ) m_xControlModel.set( m_pDlgEdObj->GetUnoControlModel(), UNO_QUERY ); @@ -74,8 +72,7 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape() if ( m_xControlModel.is() ) m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); - delete m_pExternalLock; - m_pExternalLock = nullptr; + delete getExternalLock(); } diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index f04094088e73..b44509e0c1c2 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -105,8 +105,6 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin , m_pDlgEditor(nullptr) , m_pDlgEdModel(nullptr) { - m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); - if ( m_pDialogWindow ) { SdrPage& rPage = m_pDialogWindow->GetPage(); @@ -143,8 +141,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow() if ( m_pDlgEdModel ) EndListening( *m_pDlgEdModel ); - delete m_pExternalLock; - m_pExternalLock = nullptr; + delete getExternalLock(); } diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index b370e85b6c2d..4830032599d3 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -27,7 +27,6 @@ #include <vcl/vclptr.hxx> namespace vcl { class Window; } -class VCLExternalSolarLock; namespace utl { class AccessibleStateSetHelper; @@ -53,7 +52,6 @@ class AccessibleDialogControlShape : public comphelper::OAccessibleExtendedCo friend class AccessibleDialogWindow; private: - VCLExternalSolarLock* m_pExternalLock; VclPtr<DialogWindow> m_pDialogWindow; DlgEdObj* m_pDlgEdObj; bool m_bFocused; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 57c16698699e..badcabda17d3 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -28,7 +28,6 @@ #include <tools/link.hxx> #include <vcl/vclptr.hxx> -class VCLExternalSolarLock; class VclSimpleEvent; class VclWindowEvent; @@ -77,7 +76,6 @@ private: typedef std::vector< ChildDescriptor > AccessibleChildren; AccessibleChildren m_aAccessibleChildren; - VCLExternalSolarLock* m_pExternalLock; VclPtr<basctl::DialogWindow> m_pDialogWindow; DlgEditor* m_pDlgEditor; DlgEdModel* m_pDlgEdModel; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 8af1d702725c..520dadab867b 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -50,8 +50,6 @@ class AccessibleStateSetHelper; typedef ::cppu::ImplHelper1< css::lang::XServiceInfo > VCLXAccessibleComponent_BASE; -class VCLExternalSolarLock; - class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent :public comphelper::OAccessibleExtendedComponentHelper ,public ::comphelper::OAccessibleImplementationAccess @@ -61,8 +59,6 @@ private: rtl::Reference<VCLXWindow> m_xVCLXWindow; VclPtr<vcl::Window> m_xEventSource; - VCLExternalSolarLock* m_pSolarLock; - DECL_LINK( WindowEventListener, VclWindowEvent&, void ); DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); void DisconnectEvents(); diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index e3732f11e3c0..533be149c302 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -30,7 +30,6 @@ #include <vector> class HeaderBar; -class VCLExternalSolarLock; class VclSimpleEvent; class VclWindowEvent; diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index fe839a073c3f..a2d927777348 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -56,7 +56,7 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem() { - delete static_cast< VCLExternalSolarLock* >( getExternalLock() ); + delete getExternalLock(); } void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index ba5c170faa0d..524652c36737 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -49,8 +49,6 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ) { m_xVCLXWindow = pVCLXWindow; - m_pSolarLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) ); - DBG_ASSERT( pVCLXWindow->GetWindow(), "VCLXAccessibleComponent - no window!" ); m_xEventSource = pVCLXWindow->GetWindow(); if ( m_xEventSource ) @@ -83,8 +81,7 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() ensureDisposed(); DisconnectEvents(); - delete m_pSolarLock; - m_pSolarLock = nullptr; + delete getExternalLock(); // This is not completely safe. If we assume that the base class dtor calls some method which // uses this lock, the we crash. However, as the base class' dtor does not have a chance to call _out_ // virtual methods, this is no problem as long as the base class is safe, i.e. does not use the external _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
