[Libreoffice-commits] core.git: 4 commits - accessibility/inc accessibility/source include/svtools svtools/source UnoControls/inc UnoControls/source
Stephan Bergmann
sbergman at redhat.com
Tue Mar 25 01:16:12 PDT 2014
UnoControls/inc/basecontainercontrol.hxx | 105 ----------
UnoControls/source/base/basecontainercontrol.cxx | 94 --------
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 20 -
accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx | 4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx | 4
accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx | 3
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 4
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 20 -
accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx | 4
accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx | 4
accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx | 3
accessibility/inc/accessibility/extended/accessibletablistbox.hxx | 4
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 3
accessibility/source/extended/AccessibleBrowseBox.cxx | 9
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 31 --
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 7
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 7
accessibility/source/extended/AccessibleGridControl.cxx | 11 -
accessibility/source/extended/AccessibleGridControlBase.cxx | 30 --
accessibility/source/extended/AccessibleGridControlHeader.cxx | 7
accessibility/source/extended/AccessibleGridControlTable.cxx | 7
accessibility/source/extended/textwindowaccessibility.cxx | 8
include/svtools/accessibletableprovider.hxx | 8
svtools/source/contnr/svtabbx.cxx | 6
25 files changed, 11 insertions(+), 396 deletions(-)
New commits:
commit f9cc7509855c2e9efc1b7a37259919131e04da2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 24 17:34:05 2014 +0100
Reduce IAccessibleTabListBox to what's actually used
...the calls to getAccessibleChild(0) and getHeaderBar(BBYTE_COLUMNHEADERBAR)
ultimately all ended up at
AccessibleBrowseBox::implGetHeaderBar(BBTYPE_COLUMNHEADERBAR).
Change-Id: Ie25659e19d0d1ce2dcde2d1440ecc69b4fa265b0
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
index d14d764..985642e 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
@@ -83,9 +83,9 @@ public:
}
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+ getHeaderBar()
{
- return AccessibleBrowseBox::getHeaderBar( _eObjType );
+ return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR );
}
protected:
diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx
index 973ec03..acd3fea 100644
--- a/include/svtools/accessibletableprovider.hxx
+++ b/include/svtools/accessibletableprovider.hxx
@@ -145,14 +145,10 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible >
getMyself() = 0;
- virtual css::uno::Reference< css::accessibility::XAccessible >
- SAL_CALL getAccessibleChild( sal_Int32 nChildIndex )
- throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) = 0;
-
- /** returns the accessible object for the row or the column header bar
+ /** returns the accessible object for the column header bar
*/
virtual css::uno::Reference< css::accessibility::XAccessible >
- getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
+ getHeaderBar() = 0;
protected:
~IAccessibleTabListBox() {}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index c07ca6e..c2ecf34 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -921,10 +921,10 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR
sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState );
if ( bIsCheckBox )
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell(
- m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, false );
+ m_pAccessible->getHeaderBar(), *this, NULL, _nRow, _nColumnPos, eState, false );
else
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell(
- m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE );
+ m_pAccessible->getHeaderBar(), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE );
// insert into list
if ( !AreChildrenTransient() )
@@ -958,7 +958,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u
{
// no -> create new header cell
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell(
- _nColumn, m_pAccessible->getHeaderBar( ::svt::BBTYPE_COLUMNHEADERBAR ),
+ _nColumn, m_pAccessible->getHeaderBar(),
*this, NULL, ::svt::BBTYPE_COLUMNHEADERCELL
);
commit d96a2f432fb391d01e354236a440181058b332c2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 24 16:18:43 2014 +0100
Remove dead code
Change-Id: Ia9035189bd01d3a3e5e3222760fc392f3f78880f
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 8732fcf..b73347b 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -194,18 +194,6 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL getSize()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return <TRUE/>, if the object is showing. */
- virtual sal_Bool SAL_CALL isShowing()
- throw ( ::com::sun::star::uno::RuntimeException );
-
- /** @return <TRUE/>, if the object is visible. */
- virtual sal_Bool SAL_CALL isVisible()
- throw ( ::com::sun::star::uno::RuntimeException );
-
- /** @return <TRUE/>, if the object can accept the focus. */
- virtual sal_Bool SAL_CALL isFocusTraversable()
- throw ( ::com::sun::star::uno::RuntimeException );
-
virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 772a4bc..689c2f7 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -171,18 +171,6 @@ public:
virtual ::com::sun::star::awt::Size SAL_CALL getSize()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return <TRUE/>, if the object is showing. */
- virtual sal_Bool SAL_CALL isShowing()
- throw ( ::com::sun::star::uno::RuntimeException );
-
- /** @return <TRUE/>, if the object is visible. */
- virtual sal_Bool SAL_CALL isVisible()
- throw ( ::com::sun::star::uno::RuntimeException );
-
- /** @return <TRUE/>, if the object can accept the focus. */
- virtual sal_Bool SAL_CALL isFocusTraversable()
- throw ( ::com::sun::star::uno::RuntimeException );
-
virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 4c7bdfe..2ed6524 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -243,31 +243,6 @@ awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
return AWTSize( getBoundingBox().GetSize() );
}
-sal_Bool SAL_CALL AccessibleBrowseBoxBase::isShowing()
- throw ( uno::RuntimeException )
-{
- SolarMutexGuard aSolarGuard;
- ::osl::MutexGuard aGuard( getOslMutex() );
- ensureIsAlive();
- return implIsShowing();
-}
-
-sal_Bool SAL_CALL AccessibleBrowseBoxBase::isVisible()
- throw ( uno::RuntimeException )
-{
- Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
- return xStateSet.is() ?
- xStateSet->contains( AccessibleStateType::VISIBLE ) : sal_False;
-}
-
-sal_Bool SAL_CALL AccessibleBrowseBoxBase::isFocusTraversable()
- throw ( uno::RuntimeException )
-{
- Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
- return xStateSet.is() ?
- xStateSet->contains( AccessibleStateType::FOCUSABLE ) : sal_False;
-}
-
void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
com::sun::star::uno::Any aFocused;
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 5e188f0..ae4dd5b 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -219,30 +219,6 @@ awt::Size SAL_CALL AccessibleGridControlBase::getSize()
return AWTSize( getBoundingBox().GetSize() );
}
-sal_Bool SAL_CALL AccessibleGridControlBase::isShowing()
- throw ( uno::RuntimeException )
-{
- SolarMutexGuard aSolarGuard;
-
- ensureIsAlive();
- return implIsShowing();
-}
-
-sal_Bool SAL_CALL AccessibleGridControlBase::isVisible()
- throw ( uno::RuntimeException )
-{
- Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
- return xStateSet.is() ?
- xStateSet->contains( AccessibleStateType::VISIBLE ) : sal_False;
-}
-
-sal_Bool SAL_CALL AccessibleGridControlBase::isFocusTraversable()
- throw ( uno::RuntimeException )
-{
- Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
- return xStateSet.is() ?
- xStateSet->contains( AccessibleStateType::FOCUSABLE ) : sal_False;
-}
// XAccessibleEventBroadcaster ------------------------------------------------
void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener(
commit c6b2b5f34c66e51583f01caa0cf06c6e1c3980c0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 24 16:15:03 2014 +0100
Remove dead code
Change-Id: Id522113f1ba0c9e7b1356acc01a79e0e90a5e752
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 6a892e5..8160f8c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -93,10 +93,6 @@ protected:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XServiceInfo -----------------------------------------------------------
/** @return
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 82ad439..8732fcf 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -216,15 +216,9 @@ public:
/* Derived classes have to implement:
- getAccessibleAt,
- - grabFocus,
- - getAccessibleKeyBinding. */
+ - grabFocus. */
/** @return
- No key bindings supported by default.
- */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
- /** @return
The accessible child rendered under the given point.
*/
virtual ::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
index 7f8488f..dfb4ddc 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -83,10 +83,6 @@ public:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XAccessibleTable -------------------------------------------------------
/** @return The description text of the specified row. */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
index 839ec65..0591c8b 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
@@ -70,10 +70,6 @@ public:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XAccessibleTable -------------------------------------------------------
/** @return The description text of the specified row. */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
index 1adc5ef..d2e6854 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -79,8 +79,7 @@ public:
/* Derived classes have to implement:
- getAccessibleAt,
- - grabFocus,
- - getAccessibleKeyBinding. */
+ - grabFocus. */
// XAccessibleTable -------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 702be9a..3edd1da 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -84,10 +84,6 @@ protected:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XServiceInfo -----------------------------------------------------------
/** @return
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 6d4a5d4..772a4bc 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -189,15 +189,9 @@ public:
/* Derived classes have to implement:
- getAccessibleAt,
- - grabFocus,
- - getAccessibleKeyBinding. */
+ - grabFocus. */
/** @return
- No key bindings supported by default.
- */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
- /** @return
The accessible child rendered under the given point.
*/
virtual ::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index e11bf6d..70f4d55 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -77,10 +77,6 @@ public:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XAccessibleTable -------------------------------------------------------
/** @return The description text of the specified row. */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index 63580f4..3ec4836 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -77,10 +77,6 @@ public:
virtual void SAL_CALL grabFocus()
throw ( ::com::sun::star::uno::RuntimeException, std::exception );
- /** @return The key bindings associated with this object. */
- virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw ( ::com::sun::star::uno::RuntimeException );
-
// XAccessibleTable -------------------------------------------------------
/** @return The description text of the specified row. */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index 2f97fda..e72b0d9 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -75,8 +75,7 @@ public:
/* Derived classes have to implement:
- getAccessibleAt,
- - grabFocus,
- - getAccessibleKeyBinding. */
+ - grabFocus. */
// XAccessibleTable -------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 36ff346..7485967 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -227,9 +227,6 @@ private:
virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception);
- virtual css::uno::Any SAL_CALL getAccessibleKeyBinding()
- throw (css::uno::RuntimeException);
-
virtual css::util::Color SAL_CALL getForeground()
throw (css::uno::RuntimeException, std::exception);
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 2f28e8b..4b72551 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -195,15 +195,6 @@ void SAL_CALL AccessibleBrowseBox::grabFocus()
mpBrowseBox->GrabFocus();
}
-
-Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- ensureIsAlive();
- return Any();
-}
-
-
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 9fa315c..4c7bdfe 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -509,12 +509,6 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
return nRole;
}
-Any SAL_CALL AccessibleBrowseBoxBase::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- return Any();
-}
-
Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
throw ( uno::RuntimeException, std::exception )
{
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 397595b..f884599 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -98,13 +98,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus()
// focus on header not supported
}
-Any SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- ensureIsAlive();
- return Any(); // no special key bindings for header
-}
-
// XAccessibleTable -----------------------------------------------------------
OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index a43256f..4bf01ef 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -98,13 +98,6 @@ void SAL_CALL AccessibleBrowseBoxTable::grabFocus()
mpBrowseBox->GrabTableFocus();
}
-Any SAL_CALL AccessibleBrowseBoxTable::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- ensureIsAlive();
- return Any(); // no special key bindings for data table
-}
-
// XAccessibleTable -----------------------------------------------------------
OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 3fa3d9f..109b6cd 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -223,17 +223,6 @@ void SAL_CALL AccessibleGridControl::grabFocus()
m_aTable.GrabFocus();
}
-
-Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- SolarMutexGuard g;
-
- ensureIsAlive();
- return Any();
-}
-
-
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleGridControl::getImplementationName()
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 8299290..5e188f0 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -430,12 +430,6 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
return nRole;
}
-Any SAL_CALL AccessibleGridControlBase::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- return Any();
-}
-
Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
throw ( uno::RuntimeException, std::exception )
{
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 5f87437..50e99fc 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -118,13 +118,6 @@ void SAL_CALL AccessibleGridControlHeader::grabFocus()
// focus on header not supported
}
-Any SAL_CALL AccessibleGridControlHeader::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- ensureIsAlive();
- return Any(); // no special key bindings for header
-}
-
// XAccessibleTable -----------------------------------------------------------
OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow )
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index c9d5ace..1502981 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -115,13 +115,6 @@ void SAL_CALL AccessibleGridControlTable::grabFocus()
m_aTable.GrabFocus();
}
-Any SAL_CALL AccessibleGridControlTable::getAccessibleKeyBinding()
- throw ( uno::RuntimeException )
-{
- ensureIsAlive();
- return Any(); // no special key bindings for data table
-}
-
// XAccessibleTable -----------------------------------------------------------
OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow )
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index b5dcf47..32a28a3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -290,14 +290,6 @@ void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exc
}
// virtual
-css::uno::Any SAL_CALL Paragraph::getAccessibleKeyBinding()
- throw (css::uno::RuntimeException)
-{
- checkDisposed();
- return css::uno::Any();
-}
-
-// virtual
css::util::Color SAL_CALL Paragraph::getForeground()
throw (css::uno::RuntimeException, std::exception)
{
commit af4b38d6e7f769bf403a768bd310e5fa2b3e8ddd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 24 15:59:06 2014 +0100
Remove dead code
Change-Id: I59fb7843d5c9a6cf2873b6d668d0e9dccff316d2
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 6f5b7f7..2a71217 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -285,23 +285,6 @@ public:
@onerror -
*/
- virtual void SAL_CALL addContainerListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException );
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL removeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl
) throw( ::com::sun::star::uno::RuntimeException, std::exception );
@@ -319,23 +302,6 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeContainerListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException );
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL setStatusText(
const OUString& sStatusText
) throw( ::com::sun::star::uno::RuntimeException, std::exception );
@@ -374,77 +340,6 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception );
- // XUnoControlContainer
-
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
- virtual void SAL_CALL addTabController(
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController
- ) throw( ::com::sun::star::uno::RuntimeException );
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
- virtual void SAL_CALL removeTabController(
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController
- ) throw( ::com::sun::star::uno::RuntimeException );
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
- virtual void SAL_CALL setTabControllers(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& xTabControllers
- ) throw( ::com::sun::star::uno::RuntimeException );
-
- /**_______________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers()
- throw( ::com::sun::star::uno::RuntimeException );
-
-
// XWindow
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 5806504..37ca444 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -298,18 +298,6 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
// XControlContainer
-void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
-
- m_aListeners.addInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
-}
-
-
-// XControlContainer
-
-
void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
{
if ( rControl.is() )
@@ -363,18 +351,6 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
// XControlContainer
-void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
-
- m_aListeners.removeInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
-}
-
-
-// XControlContainer
-
-
void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception )
{
// go down to each parent
@@ -440,76 +416,6 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
}
-// XUnoControlContainer
-
-
-void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
-
- sal_uInt32 nOldCount = m_xTabControllerList.getLength () ;
- Sequence< Reference< XTabController > > aNewList ( nOldCount + 1 ) ;
- sal_uInt32 nCount = 0 ;
-
- // Copy old elements of sequence to new list.
- for ( nCount = 0; nCount < nOldCount; ++nCount )
- {
- aNewList.getArray () [nCount] = m_xTabControllerList.getConstArray () [nCount] ;
- }
-
- // Add new controller
- aNewList.getArray () [nOldCount] = rTabController ;
-
- // change old and new list
- m_xTabControllerList = aNewList ;
-}
-
-
-// XUnoControlContainer
-
-
-void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
-
- sal_uInt32 nMaxCount = m_xTabControllerList.getLength () ;
- sal_uInt32 nCount = 0 ;
-
- // Search right tabcontroller ...
- for ( nCount = 0; nCount < nMaxCount; ++nCount )
- {
- if ( m_xTabControllerList.getConstArray () [nCount] == rTabController )
- {
- // ... if is it found ... remove it from list.
- m_xTabControllerList.getArray()[ nCount ].clear();
- break ;
- }
- }
-}
-
-
-// XUnoControlContainer
-
-
-void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController > >& rTabControllers ) throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
-
- m_xTabControllerList = rTabControllers ;
-}
-
-Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabControllers () throw( RuntimeException )
-{
- // Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
-
- return m_xTabControllerList ;
-}
-
-
// XWindow
More information about the Libreoffice-commits
mailing list