mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia2436d4cc843540a51e00ee937b80303cb600851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133162
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2022-04-19 00:12:56 +09:00
committed by Tomaž Vajngerl
parent 540a54f59b
commit 216493f322
4 changed files with 4 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/Library_chartcore.mk
View File

@@ -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 \

36
chart2/source/inc/TrueGuard.hxx
View File

@@ -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: */

34
chart2/source/tools/TrueGuard.cxx
View File

@@ -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: */

6
chart2/source/view/axes/VCartesianAxis.cxx
View File

@@ -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;