Kaydet (Commit) 86eeb0bb authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Put enum definition under class scope to avoid name clash.

There is a class named EditLine in editeng which clashed with one of
the enum values.
üst e95eb1b2
...@@ -1227,7 +1227,7 @@ ScAccessibleDocument::ScAccessibleDocument( ...@@ -1227,7 +1227,7 @@ ScAccessibleDocument::ScAccessibleDocument(
{ {
uno::Reference<XAccessible> xAcc = new ScAccessibleEditObject(this, pViewShell->GetViewData()->GetEditView(eSplitPos), uno::Reference<XAccessible> xAcc = new ScAccessibleEditObject(this, pViewShell->GetViewData()->GetEditView(eSplitPos),
pViewShell->GetWindowByPos(eSplitPos), GetCurrentCellName(), GetCurrentCellDescription(), pViewShell->GetWindowByPos(eSplitPos), GetCurrentCellName(), GetCurrentCellDescription(),
CellInEditMode); ScAccessibleEditObject::CellInEditMode);
AddChild(xAcc, false); AddChild(xAcc, false);
} }
} }
...@@ -1370,7 +1370,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) ...@@ -1370,7 +1370,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{ {
mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos), mpTempAccEdit = new ScAccessibleEditObject(this, mpViewShell->GetViewData()->GetEditView(meSplitPos),
mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(), 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; uno::Reference<XAccessible> xAcc = mpTempAccEdit;
AddChild(xAcc, sal_True); AddChild(xAcc, sal_True);
......
...@@ -1998,7 +1998,7 @@ void ScTextWnd::ImplInitSettings() ...@@ -1998,7 +1998,7 @@ void ScTextWnd::ImplInitSettings()
{ {
return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this, return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), NULL, this,
rtl::OUString(String(ScResId(STR_ACC_EDITLINE_NAME))), 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 ) void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData )
......
...@@ -39,13 +39,6 @@ namespace accessibility ...@@ -39,13 +39,6 @@ namespace accessibility
class EditView; class EditView;
class Window; class Window;
enum EditObjectType
{
CellInEditMode,
EditLine,
EditControl
};
/** @descr /** @descr
This base class provides an implementation of the This base class provides an implementation of the
<code>AccessibleCell</code> service. <code>AccessibleCell</code> service.
...@@ -54,7 +47,13 @@ class ScAccessibleEditObject ...@@ -54,7 +47,13 @@ class ScAccessibleEditObject
: public ScAccessibleContextBase : public ScAccessibleContextBase
{ {
public: public:
//===== internal ======================================================== enum EditObjectType
{
CellInEditMode,
EditLine,
EditControl
};
ScAccessibleEditObject( ScAccessibleEditObject(
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent, ::com::sun::star::accessibility::XAccessible>& rxParent,
......
...@@ -348,7 +348,7 @@ void ScEditWindow::LoseFocus() ...@@ -348,7 +348,7 @@ void ScEditWindow::LoseFocus()
break; break;
} }
pAcc = new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView, this, 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; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible = pAcc;
xAcc = xAccessible; xAcc = xAccessible;
return pAcc; return pAcc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment