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>
68 lines
2.2 KiB
C++
68 lines
2.2 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_SC_INC_PARAMISC_HXX
|
|
#define INCLUDED_SC_INC_PARAMISC_HXX
|
|
|
|
#include "address.hxx"
|
|
#include <optional>
|
|
|
|
struct ScSolveParam
|
|
{
|
|
ScAddress aRefFormulaCell;
|
|
ScAddress aRefVariableCell;
|
|
std::optional<OUString> pStrTargetVal;
|
|
|
|
ScSolveParam();
|
|
ScSolveParam( const ScSolveParam& r );
|
|
ScSolveParam( const ScAddress& rFormulaCell,
|
|
const ScAddress& rVariableCell,
|
|
const OUString& rTargetValStr );
|
|
~ScSolveParam();
|
|
|
|
ScSolveParam& operator= ( const ScSolveParam& r );
|
|
bool operator== ( const ScSolveParam& r ) const;
|
|
};
|
|
|
|
/**
|
|
* Parameter for data table aka multiple operations.
|
|
*/
|
|
struct SC_DLLPUBLIC ScTabOpParam
|
|
{
|
|
enum Mode { Column = 0, Row = 1, Both = 2 };
|
|
|
|
ScRefAddress aRefFormulaCell;
|
|
ScRefAddress aRefFormulaEnd;
|
|
ScRefAddress aRefRowCell;
|
|
ScRefAddress aRefColCell;
|
|
Mode meMode;
|
|
|
|
ScTabOpParam();
|
|
ScTabOpParam( const ScTabOpParam& r );
|
|
ScTabOpParam(
|
|
const ScRefAddress& rFormulaCell, const ScRefAddress& rFormulaEnd,
|
|
const ScRefAddress& rRowCell, const ScRefAddress& rColCell, Mode eMode );
|
|
|
|
ScTabOpParam& operator= ( const ScTabOpParam& r );
|
|
bool operator== ( const ScTabOpParam& r ) const;
|
|
};
|
|
|
|
#endif // INCLUDED_SC_INC_PARAMISC_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|