Tag: cws_src680_atkbridge6 User: obr Date: 2007/03/14 03:35:12 Modified: dba/dbaccess/source/ui/inc/JAccess.hxx dba/dbaccess/source/ui/querydesign/JAccess.cxx dba/dbaccess/source/ui/querydesign/JoinTableView.cxx dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
Log: #144968# fixed crash on closing window File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: JAccess.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/JAccess.hxx?r1=1.6&r2=1.6.264.1 Delta lines: +5 -3 ------------------- --- JAccess.hxx 8 Sep 2005 15:28:28 -0000 1.6 +++ JAccess.hxx 14 Mar 2007 10:35:09 -0000 1.6.264.1 @@ -4,9 +4,9 @@ * * $RCSfile: JAccess.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.264.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 15:28:28 $ + * last change: $Author: obr $ $Date: 2007/03/14 10:35:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,6 +91,8 @@ { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); } + + void clearTableView(); }; } #endif // DBACCESS_JACCESS_HXX Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JAccess.cxx?r1=1.10&r2=1.10.84.1 Delta lines: +9 -3 ------------------- --- JAccess.cxx 17 Sep 2006 07:20:03 -0000 1.10 +++ JAccess.cxx 14 Mar 2007 10:35:09 -0000 1.10.84.1 @@ -4,9 +4,9 @@ * * $RCSfile: JAccess.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.84.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:20:03 $ + * last change: $Author: obr $ $Date: 2007/03/14 10:35:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,6 +82,12 @@ { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.JoinViewAccessibility"); } + // ----------------------------------------------------------------------------- + void OJoinDesignViewAccess::clearTableView() + { + ::osl::MutexGuard aGuard( m_aMutex ); + m_pTableView = NULL; + } // ----------------------------------------------------------------------------- // XAccessibleContext sal_Int32 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount( ) throw (RuntimeException) File [changed]: JoinTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinTableView.cxx?r1=1.55&r2=1.55.70.1 Delta lines: +12 -8 -------------------- --- JoinTableView.cxx 18 Oct 2006 13:32:10 -0000 1.55 +++ JoinTableView.cxx 14 Mar 2007 10:35:09 -0000 1.55.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: JoinTableView.cxx,v $ * - * $Revision: 1.55 $ + * $Revision: 1.55.70.1 $ * - * last change: $Author: ihi $ $Date: 2006/10/18 13:32:10 $ + * last change: $Author: obr $ $Date: 2007/03/14 10:35:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -246,7 +246,11 @@ OJoinTableView::~OJoinTableView() { DBG_DTOR(OJoinTableView,NULL); + if( m_pAccessible ) + { + m_pAccessible->clearTableView(); m_pAccessible = NULL; + } ////////////////////////////////////////////////////////////////////// // Listen loeschen clearLayoutInformation(); File [changed]: TableWindowAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx?r1=1.11&r2=1.11.84.1 Delta lines: +41 -20 --------------------- --- TableWindowAccess.cxx 17 Sep 2006 07:25:42 -0000 1.11 +++ TableWindowAccess.cxx 14 Mar 2007 10:35:10 -0000 1.11.84.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableWindowAccess.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.84.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:25:42 $ + * last change: $Author: obr $ $Date: 2007/03/14 10:35:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,19 +135,40 @@ // XAccessibleContext sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleChildCount( ) throw (RuntimeException) { - return 2; + ::osl::MutexGuard aGuard( m_aMutex ); + sal_Int32 nCount = 0; + if(m_pTable) + { + if(m_pTable->GetTitleCtrl()) + ++nCount; + if(m_pTable->GetListBox()) + ++nCount; + } + return nCount; } // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XAccessible > aRet; - if(i == 0 && m_pTable) + if(m_pTable) + { + switch(i) + { + case 0: + if(m_pTable->GetTitleCtrl()) + { aRet = m_pTable->GetTitleCtrl()->GetAccessible(); - else if(i == 1 && m_pTable) + break; + } // fall through if title control does not exist + case 1: + if(m_pTable->GetListBox()) aRet = m_pTable->GetListBox()->GetAccessible(); - else + break; + default: throw IndexOutOfBoundsException(); + } + } return aRet; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
