tdf#141769 ScTextWnd has to be available before the editview is created
Change-Id: Iec3b4180c4dc83723224b7122a1513cb8fe3ea0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116917
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 57780c4..20074b4 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -27,6 +27,7 @@
#include <editsrc.hxx>
#include <scmod.hxx>
#include <inputhdl.hxx>
#include <inputwin.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -594,4 +595,12 @@ OutputDevice* ScAccessibleEditControlObject::GetOutputDeviceForView()
return &m_pController->GetDrawingArea()->get_ref_device();
}
ScAccessibleEditLineObject::ScAccessibleEditLineObject(ScTextWnd* pTextWnd)
: ScAccessibleEditControlObject(pTextWnd, ScAccessibleEditObject::EditLine)
{
// tdf#141769 set this early so its always available, even before the on-demand
// editview is created
mpTextWnd = pTextWnd;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 53ae38a..4d8d59d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2095,7 +2095,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* pDrawingArea)
css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible()
{
pAcc = new ScAccessibleEditControlObject(this, ScAccessibleEditObject::EditLine);
pAcc = new ScAccessibleEditLineObject(this);
return pAcc;
}
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index eb672e3..0c679e6 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -174,7 +174,9 @@ private:
std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper;
EditView* mpEditView;
VclPtr<vcl::Window> mpWindow;
protected:
ScTextWnd* mpTextWnd;
private:
EditObjectType meObjectType;
bool mbHasFocus;
@@ -221,4 +223,10 @@ public:
virtual void SAL_CALL disposing() override;
};
class ScAccessibleEditLineObject : public ScAccessibleEditControlObject
{
public:
ScAccessibleEditLineObject(ScTextWnd* pTextWnd);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
