sd/source/ui/view/drviews2.cxx | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 943913f74c26210ebf3ed04f36412e3c45b76f0e
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu May 9 11:52:13 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu May 9 12:06:48 2024 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
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();
}
