diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 13:49:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 13:49:34 +0000 |
| commit | a1d223ffdb9e8f1adcc6eb23f307d0535b95391f (patch) | |
| tree | cffd8743fe3b0b9cbd14e6a765bd9add55aca9e1 /svtools/source/brwbox | |
| parent | 1507c26f646fe89cda02d65b09974136cba9a8f9 (diff) | |
INTEGRATION: CWS a11ysep (1.10.702); FILE MERGED
2007/02/27 09:12:10 fs 1.10.702.4: RESYNC: (1.13-1.14); FILE MERGED
2006/09/21 19:58:32 fs 1.10.702.3: RESYNC: (1.11-1.13); FILE MERGED
2005/09/27 08:04:34 fs 1.10.702.2: RESYNC: (1.10-1.11); FILE MERGED
2005/03/07 08:16:00 fs 1.10.702.1: #i44293# A11Y related implementations now provided by a factory (implemented in module accessibility)
Diffstat (limited to 'svtools/source/brwbox')
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox2.cxx | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 1e0362703498..5e61c5264e27 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: editbrowsebox2.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:07:05 $ + * last change: $Author: hr $ $Date: 2007-06-27 14:49:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,9 +44,6 @@ #ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #endif -#ifndef _SVTOOLS_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX -#include "editbrowseboxcell.hxx" -#endif #ifndef SVTOOLS_EDITBROWSEBOX_IMPL_HXX #include "editbrowseboximpl.hxx" #endif @@ -56,10 +53,9 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> #endif -#ifndef _SVTOOLS_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX -#include "AccessibleBrowseBoxCheckBoxCell.hxx" -#endif // _SVTOOLS_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX - +#ifndef SVTOOLS_ACCESSIBLE_FACTORY_ACCESS_HXX +#include "svtaccessiblefactory.hxx" +#endif namespace svt { @@ -70,15 +66,26 @@ namespace svt // ----------------------------------------------------------------------------- Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled) { - XACC xAcc = GetAccessible(); - Reference<XAccessibleContext> xAccContext = xAcc->getAccessibleContext(); - return new AccessibleCheckBoxCell(xAccContext->getAccessibleChild( ::svt::BBINDEX_TABLE ) - ,*this - ,NULL - ,_nRow - ,_nColumnPos - ,eState - ,_bEnabled); + Reference< XAccessible > xAccessible( GetAccessible() ); + Reference< XAccessibleContext > xAccContext; + if ( xAccessible.is() ) + xAccContext = xAccessible->getAccessibleContext(); + + Reference< XAccessible > xReturn; + if ( xAccContext.is() ) + { + xReturn = getAccessibleFactory().createAccessibleCheckBoxCell( + xAccContext->getAccessibleChild( ::svt::BBINDEX_TABLE ), + *this, + NULL, + _nRow, + _nColumnPos, + eState, + _bEnabled, + sal_True + ); + } + return xReturn; } // ----------------------------------------------------------------------------- Reference< XAccessible > EditBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) @@ -102,7 +109,7 @@ void EditBrowseBox::implCreateActiveAccessible( ) Reference< XAccessible > xMy = GetAccessible(); if ( xMy.is() && xCont.is() ) { - m_aImpl->m_xActiveCell = m_aImpl->m_pActiveCell = new EditBrowseBoxTableCellAccess( + m_aImpl->m_xActiveCell = getAccessibleFactory().createEditBrowseBoxTableCellAccess( xMy, // parent accessible xCont, // control accessible VCLUnoHelper::GetInterface( &aController->GetWindow() ), // focus window (for notifications) @@ -150,7 +157,6 @@ void EditBrowseBoxImpl::clearActiveCell() OSL_ENSURE( sal_False, "EditBrowseBoxImpl::clearActiveCell: caught an exception while disposing the AccessibleCell!" ); } - m_pActiveCell = NULL; m_xActiveCell = NULL; } // ----------------------------------------------------------------------------- |