From bacd723b72d9f6118e3bce1aed41ab8deaef230c Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Mon, 18 Apr 2011 16:36:58 +0200 Subject: Fix build - the same symbol defined on 2 places. --- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 4 ++-- accessibility/source/extended/AccessibleGridControlTableCell.cxx | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'accessibility') diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 40ca8ef9fbe4..a8d1ac975ad5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -40,13 +40,13 @@ namespace accessibility { namespace { - void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) + static void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); } - sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount ) + static sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount ) { return _nRow * _nColumnCount + _nColumn; } diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 68bba16d6a3b..12a70990c41f 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -40,16 +40,13 @@ namespace accessibility { namespace { - void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) + // FIXME this is a copy'n'paste from + // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that... + static void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { if ( _nIndex >= _sText.getLength() ) throw ::com::sun::star::lang::IndexOutOfBoundsException(); } - - sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount ) - { - return _nRow * _nColumnCount + _nColumn; - } } using namespace ::com::sun::star::lang; using namespace utl; -- cgit