diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 07:26:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 14:50:28 +0100 |
commit | 9ad252b2e79576119c2d733a1a45fdd9e9f83140 (patch) | |
tree | 87fee16145d457b6799a05c389d85270476f7f35 /svtools/inc/table | |
parent | 3aca35f1505fa552eaa316a2d47a60ef52646525 (diff) |
Drop o3tl::optional wrapper
...now that macOS builds are guaranteed to have std::optional since
358146bbbd1b9775c12770fb5e497b6ec5adfc51 "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>
Diffstat (limited to 'svtools/inc/table')
-rw-r--r-- | svtools/inc/table/tablemodel.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svtools/inc/table/tablemodel.hxx b/svtools/inc/table/tablemodel.hxx index a27d6b0e5834..b2913615b201 100644 --- a/svtools/inc/table/tablemodel.hxx +++ b/svtools/inc/table/tablemodel.hxx @@ -29,7 +29,7 @@ #include <sal/types.h> -#include <o3tl/optional.hxx> +#include <optional> #include <memory> #include <vector> #include <o3tl/typed_flags_set.hxx> @@ -364,55 +364,55 @@ namespace svt { namespace table If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getLineColor() const = 0; + virtual ::std::optional< ::Color > getLineColor() const = 0; /** returns the color to be used for rendering the header background. If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getHeaderBackgroundColor() const = 0; + virtual ::std::optional< ::Color > getHeaderBackgroundColor() const = 0; /** returns the color to be used for rendering the header text. If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getHeaderTextColor() const = 0; + virtual ::std::optional< ::Color > getHeaderTextColor() const = 0; /** returns the color to be used for the background of selected cells, when the control has the focus If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getActiveSelectionBackColor() const = 0; + virtual ::std::optional< ::Color > getActiveSelectionBackColor() const = 0; /** returns the color to be used for the background of selected cells, when the control does not have the focus If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getInactiveSelectionBackColor() const = 0; + virtual ::std::optional< ::Color > getInactiveSelectionBackColor() const = 0; /** returns the color to be used for the text of selected cells, when the control has the focus If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getActiveSelectionTextColor() const = 0; + virtual ::std::optional< ::Color > getActiveSelectionTextColor() const = 0; /** returns the color to be used for the text of selected cells, when the control does not have the focus If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getInactiveSelectionTextColor() const = 0; + virtual ::std::optional< ::Color > getInactiveSelectionTextColor() const = 0; /** returns the color to be used for rendering cell texts. If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getTextColor() const = 0; + virtual ::std::optional< ::Color > getTextColor() const = 0; /** returns the color to be used for text lines (underline, strikethrough) when rendering cell text. If this value is not set, a default color from the style settings will be used. */ - virtual ::o3tl::optional< ::Color > getTextLineColor() const = 0; + virtual ::std::optional< ::Color > getTextLineColor() const = 0; /** returns the colors to be used for the row backgrounds. @@ -425,7 +425,7 @@ namespace svt { namespace table If value is a non-empty sequence, then rows will have the background colors as specified in the sequence, in alternating order. */ - virtual ::o3tl::optional< ::std::vector< ::Color > > + virtual ::std::optional< ::std::vector< ::Color > > getRowBackgroundColors() const = 0; /** determines the vertical alignment of content within a cell |