Commits

Anonymous committed 36a4c74

accfixes3: removed the 'Offset' parameter from createAccessibleBrowseBoxTableCell, it was unused with the IA2 changes

Comments (0)

Files changed (8)

accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx

 										,public AccessibleTextHelper_BASE
 										,public ::comphelper::OCommonAccessibleText
 	{
-    private:
-        sal_Int32   m_nOffset;
-
 	protected:
 		// OCommonAccessibleText
 		virtual ::rtl::OUString					implGetText();
 									::svt::IAccessibleTableProvider& _rBrowseBox,
 									const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
 									sal_Int32 _nRowId,
-                                    sal_uInt16 _nColId,
-                                    sal_Int32 _nOffset );
+                                    sal_uInt16 _nColId );
 
         void    nameChanged( const ::rtl::OUString& rNewName, const ::rtl::OUString& rOldName );
 

accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx

 								IAccessibleTableProvider& _rBrowseBox,
 								const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
 								sal_Int32 _nRowPos,
-                                sal_uInt16 _nColPos,
-                                sal_Int32 _nOffset )
+                                sal_uInt16 _nColPos )
 		:AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos )
 	{
-        m_nOffset = ( OFFSET_DEFAULT == _nOffset ) ? (sal_Int32)BBINDEX_FIRSTCONTROL : _nOffset;
 		sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() );
         setAccessibleName( _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nIndex ) );
         setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( BBTYPE_TABLECELL, nIndex ) );

accessibility/source/helper/acc_factory.cxx

 				IAccessibleTableProvider& _rBrowseBox,
 				const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
 				sal_Int32 _nRowId,
-				sal_uInt16 _nColId,
-                sal_Int32 _nOffset
+				sal_uInt16 _nColId
             ) const;
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
 	//--------------------------------------------------------------------
     Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
         const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
-        const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
+        const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId ) const
     {
         return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow,
-            _nRowId, _nColId, _nOffset );
+            _nRowId, _nColId );
     }
 
 	//--------------------------------------------------------------------

svtools/inc/svtools/accessiblefactory.hxx

 				IAccessibleTableProvider& _rBrowseBox,
 				const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
 				sal_Int32 _nRowId,
-				sal_uInt16 _nColId,
-                sal_Int32 _nOffset
+				sal_uInt16 _nColId
             ) const = 0;
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >

svtools/inc/svtools/accessibletableprovider.hxx

 
 // ============================================================================
 
-#define OFFSET_DEFAULT  ((sal_Int32)-1)
-#define OFFSET_NONE     ((sal_Int32)0)
-
-// ============================================================================
-
 enum AccessibleTableChildIndex
 {
     /** Child index of the column header bar (first row). Exists always. */

svtools/source/brwbox/brwbox3.cxx

         *this,
         NULL,
         _nRow,
-        _nColumnPos,
-        OFFSET_DEFAULT
+        _nColumnPos
     );
 }
 // -----------------------------------------------------------------------------

svtools/source/contnr/svtabbx.cxx

                 m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, sal_True, sal_False );
         else
             xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell(
-                m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE );
+                m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos );
 
         // insert into list
         if ( !AreChildrenTransient() )

svtools/source/misc/svtaccessiblefactory.cxx

 				    IAccessibleTableProvider& /*_rBrowseBox*/,
 				    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& /*_xFocusWindow*/,
 				    sal_Int32 /*_nRowId*/,
-				    sal_uInt16 /*_nColId*/,
-                    sal_Int32 /*_nOffset*/
+				    sal_uInt16 /*_nColId*/
                 ) const
             {
                 return NULL;