Resolves: tdf#104919 crash with empty ScNavigatorDlg member
commit 292560a957498bed70b625c992ec6bcf631dceb3
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon Oct 17 13:23:23 2016 +0200
loplugin:unusedmethods
detected the intended methods to do this were unused, so restore then, but hook
them up this time
Change-Id: I3b7e4a557696a91a70956487468b99fec6324a93
(cherry picked from commit f91dc0342de13e648dba5d9a93c01db23ae83533)
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 7a21bf8..ac588dd 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -112,6 +112,10 @@ class ColumnEdit : public SpinField
public:
ColumnEdit(Window* pParent, WinBits nWinBits);
~ColumnEdit() override;
void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg)
{
xDlg = pNaviDlg;
}
SCCOL GetCol() { return nCol; }
void SetCol( SCCOL nColNo );
@@ -140,6 +144,10 @@ class RowEdit : public NumericField
public:
RowEdit(Window* pParent, WinBits nWinBits);
~RowEdit() override;
void SetNavigatorDlg(ScNavigatorDlg *pNaviDlg)
{
xDlg = pNaviDlg;
}
SCROW GetRow() { return (SCROW)GetValue(); }
void SetRow(SCROW nRow) { SetValue(nRow); }
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index e3782a5..4c5df44 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -451,7 +451,9 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, bool bSidebar, vcl::Window* pPar
{
get(aLbDocuments, "documents");
get(aEdCol, "column");
aEdCol->SetNavigatorDlg(this);
get(aEdRow, "row");
aEdRow->SetNavigatorDlg(this);
get(aTbxCmd, "toolbox");
aTbxCmd->SetSelectHdl(LINK(this, ScNavigatorDlg, ToolBoxSelectHdl));
aTbxCmd->SetDropdownClickHdl(LINK(this, ScNavigatorDlg, ToolBoxDropdownClickHdl));