[Libreoffice-commits] .: Branch 'libreoffice-3-4' - accessibility/source

[Jan Holesovsky]

 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx   |    4 ++--
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |    9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 1ea5f37619d412626278e156abde7b1eafbaa002
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Apr 18 16:36:58 2011 +0200

    Fix build - the same symbol defined on 2 places.

diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 1409f0e..88c4251 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 4a3182a..3b1a0d6 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;