68e7974026
which warns against using the 'operator bool' conversion of std::optional<bool> which can lead to interesting bugs The bugs that this plugin have been submitted independantly, so this change is just using has_value() in relevant places. Change-Id: I259b837feeecddcb8cd1d7e5db1e85bf505907cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155978 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
48 lines
1.6 KiB
C++
48 lines
1.6 KiB
C++
/* -*- 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/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "scdllapi.h"
|
|
#include <optional>
|
|
#include <tools/fontenum.hxx>
|
|
#include <tools/color.hxx>
|
|
#include <vcl/fntstyle.hxx>
|
|
#include <i18nlangtag/lang.h>
|
|
|
|
class SvxFontItem;
|
|
|
|
struct SC_DLLPUBLIC ScDxfFont
|
|
{
|
|
std::optional<const SvxFontItem*> pFontAttr;
|
|
std::optional<sal_uInt32> nFontHeight;
|
|
std::optional<FontWeight> eWeight;
|
|
std::optional<FontItalic> eItalic;
|
|
std::optional<FontLineStyle> eUnder;
|
|
std::optional<FontLineStyle> eOver;
|
|
std::optional<bool> bWordLine;
|
|
std::optional<FontStrikeout> eStrike;
|
|
std::optional<bool> bOutline;
|
|
std::optional<bool> bShadow;
|
|
std::optional<FontEmphasisMark> eEmphasis;
|
|
std::optional<FontRelief> eRelief;
|
|
std::optional<Color> aColor;
|
|
std::optional<LanguageType> eLang;
|
|
|
|
bool isEmpty() const
|
|
{
|
|
return !(pFontAttr.has_value() || nFontHeight.has_value() ||
|
|
eWeight.has_value() || eItalic.has_value() || eUnder.has_value() ||
|
|
eOver.has_value() || bWordLine.has_value() || eStrike.has_value() ||
|
|
bOutline.has_value() || bShadow.has_value() || eEmphasis.has_value() ||
|
|
eRelief.has_value() || aColor.has_value() || eLang.has_value());
|
|
}
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|