canvas/Library_cairocanvas.mk | 2
canvas/Library_canvastools.mk | 2
canvas/Library_oglcanvas.mk | 2
canvas/Library_vclcanvas.mk | 2
canvas/inc/pch/precompiled_cairocanvas.cxx | 12 +++
canvas/inc/pch/precompiled_cairocanvas.hxx | 90 +++++++++++++++++++++++
canvas/inc/pch/precompiled_canvastools.cxx | 12 +++
canvas/inc/pch/precompiled_canvastools.hxx | 109 +++++++++++++++++++++++++++++
canvas/inc/pch/precompiled_oglcanvas.cxx | 12 +++
canvas/inc/pch/precompiled_oglcanvas.hxx | 67 +++++++++++++++++
canvas/inc/pch/precompiled_vclcanvas.cxx | 12 +++
canvas/inc/pch/precompiled_vclcanvas.hxx | 92 ++++++++++++++++++++++++
vcl/vclplug_win.component | 2
vcl/win/dtrans/ftransl.cxx | 6 -
14 files changed, 417 insertions(+), 5 deletions(-)
New commits:
commit 9947cae47cbfb53f560d537ca0be3df2e694fbba
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Oct 2 11:07:32 2020 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Oct 2 20:39:36 2020 +0200
add PCHs for canvas/
Change-Id: I4773b94e0e02e8bc87dfacf1594b3759e1f93e89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103825
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 1df33507f0c2..7a587c84d941 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
-I$(SRCDIR)/canvas/inc \
))
+$(eval $(call
gb_Library_set_precompiled_header,cairocanvas,canvas/inc/pch/precompiled_cairocanvas))
+
$(eval $(call
gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas))
$(eval $(call gb_Library_use_sdk_api,cairocanvas))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 90d67dfc543a..f810cab5cc50 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,canvastools,\
-I$(SRCDIR)/canvas/inc \
))
+$(eval $(call
gb_Library_set_precompiled_header,canvastools,canvas/inc/pch/precompiled_canvastools))
+
$(eval $(call gb_Library_use_sdk_api,canvastools))
$(eval $(call gb_Library_add_defs,canvastools,\
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 20dbb7a80bed..189ebf83a999 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -14,6 +14,8 @@ $(eval $(call gb_Library_set_include,oglcanvas,\
-I$(SRCDIR)/canvas/inc \
))
+$(eval $(call
gb_Library_set_precompiled_header,oglcanvas,canvas/inc/pch/precompiled_oglcanvas))
+
$(eval $(call
gb_Library_set_componentfile,oglcanvas,canvas/source/opengl/oglcanvas))
$(eval $(call gb_Library_use_sdk_api,oglcanvas))
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 27a54ba651a6..8c5f31484d56 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
-I$(SRCDIR)/canvas/inc \
))
+$(eval $(call
gb_Library_set_precompiled_header,vclcanvas,canvas/inc/pch/precompiled_vclcanvas))
+
$(eval $(call
gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
$(eval $(call gb_Library_use_externals,vclcanvas,\
diff --git a/canvas/inc/pch/precompiled_cairocanvas.cxx
b/canvas/inc/pch/precompiled_cairocanvas.cxx
new file mode 100644
index 000000000000..d0be1b85f787
--- /dev/null
+++ b/canvas/inc/pch/precompiled_cairocanvas.cxx
@@ -0,0 +1,12 @@
+/* -*- 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/.
+ */
+
+#include "precompiled_cairocanvas.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_cairocanvas.hxx
b/canvas/inc/pch/precompiled_cairocanvas.hxx
new file mode 100644
index 000000000000..ee38cccdc32f
--- /dev/null
+++ b/canvas/inc/pch/precompiled_cairocanvas.hxx
@@ -0,0 +1,90 @@
+/* -*- 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 has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-10-02 10:57:08 using:
+ ./bin/update_pch canvas cairocanvas --cutoff=1 --exclude:system
--include:module --include:local
+
+ If after updating build fails, use the following command to locate
conflicting headers:
+ ./bin/update_pch_bisect ./canvas/inc/pch/precompiled_cairocanvas.hxx "make
canvas.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <algorithm>
+#include <cairo.h>
+#include <math.h>
+#include <memory>
+#include <tuple>
+#include <boost/cast.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/mutex.hxx>
+#include <rtl/instance.hxx>
+#include <rtl/math.hxx>
+#include <sal/config.h>
+#include <sal/log.hxx>
+#include <vcl/BitmapTools.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/cairo.hxx>
+#include <vcl/canvastools.hxx>
+#include <vcl/dibtools.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/opengl/OpenGLWrapper.hxx>
+#include <vcl/skia/SkiaHelper.hxx>
+#include <vcl/sysdata.hxx>
+#include <vcl/virdev.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/keystoplerp.hxx>
+#include <basegfx/utils/lerp.hxx>
+#include <basegfx/utils/unopolypolygon.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/lang/NoSupportException.hpp>
+#include <com/sun/star/rendering/ColorComponentTag.hpp>
+#include <com/sun/star/rendering/ColorSpaceType.hpp>
+#include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+#include <com/sun/star/rendering/PathCapType.hpp>
+#include <com/sun/star/rendering/PathJoinType.hpp>
+#include <com/sun/star/rendering/RenderingIntent.hpp>
+#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/TextDirection.hpp>
+#include <com/sun/star/rendering/TexturingMode.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
+#include <com/sun/star/util/Endianness.hpp>
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/stream.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <canvas/canvastools.hxx>
+#include <parametricpolypolygon.hxx>
+#include <verifyinput.hxx>
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_canvastools.cxx
b/canvas/inc/pch/precompiled_canvastools.cxx
new file mode 100644
index 000000000000..5abede342844
--- /dev/null
+++ b/canvas/inc/pch/precompiled_canvastools.cxx
@@ -0,0 +1,12 @@
+/* -*- 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/.
+ */
+
+#include "precompiled_canvastools.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_canvastools.hxx
b/canvas/inc/pch/precompiled_canvastools.hxx
new file mode 100644
index 000000000000..a3f730ebb2c9
--- /dev/null
+++ b/canvas/inc/pch/precompiled_canvastools.hxx
@@ -0,0 +1,109 @@
+/* -*- 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 has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-10-02 11:01:53 using:
+ ./bin/update_pch canvas canvastools --cutoff=1 --exclude:system
--include:module --include:local
+
+ If after updating build fails, use the following command to locate
conflicting headers:
+ ./bin/update_pch_bisect ./canvas/inc/pch/precompiled_canvastools.hxx "make
canvas.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <algorithm>
+#include <limits>
+#include <boost/range/adaptor/reversed.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <rtl/instance.hxx>
+#include <rtl/math.hxx>
+#include <sal/config.h>
+#include <sal/log.hxx>
+#include <vcl/canvastools.hxx>
+#include <vcl/window.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <base/cachedprimitivebase.hxx>
+#include <base/canvascustomspritehelper.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/point/b2ipoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontriangulator.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/range/b2irange.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/vector/b2dsize.hxx>
+#include <basegfx/vector/b2ivector.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
+#include <com/sun/star/beans/UnknownPropertyException.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/geometry/IntegerPoint2D.hpp>
+#include <com/sun/star/geometry/IntegerSize2D.hpp>
+#include <com/sun/star/geometry/Matrix2D.hpp>
+#include <com/sun/star/geometry/RealBezierSegment2D.hpp>
+#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/geometry/RealRectangle2D.hpp>
+#include <com/sun/star/geometry/RealSize2D.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/rendering/ColorComponentTag.hpp>
+#include <com/sun/star/rendering/ColorSpaceType.hpp>
+#include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/FontRequest.hpp>
+#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
+#include <com/sun/star/rendering/PathCapType.hpp>
+#include <com/sun/star/rendering/PathJoinType.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/RenderingIntent.hpp>
+#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/Texture.hpp>
+#include <com/sun/star/rendering/TexturingMode.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/XColorSpace.hpp>
+#include <com/sun/star/rendering/XGraphicDevice.hpp>
+#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
+#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <com/sun/star/util/Endianness.hpp>
+#include <comphelper/scopeguard.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <rendering/isurfaceproxy.hxx>
+#include <rendering/isurfaceproxymanager.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/time.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <canvas/canvastools.hxx>
+#include <canvas/elapsedtime.hxx>
+#include <parametricpolypolygon.hxx>
+#include <propertysethelper.hxx>
+#include <spriteredrawmanager.hxx>
+#include <verifyinput.hxx>
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_oglcanvas.cxx
b/canvas/inc/pch/precompiled_oglcanvas.cxx
new file mode 100644
index 000000000000..2a2e0ee5da92
--- /dev/null
+++ b/canvas/inc/pch/precompiled_oglcanvas.cxx
@@ -0,0 +1,12 @@
+/* -*- 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/.
+ */
+
+#include "precompiled_oglcanvas.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_oglcanvas.hxx
b/canvas/inc/pch/precompiled_oglcanvas.hxx
new file mode 100644
index 000000000000..a3731af352e0
--- /dev/null
+++ b/canvas/inc/pch/precompiled_oglcanvas.hxx
@@ -0,0 +1,67 @@
+/* -*- 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 has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-10-02 11:01:53 using:
+ ./bin/update_pch canvas oglcanvas --cutoff=1 --exclude:system
--include:module --include:local
+
+ If after updating build fails, use the following command to locate
conflicting headers:
+ ./bin/update_pch_bisect ./canvas/inc/pch/precompiled_oglcanvas.hxx "make
canvas.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <functional>
+#include <iterator>
+#include <memory>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/mutex.hxx>
+#include <rtl/crc.h>
+#include <rtl/math.hxx>
+#include <sal/config.h>
+#include <sal/log.hxx>
+#include <vcl/canvastools.hxx>
+#include <vcl/font.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/syschild.hxx>
+#include <vcl/virdev.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolygontriangulator.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/tools.hxx>
+#include <basegfx/utils/unopolypolygon.hxx>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/geometry/IntegerSize2D.hpp>
+#include <com/sun/star/lang/NoSupportException.hpp>
+#include <com/sun/star/rendering/ARGBColor.hpp>
+#include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/FontMetrics.hpp>
+#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <epoxy/gl.h>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <canvas/canvastools.hxx>
+#include <verifyinput.hxx>
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_vclcanvas.cxx
b/canvas/inc/pch/precompiled_vclcanvas.cxx
new file mode 100644
index 000000000000..387ff9be8b56
--- /dev/null
+++ b/canvas/inc/pch/precompiled_vclcanvas.cxx
@@ -0,0 +1,12 @@
+/* -*- 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/.
+ */
+
+#include "precompiled_vclcanvas.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/inc/pch/precompiled_vclcanvas.hxx
b/canvas/inc/pch/precompiled_vclcanvas.hxx
new file mode 100644
index 000000000000..cdad07862596
--- /dev/null
+++ b/canvas/inc/pch/precompiled_vclcanvas.hxx
@@ -0,0 +1,92 @@
+/* -*- 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 has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2020-10-02 11:01:53 using:
+ ./bin/update_pch canvas vclcanvas --cutoff=1 --exclude:system
--include:module --include:local
+
+ If after updating build fails, use the following command to locate
conflicting headers:
+ ./bin/update_pch_bisect ./canvas/inc/pch/precompiled_vclcanvas.hxx "make
canvas.build" --find-conflicts
+*/
+
+#if PCH_LEVEL >= 1
+#include <memory>
+#include <tuple>
+#include <boost/cast.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#include <osl/diagnose.h>
+#include <rtl/instance.hxx>
+#include <rtl/math.hxx>
+#include <sal/config.h>
+#include <sal/log.hxx>
+#include <vcl/BitmapAlphaClampFilter.hxx>
+#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/BitmapTools.hxx>
+#include <vcl/alpha.hxx>
+#include <vcl/bitmapaccess.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/canvastools.hxx>
+#include <vcl/dibtools.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/skia/SkiaHelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/window.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drectangle.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/utils/canvastools.hxx>
+#include <basegfx/utils/keystoplerp.hxx>
+#include <basegfx/utils/lerp.hxx>
+#include <basegfx/utils/tools.hxx>
+#include <basegfx/utils/unopolypolygon.hxx>
+#include <basegfx/vector/b2dsize.hxx>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/drawing/LineCap.hpp>
+#include <com/sun/star/lang/NoSupportException.hpp>
+#include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+#include <com/sun/star/rendering/PathCapType.hpp>
+#include <com/sun/star/rendering/PathJoinType.hpp>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/TextDirection.hpp>
+#include <com/sun/star/rendering/TexturingMode.hpp>
+#include <com/sun/star/rendering/ViewState.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
+#include <tools/poly.hxx>
+#include <tools/stream.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <canvas/canvastools.hxx>
+#include <parametricpolypolygon.hxx>
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 26fbcd216e21f2c5ce38263eb1eb893697815212
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 2 14:14:53 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 2 20:39:26 2020 +0200
Use the new single-instance="true" attribute in vcl
Change-Id: I8ad9bf5631c2ae2e5a38eb8a422fa601d9f08c1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103842
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/vclplug_win.component b/vcl/vclplug_win.component
index d6dc9f24e93f..0187827d54a4 100644
--- a/vcl/vclplug_win.component
+++ b/vcl/vclplug_win.component
@@ -20,7 +20,7 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components";>
<implementation name="com.sun.star.datatransfer.DataFormatTranslator"
- constructor="dtrans_CDataFormatTranslatorUNO_get_implementation">
+ constructor="dtrans_CDataFormatTranslatorUNO_get_implementation"
single-instance="true">
<service name="com.sun.star.datatransfer.DataFormatTranslator"/>
</implementation>
<implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
diff --git a/vcl/win/dtrans/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx
index 1bbf90c689c4..f7eb3e2086ed 100644
--- a/vcl/win/dtrans/ftransl.cxx
+++ b/vcl/win/dtrans/ftransl.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
+#include <cppuhelper/weak.hxx>
#include "ImplHelper.hxx"
#include <shlobj.h>
@@ -540,8 +540,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
dtrans_CDataFormatTranslatorUNO_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any>
const&)
{
- static rtl::Reference<CDataFormatTranslatorUNO> g_Instance(new
CDataFormatTranslatorUNO(context));
- g_Instance->acquire();
- return static_cast<cppu::OWeakObject*>(g_Instance.get());
+ return cppu::acquire(static_cast<cppu::OWeakObject*>(new
CDataFormatTranslatorUNO(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
