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>
104 lines
3.4 KiB
C++
104 lines
3.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/.
|
|
*
|
|
* 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_OUTDEVSTATE_HXX
|
|
#define INCLUDED_VCL_OUTDEVSTATE_HXX
|
|
|
|
#include <vcl/mapmod.hxx>
|
|
#include <vcl/vclenum.hxx>
|
|
|
|
#include <tools/color.hxx>
|
|
#include <tools/gen.hxx>
|
|
#include <tools/fontenum.hxx>
|
|
#include <o3tl/typed_flags_set.hxx>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <i18nlangtag/lang.h>
|
|
|
|
namespace vcl { class Font; }
|
|
namespace vcl { class Region; }
|
|
|
|
// Flags for OutputDevice::Push() and OutDevState
|
|
enum class PushFlags {
|
|
NONE = 0x0000,
|
|
LINECOLOR = 0x0001,
|
|
FILLCOLOR = 0x0002,
|
|
FONT = 0x0004,
|
|
TEXTCOLOR = 0x0008,
|
|
MAPMODE = 0x0010,
|
|
CLIPREGION = 0x0020,
|
|
RASTEROP = 0x0040,
|
|
TEXTFILLCOLOR = 0x0080,
|
|
TEXTALIGN = 0x0100,
|
|
REFPOINT = 0x0200,
|
|
TEXTLINECOLOR = 0x0400,
|
|
TEXTLAYOUTMODE = 0x0800,
|
|
TEXTLANGUAGE = 0x1000,
|
|
OVERLINECOLOR = 0x2000,
|
|
ALL = 0xFFFF
|
|
};
|
|
|
|
namespace o3tl
|
|
{
|
|
template<> struct typed_flags<PushFlags> : is_typed_flags<PushFlags, 0xFFFF> {};
|
|
}
|
|
#define PUSH_ALLTEXT (PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR | PushFlags::TEXTLINECOLOR | PushFlags::OVERLINECOLOR | PushFlags::TEXTALIGN | PushFlags::TEXTLAYOUTMODE | PushFlags::TEXTLANGUAGE)
|
|
#define PUSH_ALLFONT (PUSH_ALLTEXT | PushFlags::FONT)
|
|
|
|
// Layout flags for Complex Text Layout
|
|
// These are flag values, i.e they can be combined
|
|
enum class ComplexTextLayoutFlags
|
|
{
|
|
Default = 0x0000,
|
|
BiDiRtl = 0x0001,
|
|
BiDiStrong = 0x0002,
|
|
TextOriginLeft = 0x0004,
|
|
TextOriginRight = 0x0008
|
|
};
|
|
namespace o3tl {
|
|
template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x000f> {};
|
|
}
|
|
|
|
struct OutDevState
|
|
{
|
|
OutDevState();
|
|
OutDevState(OutDevState&&);
|
|
~OutDevState();
|
|
|
|
std::optional<MapMode> mpMapMode;
|
|
bool mbMapActive;
|
|
std::unique_ptr<vcl::Region> mpClipRegion;
|
|
std::optional<Color> mpLineColor;
|
|
std::optional<Color> mpFillColor;
|
|
std::unique_ptr<vcl::Font> mpFont;
|
|
std::optional<Color> mpTextColor;
|
|
std::optional<Color> mpTextFillColor;
|
|
std::optional<Color> mpTextLineColor;
|
|
std::optional<Color> mpOverlineColor;
|
|
std::optional<Point> mpRefPoint;
|
|
TextAlign meTextAlign;
|
|
RasterOp meRasterOp;
|
|
ComplexTextLayoutFlags mnTextLayoutMode;
|
|
LanguageType meTextLanguage;
|
|
PushFlags mnFlags;
|
|
};
|
|
|
|
#endif // INCLUDED_VCL_OUTDEVSTATE_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|