strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#103674# change the reference to the accessible context from weak to hard

Browse source
This commit is contained in:
Thomas Benisch 2002-11-07 16:19:24 +00:00
parent 54d75b784d
commit 23d689d4e4
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toolkit/inc/toolkit/awt/vclxwindow.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: vclxwindow.hxx,v $ * $RCSfile: vclxwindow.hxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: tbe $ $Date: 2002-06-19 13:21:09 $ * last change: $Author: tbe $ $Date: 2002-11-07 17:18:35 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -140,7 +140,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> mxPointer; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> mxPointer;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> mxViewGraphics; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics> mxViewGraphics;
::com::sun::star::uno::WeakReference< ::drafts::com::sun::star::accessibility::XAccessibleContext > mxAccessibleContext; ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleContext > mxAccessibleContext;
ULONG nDummy1; ULONG nDummy1;
ULONG nDummy2; ULONG nDummy2;
@ -161,8 +161,6 @@ protected:
virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleContext > virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleContext >
CreateAccessibleContext(); CreateAccessibleContext();
::com::sun::star::uno::WeakReference< ::drafts::com::sun::star::accessibility::XAccessibleContext > GetAccessibleContext() { return mxAccessibleContext; }
public: public:
VCLXWindow(); VCLXWindow();
~VCLXWindow(); ~VCLXWindow();

25
toolkit/source/awt/vclxwindow.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: vclxwindow.cxx,v $ * $RCSfile: vclxwindow.cxx,v $
* *
* $Revision: 1.30 $ * $Revision: 1.31 $
* *
* last change: $Author: mt $ $Date: 2002-11-04 14:10:09 $ * last change: $Author: tbe $ $Date: 2002-11-07 17:19:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -187,6 +187,9 @@ void ImplInitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const MouseE
// ---------------------------------------------------- // ----------------------------------------------------
// class VCLXWindow // class VCLXWindow
// ---------------------------------------------------- // ----------------------------------------------------
DBG_NAME(VCLXWindow);
VCLXWindow::VCLXWindow() VCLXWindow::VCLXWindow()
: maEventListeners( *this ), : maEventListeners( *this ),
maFocusListeners( *this ), maFocusListeners( *this ),
@ -198,12 +201,16 @@ VCLXWindow::VCLXWindow()
maContainerListeners( *this ), maContainerListeners( *this ),
maTopWindowListeners( *this ) maTopWindowListeners( *this )
{ {
DBG_CTOR( VCLXWindow, 0 );
mbDisposing = sal_False; mbDisposing = sal_False;
mbDesignMode = sal_False; mbDesignMode = sal_False;
} }
VCLXWindow::~VCLXWindow() VCLXWindow::~VCLXWindow()
{ {
DBG_DTOR( VCLXWindow, 0 );
if ( GetWindow() ) if ( GetWindow() )
{ {
GetWindow()->RemoveEventListener( LINK( this, VCLXWindow, WindowEventListener ) ); GetWindow()->RemoveEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
@ -578,7 +585,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException)
// dispose our accessibility wrapper // dispose our accessibility wrapper
try try
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent( mxAccessibleContext.get(), ::com::sun::star::uno::UNO_QUERY ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent( mxAccessibleContext, ::com::sun::star::uno::UNO_QUERY );
if ( xComponent.is() ) if ( xComponent.is() )
xComponent->dispose(); xComponent->dispose();
} }
@ -1474,7 +1481,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
using namespace ::drafts::com::sun::star; using namespace ::drafts::com::sun::star;
// check if it comes from our AccessibleContext // check if it comes from our AccessibleContext
uno::Reference< uno::XInterface > aAC( mxAccessibleContext.get(), uno::UNO_QUERY ); uno::Reference< uno::XInterface > aAC( mxAccessibleContext, uno::UNO_QUERY );
uno::Reference< uno::XInterface > xSource( _rSource.Source, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xSource( _rSource.Source, uno::UNO_QUERY );
DBG_ASSERT( aAC.get() == xSource.get(), "VCLXWindow::disposing: where does this call come from?" ); DBG_ASSERT( aAC.get() == xSource.get(), "VCLXWindow::disposing: where does this call come from?" );
@ -1491,19 +1498,17 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
::vos::OGuard aGuard( GetMutex() ); ::vos::OGuard aGuard( GetMutex() );
::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleContext > xC( mxAccessibleContext.get(), ::com::sun::star::uno::UNO_QUERY ); if ( !mxAccessibleContext.is() && GetWindow() )
if ( !xC.is() && GetWindow() )
{ {
xC = CreateAccessibleContext(); mxAccessibleContext = CreateAccessibleContext();
mxAccessibleContext = xC;
// add as event listener to this component // add as event listener to this component
// in case somebody disposes it, we do not want to have a (though weak) reference to a dead // in case somebody disposes it, we do not want to have a (though weak) reference to a dead
// object // object
uno::Reference< lang::XComponent > xComp( xC, uno::UNO_QUERY ); uno::Reference< lang::XComponent > xComp( mxAccessibleContext, uno::UNO_QUERY );
if ( xComp.is() ) if ( xComp.is() )
xComp->addEventListener( this ); xComp->addEventListener( this );
} }
return xC; return mxAccessibleContext;
} }