summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-07-14 13:38:51 +0200
committerArmin Le Grand <Armin.Le.Grand@cib.de>2016-07-14 13:38:51 +0200
commit9b4f3716dbadf0508d53201f7b6f2a608d1fe51a (patch)
tree673b4a13de8098e27f31d8a568b37bf0699e286f
parentAdaptions for Linux build, mostly Cairo (diff)
downloadcore-feature/svg-optimisations-5-0.tar.gz
core-feature/svg-optimisations-5-0.zip
Added changes for KDE4 feature/svg-optimisations-5-0
Change-Id: I5941fa97848fa3b0129d01c2b6f554f5b8c4019f
-rw-r--r--include/drawinglayer/primitive2d/patternfillprimitive2d.hxx2
-rw-r--r--sw/source/core/ole/ndole.cxx2
-rw-r--r--vcl/Library_vclplug_kde4.mk1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
index dc0048767c51..744987e4604b 100644
--- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
@@ -84,7 +84,7 @@ namespace drawinglayer
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
/// overload to react on evtl. buffered content
- virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
+ virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
/// provide unique ID
DeclPrimitive2DIDBlock()
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 00819be6e116..bdff5331c1c9 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -748,7 +748,7 @@ public:
}
private:
- virtual void doWork() override
+ virtual void doWork() SAL_OVERRIDE
{
try
{
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 645d6c9aac33..099b39ba49a9 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_externals,vclplug_kde4,\
icuuc \
kde4 \
glew \
+ cairo \
))
$(eval $(call gb_Library_add_libs,vclplug_kde4,\