2010-10-14 08:27:31 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-06-21 14:30:25 +01:00
|
|
|
/*
|
|
|
|
|
* 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 .
|
|
|
|
|
*/
|
2004-03-18 09:41:15 +00:00
|
|
|
|
2019-12-18 22:13:49 +03:00
|
|
|
#pragma once
|
2004-03-18 09:41:15 +00:00
|
|
|
|
2005-03-10 12:22:58 +00:00
|
|
|
#include <com/sun/star/rendering/RenderState.hpp>
|
2004-03-18 09:41:15 +00:00
|
|
|
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
|
|
|
|
|
|
|
|
|
#include <cppcanvas/canvasgraphic.hxx>
|
2019-02-26 21:10:25 +01:00
|
|
|
#include <cppcanvas/canvas.hxx>
|
2004-03-18 09:41:15 +00:00
|
|
|
|
Introduce o3tl::optional as an alias for std::optional
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3f4ec81f78967c2d7f3c4554398cb9d "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-30 17:48:32 +01:00
|
|
|
#include <o3tl/optional.hxx>
|
2007-07-17 14:23:50 +00:00
|
|
|
|
2005-03-10 12:22:58 +00:00
|
|
|
namespace com { namespace sun { namespace star { namespace rendering
|
2004-03-18 09:41:15 +00:00
|
|
|
{
|
|
|
|
|
class XGraphicDevice;
|
2005-03-10 12:22:58 +00:00
|
|
|
} } } }
|
2004-03-18 09:41:15 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Definition of CanvasGraphicHelper class */
|
|
|
|
|
|
|
|
|
|
namespace cppcanvas
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
namespace internal
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
class CanvasGraphicHelper : public virtual CanvasGraphic
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas );
|
|
|
|
|
|
|
|
|
|
// CanvasGraphic implementation
|
2015-10-12 16:04:04 +02:00
|
|
|
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override;
|
|
|
|
|
virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) override;
|
|
|
|
|
virtual void setClip() override;
|
2017-02-03 08:46:48 +02:00
|
|
|
virtual void setCompositeOp( sal_Int8 aOp ) override;
|
2004-03-18 09:41:15 +00:00
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
// for our clients
|
|
|
|
|
// ===============
|
2016-04-14 10:20:52 +02:00
|
|
|
const CanvasSharedPtr& getCanvas() const { return mpCanvas; }
|
2015-07-28 13:47:37 +02:00
|
|
|
const css::rendering::RenderState& getRenderState() const;
|
2004-03-18 09:41:15 +00:00
|
|
|
|
|
|
|
|
private:
|
2015-07-28 13:47:37 +02:00
|
|
|
mutable css::rendering::RenderState maRenderState;
|
2005-11-02 12:39:11 +00:00
|
|
|
|
Introduce o3tl::optional as an alias for std::optional
...with a boost::optional fallback for Xcode < 10 (as std::optional is only
available starting with Xcode 10 according to
<https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS
and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite
all code to use o3tl::optional instead of boost::optional.
One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per
fed7c3deb3f4ec81f78967c2d7f3c4554398cb9d "Slience bogus
-Werror=maybe-uninitialized" should no longer be necessary (and whose check
happened to no longer trigger for GCC 10 trunk, even though that compiler would
still emit bogus -Wmaybe-uninitialized for uses of boost::optional under
--enable-optimized, which made me ponder whether this switch from
boost::optional to std::optional would be a useful thing to do; I keep that
configure.ac check for now, though, and will only remove it in a follow up
commit).
Another longer-term benefit is that the code is now already in good shape for an
eventual switch to std::optional (a switch we would have done anyway once we no
longer need to support Xcode < 10).
Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses
boost::property_tree::ptree::get_child_optional returning boost::optional, so
let it keep using boost::optional for now.
After a number of preceding commits have paved the way for this change, this
commit is completely mechanical, done with
> git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g'
(before committing include/o3tl/optional.hxx, and relying on some GNU features).
It excludes some files where mention of boost::optional et al should apparently
not be changed (and the sub-repo directory stubs). It turned out that all uses
of boost::none across the code base were in combination with boost::optional, so
had all to be rewritten as o3tl::nullopt.
Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b
Reviewed-on: https://gerrit.libreoffice.org/84128
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-30 17:48:32 +01:00
|
|
|
o3tl::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
|
2015-07-28 09:46:23 +02:00
|
|
|
CanvasSharedPtr mpCanvas;
|
2004-03-18 09:41:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-14 08:27:31 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|