Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	i18npool/inc/i18npool/lang.h
	i18npool/source/isolang/isolang.cxx
	svtools/source/filter/exportdialog.cxx
	svtools/source/graphic/grfmgr.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/window/salframe.cxx
	vcl/inc/sft.hxx
	vcl/inc/unx/pspgraphics.h
	vcl/inc/vcl/cursor.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/prj/d.lst
	vcl/source/app/settings.cxx
	vcl/source/control/edit.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/window/cursor.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/fontmanager/fontconfig.cxx
	vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
	vcl/unx/kde4/KDESalGraphics.cxx

1 files changed, 23 insertions, 23 deletions

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 11e658641ac6..def31f0d121f 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 
 $(eval $(call gb_Library_set_include,svt,\
+    -I$(OUTDIR)/inc/external/jpeg \
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
@@ -43,7 +44,6 @@ $(eval $(call gb_Library_set_include,svt,\
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_set_defs,svt,\
@@ -173,27 +173,27 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
-    svtools/source/filter.vcl/filter/FilterConfigCache \
-    svtools/source/filter.vcl/filter/FilterConfigItem \
-    svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
-    svtools/source/filter.vcl/filter/exportdialog \
-    svtools/source/filter.vcl/filter/filter \
-    svtools/source/filter.vcl/filter/filter2 \
-    svtools/source/filter.vcl/filter/sgfbram \
-    svtools/source/filter.vcl/filter/sgvmain \
-    svtools/source/filter.vcl/filter/sgvspln \
-    svtools/source/filter.vcl/filter/sgvtext \
-    svtools/source/filter.vcl/igif/decode \
-    svtools/source/filter.vcl/igif/gifread \
-    svtools/source/filter.vcl/ixbm/xbmread \
-    svtools/source/filter.vcl/ixpm/xpmread \
-    svtools/source/filter.vcl/jpeg/jpeg \
-    svtools/source/filter.vcl/wmf/emfwr \
-    svtools/source/filter.vcl/wmf/enhwmf \
-    svtools/source/filter.vcl/wmf/winmtf \
-    svtools/source/filter.vcl/wmf/winwmf \
-    svtools/source/filter.vcl/wmf/wmf \
-    svtools/source/filter.vcl/wmf/wmfwr \
+    svtools/source/filter/FilterConfigCache \
+    svtools/source/filter/FilterConfigItem \
+    svtools/source/filter/SvFilterOptionsDialog \
+    svtools/source/filter/exportdialog \
+    svtools/source/filter/filter \
+    svtools/source/filter/filter2 \
+    svtools/source/filter/sgfbram \
+    svtools/source/filter/sgvmain \
+    svtools/source/filter/sgvspln \
+    svtools/source/filter/sgvtext \
+    svtools/source/filter/igif/decode \
+    svtools/source/filter/igif/gifread \
+    svtools/source/filter/ixbm/xbmread \
+    svtools/source/filter/ixpm/xpmread \
+    svtools/source/filter/jpeg/jpeg \
+    svtools/source/filter/wmf/emfwr \
+    svtools/source/filter/wmf/enhwmf \
+    svtools/source/filter/wmf/winmtf \
+    svtools/source/filter/wmf/winwmf \
+    svtools/source/filter/wmf/wmf \
+    svtools/source/filter/wmf/wmfwr \
     svtools/source/graphic/descriptor \
     svtools/source/graphic/graphic \
     svtools/source/graphic/graphicunofactory \
@@ -289,7 +289,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 ))
 
 $(eval $(call gb_Library_add_cobjects,svt,\
-    svtools/source/filter.vcl/jpeg/jpegc \
+    svtools/source/filter/jpeg/jpegc \
 ))
 
 ifeq ($(OS),WNT)