diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2024-05-09 11:52:13 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2024-05-09 12:06:48 +0200 |
| commit | 943913f74c26210ebf3ed04f36412e3c45b76f0e (patch) | |
| tree | a35e02725f4053e5365de75ad86c5856bfb0f4db /sd | |
| parent | 68300e741bfd332e9ffef0f70a8c065672b18994 (diff) | |
sd: fix -Wshadow warnings
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx: In lambda function:
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2713:38: error: declaration of ‘aTitle’ shadows a previous local [-Werror=shadow]
2713 | OUString aTitle;
| ^~~~~~
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2700:26: note: shadowed declaration is here
2700 | OUString aTitle(pSelected->GetTitle());
| ^~~~~~
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2714:38: error: declaration of ‘aDescription’ shadows a previous local [-Werror=shadow]
2714 | OUString aDescription;
| ^~~~~~~~~~~~
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2701:26: note: shadowed declaration is here
2701 | OUString aDescription(pSelected->GetDescription());
| ^~~~~~~~~~~~
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2715:34: error: declaration of ‘isDecorative’ shadows a previous local [-Werror=shadow]
2715 | bool isDecorative;
| ^~~~~~~~~~~~
/home/vmiklos/git/libreoffice/co-24.04/sd/source/ui/view/drviews2.cxx:2702:22: note: shadowed declaration is here
2702 | bool isDecorative(pSelected->IsDecorative());
| ^~~~~~~~~~~~
cc1plus: all warnings being treated as errors
Change-Id: I036105d084010c66b8aab75befdef590408b25ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167381
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index a7ed100977bf..d149c9633d7f 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2710,17 +2710,17 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { if (nResult == RET_OK) { - OUString aTitle; - OUString aDescription; - bool isDecorative; + OUString aNewTitle; + OUString aNewDescription; + bool newIsDecorative; - pDlg->GetTitle(aTitle); - pDlg->GetDescription(aDescription); - pDlg->IsDecorative(isDecorative); + pDlg->GetTitle(aNewTitle); + pDlg->GetDescription(aNewDescription); + pDlg->IsDecorative(newIsDecorative); - pSelected->SetTitle(aTitle); - pSelected->SetDescription(aDescription); - pSelected->SetDecorative(isDecorative); + pSelected->SetTitle(aNewTitle); + pSelected->SetDescription(aNewDescription); + pSelected->SetDecorative(newIsDecorative); } pDlg->disposeOnce(); } |