summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx4
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx2
-rw-r--r--accessibility/source/helper/acc_factory.cxx5
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx4
-rw-r--r--svtools/inc/svtools/accessiblefactory.hxx1
-rw-r--r--svtools/inc/svtools/editbrowsebox.hxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx3
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx1
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
10 files changed, 8 insertions, 18 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 3106defa8cdd..c0af4538b19b 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -38,7 +38,6 @@ namespace accessibility
{
private:
TriState m_eState;
- sal_Bool m_bEnabled;
sal_Bool m_bIsTriState;
protected:
@@ -53,8 +52,7 @@ namespace accessibility
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
const TriState& _eState,
- sal_Bool _bEnabled,
- sal_Bool _bIsTriState = sal_True);
+ sal_Bool _bIsTriState);
// XInterface
DECLARE_XINTERFACE( )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 5241bfe193e8..a5331c31e04b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -34,11 +34,9 @@ namespace accessibility
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
,const TriState& _eState,
- sal_Bool _bEnabled,
sal_Bool _bIsTriState)
:AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, BBTYPE_CHECKBOXCELL)
,m_eState(_eState)
- ,m_bEnabled(_bEnabled)
,m_bIsTriState(_bIsTriState)
{
}
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 92ce2cc43d19..5125ba45e7e1 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -210,7 +210,6 @@ inline bool hasFloatingChild(Window *pWindow)
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
const TriState& _eState,
- sal_Bool _bEnabled,
sal_Bool _bIsTriState
) const;
@@ -501,10 +500,10 @@ inline bool hasFloatingChild(Window *pWindow)
Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
- const TriState& _eState, sal_Bool _bEnabled, sal_Bool _bIsTriState ) const
+ const TriState& _eState, sal_Bool _bIsTriState ) const
{
return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow,
- _nRowPos, _nColPos, _eState, _bEnabled, _bIsTriState );
+ _nRowPos, _nColPos, _eState, _bIsTriState );
}
//--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 36e595839563..6e548bb96d34 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -470,17 +470,15 @@ Reference< XAccessible > OTableGrantControl::CreateAccessibleCell( sal_Int32 _nR
if(nColumnId != COL_TABLE_NAME)
{
TriState eState = STATE_NOCHECK;
- sal_Bool bEnable = sal_False;
TTablePrivilegeMap::const_iterator aFind = findPrivilege(_nRow);
if(aFind != m_aPrivMap.end())
{
eState = isAllowed(nColumnId,aFind->second.nRights) ? STATE_CHECK : STATE_NOCHECK;
- bEnable = isAllowed(nColumnId,aFind->second.nWithGrant);
}
else
eState = STATE_NOCHECK;
- return EditBrowseBox::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eState,bEnable );
+ return EditBrowseBox::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eState );
}
return EditBrowseBox::CreateAccessibleCell( _nRow, _nColumnPos );
}
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
index f747b9a4cb31..43aff5072d66 100644
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.hxx
@@ -155,7 +155,6 @@ namespace svt
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
const TriState& _eState,
- sal_Bool _bEnabled,
sal_Bool _bIsTriState
) const = 0;
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index 908bb8e91f03..c9b438947e64 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -661,7 +661,7 @@ namespace svt
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True);
+ ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState);
protected:
// creates the accessible which wraps the active cell
void implCreateActiveAccessible( );
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 27ddef2ae13e..080d4a33d47f 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -41,7 +41,7 @@ namespace svt
using namespace ::com::sun::star::accessibility::AccessibleEventId;
// -----------------------------------------------------------------------------
-Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState,sal_Bool _bEnabled)
+Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState)
{
Reference< XAccessible > xAccessible( GetAccessible() );
Reference< XAccessibleContext > xAccContext;
@@ -58,7 +58,6 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow,
_nRow,
_nColumnPos,
eState,
- _bEnabled,
sal_True
);
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 13850f2b4c57..eba80955ff27 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -978,7 +978,7 @@ 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, sal_True, sal_False );
+ m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, sal_False );
else
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell(
m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE );
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index ca15bf53bd87..dcda126304ab 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -189,7 +189,6 @@ namespace svt
sal_Int32 /*_nRowPos*/,
sal_uInt16 /*_nColPos*/,
const TriState& /*_eState*/,
- sal_Bool /*_bEnabled*/,
sal_Bool /*_bIsTriState*/
) const
{
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index c93692bb9142..61491ba16824 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3792,7 +3792,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
eValue = STATE_DONTKNOW;
break;
}
- return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True );
+ return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue );
}
}
return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos );
generated by cgit (git 2.34.1) at 2024-07-27 02:29:05 +0000