diff options
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/AccessibleEditObject.hxx | 15 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 41c26d705e52..8eb34f05ec78 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1227,7 +1227,7 @@ ScAccessibleDocument::ScAccessibleDocument( { uno::Reference<XAccessible> xAcc = new ScAccessibleEditObject(this, pViewShell->GetViewData()->GetEditView(eSplitPos), pViewShell->GetWindowByPos(eSplitPos), GetCurrentCellName(), GetCurrentCellDescription(), - CellInEditMode); + ScAccessibleEditObject::CellInEditMode); AddChild(xAcc, false); } } @@ -1370,7 +1370,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), CellInEditMode); + rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::CellInEditMode); uno::Reference<XAccessible> xAcc = mpTempAccEdit; AddChild(xAcc, sal_True); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f0fb7a8bf2b6..7fa55dfc323e 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1998,7 +1998,7 @@ void ScTextWnd::ImplInitSettings() { return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, rtl::OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), - rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), EditLine); + rtl::OUString(String(ScResId(STR_ACC_EDITLINE_DESCR))), ScAccessibleEditObject::EditLine); } void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 5dd40f7c0d62..25faa1aa938e 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -39,13 +39,6 @@ namespace accessibility class EditView; class Window; -enum EditObjectType -{ - CellInEditMode, - EditLine, - EditControl -}; - /** @descr This base class provides an implementation of the <code>AccessibleCell</code> service. @@ -54,7 +47,13 @@ class ScAccessibleEditObject : public ScAccessibleContextBase { public: - //===== internal ======================================================== + enum EditObjectType + { + CellInEditMode, + EditLine, + EditControl + }; + ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index eb8ea2b625bc..9154152dbb45 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -348,7 +348,7 @@ void ScEditWindow::LoseFocus() break; } pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, - rtl::OUString(sName), rtl::OUString(sDescription), EditControl); + rtl::OUString(sName), rtl::OUString(sDescription), ScAccessibleEditObject::EditControl); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc; xAcc = xAccessible; return pAcc; |