Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
l10ntools/scripts/localize.pl
l10ntools/source/directory.cxx
l10ntools/source/srciter.cxx
padmin/Executable_spadmin.bin.mk
padmin/Library_spa.mk
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/grfmgr.hxx
svtools/source/filter/filter.cxx
svtools/source/filter/filter2.cxx
svtools/source/filter/wmf/emfwr.cxx
svtools/source/filter/wmf/enhwmf.cxx
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/winwmf.cxx
svtools/source/filter/wmf/wmfwr.cxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/grfmgr2.cxx
toolkit/source/controls/controlmodelcontainerbase.cxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/helper/formpdfexport.cxx
toolkit/source/helper/unowrapper.cxx
vcl/Package_osx.mk
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/app/salsys.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/dtrans/test_aquacb.cxx
vcl/aqua/source/res/makefile.mk
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salframeview.mm
vcl/inc/aqua/salgdi.h
vcl/inc/aqua/salinst.h
vcl/inc/graphite_adaptors.hxx
vcl/inc/graphite_cache.hxx
vcl/inc/graphite_serverfont.hxx
vcl/inc/impprn.hxx
vcl/inc/svdata.hxx
vcl/inc/unx/i18n_status.hxx
vcl/inc/unx/saldata.hxx
vcl/inc/unx/salfont.h
vcl/inc/unx/salinst.h
vcl/inc/unx/salprn.h
vcl/inc/unx/salsys.h
vcl/inc/unx/sm.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/graph.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/polyscan.hxx
vcl/inc/vcl/svcompat.hxx
vcl/inc/vcl/svgread.hxx
vcl/inc/vcl/unobrok.hxx
vcl/inc/win/salgdi.h
vcl/inc/win/wincomp.hxx
vcl/prj/d.lst
vcl/source/app/dbggui.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/makefile.mk
vcl/source/app/settings.cxx
vcl/source/app/sound.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/timer.cxx
vcl/source/app/unohelp.cxx
vcl/source/components/dtranscomp.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ctrl.cxx
vcl/source/control/edit.cxx
vcl/source/control/field2.cxx
vcl/source/control/ilstbox.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/cvtgrf.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/imagerepository.cxx
vcl/source/gdi/impbmp.cxx
vcl/source/gdi/impgraph.cxx
vcl/source/gdi/impimagetree.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outdev5.cxx
vcl/source/gdi/outdev6.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/polyscan.cxx
vcl/source/gdi/print.cxx
vcl/source/gdi/print2.cxx
vcl/source/gdi/region.cxx
vcl/source/gdi/salgdilayout.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/gdi/svcompat.cxx
vcl/source/gdi/virdev.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_vdev.cxx
vcl/source/glyphs/gcach_vdev.hxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_serverfont.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/glyphs/makefile.mk
vcl/source/src/makefile.mk
vcl/source/window/accel.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dialog.cxx
vcl/source/window/dndevdis.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/introwin.cxx
vcl/source/window/keycod.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/scrwnd.cxx
vcl/source/window/split.cxx
vcl/source/window/splitwin.cxx
vcl/source/window/status.cxx
vcl/source/window/syswin.cxx
vcl/source/window/tabpage.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/winproc.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/generic/app/i18n_cb.cxx
vcl/unx/generic/app/i18n_ic.cxx
vcl/unx/generic/app/saldata.cxx
vcl/unx/generic/app/saldisp.cxx
vcl/unx/generic/app/salinst.cxx
vcl/unx/generic/app/wmadaptor.cxx
vcl/unx/generic/fontmanager/afm_hash.cpp
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi3.cxx
vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/window/salframe.cxx
vcl/unx/generic/window/salobj.cxx
vcl/unx/gtk/a11y/makefile.mk
vcl/unx/gtk/app/gtksys.cxx
vcl/unx/gtk/app/makefile.mk
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde/salnativewidgets-kde.cxx
vcl/unx/kde4/KDESalDisplay.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/KDEXLib.hxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/makefile.mk
vcl/unx/source/app/makefile.mk
vcl/unx/source/fontmanager/makefile.mk
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/inc/salcursors.h
vcl/util/linksvp/makefile.mk
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/app/salshl.cxx
vcl/win/source/gdi/makefile.mk
vcl/win/source/gdi/salbmp.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi2.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salgdi_gdiplus.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/salvd.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salmenu.cxx
vcl/win/source/window/salobj.cxx

11 files changed, 22 insertions, 113 deletions

diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index 31dc7b9dcba7..db1e12226673 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
 
 class KDEData : public X11SalData
 {
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index 3b7117684942..5fd1e4459660 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 class SalKDEDisplay : public SalX11Display
 {
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 69826443a6c2..40146434ba84 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -45,13 +45,14 @@
 #include "KDEXLib.hxx"
 #include "KDESalGraphics.hxx"
 
+#include <tools/color.hxx>
+
 #include <vcl/settings.hxx>
 #include <vcl/font.hxx>
-#include <tools/color.hxx>
 
-#include <vcl/svdata.hxx>
+#include <svdata.hxx>
 
-#include <pspgraphics.h>
+#include <unx/pspgraphics.h>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index f006a6e0d796..7658ea036bb2 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <salframe.h>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
 
 class KDESalFrame : public X11SalFrame
 {
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 5d1f3541a9b5..2f4c3f384c75 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -29,8 +29,8 @@
 #pragma once
 
 #include <rtl/string.hxx>
-#include <saldisp.hxx>
-#include <salgdi.h>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
 
 #define Region QtXRegion
 #include <QImage>
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 9f35557061bb..a8efcd4dcde1 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <salinst.h>
+#include <unx/salinst.h>
 
 class SalYieldMutex;
 class SalFrame;
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index ce4ea14dadb5..c025d4b28215 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -26,6 +26,8 @@
  *
  ************************************************************************/
 
+#include <vos/process.hxx>
+
 #include "VCLKDEApplication.hxx"
 
 #define Region QtXRegion
@@ -43,10 +45,10 @@
 
 #include "KDEXLib.hxx"
 
-#include <i18n_im.hxx>
-#include <i18n_xkb.hxx>
+#include <unx/i18n_im.hxx>
+#include <unx/i18n_xkb.hxx>
 
-#include <saldata.hxx>
+#include <unx/saldata.hxx>
 #include <osl/process.h>
 
 #include "KDESalDisplay.hxx"
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 72848ed4084c..497a97f3b828 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 #include <fixx11h.h>
 
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index c923598736e8..9ab88020d119 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -39,7 +39,7 @@ VCLKDEApplication::VCLKDEApplication() :
 {
 }
 
-bool VCLKDEApplication::x11EventFilter(XEvent* event)
+bool VCLKDEApplication::x11EventFilter(XEvent* ev)
 {
     //if we have a display and the display consumes the event
     //do not process the event in qt
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index d38c346c21b8..6bc06f3fa880 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -36,6 +36,8 @@
 #include "KDEData.hxx"
 #include "KDESalInstance.hxx"
 
+#include "vclpluginapi.h"
+
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
 #endif
@@ -44,7 +46,7 @@
 
 /// entry point for the KDE4 VCL plugin
 extern "C" {
-    VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule )
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/kde4/makefile.mk b/vcl/unx/kde4/makefile.mk
deleted file mode 100644
index 83ac1c0e6802..000000000000
--- a/vcl/unx/kde4/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=vcl
-TARGET=kde4plug
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# For some of the included external KDE headers, GCC complains about shadowed
-# symbols in instantiated template code only at the end of a compilation unit,
-# so the only solution is to disable that warning here:
-.IF "$(COM)" == "GCC"
-CFLAGSCXX+=-Wno-shadow
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_KDE4)" != ""
-
-CFLAGS+=$(KDE4_CFLAGS) $(KDE_GLIB_CFLAGS)
-
-.IF "$(ENABLE_RANDR)" != ""
-CDEFS+=-DUSE_RANDR
-.ENDIF
-
-.IF "$(KDE_HAVE_GLIB)" != ""
-CDEFS+=-DKDE_HAVE_GLIB
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/main.obj \
-    $(SLO)$/VCLKDEApplication.obj \
-    $(SLO)$/KDEXLib.obj \
-    $(SLO)$/KDEXLib.moc.obj \
-    $(SLO)$/KDESalDisplay.obj \
-    $(SLO)$/KDESalFrame.obj \
-    $(SLO)$/KDESalGraphics.obj \
-    $(SLO)$/KDESalInstance.obj \
-    $(SLO)$/KDEData.obj
-    
-
-.ELSE # "$(ENABLE_KDE4)" != ""
-
-dummy:
-    @echo KDE disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-$(MISC)$/KDEXLib.moc.cxx : KDEXLib.hxx
-    $(MOC4) $< -o $@