diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-06-09 14:48:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-06-09 17:50:44 +0200 |
| commit | 842a5504119c49edf368b94889f098e76f5fb80d (patch) | |
| tree | ca3dfac7ccb73ce23e77a0c16437d89f83226970 | |
| parent | a5d6dc7ac82cf6f527a47bf67f976f982c2c0015 (diff) | |
drop unnecessary pWin arg to InitAcc
on the only path InitAcc has a non-null pWin arg the caller ctor
has already set mpWindow to pWin which is also all that InitAcc does
with its pWin arg
Change-Id: I668232117be41fd33bf9ca41db882b5124d61ff0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116923
Tested-by: Jenkins
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 | 3 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 2f06f9d8fdda..8412b313c69c 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, rName, rDescription); + InitAcc(rxParent, pEditView, rName, rDescription); } ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType) @@ -85,13 +85,12 @@ ScAccessibleEditObject::ScAccessibleEditObject(EditObjectType eObjectType) void ScAccessibleEditObject::InitAcc( const uno::Reference<XAccessible>& rxParent, - EditView* pEditView, vcl::Window* pWin, + EditView* pEditView, const OUString& rName, const OUString& rDescription) { SetParent(rxParent); mpEditView = pEditView; - mpWindow = pWin; CreateTextHelper(); SetName(rName); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 39c8f4abdb21..52de56543a80 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, + pAcc->InitAcc(nullptr, m_xEditView.get(), 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, + pAcc->InitAcc(nullptr, m_xEditView.get(), 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 ea9c638705d4..43a4cba6b18d 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -59,8 +59,7 @@ public: void InitAcc( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - EditView* pEditView, vcl::Window* pWin, - const OUString& rName, const OUString& rDescription); + EditView* pEditView, const OUString& rName, const OUString& rDescription); protected: virtual ~ScAccessibleEditObject() override; diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 40cea53f9c91..c71c67b0842b 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, + tmpAcc->InitAcc(nullptr, m_xEditView.get(), sName, pDrawingArea->get_tooltip_text()); } |