chart2: not really worth having a TrueGuard - just use ScopeGuard

Change-Id: Ia2436d4cc843540a51e00ee937b80303cb600851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133162
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

4 files changed, 4 insertions, 73 deletions

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 2042a53b7367..2f1a1a9587f8 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -225,7 +225,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/tools/StatisticsHelper \
     chart2/source/tools/ThreeDHelper \
     chart2/source/tools/TitleHelper \
-    chart2/source/tools/TrueGuard \
     chart2/source/tools/UncachedDataSequence \
     chart2/source/tools/UserDefinedProperties \
     chart2/source/tools/WeakListenerAdapter \
diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx
deleted file mode 100644
index 528fd28fc265..000000000000
--- a/chart2/source/inc/TrueGuard.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-namespace chart
-{
-/** This guard sets the given boolean reference to true in the constructor and to false in the destructor
- */
-class TrueGuard final
-{
-public:
-    explicit TrueGuard(bool& rbTrueDuringGuardedTime);
-    ~TrueGuard();
-
-private:
-    bool& m_rbTrueDuringGuardedTime;
-};
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx
deleted file mode 100644
index 3fca959e78c2..000000000000
--- a/chart2/source/tools/TrueGuard.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <TrueGuard.hxx>
-
-namespace chart
-{
-TrueGuard::TrueGuard(bool& rbTrueDuringGuardedTime)
-    : m_rbTrueDuringGuardedTime(rbTrueDuringGuardedTime)
-{
-    m_rbTrueDuringGuardedTime = true;
-}
-
-TrueGuard::~TrueGuard() { m_rbTrueDuringGuardedTime = false; }
-
-} //  namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index e6b52f0eb0c2..835e085955be 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -23,7 +23,6 @@
 #include <PropertyMapper.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <LabelPositionHelper.hxx>
-#include <TrueGuard.hxx>
 #include <BaseGFXHelper.hxx>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
@@ -37,6 +36,8 @@
 #include <svx/unoshape.hxx>
 #include <svx/unoshtxt.hxx>
 
+#include <comphelper/scopeguard.hxx>
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -1720,7 +1721,8 @@ void VCartesianAxis::createLabels()
 
 void VCartesianAxis::createMaximumLabels()
 {
-    TrueGuard aRecordMaximumTextSize(m_bRecordMaximumTextSize);
+    m_bRecordMaximumTextSize = true;
+    const comphelper::ScopeGuard aGuard([this]() { m_bRecordMaximumTextSize = false; });
 
     if( !prepareShapeCreation() )
         return;