external/boost/include/boost/logic/tribool.hpp | 31 --------------------
pch/inc/pch/precompiled_system.hxx | 1
writerfilter/inc/pch/precompiled_writerfilter.hxx | 1
writerfilter/source/rtftok/rtfsdrimport.cxx | 34 +++++++++++-----------
4 files changed, 17 insertions(+), 50 deletions(-)
New commits:
commit eb8ce706d41fcf23333af3b0eec5cee2a12075f0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 10 16:29:39 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Aug 10 21:39:50 2021 +0200
Clean up remaining uses of boost::logic::tribool
obFitShapeToText and obRelFlipV can just as well be modelled with
std::optional<bool>, and obFlipH and obFlipV apparently only need two states
anyway (as for a boost::logic::tribool x, bool(x == true) is true iff x has
the
value true)
Change-Id: Ic35e33ffa4ee30d1c2cdf9f8d4aa3bae29ece2af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120281
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/boost/include/boost/logic/tribool.hpp
b/external/boost/include/boost/logic/tribool.hpp
deleted file mode 100644
index cbb8993dba96..000000000000
--- a/external/boost/include/boost/logic/tribool.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/* generated by bin/gen-boost-headers, do not edit! */
-#pragma once
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpragmas" /* first! for GCC */
-#pragma GCC diagnostic ignored "-Wunknown-warning-option" // second! for Clang
5
-#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wdeprecated-copy"
-#pragma GCC diagnostic ignored "-Wdeprecated-copy-dtor"
-#pragma GCC diagnostic ignored "-Wextra"
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#pragma GCC diagnostic ignored "-Winvalid-constexpr"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend"
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wnonnull"
-#pragma GCC diagnostic ignored "-Wparentheses"
-#pragma GCC diagnostic ignored "-Wplacement-new"
-#pragma GCC diagnostic ignored "-Wreturn-type"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
-#pragma GCC diagnostic ignored "-Wtype-limits"
-#pragma GCC diagnostic ignored "-Wundef"
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#pragma GCC diagnostic ignored "-Wunused-macros"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#include_next <boost/logic/tribool.hpp>
-#pragma GCC diagnostic pop
diff --git a/pch/inc/pch/precompiled_system.hxx
b/pch/inc/pch/precompiled_system.hxx
index 0f9afc9f9b0a..a7aa9bcf0095 100644
--- a/pch/inc/pch/precompiled_system.hxx
+++ b/pch/inc/pch/precompiled_system.hxx
@@ -23,7 +23,6 @@
#include <boost/functional/hash.hpp>
#include <boost/intrusive_ptr.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/logic/tribool.hpp>
#include <boost/math/special_functions/sinc.hpp>
#include <boost/multi_array.hpp>
#include <boost/multi_index/composite_key.hpp>
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 115207af85e6..40941cb37cd9 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -34,7 +34,6 @@
#include <utility>
#include <vector>
#include <boost/lexical_cast.hpp>
-#include <boost/logic/tribool.hpp>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 2eeb8598c09f..ec67b056959d 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -9,6 +9,7 @@
#include "rtfsdrimport.hxx"
#include <cmath>
+#include <optional>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -42,7 +43,6 @@
#include <oox/helper/modelobjecthelper.hxx>
#include <oox/drawingml/shapepropertymap.hxx>
#include <oox/helper/propertyset.hxx>
-#include <boost/logic/tribool.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <svx/unoapi.hxx>
#include <svx/svdobj.hxx>
@@ -194,7 +194,7 @@ void
RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape,
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
sal_Int16 nHoriOrient = 0;
sal_Int16 nVertOrient = 0;
- boost::logic::tribool obFitShapeToText(boost::logic::indeterminate);
+ std::optional<bool> obFitShapeToText;
bool bFilled = true;
if (aKey == u"posh")
@@ -256,12 +256,12 @@ void
RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape,
xPropertySet->setPropertyValue("HoriOrient",
uno::makeAny(nHoriOrient));
if (nVertOrient != 0 && xPropertySet.is())
xPropertySet->setPropertyValue("VertOrient",
uno::makeAny(nVertOrient));
- if (!boost::logic::indeterminate(obFitShapeToText) && xPropertySet.is())
+ if (obFitShapeToText.has_value() && xPropertySet.is())
{
xPropertySet->setPropertyValue(
- "SizeType", uno::makeAny(obFitShapeToText ? text::SizeType::MIN :
text::SizeType::FIX));
- xPropertySet->setPropertyValue("FrameIsAutomaticHeight",
-
uno::makeAny(static_cast<bool>(obFitShapeToText)));
+ "SizeType",
+ uno::makeAny(*obFitShapeToText ? text::SizeType::MIN :
text::SizeType::FIX));
+ xPropertySet->setPropertyValue("FrameIsAutomaticHeight",
uno::makeAny(*obFitShapeToText));
}
if (!bFilled && xPropertySet.is())
{
@@ -389,9 +389,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose,
ShapeOrPict const shap
std::optional<sal_Int16> oRelativeHeight;
sal_Int16 nRelativeWidthRelation = text::RelOrientation::PAGE_FRAME;
sal_Int16 nRelativeHeightRelation = text::RelOrientation::PAGE_FRAME;
- boost::logic::tribool obRelFlipV(boost::logic::indeterminate);
- boost::logic::tribool obFlipH(boost::logic::indeterminate);
- boost::logic::tribool obFlipV(boost::logic::indeterminate);
+ std::optional<bool> obRelFlipV;
+ bool obFlipH(false);
+ bool obFlipV(false);
OUString aShapeText = "";
OUString aFontFamily = "";
@@ -894,7 +894,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose,
ShapeOrPict const shap
}
// Handle horizontal flip.
- if (obFlipH == true && xPropertySet.is())
+ if (obFlipH && xPropertySet.is())
xPropertySet->setPropertyValue("IsMirrored", uno::makeAny(true));
return;
}
@@ -956,7 +956,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose,
ShapeOrPict const shap
}
}
- if (!boost::logic::indeterminate(obRelFlipV) && xPropertySet.is())
+ if (obRelFlipV.has_value() && xPropertySet.is())
{
if (nType == ESCHER_ShpInst_Line)
{
@@ -972,7 +972,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose,
ShapeOrPict const shap
aPoly.append(basegfx::B2DPoint(rPoint.X, rPoint.Y));
}
basegfx::B2DHomMatrix aTransformation;
- aTransformation.scale(1.0, obRelFlipV ? -1.0 : 1.0);
+ aTransformation.scale(1.0, *obRelFlipV ? -1.0 : 1.0);
aPoly.transform(aTransformation);
for (sal_Int32 i = 0; i < rPolygon.getLength(); ++i)
{
@@ -1026,16 +1026,16 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool
bClose, ShapeOrPict const shap
xShape->setSize(awt::Size(rShape.getRight() - rShape.getLeft(),
rShape.getBottom() - rShape.getTop()));
- if (obFlipH == true || obFlipV == true)
+ if (obFlipH || obFlipV)
{
if (bCustom)
{
// This has to be set after position and size is set,
otherwise flip will affect the position.
comphelper::SequenceAsHashMap aCustomShapeGeometry(
xPropertySet->getPropertyValue("CustomShapeGeometry"));
- if (obFlipH == true)
+ if (obFlipH)
aCustomShapeGeometry["MirroredX"] <<= true;
- if (obFlipV == true)
+ if (obFlipV)
aCustomShapeGeometry["MirroredY"] <<= true;
xPropertySet->setPropertyValue(
"CustomShapeGeometry",
@@ -1045,12 +1045,12 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool
bClose, ShapeOrPict const shap
{
Point aRef1 = pObject->GetSnapRect().Center();
Point aRef2(aRef1);
- if (obFlipH == true)
+ if (obFlipH)
{
// Horizontal mirror means a vertical reference line.
aRef2.AdjustY(1);
}
- if (obFlipV == true)
+ if (obFlipV)
{
// Vertical mirror means a horizontal reference line.
aRef2.AdjustX(1);
