[Libreoffice-commits] core.git: Branch 'feature/svg-optimisations-5-0' - include/drawinglayer sw/source vcl/Library_vclplug_kde4.mk

[Jan-Marek Glogowski]

 include/drawinglayer/primitive2d/patternfillprimitive2d.hxx |    2 +-
 sw/source/core/ole/ndole.cxx                                |    2 +-
 vcl/Library_vclplug_kde4.mk                                 |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9b4f3716dbadf0508d53201f7b6f2a608d1fe51a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Jul 14 13:38:51 2016 +0200

    Added changes for KDE4
    
    Change-Id: I5941fa97848fa3b0129d01c2b6f554f5b8c4019f

diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
index dc00487..744987e 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 00819be..bdff533 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 645d6c9..099b39b 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,\