summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'accessibility')
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControl.hxx8
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx6
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx7
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx8
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControl.cxx9
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlHeader.cxx9
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlTable.cxx12
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlTableBase.cxx10
-rw-r--r--accessibility/source/helper/acc_factory.cxx13
9 files changed, 12 insertions, 70 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 765dc115fa11..219cf03dfe88 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -64,14 +64,6 @@ protected:
virtual ~AccessibleGridControl();
- /** sets the XAccessible which created the context
-
- <p>To be called only once, and only if in the ctor NULL was passed.</p>
- */
- void setCreator(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
- );
-
/** Cleans up members. */
using AccessibleGridControlBase::disposing;
virtual void SAL_CALL disposing();
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index f164e7576247..1c1a3aee2804 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -197,12 +197,6 @@ protected:
inline sal_Bool isRowBar() const;
/** @return <TRUE/>, if the objects is a header bar for columns. */
inline sal_Bool isColumnBar() const;
-
- /** @attention This method requires locked mutex's and a living object.
- @throws <type>IndexOutOfBoundsException</type>
- If the specified row/column index (depending on type) is invalid. */
- void ensureIsValidHeaderIndex( sal_Int32 nIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
};
// inlines --------------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index c3465c6c32fb..c71bfd5eb65f 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -211,13 +211,6 @@ protected:
//// internal helper methods ------------------------------------------------
- /** Returns the specified row or column. Uses one of the parameters,
- depending on object type.
- @attention This method requires locked mutex's and a living object.
- @return The XAccessible interface of the specified column/row. */
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
- implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos );
///** @attention This method requires a locked mutex.
// @return The XAccessibleTable interface of the specified header bar. */
::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index aa9eb061f147..79c294952acf 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -198,14 +198,6 @@ protected:
@return The child index of the specified cell address. */
sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
- /** @attention This method requires locked mutex's and a living object.
- @return <TRUE/>, if the specified row is selected. */
- sal_Bool implIsRowSelected( sal_Int32 nRow ) const;
-
- /** @attention This method requires locked mutex's and a living object.
- @return The count of selected rows. */
- sal_Int32 implGetSelectedRowCount() const;
-
/** Fills a sequence with sorted indexes of completely selected rows.
@attention This method requires locked mutex's and a living object.
@param rSeq Out-parameter that takes the sorted row index list. */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index fd24a3f27aa1..4671f3284110 100755
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -90,15 +90,6 @@ AccessibleGridControl::AccessibleGridControl(
m_pImpl.reset( new AccessibleGridControl_Impl() );
m_pImpl->m_aCreator = _rxCreator;
}
-// -----------------------------------------------------------------------------
-void AccessibleGridControl::setCreator( const Reference< XAccessible >& _rxCreator )
-{
-#if OSL_DEBUG_LEVEL > 0
- Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
- DBG_ASSERT( !xCreator.is(), "accessibility/extended/AccessibleGridControl::setCreator: creator already set!" );
-#endif
- m_pImpl->m_aCreator = _rxCreator;
-}
// -----------------------------------------------------------------------------
AccessibleGridControl::~AccessibleGridControl()
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index d8cc7a11d202..a5a2be4049dc 100755
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -304,15 +304,6 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
return xChild;
}
-void AccessibleGridControlHeader::ensureIsValidHeaderIndex( sal_Int32 nIndex )
- throw ( lang::IndexOutOfBoundsException )
-{
- if( isRowBar() )
- ensureIsValidRow( nIndex );
- else
- ensureIsValidColumn( nIndex );
-}
-
// ============================================================================
} // namespace accessibility
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index ba6c229e2dc5..3b51c986b8b1 100755
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -297,7 +297,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
TCSolarGuard aSolarGuard;
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
- // return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount();
return 0;
}
//To Do - not implemented yet
@@ -309,9 +308,6 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
(void)nSelectedChildIndex;
- // method may throw lang::IndexOutOfBoundsException
- //sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex );
- //return implGetChild( nIndex, implToVCLColumnPos( nIndex ) );
return NULL;
}
//To Do - not implemented yet
@@ -371,14 +367,6 @@ Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
return m_aTable.calcTableRect();
}
// internal helper methods ----------------------------------------------------
-
-Reference< XAccessible > AccessibleGridControlTable::implGetChild(
- sal_Int32 nRow, sal_uInt16 nColumnPos )
-{
- (void)nRow;
- (void)nColumnPos;
- return NULL;
-}
//To Do - not implemented yet
//sal_Int32 AccessibleGridControlTable::implGetChildIndexFromSelectedIndex(
// sal_Int32 nSelectedChildIndex )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index bc266f10f323..76584bf4b965 100755
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -263,16 +263,6 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
return nRow * m_aTable.GetColumnCount() + nColumn;
}
-sal_Bool AccessibleGridControlTableBase::implIsRowSelected( sal_Int32 nRow ) const
-{
- return m_aTable.IsRowSelected( nRow );
-}
-
-sal_Int32 AccessibleGridControlTableBase::implGetSelectedRowCount() const
-{
- return m_aTable.GetSelectedRowCount();
-}
-
void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
{
rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 60e4f416dc3c..91476bc42863 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -74,6 +74,7 @@
#include <vcl/combobox.hxx>
#include <accessibility/extended/AccessibleGridControl.hxx>
#include <svtools/accessibletable.hxx>
+//#include "vcl/popupmenuwindow.hxx"
#include <floatingwindowaccessible.hxx>
@@ -385,7 +386,17 @@ inline bool hasFloatingChild(Window *pWindow)
}
else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
{
- xContext = new FloatingWindowAccessible( _pXWindow );
+ PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
+ pWindow->GetAccessibleChildWindow(0));
+ if ( pChild && pChild->IsPopupMenu() )
+ {
+ // Get the accessible context from the child window.
+ Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+ if (xAccessible.is())
+ xContext = xAccessible->getAccessibleContext();
+ }
+ else
+ xContext = new FloatingWindowAccessible( _pXWindow );
}
else if ( nType == WINDOW_HELPTEXTWINDOW )
{