9ad252b2e7
...now that macOS builds are guaranteed to have std::optional since
358146bbbd "Bump macOS build baseline to
Xcode 11.3 and macOS 10.14.4".
The change is done mostly mechanically with
> for i in $(git grep -Fl optional); do
> sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \
> -e 's/\<o3tl::optional\>/std::optional/g' \
> -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i"
> done
> for i in $(git grep -Flw o3tl::nullopt); do
> sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i"
> done
(though that causes some of the resulting
#include <optional>
to appear at different places relative to other includes than if they had been
added manually), plus a few manual modifications:
* adapt bin/find-unneeded-includes
* adapt desktop/IwyuFilter_desktop.yaml
* remove include/o3tl/optional.hxx
* quote resulting "<"/">" as "<"/">" in officecfg/registry/cppheader.xsl
* and then solenv/clang-format/reformat-formatted-files
Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
48 lines
1.4 KiB
C++
48 lines
1.4 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 || nFontHeight ||
|
|
eWeight || eItalic || eUnder ||
|
|
eOver || bWordLine || eStrike ||
|
|
bOutline || bShadow || eEmphasis ||
|
|
eRelief || aColor || eLang);
|
|
}
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|