sc/source/ui/view/tabvwshf.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 7d7b668d3732052612c15908dceda148a1973108 Author: Miklos Vajna <[email protected]> AuthorDate: Thu Sep 12 14:42:06 2024 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Sep 12 22:14:52 2024 +0200 sc: fix -Werror=shadow Seen with gcc-12, a problem since commit 5044236b08e5390ba5a154966391e9a32441c6e7 (feat: Make move/copy sheet an async jsdialog, 2024-09-11). Change-Id: I551fe44ec59efec7650a718d5a5107a7b936dcdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173261 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index c8fed32c9dd3..8d11e0ade001 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -678,7 +678,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ](sal_Int32 nResult) { if ( nResult == RET_OK ) { - sal_uInt16 nDoc = pDlg->GetSelectedDocument(); + sal_uInt16 nSelectedDoc = pDlg->GetSelectedDocument(); SCTAB nSelectedTab = pDlg->GetSelectedTable(); bool bCopy = pDlg->GetCopyTable(); bool bRna = pDlg->GetRenameTable(); @@ -692,9 +692,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) bool bDoItAsync = true; OUString aFoundDocName; - if ( nDoc != SC_DOC_NEW ) + if ( nSelectedDoc != SC_DOC_NEW ) { - ScDocShell* pSh = ScDocShell::GetShellByNum( nDoc ); + ScDocShell* pSh = ScDocShell::GetShellByNum( nSelectedDoc ); if (pSh) { aFoundDocName = pSh->GetTitle(); @@ -716,10 +716,10 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) pReq->Done(); if (bFromContextMenu) - MoveTable(nDoc, nSelectedTab, bCopy, &aNewTabName, true, + MoveTable(nSelectedDoc, nSelectedTab, bCopy, &aNewTabName, true, nContextMenuTab); else - MoveTable(nDoc, nSelectedTab, bCopy, &aNewTabName); + MoveTable(nSelectedDoc, nSelectedTab, bCopy, &aNewTabName); } }
