[Libreoffice-commits] core.git: sd/Library_sdfilt.mk sd/source

[Stephan Bergmann]

 sd/Library_sdfilt.mk           |    1 +
 sd/source/filter/ppt/pptin.cxx |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 8d3b8dd0b273f670baceaebdf4f66050e259c929
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 19 15:53:38 2017 +0200

    Make Library_sdfilt find Library_sd include files via -I
    
    ...instead of through ../../... paths.  Change done in preparation of
    loplugin:includeform.
    
    Change-Id: I1b4476f32573c2ef19d2a145e6e617b63006d40b
    Reviewed-on: https://gerrit.libreoffice.org/43562
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index de9d938809c0..ec85ffc53853 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,sdfilt))
 $(eval $(call gb_Library_set_include,sdfilt,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sd/inc \
+    -I$(SRCDIR)/sd/source/ui/inc \
 ))
 
 ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index dea57ff7ea75..3ee02d93f1b1 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -74,9 +74,9 @@
 #include "customshowlist.hxx"
 #include "sddll.hxx"
 
-#include "../../ui/inc/DrawDocShell.hxx"
-#include "../../ui/inc/FrameView.hxx"
-#include "../../ui/inc/optsitem.hxx"
+#include "DrawDocShell.hxx"
+#include "FrameView.hxx"
+#include "optsitem.hxx"
 
 #include <unotools/fltrcfg.hxx>
 #include <sfx2/progress.hxx>