diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-06-09 14:44:23 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-06-09 17:47:37 +0200 |
| commit | a5d6dc7ac82cf6f527a47bf67f976f982c2c0015 (patch) | |
| tree | d85ba96cdb7bf3ca8f45371443e9aa9a1487d6cf | |
| parent | cb8d6ebfb5b5512c32027708859251fae8c2fcae (diff) | |
ScTextWnd is set since the ctor now so drop from InitAcc
Change-Id: Ia1ccf9393f229d13fde23f2e425ff1cf169ebd9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116922
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleEditObject.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/AccessibleEditObject.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 20074b494c0b..2f06f9d8fdda 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -69,7 +69,7 @@ ScAccessibleEditObject::ScAccessibleEditObject( , mbHasFocus(false) , m_pScDoc(nullptr) { - InitAcc(rxParent, pEditView, pWin, nullptr, rName, rDescription); + InitAcc(rxParent, pEditView, pWin, rName, rDescription); } ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType) @@ -86,13 +86,12 @@ ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType) void ScAccessibleEditObject::InitAcc( const uno::Reference<XAccessible>& rxParent, EditView* pEditView, vcl::Window* pWin, - ScTextWnd* pTxtWnd, const OUString& rName, + const OUString& rName, const OUString& rDescription) { SetParent(rxParent); mpEditView = pEditView; mpWindow = pWin; - mpTextWnd = pTxtWnd; CreateTextHelper(); SetName(rName); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 4d8d59dd957f..39c8f4abdb21 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1536,7 +1536,7 @@ void ScTextWnd::InitEditEngine() if (pAcc) { - pAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, this, + pAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, ScResId(STR_ACC_EDITLINE_NAME), ScResId(STR_ACC_EDITLINE_DESCR)); } @@ -2010,7 +2010,7 @@ void ScTextWnd::MakeDialogEditView() if (pAcc) { - pAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, this, + pAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, ScResId(STR_ACC_EDITLINE_NAME), ScResId(STR_ACC_EDITLINE_DESCR)); } diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 0c679e6831ae..ea9c638705d4 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -59,7 +59,7 @@ public: void InitAcc( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - EditView* pEditView, vcl::Window* pWin, ScTextWnd* pTextWnd, + EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription); protected: diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 403d6148454a..40cea53f9c91 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -105,7 +105,7 @@ void ScEditWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) break; } - tmpAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, nullptr, + tmpAcc->InitAcc(nullptr, m_xEditView.get(), nullptr, sName, pDrawingArea->get_tooltip_text()); } |