desktop/source/migration/migration.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c4fb915213875fda248593743421d8c43533e375
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Sep 15 18:26:16 2022 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Sep 15 20:28:17 2022 +0200
[loplugin:fakebool] in desktop
/home/julien/lo/libreoffice/desktop/source/migration/migration.cxx:628:5:
error: VarDecl, use "bool" instead of '::sal_Bool' (aka 'unsigned char')
[loplugin:fakebool]
auto const hasCurrent = set->hasByName(currentName);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/julien/lo/libreoffice/desktop/source/migration/migration.cxx:629:5:
error: VarDecl, use "bool" instead of '::sal_Bool' (aka 'unsigned char')
[loplugin:fakebool]
auto const hasMigrated = set->hasByName(migratedName);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/julien/lo/libreoffice/desktop/source/migration/migration.cxx:647:5:
error: VarDecl, use "bool" instead of '::sal_Bool' (aka 'unsigned char')
[loplugin:fakebool]
auto const hasMigrated = set->hasByName(migratedName);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
since 7f04bb393f830a2983e3e26485bbe217c66006ff
Clean up color scheme migration
Change-Id: I2a06b73cecc4812d2876689f22ba89eba12b308f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140024
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 162941bfd0ea..4ae3482a55c9 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -625,8 +625,8 @@ void renameMigratedSetElementTo(
// To avoid unexpected data loss, the code is careful to only rename from
currentName to
// migratedName in the expected case where the currentName element exists
and the migratedName
// element doesn't exist:
- auto const hasCurrent = set->hasByName(currentName);
- auto const hasMigrated = set->hasByName(migratedName);
+ bool const hasCurrent = set->hasByName(currentName);
+ bool const hasMigrated = set->hasByName(migratedName);
if (hasCurrent && !hasMigrated) {
auto const elem = set->getByName(currentName);
set->removeByName(currentName);
@@ -644,7 +644,7 @@ void renameMigratedSetElementBack(
// To avoid unexpected data loss, the code is careful to ensure that in
the end a currentName
// element exists, creating it from a template if the migratedName element
had unexpectedly gone
// missing:
- auto const hasMigrated = set->hasByName(migratedName);
+ bool const hasMigrated = set->hasByName(migratedName);
css::uno::Any elem;
if (hasMigrated) {
elem = set->getByName(migratedName);
