summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-04-22 15:09:06 +0200
committerJan Holesovsky <kendy@suse.cz>2011-04-22 15:09:06 +0200
commit83380a7805f69b18f432895fc17c53cf0354bf4d (patch)
treeb38d271cb6a768b6c2f9d3bee37d0d88e0472cb4 /vcl
parentd5bbd70673a2d5c6f8937428b97111e9c13fd21f (diff)
parent9e84958536c737f8fdcff4d28664d0c13b9cdc8c (diff)
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
Diffstat (limited to 'vcl')
-rw-r--r--vcl/AllLangResTarget_vcl.mk (renamed from vcl/unx/source/desktopdetect/makefile.mk)49
-rw-r--r--vcl/Library_desktop_detector.mk85
-rwxr-xr-xvcl/Library_vcl.mk512
-rwxr-xr-xvcl/Library_vclplug_gen.mk206
-rwxr-xr-xvcl/Library_vclplug_gtk.mk128
-rwxr-xr-xvcl/Library_vclplug_kde.mk93
-rwxr-xr-xvcl/Library_vclplug_kde4.mk99
-rwxr-xr-xvcl/Library_vclplug_svp.mk98
-rw-r--r--vcl/Makefile (renamed from vcl/source/salmain/makefile.mk)19
-rw-r--r--vcl/Module_vcl.mk (renamed from vcl/aqua/source/app/makefile.mk)69
-rw-r--r--vcl/Package_inc.mk168
-rw-r--r--vcl/Package_osx.mk (renamed from vcl/util/target.pmk)22
-rwxr-xr-xvcl/StaticLibrary_vclmain.mk62
-rwxr-xr-xvcl/WinResTarget_vcl.mk123
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ycomponentwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yfactory.mm8
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.cxx9
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.hxx4
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocustracker.cxx13
-rw-r--r--vcl/aqua/source/a11y/aqua11ylistener.cxx13
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.mm6
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.mm22
-rw-r--r--vcl/aqua/source/a11y/aqua11yutil.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11yvaluewrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapper.mm23
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm2
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.hxx3
-rw-r--r--vcl/aqua/source/a11y/makefile.mk88
-rw-r--r--vcl/aqua/source/app/saldata.cxx7
-rw-r--r--vcl/aqua/source/app/salinst.cxx40
-rwxr-xr-xvcl/aqua/source/app/salnstimer.mm11
-rw-r--r--vcl/aqua/source/app/salsys.cxx13
-rw-r--r--vcl/aqua/source/app/saltimer.cxx10
-rwxr-xr-xvcl/aqua/source/app/vclnsapp.mm38
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx2
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx75
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx22
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx4
-rw-r--r--vcl/aqua/source/dtrans/aqua_service.cxx90
-rw-r--r--vcl/aqua/source/dtrans/makefile.mk68
-rw-r--r--vcl/aqua/source/dtrans/service_entry.cxx11
-rw-r--r--vcl/aqua/source/dtrans/test_aquacb.cxx209
-rw-r--r--vcl/aqua/source/gdi/aquaprintaccessoryview.mm13
-rwxr-xr-xvcl/aqua/source/gdi/aquaprintview.mm6
-rw-r--r--vcl/aqua/source/gdi/makefile.mk74
-rw-r--r--vcl/aqua/source/gdi/salatslayout.cxx16
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx7
-rw-r--r--vcl/aqua/source/gdi/salbmp.cxx19
-rw-r--r--vcl/aqua/source/gdi/salcolorutils.cxx3
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx73
-rw-r--r--vcl/aqua/source/gdi/salgdiutils.cxx12
-rw-r--r--vcl/aqua/source/gdi/salmathutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx24
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx46
-rw-r--r--vcl/aqua/source/gdi/salvd.cxx16
-rw-r--r--vcl/aqua/source/res/makefile.mk53
-rw-r--r--vcl/aqua/source/window/makefile.mk63
-rw-r--r--vcl/aqua/source/window/salframe.cxx38
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm92
-rw-r--r--vcl/aqua/source/window/salmenu.cxx34
-rwxr-xr-xvcl/aqua/source/window/salnsmenu.mm12
-rw-r--r--vcl/aqua/source/window/salobj.cxx12
-rw-r--r--vcl/inc/accel.h (renamed from vcl/inc/vcl/accel.h)0
-rw-r--r--vcl/inc/accmgr.hxx (renamed from vcl/inc/vcl/accmgr.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11yfactory.h (renamed from vcl/aqua/inc/aqua11yfactory.h)0
-rw-r--r--vcl/inc/aqua/aqua11yfocustracker.hxx (renamed from vcl/aqua/inc/aqua11yfocustracker.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11ylistener.hxx (renamed from vcl/aqua/inc/aqua11ylistener.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11ywrapper.h (renamed from vcl/aqua/inc/aqua11ywrapper.h)0
-rw-r--r--vcl/inc/aqua/aquaprintview.h (renamed from vcl/aqua/inc/aquaprintview.h)0
-rw-r--r--vcl/inc/aqua/aquavclevents.hxx (renamed from vcl/aqua/inc/aquavclevents.hxx)0
-rw-r--r--vcl/inc/aqua/aquavcltypes.h (renamed from vcl/aqua/inc/aquavcltypes.h)0
-rw-r--r--vcl/inc/aqua/keyboardfocuslistener.hxx (renamed from vcl/aqua/inc/keyboardfocuslistener.hxx)0
-rw-r--r--vcl/inc/aqua/salatsuifontutils.hxx (renamed from vcl/aqua/inc/salatsuifontutils.hxx)0
-rw-r--r--vcl/inc/aqua/salbmp.h (renamed from vcl/aqua/inc/salbmp.h)19
-rw-r--r--vcl/inc/aqua/salcolorutils.hxx (renamed from vcl/aqua/inc/salcolorutils.hxx)0
-rw-r--r--vcl/inc/aqua/salconst.h (renamed from vcl/aqua/inc/salconst.h)0
-rw-r--r--vcl/inc/aqua/saldata.hxx (renamed from vcl/aqua/inc/saldata.hxx)6
-rw-r--r--vcl/inc/aqua/salfontutils.hxx (renamed from vcl/aqua/inc/salfontutils.hxx)0
-rw-r--r--vcl/inc/aqua/salframe.h (renamed from vcl/aqua/inc/salframe.h)11
-rw-r--r--vcl/inc/aqua/salframeview.h (renamed from vcl/aqua/inc/salframeview.h)2
-rw-r--r--vcl/inc/aqua/salgdi.h (renamed from vcl/aqua/inc/salgdi.h)10
-rw-r--r--vcl/inc/aqua/salinst.h (renamed from vcl/aqua/inc/salinst.h)6
-rw-r--r--vcl/inc/aqua/salmathutils.hxx (renamed from vcl/aqua/inc/salmathutils.hxx)0
-rw-r--r--vcl/inc/aqua/salmenu.h (renamed from vcl/aqua/inc/salmenu.h)3
-rw-r--r--vcl/inc/aqua/salnativewidgets.h (renamed from vcl/aqua/inc/salnativewidgets.h)0
-rw-r--r--vcl/inc/aqua/salnsmenu.h (renamed from vcl/aqua/inc/salnsmenu.h)0
-rw-r--r--vcl/inc/aqua/salnstimer.h (renamed from vcl/aqua/inc/salnstimer.h)0
-rw-r--r--vcl/inc/aqua/salobj.h (renamed from vcl/aqua/inc/salobj.h)3
-rw-r--r--vcl/inc/aqua/salprn.h (renamed from vcl/aqua/inc/salprn.h)6
-rw-r--r--vcl/inc/aqua/salsys.h (renamed from vcl/aqua/inc/salsys.h)7
-rw-r--r--vcl/inc/aqua/saltimer.h (renamed from vcl/aqua/inc/saltimer.h)2
-rw-r--r--vcl/inc/aqua/salvd.h (renamed from vcl/aqua/inc/salvd.h)11
-rw-r--r--vcl/inc/aqua/svsys.h (renamed from vcl/aqua/inc/svsys.h)0
-rw-r--r--vcl/inc/aqua/vclnsapp.h (renamed from vcl/aqua/inc/vclnsapp.h)0
-rw-r--r--vcl/inc/bmpfast.hxx (renamed from vcl/inc/vcl/bmpfast.hxx)0
-rw-r--r--vcl/inc/brdwin.hxx (renamed from vcl/inc/vcl/brdwin.hxx)0
-rw-r--r--vcl/inc/canvasbitmap.hxx (renamed from vcl/inc/vcl/canvasbitmap.hxx)0
-rw-r--r--vcl/inc/controldata.hxx (renamed from vcl/inc/vcl/controldata.hxx)0
-rw-r--r--vcl/inc/dbggui.hxx (renamed from vcl/inc/vcl/dbggui.hxx)0
-rw-r--r--vcl/inc/dndevdis.hxx (renamed from vcl/inc/vcl/dndevdis.hxx)0
-rw-r--r--vcl/inc/dndlcon.hxx (renamed from vcl/inc/vcl/dndlcon.hxx)0
-rw-r--r--vcl/inc/fontcache.hxx (renamed from vcl/inc/vcl/fontcache.hxx)0
-rw-r--r--vcl/inc/fontsubset.hxx (renamed from vcl/inc/vcl/fontsubset.hxx)4
-rw-r--r--vcl/inc/glyphcache.hxx (renamed from vcl/inc/vcl/glyphcache.hxx)6
-rw-r--r--vcl/inc/graphite_features.hxx (renamed from vcl/inc/vcl/graphite_features.hxx)0
-rw-r--r--vcl/inc/graphite_layout.hxx (renamed from vcl/inc/vcl/graphite_layout.hxx)2
-rw-r--r--vcl/inc/graphite_serverfont.hxx (renamed from vcl/inc/vcl/graphite_serverfont.hxx)2
-rw-r--r--vcl/inc/helpwin.hxx (renamed from vcl/inc/vcl/helpwin.hxx)0
-rw-r--r--vcl/inc/idlemgr.hxx (renamed from vcl/inc/vcl/idlemgr.hxx)0
-rw-r--r--vcl/inc/ilstbox.hxx (renamed from vcl/inc/vcl/ilstbox.hxx)0
-rw-r--r--vcl/inc/image.h (renamed from vcl/inc/vcl/image.h)0
-rw-r--r--vcl/inc/impbmp.hxx (renamed from vcl/inc/vcl/impbmp.hxx)0
-rw-r--r--vcl/inc/impfont.hxx (renamed from vcl/inc/vcl/impfont.hxx)0
-rw-r--r--vcl/inc/impgraph.hxx (renamed from vcl/inc/vcl/impgraph.hxx)20
-rw-r--r--vcl/inc/impimagetree.hxx (renamed from vcl/inc/vcl/impimagetree.hxx)0
-rw-r--r--vcl/inc/impoct.hxx (renamed from vcl/inc/vcl/impoct.hxx)0
-rw-r--r--vcl/inc/jobset.h (renamed from vcl/inc/vcl/jobset.h)0
-rw-r--r--vcl/inc/makefile.mk49
-rw-r--r--vcl/inc/outdata.hxx (renamed from vcl/inc/vcl/outdata.hxx)0
-rw-r--r--vcl/inc/outdev.h (renamed from vcl/inc/vcl/outdev.h)2
-rw-r--r--vcl/inc/outfont.hxx (renamed from vcl/inc/vcl/outfont.hxx)0
-rw-r--r--vcl/inc/print.h (renamed from vcl/inc/vcl/print.h)2
-rw-r--r--vcl/inc/printdlg.hxx (renamed from vcl/inc/vcl/prndlg.hxx)4
-rw-r--r--vcl/inc/printergfx.hxx (renamed from vcl/inc/vcl/printergfx.hxx)2
-rw-r--r--vcl/inc/printerjob.hxx (renamed from vcl/inc/vcl/printerjob.hxx)0
-rw-r--r--vcl/inc/region.h (renamed from vcl/inc/vcl/region.h)0
-rw-r--r--vcl/inc/salbmp.hxx (renamed from vcl/inc/vcl/salbmp.hxx)0
-rw-r--r--vcl/inc/saldatabasic.hxx (renamed from vcl/inc/vcl/saldatabasic.hxx)6
-rw-r--r--vcl/inc/salframe.hxx (renamed from vcl/inc/vcl/salframe.hxx)4
-rw-r--r--vcl/inc/salgdi.hxx (renamed from vcl/inc/vcl/salgdi.hxx)0
-rw-r--r--vcl/inc/salgeom.hxx (renamed from vcl/inc/vcl/salgeom.hxx)0
-rw-r--r--vcl/inc/salimestatus.hxx (renamed from vcl/inc/vcl/salimestatus.hxx)0
-rw-r--r--vcl/inc/salinst.hxx (renamed from vcl/inc/vcl/salinst.hxx)0
-rw-r--r--vcl/inc/sallayout.hxx (renamed from vcl/inc/vcl/sallayout.hxx)0
-rw-r--r--vcl/inc/salmenu.hxx (renamed from vcl/inc/vcl/salmenu.hxx)0
-rw-r--r--vcl/inc/salobj.hxx (renamed from vcl/inc/vcl/salobj.hxx)2
-rw-r--r--vcl/inc/salprn.hxx (renamed from vcl/inc/vcl/salprn.hxx)0
-rw-r--r--vcl/inc/salptype.hxx (renamed from vcl/inc/vcl/salptype.hxx)0
-rw-r--r--vcl/inc/salsession.hxx (renamed from vcl/inc/vcl/salsession.hxx)0
-rw-r--r--vcl/inc/salsys.hxx (renamed from vcl/inc/vcl/salsys.hxx)0
-rw-r--r--vcl/inc/saltimer.hxx (renamed from vcl/inc/vcl/saltimer.hxx)5
-rw-r--r--vcl/inc/salvd.hxx (renamed from vcl/inc/vcl/salvd.hxx)0
-rw-r--r--vcl/inc/salwtype.hxx (renamed from vcl/inc/vcl/salwtype.hxx)0
-rw-r--r--vcl/inc/sft.hxx10
-rw-r--r--vcl/inc/subedit.hxx (renamed from vcl/inc/vcl/subedit.hxx)0
-rw-r--r--vcl/inc/svdata.hxx (renamed from vcl/inc/vcl/svdata.hxx)12
-rw-r--r--vcl/inc/svids.hrc (renamed from vcl/inc/vcl/svids.hrc)0
-rw-r--r--vcl/inc/svsys.h (renamed from vcl/util/hidother.src)15
-rw-r--r--vcl/inc/textlayout.hxx (renamed from vcl/inc/vcl/textlayout.hxx)0
-rw-r--r--vcl/inc/toolbox.h (renamed from vcl/inc/vcl/toolbox.h)0
-rw-r--r--vcl/inc/unx/XIM.h (renamed from vcl/unx/inc/XIM.h)0
-rw-r--r--vcl/inc/unx/Xproto.h (renamed from vcl/unx/inc/Xproto.h)3
-rw-r--r--vcl/inc/unx/cdeint.hxx (renamed from vcl/unx/inc/cdeint.hxx)2
-rw-r--r--vcl/inc/unx/dtint.hxx (renamed from vcl/unx/inc/dtint.hxx)0
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx (renamed from vcl/unx/inc/plugins/gtk/atkbridge.hxx)6
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkdata.hxx)4
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkframe.hxx)2
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkgdi.hxx)2
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkinst.hxx)4
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkobject.hxx)4
-rw-r--r--vcl/inc/unx/i18n_cb.hxx (renamed from vcl/unx/inc/i18n_cb.hxx)2
-rw-r--r--vcl/inc/unx/i18n_ic.hxx (renamed from vcl/unx/inc/i18n_ic.hxx)0
-rw-r--r--vcl/inc/unx/i18n_im.hxx (renamed from vcl/unx/inc/i18n_im.hxx)4
-rw-r--r--vcl/inc/unx/i18n_keysym.hxx (renamed from vcl/unx/inc/i18n_keysym.hxx)0
-rw-r--r--vcl/inc/unx/i18n_status.hxx (renamed from vcl/unx/inc/i18n_status.hxx)2
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx (renamed from vcl/unx/inc/i18n_xkb.hxx)4
-rw-r--r--vcl/inc/unx/kde/kdedata.hxx (renamed from vcl/unx/inc/plugins/kde/kdedata.hxx)6
-rw-r--r--vcl/inc/unx/pspgraphics.h (renamed from vcl/unx/inc/pspgraphics.h)9
-rw-r--r--vcl/inc/unx/salbmp.h (renamed from vcl/unx/inc/salbmp.h)10
-rw-r--r--vcl/inc/unx/saldata.hxx (renamed from vcl/unx/inc/saldata.hxx)12
-rw-r--r--vcl/inc/unx/saldisp.hxx (renamed from vcl/unx/inc/saldisp.hxx)13
-rw-r--r--vcl/inc/unx/salframe.h (renamed from vcl/unx/inc/salframe.h)19
-rw-r--r--vcl/inc/unx/salgdi.h (renamed from vcl/unx/inc/salgdi.h)17
-rw-r--r--vcl/inc/unx/salinst.h (renamed from vcl/unx/inc/salinst.h)8
-rw-r--r--vcl/inc/unx/salmenu.h (renamed from vcl/unx/inc/salmenu.h)0
-rw-r--r--vcl/inc/unx/salobj.h (renamed from vcl/unx/inc/salobj.h)7
-rw-r--r--vcl/inc/unx/salprn.h (renamed from vcl/unx/inc/salprn.h)7
-rw-r--r--vcl/inc/unx/salstd.hxx (renamed from vcl/unx/inc/salstd.hxx)0
-rw-r--r--vcl/inc/unx/salsys.h (renamed from vcl/unx/inc/salsys.h)6
-rw-r--r--vcl/inc/unx/saltimer.h (renamed from vcl/unx/inc/saltimer.h)2
-rw-r--r--vcl/inc/unx/salunx.h (renamed from vcl/unx/inc/salunx.h)4
-rw-r--r--vcl/inc/unx/salvd.h (renamed from vcl/unx/inc/salvd.h)4
-rw-r--r--vcl/inc/unx/sm.hxx (renamed from vcl/unx/inc/sm.hxx)11
-rw-r--r--vcl/inc/unx/soicon.hxx (renamed from vcl/unx/inc/soicon.hxx)0
-rw-r--r--vcl/inc/unx/strhelper.hxx (renamed from vcl/unx/inc/strhelper.hxx)0
-rw-r--r--vcl/inc/unx/svsys.h (renamed from vcl/unx/inc/svsys.h)2
-rw-r--r--vcl/inc/unx/svunx.h (renamed from vcl/unx/inc/svunx.h)0
-rw-r--r--vcl/inc/unx/wmadaptor.hxx (renamed from vcl/unx/inc/wmadaptor.hxx)4
-rw-r--r--vcl/inc/unx/x11_cursors/airbrush_curs.h (renamed from vcl/unx/source/inc/airbrush_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/airbrush_mask.h (renamed from vcl/unx/source/inc/airbrush_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/ase_curs.h (renamed from vcl/unx/source/inc/ase_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/ase_mask.h (renamed from vcl/unx/source/inc/ase_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asn_curs.h (renamed from vcl/unx/source/inc/asn_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asn_mask.h (renamed from vcl/unx/source/inc/asn_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asne_curs.h (renamed from vcl/unx/source/inc/asne_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asne_mask.h (renamed from vcl/unx/source/inc/asne_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asns_curs.h (renamed from vcl/unx/source/inc/asns_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asns_mask.h (renamed from vcl/unx/source/inc/asns_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asnswe_curs.h (renamed from vcl/unx/source/inc/asnswe_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asnswe_mask.h (renamed from vcl/unx/source/inc/asnswe_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asnw_curs.h (renamed from vcl/unx/source/inc/asnw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asnw_mask.h (renamed from vcl/unx/source/inc/asnw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/ass_curs.h (renamed from vcl/unx/source/inc/ass_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/ass_mask.h (renamed from vcl/unx/source/inc/ass_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asse_curs.h (renamed from vcl/unx/source/inc/asse_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asse_mask.h (renamed from vcl/unx/source/inc/asse_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/assw_curs.h (renamed from vcl/unx/source/inc/assw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/assw_mask.h (renamed from vcl/unx/source/inc/assw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asw_curs.h (renamed from vcl/unx/source/inc/asw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/asw_mask.h (renamed from vcl/unx/source/inc/asw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/aswe_curs.h (renamed from vcl/unx/source/inc/aswe_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/aswe_mask.h (renamed from vcl/unx/source/inc/aswe_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chain_curs.h (renamed from vcl/unx/source/inc/chain_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chain_mask.h (renamed from vcl/unx/source/inc/chain_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chainnot_curs.h (renamed from vcl/unx/source/inc/chainnot_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chainnot_mask.h (renamed from vcl/unx/source/inc/chainnot_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chart_curs.h (renamed from vcl/unx/source/inc/chart_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/chart_mask.h (renamed from vcl/unx/source/inc/chart_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copydata_curs.h (renamed from vcl/unx/source/dtrans/copydata_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copydata_mask.h (renamed from vcl/unx/source/dtrans/copydata_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copydlnk_curs.h (renamed from vcl/unx/source/inc/copydlnk_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copydlnk_mask.h (renamed from vcl/unx/source/inc/copydlnk_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyfile_curs.h (renamed from vcl/unx/source/inc/copyfile_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyfile_mask.h (renamed from vcl/unx/source/inc/copyfile_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyfiles_curs.h (renamed from vcl/unx/source/inc/copyfiles_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyfiles_mask.h (renamed from vcl/unx/source/inc/copyfiles_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyflnk_curs.h (renamed from vcl/unx/source/inc/copyflnk_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/copyflnk_mask.h (renamed from vcl/unx/source/inc/copyflnk_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/crook_curs.h (renamed from vcl/unx/source/inc/crook_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/crook_mask.h (renamed from vcl/unx/source/inc/crook_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/crop_curs.h (renamed from vcl/unx/source/inc/crop_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/crop_mask.h (renamed from vcl/unx/source/inc/crop_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/detective_curs.h (renamed from vcl/unx/source/inc/detective_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/detective_mask.h (renamed from vcl/unx/source/inc/detective_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawarc_curs.h (renamed from vcl/unx/source/inc/drawarc_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawarc_mask.h (renamed from vcl/unx/source/inc/drawarc_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawbezier_curs.h (renamed from vcl/unx/source/inc/drawbezier_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawbezier_mask.h (renamed from vcl/unx/source/inc/drawbezier_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcaption_curs.h (renamed from vcl/unx/source/inc/drawcaption_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcaption_mask.h (renamed from vcl/unx/source/inc/drawcaption_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcirclecut_curs.h (renamed from vcl/unx/source/inc/drawcirclecut_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcirclecut_mask.h (renamed from vcl/unx/source/inc/drawcirclecut_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawconnect_curs.h (renamed from vcl/unx/source/inc/drawconnect_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawconnect_mask.h (renamed from vcl/unx/source/inc/drawconnect_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrook_curs.h (renamed from vcl/unx/source/inc/drawcrook_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrook_mask.h (renamed from vcl/unx/source/inc/drawcrook_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrop_curs.h (renamed from vcl/unx/source/inc/drawcrop_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrop_mask.h (renamed from vcl/unx/source/inc/drawcrop_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawellipse_curs.h (renamed from vcl/unx/source/inc/drawellipse_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawellipse_mask.h (renamed from vcl/unx/source/inc/drawellipse_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawfreehand_curs.h (renamed from vcl/unx/source/inc/drawfreehand_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawfreehand_mask.h (renamed from vcl/unx/source/inc/drawfreehand_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawline_curs.h (renamed from vcl/unx/source/inc/drawline_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawline_mask.h (renamed from vcl/unx/source/inc/drawline_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawmirror_curs.h (renamed from vcl/unx/source/inc/drawmirror_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawmirror_mask.h (renamed from vcl/unx/source/inc/drawmirror_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawpie_curs.h (renamed from vcl/unx/source/inc/drawpie_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawpie_mask.h (renamed from vcl/unx/source/inc/drawpie_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawpolygon_curs.h (renamed from vcl/unx/source/inc/drawpolygon_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawpolygon_mask.h (renamed from vcl/unx/source/inc/drawpolygon_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawrect_curs.h (renamed from vcl/unx/source/inc/drawrect_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawrect_mask.h (renamed from vcl/unx/source/inc/drawrect_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawtext_curs.h (renamed from vcl/unx/source/inc/drawtext_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/drawtext_mask.h (renamed from vcl/unx/source/inc/drawtext_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/fill_curs.h (renamed from vcl/unx/source/inc/fill_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/fill_mask.h (renamed from vcl/unx/source/inc/fill_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/hshear_curs.h (renamed from vcl/unx/source/inc/hshear_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/hshear_mask.h (renamed from vcl/unx/source/inc/hshear_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/invert50.h (renamed from vcl/unx/source/inc/invert50.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/linkdata_curs.h (renamed from vcl/unx/source/dtrans/linkdata_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/linkdata_mask.h (renamed from vcl/unx/source/dtrans/linkdata_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/linkfile_curs.h (renamed from vcl/unx/source/inc/linkfile_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/linkfile_mask.h (renamed from vcl/unx/source/inc/linkfile_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/magnify_curs.h (renamed from vcl/unx/source/inc/magnify_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/magnify_mask.h (renamed from vcl/unx/source/inc/magnify_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/mirror_curs.h (renamed from vcl/unx/source/inc/mirror_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/mirror_mask.h (renamed from vcl/unx/source/inc/mirror_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movebezierweight_curs.h (renamed from vcl/unx/source/inc/movebezierweight_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movebezierweight_mask.h (renamed from vcl/unx/source/inc/movebezierweight_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movedata_curs.h (renamed from vcl/unx/source/dtrans/movedata_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movedata_mask.h (renamed from vcl/unx/source/dtrans/movedata_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movedlnk_curs.h (renamed from vcl/unx/source/inc/movedlnk_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movedlnk_mask.h (renamed from vcl/unx/source/inc/movedlnk_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movefile_curs.h (renamed from vcl/unx/source/inc/movefile_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movefile_mask.h (renamed from vcl/unx/source/inc/movefile_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movefiles_curs.h (renamed from vcl/unx/source/inc/movefiles_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movefiles_mask.h (renamed from vcl/unx/source/inc/movefiles_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/moveflnk_curs.h (renamed from vcl/unx/source/inc/moveflnk_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/moveflnk_mask.h (renamed from vcl/unx/source/inc/moveflnk_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movepoint_curs.h (renamed from vcl/unx/source/inc/movepoint_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/movepoint_mask.h (renamed from vcl/unx/source/inc/movepoint_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/nodrop_curs.h (renamed from vcl/unx/source/dtrans/nodrop_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/nodrop_mask.h (renamed from vcl/unx/source/dtrans/nodrop_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/null_curs.h (renamed from vcl/unx/source/inc/null_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/null_mask.h (renamed from vcl/unx/source/inc/null_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/paintbrush_curs.h (renamed from vcl/unx/source/inc/paintbrush_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/paintbrush_mask.h (renamed from vcl/unx/source/inc/paintbrush_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotcol_curs.h (renamed from vcl/unx/source/inc/pivotcol_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotcol_mask.h (renamed from vcl/unx/source/inc/pivotcol_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotdel_curs.h (renamed from vcl/unx/source/inc/pivotdel_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotdel_mask.h (renamed from vcl/unx/source/inc/pivotdel_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotfld_curs.h (renamed from vcl/unx/source/inc/pivotfld_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotfld_mask.h (renamed from vcl/unx/source/inc/pivotfld_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotrow_curs.h (renamed from vcl/unx/source/inc/pivotrow_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/pivotrow_mask.h (renamed from vcl/unx/source/inc/pivotrow_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/rotate_curs.h (renamed from vcl/unx/source/inc/rotate_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/rotate_mask.h (renamed from vcl/unx/source/inc/rotate_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/salcursors.h162
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_curs.h (renamed from vcl/unx/source/inc/tblsele_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_mask.h (renamed from vcl/unx/source/inc/tblsele_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_curs.h (renamed from vcl/unx/source/inc/tblsels_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_mask.h (renamed from vcl/unx/source/inc/tblsels_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_curs.h (renamed from vcl/unx/source/inc/tblselse_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_mask.h (renamed from vcl/unx/source/inc/tblselse_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_curs.h (renamed from vcl/unx/source/inc/tblselsw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_mask.h (renamed from vcl/unx/source/inc/tblselsw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_curs.h (renamed from vcl/unx/source/inc/tblselw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_mask.h (renamed from vcl/unx/source/inc/tblselw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_curs.h (renamed from vcl/unx/source/inc/timemove_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_mask.h (renamed from vcl/unx/source/inc/timemove_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_curs.h (renamed from vcl/unx/source/inc/timesize_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_mask.h (renamed from vcl/unx/source/inc/timesize_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_curs.h (renamed from vcl/unx/source/inc/vertcurs_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_mask.h (renamed from vcl/unx/source/inc/vertcurs_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_curs.h (renamed from vcl/unx/source/inc/vshear_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_mask.h (renamed from vcl/unx/source/inc/vshear_mask.h)0
-rw-r--r--vcl/inc/vcl/cursor.hxx2
-rw-r--r--vcl/inc/vcl/gdimtf.hxx13
-rw-r--r--vcl/inc/vcl/gfxlink.hxx3
-rw-r--r--vcl/inc/vcl/graph.hxx17
-rw-r--r--vcl/inc/vcl/jobdata.hxx2
-rw-r--r--vcl/inc/vcl/metaact.hxx51
-rw-r--r--vcl/inc/vcl/outdev.hxx23
-rw-r--r--vcl/inc/vcl/pdfextoutdevdata.hxx34
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx23
-rw-r--r--vcl/inc/vcl/polyscan.hxx158
-rw-r--r--vcl/inc/vcl/ppdparser.hxx10
-rw-r--r--vcl/inc/vcl/rendergraphic.hxx124
-rw-r--r--vcl/inc/vcl/rendergraphicrasterizer.hxx111
-rw-r--r--vcl/inc/vcl/salctype.hxx1
-rw-r--r--vcl/inc/vcl/svcompat.hxx73
-rw-r--r--vcl/inc/vcl/svgread.hxx83
-rw-r--r--vcl/inc/vcl/unobrok.hxx42
-rw-r--r--vcl/inc/vclpluginapi.h73
-rw-r--r--vcl/inc/wall2.hxx (renamed from vcl/inc/vcl/wall2.hxx)0
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salbmp.h (renamed from vcl/win/inc/salbmp.h)5
-rw-r--r--vcl/inc/win/saldata.hxx (renamed from vcl/win/inc/saldata.hxx)10
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salframe.h (renamed from vcl/win/inc/salframe.h)3
-rw-r--r--vcl/inc/win/salgdi.h (renamed from vcl/win/inc/salgdi.h)9
-rw-r--r--vcl/inc/win/salids.hrc (renamed from vcl/win/inc/salids.hrc)0
-rw-r--r--vcl/inc/win/salinst.h (renamed from vcl/win/inc/salinst.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salmenu.h (renamed from vcl/win/inc/salmenu.h)4
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salnativewidgets.h (renamed from vcl/win/inc/salnativewidgets.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salobj.h (renamed from vcl/win/inc/salobj.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salprn.h (renamed from vcl/win/inc/salprn.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salsys.h (renamed from vcl/win/inc/salsys.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/saltimer.h (renamed from vcl/win/inc/saltimer.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salvd.h (renamed from vcl/win/inc/salvd.h)3
-rw-r--r--vcl/inc/win/svsys.h (renamed from vcl/win/inc/svsys.h)0
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/wincomp.hxx (renamed from vcl/win/inc/wincomp.hxx)1
-rw-r--r--vcl/inc/window.h (renamed from vcl/inc/vcl/window.h)0
-rw-r--r--vcl/inc/xconnection.hxx (renamed from vcl/inc/vcl/xconnection.hxx)0
-rw-r--r--vcl/prj/build.lst55
-rw-r--r--vcl/prj/d.lst158
-rw-r--r--vcl/prj/makefile.mk (renamed from vcl/util/makefile.pmk)16
-rwxr-xr-x[-rw-r--r--]vcl/source/app/dbggui.cxx30
-rw-r--r--vcl/source/app/help.cxx12
-rw-r--r--vcl/source/app/i18nhelp.cxx10
-rw-r--r--vcl/source/app/idlemgr.cxx5
-rw-r--r--vcl/source/app/makefile.mk71
-rw-r--r--vcl/source/app/salvtables.cxx20
-rw-r--r--vcl/source/app/session.cxx13
-rw-r--r--vcl/source/app/settings.cxx12
-rw-r--r--vcl/source/app/sound.cxx12
-rw-r--r--vcl/source/app/stdtext.cxx4
-rw-r--r--vcl/source/app/svapp.cxx49
-rw-r--r--vcl/source/app/svdata.cxx30
-rw-r--r--vcl/source/app/svmain.cxx81
-rw-r--r--vcl/source/app/timer.cxx10
-rw-r--r--vcl/source/app/unohelp.cxx18
-rw-r--r--vcl/source/app/vclevent.cxx3
-rw-r--r--vcl/source/components/dtranscomp.cxx13
-rw-r--r--vcl/source/components/factory.cxx15
-rw-r--r--vcl/source/components/fontident.cxx14
-rw-r--r--vcl/source/components/makefile.mk21
-rw-r--r--vcl/source/components/rasterizer_rsvg.cxx640
-rw-r--r--vcl/source/control/button.cxx14
-rw-r--r--vcl/source/control/combobox.cxx11
-rw-r--r--vcl/source/control/ctrl.cxx11
-rw-r--r--vcl/source/control/edit.cxx11
-rw-r--r--vcl/source/control/field.cxx7
-rw-r--r--vcl/source/control/field2.cxx8
-rw-r--r--vcl/source/control/fixed.cxx8
-rw-r--r--vcl/source/control/group.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx13
-rw-r--r--vcl/source/control/longcurr.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx22
-rw-r--r--vcl/source/control/makefile.mk78
-rw-r--r--vcl/source/control/scrbar.cxx3
-rw-r--r--vcl/source/control/spinfld.cxx6
-rw-r--r--vcl/source/control/tabctrl.cxx9
-rw-r--r--vcl/source/fontsubset/cff.cxx3
-rw-r--r--vcl/source/fontsubset/fontsubset.cxx5
-rw-r--r--vcl/source/fontsubset/makefile.mk51
-rw-r--r--vcl/source/gdi/bitmap.cxx12
-rw-r--r--vcl/source/gdi/bitmap3.cxx6
-rw-r--r--vcl/source/gdi/bitmapex.cxx13
-rw-r--r--vcl/source/gdi/bmpacc.cxx5
-rw-r--r--vcl/source/gdi/bmpacc3.cxx7
-rw-r--r--vcl/source/gdi/bmpfast.cxx2
-rw-r--r--vcl/source/gdi/configsettings.cxx4
-rw-r--r--vcl/source/gdi/cvtgrf.cxx6
-rw-r--r--vcl/source/gdi/font.cxx15
-rw-r--r--vcl/source/gdi/gdimtf.cxx768
-rw-r--r--vcl/source/gdi/gfxlink.cxx1
-rw-r--r--vcl/source/gdi/graph.cxx34
-rw-r--r--vcl/source/gdi/image.cxx5
-rw-r--r--vcl/source/gdi/imagerepository.cxx3
-rw-r--r--vcl/source/gdi/impbmp.cxx11
-rw-r--r--vcl/source/gdi/impgraph.cxx64
-rw-r--r--vcl/source/gdi/impimage.cxx4
-rw-r--r--vcl/source/gdi/impimagetree.cxx11
-rw-r--r--vcl/source/gdi/jobset.cxx4
-rwxr-xr-xvcl/source/gdi/makefile.mk24
-rw-r--r--vcl/source/gdi/metaact.cxx92
-rw-r--r--vcl/source/gdi/metric.cxx2
-rw-r--r--vcl/source/gdi/octree.cxx5
-rw-r--r--vcl/source/gdi/outdev.cxx27
-rw-r--r--vcl/source/gdi/outdev2.cxx23
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/outdev3.cxx52
-rw-r--r--vcl/source/gdi/outdev4.cxx17
-rw-r--r--vcl/source/gdi/outdev5.cxx11
-rw-r--r--vcl/source/gdi/outdev6.cxx42
-rw-r--r--vcl/source/gdi/outdevnative.cxx3
-rw-r--r--vcl/source/gdi/outmap.cxx16
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx53
-rw-r--r--vcl/source/gdi/pdffontcache.cxx6
-rw-r--r--vcl/source/gdi/pdffontcache.hxx4
-rw-r--r--vcl/source/gdi/pdfwriter.cxx6
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx46
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx8
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx17
-rw-r--r--vcl/source/gdi/polyscan.cxx361
-rw-r--r--vcl/source/gdi/print.cxx24
-rw-r--r--vcl/source/gdi/print2.cxx37
-rw-r--r--vcl/source/gdi/print3.cxx11
-rw-r--r--vcl/source/gdi/region.cxx5
-rw-r--r--vcl/source/gdi/rendergraphic.cxx240
-rw-r--r--vcl/source/gdi/rendergraphicrasterizer.cxx400
-rw-r--r--vcl/source/gdi/salgdilayout.cxx27
-rw-r--r--vcl/source/gdi/sallayout.cxx6
-rw-r--r--vcl/source/gdi/salmisc.cxx2
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx2
-rw-r--r--vcl/source/gdi/svcompat.cxx81
-rw-r--r--vcl/source/gdi/svgread.cxx131
-rw-r--r--vcl/source/gdi/textlayout.cxx5
-rw-r--r--vcl/source/gdi/virdev.cxx15
-rw-r--r--vcl/source/gdi/wall.cxx7
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx8
-rw-r--r--vcl/source/glyphs/gcach_ftyp.hxx2
-rw-r--r--vcl/source/glyphs/gcach_layout.cxx4
-rw-r--r--vcl/source/glyphs/gcach_rbmp.cxx2
-rw-r--r--vcl/source/glyphs/gcach_vdev.cxx290
-rw-r--r--vcl/source/glyphs/gcach_vdev.hxx60
-rw-r--r--vcl/source/glyphs/glyphcache.cxx8
-rw-r--r--vcl/source/glyphs/graphite_features.cxx2
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx3
-rw-r--r--vcl/source/glyphs/graphite_serverfont.cxx5
-rw-r--r--vcl/source/glyphs/graphite_textsrc.cxx2
-rw-r--r--vcl/source/glyphs/graphite_textsrc.hxx3
-rw-r--r--vcl/source/glyphs/makefile.mk80
-rw-r--r--vcl/source/helper/canvasbitmap.cxx2
-rw-r--r--vcl/source/helper/canvastools.cxx2
-rw-r--r--vcl/source/helper/lazydelete.cxx2
-rw-r--r--vcl/source/helper/makefile.mk55
-rw-r--r--vcl/source/helper/xconnection.cxx9
-rw-r--r--vcl/source/salmain/salmain.cxx3
-rw-r--r--vcl/source/src/btntext.src4
-rw-r--r--vcl/source/src/helptext.src4
-rw-r--r--vcl/source/src/images.src4
-rw-r--r--vcl/source/src/makefile.mk56
-rw-r--r--vcl/source/src/menu.src5
-rw-r--r--vcl/source/src/print.src2
-rw-r--r--vcl/source/src/stdtext.src4
-rw-r--r--vcl/source/src/units.src4
-rw-r--r--vcl/source/window/abstdlg.cxx3
-rw-r--r--vcl/source/window/accel.cxx5
-rw-r--r--vcl/source/window/accmgr.cxx5
-rw-r--r--vcl/source/window/arrange.cxx3
-rw-r--r--vcl/source/window/brdwin.cxx10
-rw-r--r--vcl/source/window/btndlg.cxx4
-rw-r--r--vcl/source/window/cursor.cxx24
-rw-r--r--vcl/source/window/dialog.cxx7
-rw-r--r--vcl/source/window/dlgctrl.cxx7
-rw-r--r--vcl/source/window/dndevdis.cxx9
-rw-r--r--vcl/source/window/dndlcon.cxx2
-rw-r--r--vcl/source/window/dockingarea.cxx5
-rw-r--r--vcl/source/window/dockmgr.cxx11
-rw-r--r--vcl/source/window/dockwin.cxx10
-rw-r--r--vcl/source/window/floatwin.cxx11
-rw-r--r--vcl/source/window/introwin.cxx9
-rw-r--r--vcl/source/window/keycod.cxx9
-rw-r--r--vcl/source/window/makefile.mk106
-rw-r--r--vcl/source/window/menu.cxx19
-rw-r--r--vcl/source/window/msgbox.cxx12
-rw-r--r--vcl/source/window/printdlg.cxx9
-rw-r--r--vcl/source/window/scrwnd.cxx7
-rw-r--r--vcl/source/window/seleng.cxx6
-rw-r--r--vcl/source/window/split.cxx7
-rw-r--r--vcl/source/window/splitwin.cxx6
-rw-r--r--vcl/source/window/status.cxx8
-rwxr-xr-x[-rw-r--r--]vcl/source/window/syschild.cxx20
-rw-r--r--vcl/source/window/syswin.cxx10
-rw-r--r--vcl/source/window/tabpage.cxx7
-rw-r--r--vcl/source/window/taskpanelist.cxx7
-rwxr-xr-x[-rw-r--r--]vcl/source/window/toolbox.cxx18
-rw-r--r--vcl/source/window/toolbox2.cxx14
-rwxr-xr-x[-rw-r--r--]vcl/source/window/window.cxx72
-rw-r--r--vcl/source/window/window2.cxx22
-rw-r--r--vcl/source/window/window4.cxx5
-rw-r--r--vcl/source/window/winproc.cxx40
-rw-r--r--vcl/source/window/wpropset.cxx3
-rwxr-xr-x[-rw-r--r--]vcl/source/window/wrkwin.cxx14
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx (renamed from vcl/unx/source/app/i18n_cb.cxx)18
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx (renamed from vcl/unx/source/app/i18n_ic.cxx)21
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx (renamed from vcl/unx/source/app/i18n_im.cxx)13
-rw-r--r--vcl/unx/generic/app/i18n_keysym.cxx (renamed from vcl/unx/source/app/i18n_keysym.cxx)2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx (renamed from vcl/unx/source/app/i18n_status.cxx)18
-rw-r--r--vcl/unx/generic/app/i18n_wrp.cxx (renamed from vcl/unx/source/app/i18n_wrp.cxx)3
-rw-r--r--vcl/unx/generic/app/i18n_xkb.cxx (renamed from vcl/unx/source/app/i18n_xkb.cxx)6
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx (renamed from vcl/unx/source/app/keysymnames.cxx)2
-rw-r--r--vcl/unx/generic/app/randrwrapper.cxx (renamed from vcl/unx/source/app/randrwrapper.cxx)4
-rw-r--r--vcl/unx/generic/app/saldata.cxx (renamed from vcl/unx/source/app/saldata.cxx)18
-rw-r--r--vcl/unx/generic/app/saldisp.cxx (renamed from vcl/unx/source/app/saldisp.cxx)30
-rw-r--r--vcl/unx/generic/app/salinst.cxx (renamed from vcl/unx/source/app/salinst.cxx)27
-rw-r--r--vcl/unx/generic/app/salsys.cxx (renamed from vcl/unx/source/app/salsys.cxx)17
-rw-r--r--vcl/unx/generic/app/saltimer.cxx (renamed from vcl/unx/source/app/saltimer.cxx)10
-rw-r--r--vcl/unx/generic/app/sm.cxx (renamed from vcl/unx/source/app/sm.cxx)15
-rw-r--r--vcl/unx/generic/app/soicon.cxx (renamed from vcl/unx/source/app/soicon.cxx)19
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx (renamed from vcl/unx/source/app/wmadaptor.cxx)16
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx (renamed from vcl/unx/source/desktopdetect/desktopdetector.cxx)8
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx (renamed from vcl/unx/source/dtrans/X11_clipboard.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx (renamed from vcl/unx/source/dtrans/X11_clipboard.hxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.cxx (renamed from vcl/unx/source/dtrans/X11_dndcontext.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.hxx (renamed from vcl/unx/source/dtrans/X11_dndcontext.hxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_droptarget.cxx (renamed from vcl/unx/source/dtrans/X11_droptarget.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx (renamed from vcl/unx/source/dtrans/X11_selection.cxx)4
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx (renamed from vcl/unx/source/dtrans/X11_selection.hxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx (renamed from vcl/unx/source/dtrans/X11_service.cxx)2
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.cxx (renamed from vcl/unx/source/dtrans/X11_transferable.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.hxx (renamed from vcl/unx/source/dtrans/X11_transferable.hxx)0
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx (renamed from vcl/unx/source/dtrans/bmp.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/bmp.hxx (renamed from vcl/unx/source/dtrans/bmp.hxx)0
-rw-r--r--vcl/unx/generic/dtrans/config.cxx (renamed from vcl/unx/source/dtrans/config.cxx)0
-rw-r--r--vcl/unx/generic/dtrans/copydata_curs.h (renamed from vcl/unx/source/inc/copydata_curs.h)0
-rw-r--r--vcl/unx/generic/dtrans/copydata_mask.h (renamed from vcl/unx/source/inc/copydata_mask.h)0
-rw-r--r--vcl/unx/generic/dtrans/linkdata_curs.h (renamed from vcl/unx/source/inc/linkdata_curs.h)0
-rw-r--r--vcl/unx/generic/dtrans/linkdata_mask.h (renamed from vcl/unx/source/inc/linkdata_mask.h)0
-rw-r--r--vcl/unx/generic/dtrans/movedata_curs.h (renamed from vcl/unx/source/inc/movedata_curs.h)0
-rw-r--r--vcl/unx/generic/dtrans/movedata_mask.h (renamed from vcl/unx/source/inc/movedata_mask.h)0
-rw-r--r--vcl/unx/generic/dtrans/nodrop_curs.h (renamed from vcl/unx/source/inc/nodrop_curs.h)0
-rw-r--r--vcl/unx/generic/dtrans/nodrop_mask.h (renamed from vcl/unx/source/inc/nodrop_mask.h)0
-rw-r--r--vcl/unx/generic/fontmanager/adobeenc.tab (renamed from vcl/unx/source/fontmanager/adobeenc.tab)0
-rwxr-xr-xvcl/unx/generic/fontmanager/afm_keyword_list (renamed from vcl/unx/source/fontmanager/afm_keyword_list)0
-rw-r--r--vcl/unx/generic/fontmanager/fontcache.cxx (renamed from vcl/unx/source/fontmanager/fontcache.cxx)2
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx (renamed from vcl/unx/source/fontmanager/fontconfig.cxx)4
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx (renamed from vcl/unx/source/fontmanager/fontmanager.cxx)11
-rw-r--r--vcl/unx/generic/fontmanager/helper.cxx (renamed from vcl/unx/source/fontmanager/helper.cxx)0
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.cxx (renamed from vcl/unx/source/fontmanager/parseAFM.cxx)0
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.hxx (renamed from vcl/unx/source/fontmanager/parseAFM.hxx)0
-rw-r--r--vcl/unx/generic/gdi/cdeint.cxx (renamed from vcl/unx/source/gdi/cdeint.cxx)11
-rw-r--r--vcl/unx/generic/gdi/dtint.cxx (renamed from vcl/unx/source/gdi/dtint.cxx)26
-rw-r--r--vcl/unx/generic/gdi/dtsetenum.hxx (renamed from vcl/unx/source/gdi/dtsetenum.hxx)0
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx (renamed from vcl/unx/source/gdi/gcach_xpeer.cxx)19
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx (renamed from vcl/unx/source/gdi/gcach_xpeer.hxx)4
-rw-r--r--vcl/unx/generic/gdi/pspgraphics.cxx (renamed from vcl/unx/source/gdi/pspgraphics.cxx)36
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx (renamed from vcl/unx/source/gdi/salbmp.cxx)23
-rw-r--r--vcl/unx/generic/gdi/salcvt.cxx (renamed from vcl/unx/source/gdi/salcvt.cxx)0
-rw-r--r--vcl/unx/generic/gdi/salcvt.hxx (renamed from vcl/unx/source/gdi/salcvt.hxx)3
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx (renamed from vcl/unx/source/gdi/salgdi.cxx)28
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx (renamed from vcl/unx/source/gdi/salgdi2.cxx)20
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx (renamed from vcl/unx/source/gdi/salgdi3.cxx)47
-rw-r--r--vcl/unx/generic/gdi/salprnpsp.cxx (renamed from vcl/unx/source/gdi/salprnpsp.cxx)28
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx (renamed from vcl/unx/source/gdi/salvd.cxx)16
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx (renamed from vcl/unx/source/gdi/xrender_peer.cxx)9
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx (renamed from vcl/unx/source/gdi/xrender_peer.hxx)0
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx (renamed from vcl/unx/source/plugadapt/salplug.cxx)6
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx (renamed from vcl/unx/source/printer/cupsmgr.cxx)2
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx (renamed from vcl/unx/source/printer/jobdata.cxx)0
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx (renamed from vcl/unx/source/printer/ppdparser.cxx)0
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx (renamed from vcl/unx/source/printer/printerinfomanager.cxx)3
-rw-r--r--vcl/unx/generic/printergfx/bitmap_gfx.cxx (renamed from vcl/unx/source/printergfx/bitmap_gfx.cxx)2
-rw-r--r--vcl/unx/generic/printergfx/common_gfx.cxx (renamed from vcl/unx/source/printergfx/common_gfx.cxx)4
-rw-r--r--vcl/unx/generic/printergfx/glyphset.cxx (renamed from vcl/unx/source/printergfx/glyphset.cxx)4
-rw-r--r--vcl/unx/generic/printergfx/glyphset.hxx (renamed from vcl/unx/source/printergfx/glyphset.hxx)0
-rw-r--r--vcl/unx/generic/printergfx/printerjob.cxx (renamed from vcl/unx/source/printergfx/printerjob.cxx)4
-rw-r--r--vcl/unx/generic/printergfx/psheader.ps (renamed from vcl/unx/source/printergfx/psheader.ps)0
-rw-r--r--vcl/unx/generic/printergfx/psputil.cxx (renamed from vcl/unx/source/printergfx/psputil.cxx)0
-rw-r--r--vcl/unx/generic/printergfx/psputil.hxx (renamed from vcl/unx/source/printergfx/psputil.hxx)0
-rw-r--r--vcl/unx/generic/printergfx/text_gfx.cxx (renamed from vcl/unx/source/printergfx/text_gfx.cxx)2
-rw-r--r--vcl/unx/generic/window/FWS.cxx (renamed from vcl/unx/source/window/FWS.cxx)0
-rw-r--r--vcl/unx/generic/window/FWS.hxx (renamed from vcl/unx/source/window/FWS.hxx)0
-rw-r--r--vcl/unx/generic/window/salframe.cxx (renamed from vcl/unx/source/window/salframe.cxx)52
-rw-r--r--vcl/unx/generic/window/salobj.cxx (renamed from vcl/unx/source/window/salobj.cxx)29
-rw-r--r--vcl/unx/gtk/a11y/atkbridge.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx2
-rw-r--r--vcl/unx/gtk/a11y/makefile.mk89
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx16
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx15
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx7
-rw-r--r--vcl/unx/gtk/app/makefile.mk77
-rw-r--r--vcl/unx/gtk/gdi/makefile.mk67
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx18
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx21
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx8
-rw-r--r--vcl/unx/gtk/window/makefile.mk79
-rw-r--r--vcl/unx/headless/makefile.mk66
-rw-r--r--vcl/unx/headless/svpbmp.hxx2
-rw-r--r--vcl/unx/headless/svpdummies.hxx7
-rw-r--r--vcl/unx/headless/svpframe.hxx2
-rw-r--r--vcl/unx/headless/svpgdi.cxx2
-rw-r--r--vcl/unx/headless/svpgdi.hxx5
-rw-r--r--vcl/unx/headless/svpinst.cxx12
-rw-r--r--vcl/unx/headless/svpinst.hxx6
-rw-r--r--vcl/unx/headless/svpprn.cxx15
-rw-r--r--vcl/unx/headless/svpprn.hxx10
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx41
-rw-r--r--vcl/unx/headless/svppspgraphics.hxx5
-rw-r--r--vcl/unx/headless/svptext.cxx12
-rw-r--r--vcl/unx/headless/svpvd.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx12
-rw-r--r--vcl/unx/kde/makefile.mk81
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx15
-rw-r--r--vcl/unx/kde4/KDEData.hxx4
-rw-r--r--vcl/unx/kde4/KDESalDisplay.hxx2
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx7
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx4
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDESalInstance.hxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx8
-rw-r--r--vcl/unx/kde4/KDEXLib.hxx2
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.cxx2
-rw-r--r--vcl/unx/kde4/main.cxx4
-rw-r--r--vcl/unx/kde4/makefile.mk96
-rw-r--r--vcl/unx/source/app/makefile.mk111
-rw-r--r--vcl/unx/source/dtrans/makefile.mk68
-rw-r--r--vcl/unx/source/fontmanager/makefile.mk77
-rw-r--r--vcl/unx/source/gdi/makefile.mk104
-rw-r--r--vcl/unx/source/inc/salcursors.h165
-rw-r--r--vcl/unx/source/plugadapt/makefile.mk59
-rw-r--r--vcl/unx/source/printer/makefile.mk70
-rw-r--r--vcl/unx/source/printergfx/makefile.mk65
-rw-r--r--vcl/unx/source/window/makefile.mk59
-rw-r--r--vcl/util/linksvp/makefile.mk67
-rwxr-xr-xvcl/util/makefile.mk2
-rw-r--r--vcl/util/makefile2.pmk34
-rw-r--r--vcl/vcl.macosx.component (renamed from vcl/util/vcl.macosx.component)3
-rw-r--r--vcl/vcl.unx.component (renamed from vcl/util/vcl.component)3
-rw-r--r--vcl/vcl.windows.component (renamed from vcl/util/vcl.windows.component)3
-rw-r--r--vcl/win/source/app/MAKEFILE.MK53
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/saldata.cxx5
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/salinfo.cxx28
-rw-r--r--vcl/win/source/app/salinst.cxx30
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/salshl.cxx4
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/saltimer.cxx6
-rw-r--r--vcl/win/source/gdi/makefile.mk73
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/salbmp.cxx14
-rw-r--r--vcl/win/source/gdi/salgdi.cxx17
-rw-r--r--vcl/win/source/gdi/salgdi2.cxx14
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx42
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx8
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx12
-rw-r--r--vcl/win/source/gdi/salprn.cxx26
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/salvd.cxx13
-rw-r--r--vcl/win/source/gdi/winlayout.cxx23
-rw-r--r--vcl/win/source/src/MAKEFILE.MK130
-rwxr-xr-x[-rw-r--r--]vcl/win/source/src/salsrc.rc2
-rw-r--r--vcl/win/source/window/MAKEFILE.MK60
-rw-r--r--vcl/win/source/window/salframe.cxx42
-rw-r--r--vcl/win/source/window/salmenu.cxx18
-rwxr-xr-x[-rw-r--r--]vcl/win/source/window/salobj.cxx13
721 files changed, 6838 insertions, 6421 deletions
diff --git a/vcl/unx/source/desktopdetect/makefile.mk b/vcl/AllLangResTarget_vcl.mk
index 83d5d29f4b71..9a3453af2810 100644
--- a/vcl/unx/source/desktopdetect/makefile.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2009 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -14,44 +14,41 @@
#
# 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
+# 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
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl))
-PRJNAME=vcl
-TARGET=dtdetect
+$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl))
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_AllLangResTarget_add_srs,vcl,\
+ vcl/source/src \
+))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
+$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
+ vcl/source/src/btntext.src \
+ vcl/source/src/helptext.src \
+ vcl/source/src/images.src \
+ vcl/source/src/menu.src \
+ vcl/source/src/print.src \
+ vcl/source/src/stdtext.src \
+ vcl/source/src/units.src \
+))
-.IF "$(GUIBASE)"!="unx"
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="unx"
-
-SLOFILES=$(SLO)$/desktopdetector.obj
-
-.ENDIF # "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
new file mode 100644
index 000000000000..49151cb19ff5
--- /dev/null
+++ b/vcl/Library_desktop_detector.mk
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,desktop_detector))
+
+#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(eval $(call gb_Library_set_include,desktop_detector,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde,\
+ $$(DEFS) \
+ -DDESKTOP_DETECTOR_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+ vcl/unx/generic/desktopdetect/desktopdetector \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
new file mode 100755
index 000000000000..e8ad1bcaed64
--- /dev/null
+++ b/vcl/Library_vcl.mk
@@ -0,0 +1,512 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vcl))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+else
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
+endif
+
+$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_set_cxxflags,vcl,\
+ $$(CXXFLAGS) \
+ $$(FREETYPE_CFLAGS) \
+))
+endif
+
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DVCL_DLLIMPLEMENTATION \
+ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
+ -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifneq ($(ENABLE_GRAPHITE),)
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ graphite_dll \
+))
+endif
+endif
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ freetype \
+))
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_set_cxxflags,vcl,\
+ $$(CXXFLAGS) \
+ $$(OBJCXXFLAGS) \
+))
+ifeq ($(ENABLE_CAIRO),TRUE)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DCAIRO \
+))
+endif
+$(eval $(call gb_Library_add_objcxxobjects,vcl,\
+ vcl/aqua/source/a11y/aqua11yactionwrapper \
+ vcl/aqua/source/a11y/aqua11ycomponentwrapper \
+ vcl/aqua/source/a11y/aqua11yfactory \
+ vcl/aqua/source/a11y/aqua11yrolehelper \
+ vcl/aqua/source/a11y/aqua11yselectionwrapper \
+ vcl/aqua/source/a11y/aqua11ytablewrapper \
+ vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
+ vcl/aqua/source/a11y/aqua11ytextwrapper \
+ vcl/aqua/source/a11y/aqua11yutil \
+ vcl/aqua/source/a11y/aqua11yvaluewrapper \
+ vcl/aqua/source/a11y/aqua11ywrapper \
+ vcl/aqua/source/a11y/aqua11ywrapperbutton \
+ vcl/aqua/source/a11y/aqua11ywrappercheckbox \
+ vcl/aqua/source/a11y/aqua11ywrappercombobox \
+ vcl/aqua/source/a11y/aqua11ywrappergroup \
+ vcl/aqua/source/a11y/aqua11ywrapperlist \
+ vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
+ vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
+ vcl/aqua/source/a11y/aqua11ywrapperrow \
+ vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
+ vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
+ vcl/aqua/source/a11y/aqua11ywrappersplitter \
+ vcl/aqua/source/a11y/aqua11ywrapperstatictext \
+ vcl/aqua/source/a11y/aqua11ywrappertabgroup \
+ vcl/aqua/source/a11y/aqua11ywrappertextarea \
+ vcl/aqua/source/a11y/aqua11ywrappertoolbar \
+ vcl/aqua/source/app/salnstimer \
+ vcl/aqua/source/app/vclnsapp \
+ vcl/aqua/source/gdi/aquaprintaccessoryview \
+ vcl/aqua/source/gdi/aquaprintview \
+ vcl/aqua/source/window/salframeview \
+ vcl/aqua/source/window/salnsmenu \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/aqua/source/a11y/aqua11yfocuslistener \
+ vcl/aqua/source/a11y/aqua11yfocustracker \
+ vcl/aqua/source/a11y/aqua11ylistener \
+ vcl/aqua/source/a11y/documentfocuslistener \
+ vcl/aqua/source/app/saldata \
+ vcl/aqua/source/app/salinst \
+ vcl/aqua/source/app/salsys \
+ vcl/aqua/source/app/saltimer \
+ vcl/aqua/source/dtrans/DataFlavorMapping \
+ vcl/aqua/source/dtrans/DragActionConversion \
+ vcl/aqua/source/dtrans/DragSource \
+ vcl/aqua/source/dtrans/DragSourceContext \
+ vcl/aqua/source/dtrans/DropTarget \
+ vcl/aqua/source/dtrans/HtmlFmtFlt \
+ vcl/aqua/source/dtrans/OSXTransferable \
+ vcl/aqua/source/dtrans/PictToBmpFlt \
+ vcl/aqua/source/dtrans/aqua_clipboard \
+ vcl/aqua/source/dtrans/service_entry \
+ vcl/aqua/source/gdi/salatslayout \
+ vcl/aqua/source/gdi/salatsuifontutils \
+ vcl/aqua/source/gdi/salbmp \
+ vcl/aqua/source/gdi/salcolorutils \
+ vcl/aqua/source/gdi/salgdi \
+ vcl/aqua/source/gdi/salgdiutils \
+ vcl/aqua/source/gdi/salmathutils \
+ vcl/aqua/source/gdi/salnativewidgets \
+ vcl/aqua/source/gdi/salprn \
+ vcl/aqua/source/gdi/salvd \
+ vcl/aqua/source/window/salframe \
+ vcl/aqua/source/window/salmenu \
+ vcl/aqua/source/window/salobj \
+))
+endif
+
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
+ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
+ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+))
+## handle fontconfig
+ifneq ($(ENABLE_FONTCONFIG),)
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DENABLE_FONTCONFIG \
+))
+## handle CUPS
+ifneq ($(ENABLE_CUPS),)
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DENABLE_CUPS \
+))
+endif
+endif
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/glyphs/gcach_ftyp \
+ vcl/source/glyphs/gcach_layout \
+ vcl/source/glyphs/gcach_rbmp \
+ vcl/source/glyphs/glyphcache \
+ vcl/unx/generic/fontmanager/fontcache \
+ vcl/unx/generic/fontmanager/fontconfig \
+ vcl/unx/generic/fontmanager/fontmanager \
+ vcl/unx/generic/fontmanager/helper \
+ vcl/unx/generic/fontmanager/parseAFM \
+ vcl/unx/generic/plugadapt/salplug \
+ vcl/unx/generic/printer/cupsmgr \
+ vcl/unx/generic/printer/jobdata \
+ vcl/unx/generic/printer/ppdparser \
+ vcl/unx/generic/printer/printerinfomanager \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/win/source/app/saldata \
+ vcl/win/source/app/salinfo \
+ vcl/win/source/app/salinst \
+ vcl/win/source/app/salshl \
+ vcl/win/source/app/saltimer \
+ vcl/win/source/gdi/salbmp \
+ vcl/win/source/gdi/salgdi \
+ vcl/win/source/gdi/salgdi2 \
+ vcl/win/source/gdi/salgdi3 \
+ vcl/win/source/gdi/salgdi_gdiplus \
+ vcl/win/source/gdi/salnativewidgets-luna \
+ vcl/win/source/gdi/salprn \
+ vcl/win/source/gdi/salvd \
+ vcl/win/source/gdi/winlayout \
+ vcl/win/source/gdi/wntgdi \
+ vcl/win/source/window/salframe \
+ vcl/win/source/window/salmenu \
+ vcl/win/source/window/salobj \
+))
+
+$(eval $(call gb_Library_add_nativeres,vcl,src))
+
+endif
+
+$(eval $(call gb_Library_add_cobjects,vcl,\
+ vcl/source/fontsubset/list \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/app/dbggui \
+ vcl/source/app/dndhelp \
+ vcl/source/app/help \
+ vcl/source/app/i18nhelp \
+ vcl/source/app/idlemgr \
+ vcl/source/app/salvtables \
+ vcl/source/app/session \
+ vcl/source/app/settings \
+ vcl/source/app/sound \
+ vcl/source/app/stdtext \
+ vcl/source/app/svapp \
+ vcl/source/app/svdata \
+ vcl/source/app/svmain \
+ vcl/source/app/svmainhook \
+ vcl/source/app/timer \
+ vcl/source/app/unohelp2 \
+ vcl/source/app/unohelp \
+ vcl/source/app/vclevent \
+ vcl/source/components/display \
+ vcl/source/components/dtranscomp \
+ vcl/source/components/factory \
+ vcl/source/components/fontident \
+ vcl/source/components/rasterizer_rsvg \
+ vcl/source/components/stringmirror \
+ vcl/source/control/button \
+ vcl/source/control/combobox \
+ vcl/source/control/ctrl \
+ vcl/source/control/edit \
+ vcl/source/control/field2 \
+ vcl/source/control/field \
+ vcl/source/control/fixbrd \
+ vcl/source/control/fixed \
+ vcl/source/control/group \
+ vcl/source/control/ilstbox \
+ vcl/source/control/imgctrl \
+ vcl/source/control/longcurr \
+ vcl/source/control/lstbox \
+ vcl/source/control/menubtn \
+ vcl/source/control/morebtn \
+ vcl/source/control/quickselectionengine \
+ vcl/source/control/scrbar \
+ vcl/source/control/slider \
+ vcl/source/control/spinbtn \
+ vcl/source/control/spinfld \
+ vcl/source/control/tabctrl \
+ vcl/source/control/throbber \
+ vcl/source/fontsubset/cff \
+ vcl/source/fontsubset/fontsubset \
+ vcl/source/fontsubset/gsub \
+ vcl/source/fontsubset/sft \
+ vcl/source/fontsubset/ttcr \
+ vcl/source/fontsubset/xlat \
+ vcl/source/gdi/alpha \
+ vcl/source/gdi/animate \
+ vcl/source/gdi/base14 \
+ vcl/source/gdi/bitmap2 \
+ vcl/source/gdi/bitmap3 \
+ vcl/source/gdi/bitmap4 \
+ vcl/source/gdi/bitmap \
+ vcl/source/gdi/bitmapex \
+ vcl/source/gdi/bmpacc2 \
+ vcl/source/gdi/bmpacc3 \
+ vcl/source/gdi/bmpacc \
+ vcl/source/gdi/bmpconv \
+ vcl/source/gdi/bmpfast \
+ vcl/source/gdi/configsettings \
+ vcl/source/gdi/cvtgrf \
+ vcl/source/gdi/cvtsvm \
+ vcl/source/gdi/extoutdevdata \
+ vcl/source/gdi/font \
+ vcl/source/gdi/gdimtf \
+ vcl/source/gdi/gfxlink \
+ vcl/source/gdi/gradient \
+ vcl/source/gdi/graph \
+ vcl/source/gdi/graphictools \
+ vcl/source/gdi/hatch \
+ vcl/source/gdi/image \
+ vcl/source/gdi/imagerepository \
+ vcl/source/gdi/impanmvw \
+ vcl/source/gdi/impbmp \
+ vcl/source/gdi/impgraph \
+ vcl/source/gdi/impimage \
+ vcl/source/gdi/impimagetree \
+ vcl/source/gdi/impvect \
+ vcl/source/gdi/jobset \
+ vcl/source/gdi/lineinfo \
+ vcl/source/gdi/mapmod \
+ vcl/source/gdi/metaact \
+ vcl/source/gdi/metric \
+ vcl/source/gdi/octree \
+ vcl/source/gdi/oldprintadaptor \
+ vcl/source/gdi/outdev2 \
+ vcl/source/gdi/outdev3 \
+ vcl/source/gdi/outdev4 \
+ vcl/source/gdi/outdev5 \
+ vcl/source/gdi/outdev6 \
+ vcl/source/gdi/outdev \
+ vcl/source/gdi/outdevnative \
+ vcl/source/gdi/outmap \
+ vcl/source/gdi/pdfextoutdevdata \
+ vcl/source/gdi/pdffontcache \
+ vcl/source/gdi/pdfwriter \
+ vcl/source/gdi/pdfwriter_impl2 \
+ vcl/source/gdi/pdfwriter_impl \
+ vcl/source/gdi/pngread \
+ vcl/source/gdi/pngwrite \
+ vcl/source/gdi/print2 \
+ vcl/source/gdi/print3 \
+ vcl/source/gdi/print \
+ vcl/source/gdi/regband \
+ vcl/source/gdi/region \
+ vcl/source/gdi/rendergraphic \
+ vcl/source/gdi/rendergraphicrasterizer \
+ vcl/source/gdi/salgdilayout \
+ vcl/source/gdi/sallayout \
+ vcl/source/gdi/salmisc \
+ vcl/source/gdi/salnativewidgets-none \
+ vcl/source/gdi/svgread \
+ vcl/source/gdi/textlayout \
+ vcl/source/gdi/virdev \
+ vcl/source/gdi/wall \
+ vcl/source/helper/canvasbitmap \
+ vcl/source/helper/canvastools \
+ vcl/source/helper/evntpost \
+ vcl/source/helper/lazydelete \
+ vcl/source/helper/strhelper \
+ vcl/source/helper/threadex \
+ vcl/source/helper/xconnection \
+ vcl/source/salmain/salmain \
+ vcl/source/window/abstdlg \
+ vcl/source/window/accel \
+ vcl/source/window/accmgr \
+ vcl/source/window/arrange \
+ vcl/source/window/brdwin \
+ vcl/source/window/btndlg \
+ vcl/source/window/cmdevt \
+ vcl/source/window/cursor \
+ vcl/source/window/decoview \
+ vcl/source/window/dialog \
+ vcl/source/window/dlgctrl \
+ vcl/source/window/dndevdis \
+ vcl/source/window/dndlcon \
+ vcl/source/window/dockingarea \
+ vcl/source/window/dockmgr \
+ vcl/source/window/dockwin \
+ vcl/source/window/floatwin \
+ vcl/source/window/introwin \
+ vcl/source/window/javachild \
+ vcl/source/window/keycod \
+ vcl/source/window/keyevent \
+ vcl/source/window/menu \
+ vcl/source/window/mnemonic \
+ vcl/source/window/mnemonicengine \
+ vcl/source/window/mouseevent \
+ vcl/source/window/msgbox \
+ vcl/source/window/popupmenuwindow \
+ vcl/source/window/printdlg \
+ vcl/source/window/scrwnd \
+ vcl/source/window/seleng \
+ vcl/source/window/split \
+ vcl/source/window/splitwin \
+ vcl/source/window/status \
+ vcl/source/window/syschild \
+ vcl/source/window/syswin \
+ vcl/source/window/tabdlg \
+ vcl/source/window/tabpage \
+ vcl/source/window/taskpanelist \
+ vcl/source/window/toolbox2 \
+ vcl/source/window/toolbox \
+ vcl/source/window/window2 \
+ vcl/source/window/window3 \
+ vcl/source/window/window4 \
+ vcl/source/window/window \
+ vcl/source/window/winproc \
+ vcl/source/window/wpropset \
+ vcl/source/window/wrkwin \
+))
+
+## handle Graphite
+ifneq ($(ENABLE_GRAPHITE),)
+$(eval $(call gb_Library_set_defs,vcl,\
+ $$(DEFS) \
+ -DENABLE_GRAPHITE \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/glyphs/graphite_cache \
+ vcl/source/glyphs/graphite_features \
+ vcl/source/glyphs/graphite_layout \
+ vcl/source/glyphs/graphite_textsrc \
+))
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/glyphs/graphite_adaptors \
+ vcl/source/glyphs/graphite_serverfont \
+))
+ifeq ($(SYSTEM_GRAPHITE),YES)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ $(GRAPHITE_LIBS)
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,vcl,\
+ graphite \
+))
+endif
+endif
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ dl \
+ m \
+ pthread \
+))
+endif
+
+ifeq ($(OS),SOLARIS)
+ifeq ($(CPUNAME)$(CPU),SPARCU)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ -R/usr/sfw/lib/64 \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ -R/usr/sfw/lib \
+))
+endif
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ AppleRemote \
+))
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ -framework QuickTime \
+ -framework Cocoa \
+ -framework Carbon \
+ -framework CoreFoundation \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
+ /ENTRY:LibMain@12 \
+))
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+ advapi32 \
+ gdi32 \
+ gdiplus \
+ imm32 \
+ kernel32 \
+ mpr \
+ msimg32 \
+ msvcrt \
+ oldnames \
+ ole32 \
+ shell32 \
+ user32 \
+ uuid \
+ uwinapi \
+ winspool \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
new file mode 100755
index 000000000000..52f4d7a362e9
--- /dev/null
+++ b/vcl/Library_vclplug_gen.mk
@@ -0,0 +1,206 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_gen))
+
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
+ vcl/unx/generic/app/i18n_cb \
+ vcl/unx/generic/app/i18n_ic \
+ vcl/unx/generic/app/i18n_im \
+ vcl/unx/generic/app/i18n_keysym \
+ vcl/unx/generic/app/i18n_status \
+ vcl/unx/generic/app/i18n_wrp \
+ vcl/unx/generic/app/i18n_xkb \
+ vcl/unx/generic/app/keysymnames \
+ vcl/unx/generic/app/randrwrapper \
+ vcl/unx/generic/app/saldata \
+ vcl/unx/generic/app/saldisp \
+ vcl/unx/generic/app/salinst \
+ vcl/unx/generic/app/salsys \
+ vcl/unx/generic/app/saltimer \
+ vcl/unx/generic/app/sm \
+ vcl/unx/generic/app/soicon \
+ vcl/unx/generic/app/wmadaptor \
+ vcl/unx/generic/dtrans/bmp \
+ vcl/unx/generic/dtrans/config \
+ vcl/unx/generic/dtrans/X11_clipboard \
+ vcl/unx/generic/dtrans/X11_dndcontext \
+ vcl/unx/generic/dtrans/X11_droptarget \
+ vcl/unx/generic/dtrans/X11_selection \
+ vcl/unx/generic/dtrans/X11_service \
+ vcl/unx/generic/dtrans/X11_transferable \
+ vcl/unx/generic/gdi/cdeint \
+ vcl/unx/generic/gdi/dtint \
+ vcl/unx/generic/gdi/gcach_xpeer \
+ vcl/unx/generic/gdi/pspgraphics \
+ vcl/unx/generic/gdi/salbmp \
+ vcl/unx/generic/gdi/salcvt \
+ vcl/unx/generic/gdi/salgdi2 \
+ vcl/unx/generic/gdi/salgdi3 \
+ vcl/unx/generic/gdi/salgdi \
+ vcl/unx/generic/gdi/salprnpsp \
+ vcl/unx/generic/gdi/salvd \
+ vcl/unx/generic/gdi/xrender_peer \
+ vcl/unx/generic/printergfx/bitmap_gfx \
+ vcl/unx/generic/printergfx/common_gfx \
+ vcl/unx/generic/printergfx/glyphset \
+ vcl/unx/generic/printergfx/printerjob \
+ vcl/unx/generic/printergfx/psputil \
+ vcl/unx/generic/printergfx/text_gfx \
+ vcl/unx/generic/window/FWS \
+ vcl/unx/generic/window/salframe \
+ vcl/unx/generic/window/salobj \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+ -DVCLPLUG_GEN_IMPLEMENTATION \
+))
+
+
+## handle RandR
+ifneq ($(ENABLE_RANDR),)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DUSE_RANDR \
+))
+ifeq ($(XRANDR_DLOPEN),FALSE)
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+ $$(CXXFLAGS) \
+ $$(XRANDR_CFLAGS) \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ $(XRANDR_LIBS) \
+))
+else
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DXRANDR_DLOPEN \
+))
+endif
+endif
+
+## handle Xinerama
+ifneq ($(USE_XINERAMA),NO)
+ifneq ($(OS),SOLARIS)
+# not Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DUSE_XINERAMA_XORG \
+))
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+else
+# Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DUSE_XINERAMA_XSUN \
+))
+ifeq ($(USE_XINERAMA_VERSION),Xorg)
+# Solaris, Xorg
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+endif
+endif
+endif
+
+## handle Render linking
+ifeq ($(XRENDER_LINK),YES)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+ $$(DEFS) \
+ -DXRENDER_LINK \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+ $$(LDFLAGS) \
+ $(shell pkg-config --libs xrender) \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
new file mode 100755
index 000000000000..feb63e06e794
--- /dev/null
+++ b/vcl/Library_vclplug_gtk.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_gtk))
+
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
+ $$(CXXFLAGS) \
+ $$(GTK_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_gtk,\
+ $$(DEFS) \
+ -DVCLPLUG_GTK_IMPLEMENTATION \
+ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
+))
+
+ifneq ($(ENABLE_DBUS),)
+$(eval $(call gb_Library_set_defs,vclplug_gtk,\
+ $$(DEFS) \
+ -DENABLE_DBUS \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
+ $$(LDFLAGS) \
+ $(shell pkg-config --libs dbus-glib-1)\
+))
+endif
+
+$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
+ $$(LDFLAGS) \
+ $$(GTK_LIBS) \
+ $$(GTHREAD_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+ vclplug_gen \
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
+ vcl/unx/gtk/a11y/atkaction \
+ vcl/unx/gtk/a11y/atkbridge \
+ vcl/unx/gtk/a11y/atkcomponent \
+ vcl/unx/gtk/a11y/atkeditabletext \
+ vcl/unx/gtk/a11y/atkfactory \
+ vcl/unx/gtk/a11y/atkhypertext \
+ vcl/unx/gtk/a11y/atkimage \
+ vcl/unx/gtk/a11y/atklistener \
+ vcl/unx/gtk/a11y/atkregistry \
+ vcl/unx/gtk/a11y/atkselection \
+ vcl/unx/gtk/a11y/atktable \
+ vcl/unx/gtk/a11y/atktextattributes \
+ vcl/unx/gtk/a11y/atktext \
+ vcl/unx/gtk/a11y/atkutil \
+ vcl/unx/gtk/a11y/atkvalue \
+ vcl/unx/gtk/a11y/atkwindow \
+ vcl/unx/gtk/a11y/atkwrapper \
+ vcl/unx/gtk/app/gtkdata \
+ vcl/unx/gtk/app/gtkinst \
+ vcl/unx/gtk/app/gtksys \
+ vcl/unx/gtk/gdi/salnativewidgets-gtk \
+ vcl/unx/gtk/window/gtkframe \
+ vcl/unx/gtk/window/gtkobject \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
new file mode 100755
index 000000000000..a3fc45513707
--- /dev/null
+++ b/vcl/Library_vclplug_kde.mk
@@ -0,0 +1,93 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_kde))
+
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
+ $$(CXXFLAGS) \
+ $$(KDE_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde,\
+ $$(DEFS) \
+ -DVCLPLUG_KDE_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
+ $$(KDE_LIBS)\
+ $$(LDFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+ vclplug_gen \
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+ vcl/unx/kde/kdedata \
+ vcl/unx/kde/salnativewidgets-kde \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
new file mode 100755
index 000000000000..30fc756b4a35
--- /dev/null
+++ b/vcl/Library_vclplug_kde4.mk
@@ -0,0 +1,99 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_kde4))
+
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
+ $$(CXXFLAGS) \
+ $$(KDE4_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde4,\
+ $$(DEFS) \
+ -DVCLPLUG_KDE4_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
+ $$(KDE4_LIBS)\
+ $$(LDFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+ vclplug_gen \
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
+ vcl/unx/kde4/KDEData \
+ vcl/unx/kde4/KDESalDisplay \
+ vcl/unx/kde4/KDESalFrame \
+ vcl/unx/kde4/KDESalGraphics \
+ vcl/unx/kde4/KDESalInstance \
+ vcl/unx/kde4/KDEXLib \
+ vcl/unx/kde4/main \
+ vcl/unx/kde4/VCLKDEApplication \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
new file mode 100755
index 000000000000..3051c0ce863e
--- /dev/null
+++ b/vcl/Library_vclplug_svp.mk
@@ -0,0 +1,98 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_svp))
+
+$(eval $(call gb_Library_set_include,vclplug_svp,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_svp,\
+ $$(DEFS) \
+ -DVCLPLUG_SVP_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+ vcl \
+ tl \
+ utl \
+ sot \
+ ucbhelper \
+ basegfx \
+ basebmp \
+ comphelper \
+ cppuhelper \
+ icuuc \
+ icule \
+ i18nisolang1 \
+ i18npaper \
+ i18nutil \
+ jvmaccess \
+ stl \
+ cppu \
+ sal \
+ vos3 \
+ X11 \
+ Xext \
+ SM \
+ ICE \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
+ vcl/unx/generic/printergfx/bitmap_gfx \
+ vcl/unx/generic/printergfx/common_gfx \
+ vcl/unx/generic/printergfx/glyphset \
+ vcl/unx/generic/printergfx/printerjob \
+ vcl/unx/generic/printergfx/psputil \
+ vcl/unx/generic/printergfx/text_gfx \
+ vcl/unx/headless/svpbmp \
+ vcl/unx/headless/svpdummies \
+ vcl/unx/headless/svpelement \
+ vcl/unx/headless/svpframe \
+ vcl/unx/headless/svpgdi \
+ vcl/unx/headless/svpinst \
+ vcl/unx/headless/svpprn \
+ vcl/unx/headless/svppspgraphics \
+ vcl/unx/headless/svptext \
+ vcl/unx/headless/svpvd \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+ dl \
+ m \
+ pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/salmain/makefile.mk b/vcl/Makefile
index 9c790bf28d75..a79aff831024 100644
--- a/vcl/source/salmain/makefile.mk
+++ b/vcl/Makefile
@@ -25,17 +25,14 @@
#
#*************************************************************************
-PRJ = ..$/..
-PRJNAME = vcl
-TARGET = salmain
-ENABLE_EXCEPTIONS = TRUE
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-.INCLUDE: settings.mk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-OBJFILES = $(OBJ)$/salmain.obj
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-LIB1TARGET=$(LB)$/vclmain.lib
-LIB1ARCHIV=$(LB)$/libvclmain.a
-LIB1FILES=$(LB)$/salmain.lib
-
-.INCLUDE: target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/Module_vcl.mk
index a0ddcbc02226..929f60988bb1 100644
--- a/vcl/aqua/source/app/makefile.mk
+++ b/vcl/Module_vcl.mk
@@ -25,39 +25,50 @@
#
#*************************************************************************
-PRJ=..$/..$/..
-PRJNAME=vcl
-TARGET=salapp
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Module_Module,vcl))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,vcl,\
+ Library_vcl \
+ StaticLibrary_vclmain \
+ Package_inc \
+ AllLangResTarget_vcl \
+))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Library_vclplug_gen \
+ Library_vclplug_svp \
+ Library_desktop_detector \
+))
-# --- Files --------------------------------------------------------
+ifneq ($(ENABLE_GTK),)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Library_vclplug_gtk \
+))
+endif
+ifneq ($(ENABLE_KDE),)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Library_vclplug_kde \
+))
+endif
+ifneq ($(ENABLE_KDE4),)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Library_vclplug_kde4 \
+))
+endif
+endif
-.IF "$(GUIBASE)"!="aqua"
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Package_osx \
+))
+endif
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="aqua"
-
-SLOFILES= $(SLO)$/salinst.obj \
- $(SLO)$/saldata.obj \
- $(SLO)$/vclnsapp.obj \
- $(SLO)$/saltimer.obj \
- $(SLO)$/salnstimer.obj \
- $(SLO)$/salsys.obj
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
+ifeq ($(GUIBASE),WIN)
+$(eval $(call gb_Module_add_targets,vcl,\
+ WinResTarget_vcl \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
new file mode 100644
index 000000000000..f45f2b9c3917
--- /dev/null
+++ b/vcl/Package_inc.mk
@@ -0,0 +1,168 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,vcl_inc,$(SRCDIR)/vcl/inc))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/abstdlg.hxx,vcl/abstdlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/animate.hxx,vcl/animate.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/apptypes.hxx,vcl/apptypes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/canvastools.hxx,vcl/canvastools.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.h,vcl/cmdevt.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.hxx,vcl/cmdevt.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.h,vcl/combobox.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.hxx,vcl/combobox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/configsettings.hxx,vcl/configsettings.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/controllayout.hxx,vcl/controllayout.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ctrl.hxx,vcl/ctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cursor.hxx,vcl/cursor.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtgrf.hxx,vcl/cvtgrf.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtsvm.hxx,vcl/cvtsvm.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/decoview.hxx,vcl/decoview.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dialog.hxx,vcl/dialog.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dllapi.h,vcl/dllapi.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dndhelp.hxx,vcl/dndhelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockingarea.hxx,vcl/dockingarea.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockwin.hxx,vcl/dockwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/edit.hxx,vcl/edit.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/event.hxx,vcl/event.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/evntpost.hxx,vcl/evntpost.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/extoutdevdata.hxx,vcl/extoutdevdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixbrd.hxx,vcl/fixbrd.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.h,vcl/graph.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.hxx,vcl/graph.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphictools.hxx,vcl/graphictools.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/group.hxx,vcl/group.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/hatch.hxx,vcl/hatch.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/helper.hxx,vcl/helper.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/help.hxx,vcl/help.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/i18nhelp.hxx,vcl/i18nhelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/image.hxx,vcl/image.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ImageListProvider.hxx,vcl/ImageListProvider.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imagerepository.hxx,vcl/imagerepository.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imgctrl.hxx,vcl/imgctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/impdel.hxx,vcl/impdel.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/inputctx.hxx,vcl/inputctx.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/introwin.hxx,vcl/introwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/javachild.hxx,vcl/javachild.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycod.hxx,vcl/keycod.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lazydelete.hxx,vcl/lazydelete.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lineinfo.hxx,vcl/lineinfo.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/longcurr.hxx,vcl/longcurr.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.h,vcl/lstbox.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.hxx,vcl/lstbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mapmod.hxx,vcl/mapmod.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menubtn.hxx,vcl/menubtn.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menu.hxx,vcl/menu.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metaact.hxx,vcl/metaact.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metric.hxx,vcl/metric.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonicengine.hxx,vcl/mnemonicengine.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonic.hxx,vcl/mnemonic.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/morebtn.hxx,vcl/morebtn.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/msgbox.hxx,vcl/msgbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/octree.hxx,vcl/octree.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/oldprintadaptor.hxx,vcl/oldprintadaptor.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/outdev.hxx,vcl/outdev.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfextoutdevdata.hxx,vcl/pdfextoutdevdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfwriter.hxx,vcl/pdfwriter.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngread.hxx,vcl/pngread.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngwrite.hxx,vcl/pngwrite.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pointr.hxx,vcl/pointr.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/popupmenuwindow.hxx,vcl/popupmenuwindow.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ppdparser.hxx,vcl/ppdparser.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/printerinfomanager.hxx,vcl/printerinfomanager.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/print.hxx,vcl/print.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prntypes.hxx,vcl/prntypes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ptrstyle.hxx,vcl/ptrstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/quickselectionengine.hxx,vcl/quickselectionengine.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/regband.hxx,vcl/regband.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/region.hxx,vcl/region.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphicrasterizer.hxx,vcl/rendergraphicrasterizer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphic.hxx,vcl/rendergraphic.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salnativewidgets.hxx,vcl/salnativewidgets.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/split.hxx,vcl/split.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/splitwin.hxx,vcl/splitwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/status.hxx,vcl/status.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sv.h,vcl/sv.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgread.hxx,vcl/svgread.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabctrl.hxx,vcl/tabctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabdlg.hxx,vcl/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabpage.hxx,vcl/tabpage.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/taskpanelist.hxx,vcl/taskpanelist.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/threadex.hxx,vcl/threadex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/throbber.hxx,vcl/throbber.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/timer.hxx,vcl/timer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/toolbox.hxx,vcl/toolbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp2.hxx,vcl/unohelp2.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp.hxx,vcl/unohelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unowrap.hxx,vcl/unowrap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclenum.hxx,vcl/vclenum.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclevent.hxx,vcl/vclevent.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
+
diff --git a/vcl/util/target.pmk b/vcl/Package_osx.mk
index 8ec15475bc90..4d5986c36ed2 100644
--- a/vcl/util/target.pmk
+++ b/vcl/Package_osx.mk
@@ -14,26 +14,22 @@
#
# 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
+# 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
+# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-ALLSLO: $(SLOFILES)
-SOSHL: $(SHL1TARGETN)
-
-WHOLEPRJ .SETDIR=$(PRJ)$/prj:
- make debug linkinc prjpch compinc
- @echo "READY"
-
-ONLYDLL .SETDIR=$(PRJ)$/util: $(SLOFILES)
- $(RM) ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll
- dmake debug=t prjpch=t linkinc=t compinc=t ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll
- @echo "READY"
+### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess
+$(eval $(call gb_Package_Package,vcl_zip,))
+$(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip))
+/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png
+ cd $(SRCDIR)/vcl/aqua/source/res ; \
+ mkdir -p $(dir $@) ; \
+ zip $@ MainMenu.nib/*.nib cursors/*.png
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
new file mode 100755
index 000000000000..ccf800b38ce6
--- /dev/null
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
+
+$(eval $(call gb_StaticLibrary_set_include,vclmain,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+ -I$(SRCDIR)/vcl/inc/pch \
+ -I$(SRCDIR)/solenv/inc \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/stl \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
+ vcl/source/salmain/salmain \
+))
+
+# HACK for now
+# We really should fix the clients of this to link against the static library
+# Instead of this evil linking of an object from $(OUTDIR)
+define StaticLibrary_salmain_hack
+$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+
+$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
+ $$(call gb_Deliver_deliver,$$<,$$@)
+
+endef
+
+ifeq ($(OS),WNT)
+$(eval $(call StaticLibrary_salmain_hack,salmain.obj))
+else
+$(eval $(call StaticLibrary_salmain_hack,salmain.o))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
new file mode 100755
index 000000000000..68fe30c0826c
--- /dev/null
+++ b/vcl/WinResTarget_vcl.mk
@@ -0,0 +1,123 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
+
+$(eval $(call gb_WinResTarget_set_include,vcl/src,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_WinResTarget_add_file,vcl/src,\
+ vcl/win/source/src/salsrc \
+))
+$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
+ vcl/win/source/src/dtext.cur \
+ vcl/win/source/src/50.bmp \
+ vcl/win/source/src/copydata.cur \
+ vcl/win/source/src/dpie.cur \
+ vcl/win/source/src/movedata.cur \
+ vcl/win/source/src/rotate.cur \
+ vcl/win/source/src/50.png \
+ vcl/win/source/src/copydlnk.cur \
+ vcl/win/source/src/dpolygon.cur \
+ vcl/win/source/src/movedlnk.cur \
+ vcl/win/source/src/salsrc.rc \
+ vcl/win/source/src/airbrush.cur \
+ vcl/win/source/src/copyf.cur \
+ vcl/win/source/src/drect.cur \
+ vcl/win/source/src/movef.cur \
+ vcl/win/source/src/sd.ico \
+ vcl/win/source/src/ase.cur \
+ vcl/win/source/src/copyf2.cur \
+ vcl/win/source/src/dtext.cur \
+ vcl/win/source/src/movef2.cur \
+ vcl/win/source/src/tblsele.cur \
+ vcl/win/source/src/asn.cur \
+ vcl/win/source/src/copyflnk.cur \
+ vcl/win/source/src/fill.cur \
+ vcl/win/source/src/moveflnk.cur \
+ vcl/win/source/src/tblsels.cur \
+ vcl/win/source/src/asne.cur \
+ vcl/win/source/src/crook.cur \
+ vcl/win/source/src/hand.cur \
+ vcl/win/source/src/movept.cur \
+ vcl/win/source/src/tblselse.cur \
+ vcl/win/source/src/asns.cur \
+ vcl/win/source/src/crop.cur \
+ vcl/win/source/src/help.cur \
+ vcl/win/source/src/neswsize.cur \
+ vcl/win/source/src/tblselsw.cur \
+ vcl/win/source/src/asnswe.cur \
+ vcl/win/source/src/cross.cur \
+ vcl/win/source/src/hshear.cur \
+ vcl/win/source/src/notallow.cur \
+ vcl/win/source/src/tblselw.cur \
+ vcl/win/source/src/asnw.cur \
+ vcl/win/source/src/darc.cur \
+ vcl/win/source/src/hsize.cur \
+ vcl/win/source/src/nullptr.cur \
+ vcl/win/source/src/timemove.cur \
+ vcl/win/source/src/ass.cur \
+ vcl/win/source/src/dbezier.cur \
+ vcl/win/source/src/hsizebar.cur \
+ vcl/win/source/src/nwsesize.cur \
+ vcl/win/source/src/timesize.cur \
+ vcl/win/source/src/asse.cur \
+ vcl/win/source/src/dcapt.cur \
+ vcl/win/source/src/hsplit.cur \
+ vcl/win/source/src/pen.cur \
+ vcl/win/source/src/vshear.cur \
+ vcl/win/source/src/assw.cur \
+ vcl/win/source/src/dcirccut.cur \
+ vcl/win/source/src/linkdata.cur \
+ vcl/win/source/src/pivotcol.cur \
+ vcl/win/source/src/vsize.cur \
+ vcl/win/source/src/asw.cur \
+ vcl/win/source/src/dconnect.cur \
+ vcl/win/source/src/linkf.cur \
+ vcl/win/source/src/pivotdel.cur \
+ vcl/win/source/src/vsizebar.cur \
+ vcl/win/source/src/aswe.cur \
+ vcl/win/source/src/dellipse.cur \
+ vcl/win/source/src/magnify.cur \
+ vcl/win/source/src/pivotfld.cur \
+ vcl/win/source/src/vsplit.cur \
+ vcl/win/source/src/chain.cur \
+ vcl/win/source/src/detectiv.cur \
+ vcl/win/source/src/mirror.cur \
+ vcl/win/source/src/pivotrow.cur \
+ vcl/win/source/src/vtext.cur \
+ vcl/win/source/src/chainnot.cur \
+ vcl/win/source/src/dfree.cur \
+ vcl/win/source/src/move.cur \
+ vcl/win/source/src/pntbrsh.cur \
+ vcl/win/source/src/chart.cur \
+ vcl/win/source/src/dline.cur \
+ vcl/win/source/src/movebw.cur \
+ vcl/win/source/src/refhand.cur \
+))
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 0fd2fa1e25ff..9df4fc986859 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -29,8 +29,8 @@
#ifndef _SV_AQUA11ACTIONWRAPPER_H
#define _SV_AQUA11ACTIONWRAPPER_H
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yActionWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
index fcd49fd67ff4..e49ad251faad 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11yactionwrapper.h"
// Wrapper for XAccessibleAction
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index f7ec6e513fa7..62ab9d7141be 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -29,8 +29,8 @@
#ifndef _SV_AQUA11COMPONENTWRAPPER_H
#define _SV_AQUA11COMPONENTWRAPPER_H
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yComponentWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm
index 5dcdf4bb9f61..41b66d19e578 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -28,10 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "aqua11yfactory.h"
+#include "aqua/salinst.h"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+
#include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
#include "aqua11yrolehelper.h"
#include "aqua11ywrapperbutton.h"
#include "aqua11ywrapperstatictext.h"
@@ -49,6 +50,7 @@
#include "aqua11ywrappertabgroup.h"
#include "aqua11ywrappertoolbar.h"
#include "aqua11ytablewrapper.h"
+
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 8e93bd450bf8..61bc4d44f147 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -29,12 +29,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
-#include "aqua11yfactory.h"
-
#include <salhelper/refobj.hxx>
+#include "aqua/aqua11yfocustracker.hxx"
+#include "aqua/aqua11yfactory.h"
+
+#include "aqua11yfocuslistener.hxx"
+
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 192a1f04e278..bdfc9085ad08 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -31,8 +31,8 @@
#include <salhelper/refobj.hxx>
-#include "keyboardfocuslistener.hxx"
-#include "aquavcltypes.h"
+#include "aqua/keyboardfocuslistener.hxx"
+#include "aqua/aquavcltypes.h"
class AquaA11yFocusListener :
public KeyboardFocusListener,
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index f4b5393c7e8f..187e715c54f7 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
@@ -29,7 +29,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "aqua11yfocustracker.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/window.hxx"
+#include "vcl/toolbox.hxx"
+#include "vcl/menu.hxx"
+
+#include "aqua/aqua11yfocustracker.hxx"
+
#include "documentfocuslistener.hxx"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -38,11 +44,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/toolbox.hxx"
-#include "vcl/menu.hxx"
-
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx
index 3b77f054a0ac..08b56718885a 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx
@@ -26,12 +26,13 @@
*
************************************************************************/
-#include "aqua11ylistener.hxx"
-#include "aqua11yfactory.h"
-#include "aqua11yfocustracker.hxx"
+#include "aqua/salinst.h"
+#include "aqua/aqua11ylistener.hxx"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+#include "aqua/aqua11ywrapper.h"
+
#include "aqua11ytextwrapper.h"
-#include "aqua11ywrapper.h"
-#include "salinst.h"
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -75,7 +76,7 @@ AquaA11yEventListener::~AquaA11yEventListener()
//------------------------------------------------------------------------------
void SAL_CALL
-AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException )
+AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException )
{
[ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
}
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index 38328c6a3d46..69404fa372a1 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11ROLEHELPER_H
#define _SV_AQUA11ROLEHELPER_H
-#include "salinst.h"
+#include "aqua/salinst.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@interface AquaA11yRoleHelper : NSObject
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
index b8ebdb08c3df..cfc052e96beb 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
@@ -28,8 +28,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include "aqua/aqua11yfactory.h"
+
#include "aqua11yrolehelper.h"
-#include "aqua11yfactory.h"
+
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index 0585f01c9360..de78565f4c4a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -29,8 +29,8 @@
#ifndef _SV_AQUA11SELECTIONWRAPPER_H
#define _SV_AQUA11SELECTIONWRAPPER_H
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11ySelectionWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
index 66f19b80a9f9..5b8d604f3b1a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -28,8 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "aqua11yfactory.h"
+#include "aqua/salinst.h"
+#include "aqua/aqua11yfactory.h"
+
#include "aqua11yselectionwrapper.h"
using namespace ::com::sun::star::accessibility;
@@ -67,6 +68,7 @@ using namespace ::com::sun::star::uno;
+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper
{
+ (void)wrapper;
if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] )
{
return YES;
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index 8f3e48364257..0b41d48e10c6 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11TABLEWRAPPER_H
#define _SV_AQUA11TABLEWRAPPER_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
#define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
index 98454ab8d57b..110cb42ffee7 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
@@ -28,8 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include "aqua/aqua11yfactory.h"
+
#include "aqua11ytablewrapper.h"
-#include "aqua11yfactory.h"
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index d7159de9f526..a21f75e7fd5a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -29,8 +29,7 @@
#ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
#define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
-#include <com/sun/star/uno/Sequence.hxx>
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yTextAttributesWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index f0d0e46a517e..2122f56e9565 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -28,8 +28,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include "aqua/salinst.h"
+
#include "aqua11ytextattributeswrapper.h"
-#include "salinst.h"
+
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index ceb9bcbe393d..dd7fa5c0411c 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -29,8 +29,8 @@
#ifndef _SV_AQUA11TEXTWRAPPER_H
#define _SV_AQUA11TEXTWRAPPER_H
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yTextWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 89c164e5e0b9..d956d2beb0b7 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -28,10 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ytextwrapper.h"
#include "aqua11ytextattributeswrapper.h"
#include "aqua11yutil.h"
+
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
@@ -49,8 +51,11 @@ using namespace ::rtl;
return CreateNSString ( [ wrapper accessibleText ] -> getText() );
}
-+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value {
++(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value
+{
// TODO
+ (void)wrapper;
+ (void)value;
}
+(id)numberOfCharactersAttributeForElement:(AquaA11yWrapper *)wrapper {
@@ -103,15 +108,22 @@ using namespace ::rtl;
return [ NSValue valueWithRange: NSMakeRange ( 0, [ wrapper accessibleText ] -> getCharacterCount() ) ];
}
-+(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value {
++(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value
+{
// do nothing
+ (void)wrapper;
+ (void)value;
}
-+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper {
++(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper
+{
+ (void)wrapper;
return [ [ NSArray alloc ] init ]; // unsupported
}
-+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper {
++(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
+{
+ (void)wrapper;
return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported
}
diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/aqua/source/a11y/aqua11yutil.mm
index 4749a3b40822..74de0a19aa41 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/vcl/aqua/source/a11y/aqua11yutil.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "aquavcltypes.h"
+#include "aqua/aquavcltypes.h"
+
#include "aqua11yutil.h"
using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index 1292ef5ab77b..517a3014d565 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -29,9 +29,9 @@
#ifndef _SV_AQUA11VALUEWRAPPER_H
#define _SV_AQUA11VALUEWRAPPER_H
-#include "salinst.h"
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/salinst.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yValueWrapper : NSObject
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index c2724a372f9f..bf8de98c3318 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -28,20 +28,21 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "saldata.hxx"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
+#include "aqua/aqua11ylistener.hxx"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+
+#include "aqua11yfocuslistener.hxx"
#include "aqua11yactionwrapper.h"
#include "aqua11ycomponentwrapper.h"
-#include "aqua11ylistener.hxx"
#include "aqua11yselectionwrapper.h"
#include "aqua11ytablewrapper.h"
#include "aqua11ytextwrapper.h"
#include "aqua11yvaluewrapper.h"
-#include "aqua11yfactory.h"
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
#include "aqua11yrolehelper.h"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -163,7 +164,8 @@ static BOOL isPopupMenuOpen = NO;
if ( ! asGetter ) {
[ methodName appendString: @"set" ];
}
- NSString * firstChar = [ attribute substringWithRange: NSMakeRange ( 2, 1 ) ]; // drop leading "AX" and get first char
+ NSRange aRange = { 2, 1 };
+ NSString * firstChar = [ attribute substringWithRange: aRange ]; // drop leading "AX" and get first char
if ( asGetter ) {
[ methodName appendString: [ firstChar lowercaseString ] ];
} else {
@@ -830,7 +832,10 @@ static BOOL isPopupMenuOpen = NO;
return nil; // TODO: to be completed
}
--(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute {
+-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute
+{
+ (void)value;
+ (void)attribute;
return NO; // TODO
}
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index d232e111865e..e4af22081106 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERBUTTON_H
#define _SV_AQUA11WRAPPERBUTTON_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperButton : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
index 48f1804c58a2..e51ceff14af9 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrapperbutton.h"
#include "aqua11ytextwrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 192e528e930d..9c2580c19f31 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERCHECKBOX_H
#define _SV_AQUA11WRAPPERCHECKBOX_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperCheckBox : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
index 25f012e1163f..6bf2aa2f8340 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrappercheckbox.h"
#include "aqua11yvaluewrapper.h"
#include "aqua11ytextwrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index 5ca5c967234f..bdcff4a981d6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERCOMBOBOX_H
#define _SV_AQUA11WRAPPERCOMBOBOX_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@interface AquaA11yWrapperComboBox : AquaA11yWrapper
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
index 16fa1372fe4e..6f8e9d05d112 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
@@ -28,9 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrappercombobox.h"
#include "aqua11yrolehelper.h"
+
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 0e6deae658d1..e53676d531ed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERGROUP_H
#define _SV_AQUA11WRAPPERGROUP_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperGroup : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
index 42298f9c745b..536cc9bba8eb 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrappergroup.h"
// Wrapper for AXGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index d0b0b17d3769..367795ff8d16 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERLIST_H
#define _SV_AQUA11WRAPPERLIST_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperList : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
index eeb210d70e65..d70679ed6966 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrapperlist.h"
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index ac9e0e7022ff..1494e7dfe0b6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H
#define _SV_AQUA11WRAPPERRADIOBUTTON_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperRadioButton : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
index 930f940c4971..4c1e9047d65e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrapperradiobutton.h"
#include "aqua11ytextwrapper.h"
#include "aqua11yvaluewrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index f73a746046ad..f6c05b955744 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERRADIOGROUP_H
#define _SV_AQUA11WRAPPERRADIOGROUP_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperRadioGroup : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
index f89ac78b044c..52e71620ceed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrapperradiogroup.h"
#include "aqua11ytextwrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index b4956ec466af..9b649ea0698d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERROW_H
#define _SV_AQUA11WRAPPERROW_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperRow : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
index d49e229218bf..0fd65fd01365 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrapperrow.h"
#include "aqua11ytextwrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index b92d9ac4a1cb..3d4cdd848efc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERSCROLLAREA_H
#define _SV_AQUA11WRAPPERSCROLLAREA_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperScrollArea : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
index f375e5ce788d..8a481b64926d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
@@ -28,7 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrapperscrollarea.h"
#include "aqua11ywrapperscrollbar.h"
#include "aqua11yrolehelper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index 8fc87d02b0fe..d589da51b153 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERSCROLLBAR_H
#define _SV_AQUA11WRAPPERSCROLLBAR_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperScrollBar : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
index 826da647055b..42b67b739602 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
@@ -28,8 +28,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
+
#include "aqua11ywrapperscrollbar.h"
+
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index dfe39d88949e..be6e99f8f3c8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERSPLITTER_H
#define _SV_AQUA11WRAPPERSPLITTER_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperSplitter : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
index 4dc645c006c8..37821f25e423 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrappersplitter.h"
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index a87f238b6027..d7115b879e2a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERSTATICTEXT_H
#define _SV_AQUA11WRAPPERSTATICTEXT_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperStaticText : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
index 7192e64b2e7c..d5afe0962904 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrapperstatictext.h"
// Wrapper for AXStaticText role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 9c448c057eff..54743abaa390 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERTABGROUP_H
#define _SV_AQUA11WRAPPERTABGROUP_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperTabGroup : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
index 708ae5440c4f..fb4e66ad9b90 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrappertabgroup.h"
// Wrapper for AXTabGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 3e11797bb383..7a458163e400 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERTEXTAREA_H
#define _SV_AQUA11WRAPPERTEXTAREA_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperTextArea : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
index 9a425eb2b893..a90fe7ae28aa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrappertextarea.h"
// Wrapper for AXTextArea role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index e7163fd8b373..c02195c7d0fa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -29,7 +29,7 @@
#ifndef _SV_AQUA11WRAPPERTOOLBAR_H
#define _SV_AQUA11WRAPPERTOOLBAR_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface AquaA11yWrapperToolbar : AquaA11yWrapper
{
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
index 28990355af55..29ddaf540266 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
+#include "aqua/salinst.h"
#include "aqua11ywrappertoolbar.h"
// Wrapper for AXToolbar role
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 6e3f3bd511ac..340219ec1967 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -33,7 +33,8 @@
#include <cppuhelper/implbase1.hxx>
-#include "aqua11yfocustracker.hxx"
+#include "aqua/aqua11yfocustracker.hxx"
+
#include <set>
// -------------------------
diff --git a/vcl/aqua/source/a11y/makefile.mk b/vcl/aqua/source/a11y/makefile.mk
deleted file mode 100644
index 0a16281e5a69..000000000000
--- a/vcl/aqua/source/a11y/makefile.mk
+++ /dev/null
@@ -1,88 +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=sala11y
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="aqua"
-
-SLOFILES= \
- $(SLO)$/aqua11ywrapper.obj \
- $(SLO)$/aqua11yfactory.obj \
- $(SLO)$/aqua11yfocuslistener.obj \
- $(SLO)$/aqua11yfocustracker.obj \
- $(SLO)$/aqua11ylistener.obj \
- $(SLO)$/aqua11yrolehelper.obj \
- $(SLO)$/aqua11yactionwrapper.obj \
- $(SLO)$/aqua11ycomponentwrapper.obj \
- $(SLO)$/aqua11yselectionwrapper.obj \
- $(SLO)$/aqua11ytablewrapper.obj \
- $(SLO)$/aqua11ytextattributeswrapper.obj \
- $(SLO)$/aqua11ytextwrapper.obj \
- $(SLO)$/aqua11yutil.obj \
- $(SLO)$/aqua11yvaluewrapper.obj \
- $(SLO)$/aqua11ywrapperbutton.obj \
- $(SLO)$/aqua11ywrappercheckbox.obj \
- $(SLO)$/aqua11ywrappercombobox.obj \
- $(SLO)$/aqua11ywrappergroup.obj \
- $(SLO)$/aqua11ywrapperlist.obj \
- $(SLO)$/aqua11ywrapperradiobutton.obj \
- $(SLO)$/aqua11ywrapperradiogroup.obj \
- $(SLO)$/aqua11ywrapperrow.obj \
- $(SLO)$/aqua11ywrapperscrollarea.obj \
- $(SLO)$/aqua11ywrapperscrollbar.obj \
- $(SLO)$/aqua11ywrappersplitter.obj \
- $(SLO)$/aqua11ywrapperstatictext.obj \
- $(SLO)$/aqua11ywrappertabgroup.obj \
- $(SLO)$/aqua11ywrappertextarea.obj \
- $(SLO)$/aqua11ywrappertoolbar.obj \
- $(SLO)$/documentfocuslistener.obj
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 925dfa8c00b0..b6f47ab440af 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -29,9 +29,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "saldata.hxx"
-#include "salnsmenu.h"
-#include "salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salnsmenu.h"
+#include "aqua/salinst.h"
+
#import "apple_remote/RemoteMainController.h"
oslThreadKey SalData::s_aAutoReleaseKey = 0;
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 20ac4e2251d6..df0d95c12f1d 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -33,26 +33,31 @@
#include "tools/fsys.hxx"
#include "tools/getprocessworkingdir.hxx"
+#include <tools/solarmutex.hxx>
+
#include "osl/process.h"
+
#include "rtl/ustrbuf.hxx"
+
#include "vcl/svapp.hxx"
-#include "vcl/print.h"
-#include "vcl/salimestatus.hxx"
#include "vcl/window.hxx"
#include "vcl/timer.hxx"
-#include "vcl/impbmp.hxx"
#include "vcl/solarmutex.hxx"
-#include "saldata.hxx"
-#include "salinst.h"
-#include "salframe.h"
-#include "salobj.h"
-#include "salsys.h"
-#include "salvd.h"
-#include "salbmp.h"
-#include "salprn.h"
-#include "saltimer.h"
-#include "vclnsapp.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+#include "aqua/salframe.h"
+#include "aqua/salobj.h"
+#include "aqua/salsys.h"
+#include "aqua/salvd.h"
+#include "aqua/salbmp.h"
+#include "aqua/salprn.h"
+#include "aqua/saltimer.h"
+#include "aqua/vclnsapp.h"
+
+#include "print.h"
+#include "impbmp.hxx"
+#include "salimestatus.hxx"
#include <comphelper/processfactory.hxx>
@@ -68,7 +73,6 @@
#import "apple_remote/RemoteMainController.h"
#include "apple_remote/RemoteControl.h"
#include "postmac.h"
-#include <tools/solarmutex.hxx>
using namespace std;
using namespace ::com::sun::star;
@@ -891,7 +895,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType )
// -----------------------------------------------------------------------
-SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle )
+SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ )
{
return NULL;
}
@@ -977,7 +981,7 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
// -----------------------------------------------------------------------
-void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
+void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
{
}
@@ -1059,13 +1063,13 @@ void AquaSalInstance::DestroySystem( SalSystem* pSystem )
// -----------------------------------------------------------------------
-void AquaSalInstance::SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) )
+void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) )
{
}
// -----------------------------------------------------------------------
-void AquaSalInstance::SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) )
+void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) )
{
}
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm
index 73e49fd99c61..f44c3d698f73 100755
--- a/vcl/aqua/source/app/salnstimer.mm
+++ b/vcl/aqua/source/app/salnstimer.mm
@@ -28,16 +28,17 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "saltimer.h"
-#include "salnstimer.h"
-#include "salinst.h"
-#include "saldata.hxx"
+#include "aqua/saltimer.h"
+#include "aqua/salnstimer.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
-#include "vcl/svdata.hxx"
+#include "svdata.hxx"
@implementation TimerCallbackCaller
-(void)timerElapsed:(NSTimer*)pTimer
{
+ (void)pTimer;
ImplSVData* pSVData = ImplGetSVData();
if( AquaSalTimer::bDispatchTimer )
{
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index ea588c9de132..6bda7feae1df 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -30,14 +30,17 @@
#include "precompiled_vcl.hxx"
#include "tools/rc.hxx"
-#include "vcl/svids.hrc"
-#include "vcl/button.hxx"
-#include "salsys.h"
-#include "saldata.hxx"
-#include "salinst.h"
#include "rtl/ustrbuf.hxx"
+#include "vcl/button.hxx"
+
+#include "aqua/salsys.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+
+#include "svids.hrc"
+
using ::rtl::OUString;
// =======================================================================
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index e0c406a6a589..a3907ccb9621 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.cxx
@@ -29,11 +29,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "saltimer.h"
-#include "salnstimer.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salinst.h"
+#include "aqua/saltimer.h"
+#include "aqua/salnstimer.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salinst.h"
// =======================================================================
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 455e7c64c6a4..cfb4d5e62454 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -28,18 +28,19 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "vclnsapp.h"
-#include "salinst.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salframeview.h"
+#include "rtl/ustrbuf.hxx"
#include "vcl/window.hxx"
#include "vcl/svapp.hxx"
#include "vcl/cmdevt.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "vcl/impimagetree.hxx"
+#include "aqua/vclnsapp.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salframeview.h"
+
+#include "impimagetree.hxx"
#include "premac.h"
#import "Carbon/Carbon.h"
@@ -52,6 +53,7 @@
{
// do nothing, this is just to start an NSThread and therefore put
// Cocoa into multithread mode
+ (void)param;
}
@end
@@ -284,11 +286,13 @@
-(NSMenu*)applicationDockMenu:(NSApplication *)sender
{
+ (void)sender;
return AquaSalInstance::GetDynamicDockMenu();
}
-(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile
{
+ (void)app;
const rtl::OUString aFile( GetOUString( pFile ) );
if( ! AquaSalInstance::isOnCommandLine( aFile ) )
{
@@ -301,6 +305,7 @@
-(void)application: (NSApplication*) app openFiles: (NSArray*)files
{
+ (void)app;
rtl::OUStringBuffer aFileList( 256 );
NSEnumerator* it = [files objectEnumerator];
@@ -330,6 +335,7 @@
-(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile
{
+ (void)app;
const rtl::OUString aFile( GetOUString( pFile ) );
const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(),
APPEVENT_PRINT_STRING, aFile );
@@ -338,6 +344,9 @@
}
-(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels
{
+ (void)app;
+ (void)printSettings;
+ (void)bShowPrintPanels;
// currently ignores print settings an bShowPrintPanels
rtl::OUStringBuffer aFileList( 256 );
@@ -360,6 +369,7 @@
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app
{
+ (void)app;
NSApplicationTerminateReply aReply = NSTerminateNow;
{
YIELD_GUARD;
@@ -387,6 +397,7 @@
-(void)systemColorsChanged: (NSNotification*) pNotification
{
+ (void)pNotification;
YIELD_GUARD;
const SalData* pSalData = GetSalData();
@@ -396,6 +407,7 @@
-(void)screenParametersChanged: (NSNotification*) pNotification
{
+ (void)pNotification;
YIELD_GUARD;
SalData* pSalData = GetSalData();
@@ -408,11 +420,13 @@
-(void)scrollbarVariantChanged: (NSNotification*) pNotification
{
+ (void)pNotification;
GetSalData()->mpFirstInstance->delayedSettingsChanged( true );
}
-(void)scrollbarSettingsChanged: (NSNotification*) pNotification
{
+ (void)pNotification;
GetSalData()->mpFirstInstance->delayedSettingsChanged( false );
}
@@ -436,7 +450,9 @@
#pragma mark -
#pragma mark NSApplication Delegates
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification {
+- (void)applicationWillBecomeActive:(NSNotification *)pNotification
+{
+ (void)pNotification;
if (GetSalData()->mpMainController->remoteControl) {
// [remoteControl startListening: self];
@@ -452,7 +468,9 @@
}
}
-- (void)applicationWillResignActive:(NSNotification *)aNotification {
+- (void)applicationWillResignActive:(NSNotification *)pNotification
+{
+ (void)pNotification;
if (GetSalData()->mpMainController->remoteControl) {
// [remoteControl stopListening: self];
@@ -470,6 +488,8 @@
- (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
{
+ (void)pApp;
+ (void)bWinVisible;
NSObject* pHdl = GetSalData()->mpDockIconClickHandler;
if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] )
{
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index c660dbc0616d..5c2259ff22c6 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -623,7 +623,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
return dp;
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* /*systemFlavor*/, NSArray* systemData) const
{
return DataProviderPtr_t(new FileListDataProvider(systemData));
}
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index bef1e639caf9..2586c9ff6a79 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -28,10 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/awt/MouseButton.hpp>
-#include <rtl/unload.h>
+
+#include "rtl/unload.h"
+#include "rtl/ustring.hxx"
#include "comphelper/makesequence.hxx"
@@ -39,9 +42,9 @@
#include "DragSourceContext.hxx"
#include "aqua_clipboard.hxx"
#include "DragActionConversion.hxx"
-#include "salframe.h"
-#include <rtl/ustring.h>
+#include "aqua/salframe.h"
+
#include <memory>
@@ -115,44 +118,50 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
-(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint
{
- DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
- mDragSource,
- DNDConstants::ACTION_COPY,
- DNDConstants::ACTION_COPY);
-
- mDragSource->mXDragSrcListener->dragEnter(dsde);
+ (void)anImage;
+ (void)aPoint;
+ DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
+ new DragSourceContext(mDragSource),
+ mDragSource,
+ DNDConstants::ACTION_COPY,
+ DNDConstants::ACTION_COPY);
+
+ mDragSource->mXDragSrcListener->dragEnter(dsde);
}
-(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
{
- // an internal drop can accept the drop but fail with dropComplete( false )
- // this is different than the Cocoa API
- bool bDropSuccess = operation != NSDragOperationNone;
- if( DragSource::g_DropSuccessSet )
- bDropSuccess = DragSource::g_DropSuccess;
-
- DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
- static_cast< XDragSource* >(mDragSource),
- SystemToOfficeDragActions(operation),
- bDropSuccess );
-
- mDragSource->mXDragSrcListener->dragDropEnd(dsde);
- mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>();
+ (void)anImage;
+ (void)aPoint;
+ // an internal drop can accept the drop but fail with dropComplete( false )
+ // this is different than the Cocoa API
+ bool bDropSuccess = operation != NSDragOperationNone;
+ if( DragSource::g_DropSuccessSet )
+ bDropSuccess = DragSource::g_DropSuccess;
+
+ DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
+ new DragSourceContext(mDragSource),
+ static_cast< XDragSource* >(mDragSource),
+ SystemToOfficeDragActions(operation),
+ bDropSuccess );
+
+ mDragSource->mXDragSrcListener->dragDropEnd(dsde);
+ mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>();
}
-(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint
{
- DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
- new DragSourceContext(mDragSource),
- mDragSource,
- DNDConstants::ACTION_COPY,
- DNDConstants::ACTION_COPY);
-
- mDragSource->mXDragSrcListener->dragOver(dsde);
+ (void)draggedImage;
+ (void)screenPoint;
+ DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
+ new DragSourceContext(mDragSource),
+ mDragSource,
+ DNDConstants::ACTION_COPY,
+ DNDConstants::ACTION_COPY);
+
+ mDragSource->mXDragSrcListener->dragOver(dsde);
}
@end
@@ -242,8 +251,8 @@ sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ )
void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
sal_Int8 sourceActions,
- sal_Int32 cursor,
- sal_Int32 image,
+ sal_Int32 /*cursor*/,
+ sal_Int32 /*image*/,
const uno::Reference<XTransferable >& transferable,
const uno::Reference<XDragSourceListener >& listener )
throw( RuntimeException)
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index e0318b405163..f5ac3b975491 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -49,8 +49,8 @@
#include <Carbon/Carbon.h>
#include <postmac.h>
-#include <salframe.h>
-#include <salframeview.h>
+#include <aqua/salframe.h>
+#include <aqua/salframeview.h>
using namespace cppu;
using namespace osl;
@@ -317,20 +317,20 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
}
- void DropTarget::draggingExited(id sender)
- {
+void DropTarget::draggingExited(id /*sender*/)
+{
DropTargetEvent dte(static_cast<OWeakObject*>(this), 0);
fire_dragExit(dte);
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
SetThemeCursor(kThemeArrowCursor);
- }
+}
- BOOL DropTarget::prepareForDragOperation(id sender)
- {
+BOOL DropTarget::prepareForDragOperation(id /*sender*/)
+{
return 1;
- }
+}
BOOL DropTarget::performDragOperation(id sender)
@@ -372,13 +372,13 @@ BOOL DropTarget::performDragOperation(id sender)
}
- void DropTarget::concludeDragOperation(id sender)
- {
+void DropTarget::concludeDragOperation(id /*sender*/)
+{
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
mXCurrentDragClipboard = uno::Reference<XClipboard>();
SetThemeCursor(kThemeArrowCursor);
- }
+}
// called from WeakComponentImplHelperX::dispose
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 82440811a7fb..6e47df691623 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -255,7 +255,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard
}
-void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
+void AquaClipboard::applicationDidBecomeActive(NSNotification*)
{
ClearableMutexGuard aGuard(m_aMutex);
@@ -379,7 +379,7 @@ OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException
}
-sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException )
+sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& /*ServiceName*/ ) throw( RuntimeException )
{
return sal_False;
}
diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
deleted file mode 100644
index aa46713bce1f..000000000000
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-#include "aqua_clipboard.hxx"
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/container/XSet.hpp>
-#include <osl/diagnose.h>
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::registry;
-using namespace cppu;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::datatransfer::clipboard;
-using namespace aqua;
-
-using ::rtl::OUString;
-
-namespace aqua {
-
-Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
-{
- return Reference< XInterface >( static_cast< XClipboard* >( new AquaClipboard(rServiceManager) ) );
-}
-
-} // namespace aqua
-
-extern "C"
-{
-
-void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey )
-{
- void* pRet = 0;
-
- if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, AQUA_CLIPBOARD_IMPL_NAME ) ) )
- {
- Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) );
-
- //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
- Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
- reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
- OUString::createFromAscii( pImplName ),
- createInstance,
- aSNS ) );
- if ( xFactory.is() )
- {
- xFactory->acquire();
- pRet = xFactory.get();
- }
- }
-
- return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/makefile.mk b/vcl/aqua/source/dtrans/makefile.mk
deleted file mode 100644
index 369799c9a260..000000000000
--- a/vcl/aqua/source/dtrans/makefile.mk
+++ /dev/null
@@ -1,68 +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=dtransaqua
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-.IF "$(OS)"!="MACOSX"
-dummy:
- @echo "Nothing to build for this platform"
-.ELSE # "$(OS)"!="MACOSX"
-.IF "$(GUIBASE)"!="aqua"
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-.ELSE
-
-CFLAGSCXX+=-fconstant-cfstrings -x objective-c++ -fobjc-exceptions
-
-SLOFILES= \
- $(SLO)$/aqua_clipboard.obj \
- $(SLO)$/DataFlavorMapping.obj \
- $(SLO)$/OSXTransferable.obj \
- $(SLO)$/HtmlFmtFlt.obj \
- $(SLO)$/PictToBmpFlt.obj \
- $(SLO)$/DropTarget.obj \
- $(SLO)$/DragSource.obj \
- $(SLO)$/service_entry.obj \
- $(SLO)$/DragSourceContext.obj \
- $(SLO)$/DragActionConversion.obj
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-.ENDIF # "$(OS)"!="MACOSX"
-
diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 661d87576fa8..4c4aa893ae0b 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.cxx
@@ -29,13 +29,16 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "saldata.hxx"
-#include "salinst.h"
+#include "osl/diagnose.h"
+
+#include "vcl/svapp.hxx"
+
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+
#include "DragSource.hxx"
#include "DropTarget.hxx"
#include "aqua_clipboard.hxx"
-#include "osl/diagnose.h"
-#include "vcl/svapp.hxx"
using namespace ::osl;
using namespace ::rtl;
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
deleted file mode 100644
index 1803f786c8a9..000000000000
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
-#include "aqua_clipboard.hxx"
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-
-#include <cppuhelper/implbase2.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <osl/diagnose.h>
-
-#include <stdio.h>
-
-using namespace ::rtl;
-using namespace ::std;
-using namespace ::cppu;
-using namespace ::com::sun::star::datatransfer;
-using namespace ::com::sun::star::datatransfer::clipboard;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-
-Reference< XTransferable > rXTransfRead;
-
-class TestTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
-{
-public:
- TestTransferable();
- virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
- virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors() throw(RuntimeException);
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
- virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
-
-private:
- Sequence< DataFlavor > m_seqDFlv;
- OUString m_Data;
-};
-
-TestTransferable::TestTransferable() :
- m_seqDFlv( 1 ),
- m_Data( RTL_CONSTASCII_USTRINGPARAM( "This is a test string" ) )
-{
- DataFlavor df;
-
- df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
- df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
-
- m_seqDFlv[0] = df;
-}
-
-Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor )
- throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
- Any anyData;
-
- if ( aFlavor.MimeType == m_seqDFlv[0].MimeType )
- {
- OString aStr( m_Data.getStr(), m_Data.getLength(), 1252 );
- Sequence< sal_Int8 > sOfChars( aStr.getLength() );
- sal_Int32 lenStr = aStr.getLength();
-
- for ( sal_Int32 i = 0; i < lenStr; ++i )
- sOfChars[i] = aStr[i];
-
- anyData = makeAny( sOfChars );
- }
-
- return anyData;
-}
-
-Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors()
- throw(RuntimeException)
-{
- return m_seqDFlv;
-}
-
-sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
- throw(RuntimeException)
-{
- sal_Int32 nLength = m_seqDFlv.getLength();
- sal_Bool bRet = sal_False;
-
- for ( sal_Int32 i = 0; i < nLength; ++i )
- {
- if ( m_seqDFlv[i].MimeType == aFlavor.MimeType )
- {
- bRet = sal_True;
- break;
- }
- }
-
- return bRet;
-}
-
-void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
- throw(RuntimeException)
-{
-}
-
-int SAL_CALL main( int argc, char** argv )
-{
- if(argc != 2)
- {
- fprintf( stderr, "usage: %s <my rdb file>\n", argv[0] );
- return 1;
- }
-
- //-------------------------------------------------
- // get the global service-manager
- //-------------------------------------------------
- OUString rdbName = OUString::createFromAscii( argv[1] );
- Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
-
- // Print a message if an error occurred.
- if ( !g_xFactory.is() )
- {
- OSL_FAIL("Can't create RegistryServiceFactory");
- return(-1);
- }
-
- //-------------------------------------------------
- // try to get an Interface to a XFilePicker Service
- //-------------------------------------------------
-
- Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new TestTransferable ) );
-
- Reference< XClipboard > xClipboard( g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ) ), UNO_QUERY );
- if ( !xClipboard.is() )
- {
- OSL_FAIL( "Error creating FolderPicker Service" );
- return(-1);
- }
-
- Reference< XTypeProvider > rXTypProv( xClipboard, UNO_QUERY );
-
- if ( rXTypProv.is() )
- {
- Sequence< Type > seqType = rXTypProv->getTypes();
- sal_Int32 nLen = seqType.getLength();
- for ( sal_Int32 i = 0; i < nLen; i++ )
- {
- Type nxtType = seqType[i];
- }
-
- Sequence< sal_Int8 > seqInt8 = rXTypProv->getImplementationId();
- }
-
- xClipboard->setContents( rXTransf, Reference< XClipboardOwner >( rXTransf, UNO_QUERY ) );
-
- rXTransfRead = xClipboard->getContents();
-
- // destroy the transferable explicitly
- rXTransfRead = Reference< XTransferable>();
-
- // destroy the clipboard
- xClipboard = Reference< XClipboard >();
-
- //--------------------------------------------------
- // shutdown the service manager
- //--------------------------------------------------
-
- // Cast factory to XComponent
- Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
-
- if ( !xComponent.is() )
- OSL_FAIL("Error shuting down");
-
- // Dispose and clear factory
- xComponent->dispose();
- g_xFactory.clear();
- g_xFactory = Reference< XMultiServiceFactory >();
-
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index e62a950129e4..2bb67dcc1940 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -28,18 +28,19 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "aquaprintview.h"
-#include "salinst.h"
+#include "tools/resary.hxx"
+
#include "vcl/print.hxx"
#include "vcl/image.hxx"
#include "vcl/virdev.hxx"
-#include "vcl/svdata.hxx"
#include "vcl/svapp.hxx"
#include "vcl/unohelp.hxx"
-#include "vcl/svids.hrc"
+#include "aqua/aquaprintview.h"
+#include "aqua/salinst.h"
-#include "tools/resary.hxx"
+#include "svdata.hxx"
+#include "svids.hrc"
#include "com/sun/star/i18n/XBreakIterator.hpp"
#include "com/sun/star/i18n/WordType.hpp"
@@ -918,7 +919,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach
[pProto release];
}
-static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/,
const rtl::OUString& rText,
const rtl::OUString& rProperty, const Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue,
std::vector<ColumnItem >& rLeftColumn,
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index 11b4b9088591..692435fc00f0 100755
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -28,10 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "aquaprintview.h"
-#include "salprn.h"
#include "vcl/print.hxx"
+#include "aqua/aquaprintview.h"
+#include "aqua/salprn.h"
+
@implementation AquaPrintView
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
{
@@ -64,6 +65,7 @@
-(NSPoint)locationOfPrintRect: (NSRect)aRect
{
+ (void)aRect;
NSPoint aPoint = { 0, 0 };
return aPoint;
}
diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk
deleted file mode 100644
index 2aea58e49250..000000000000
--- a/vcl/aqua/source/gdi/makefile.mk
+++ /dev/null
@@ -1,74 +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=salgdi
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="aqua"
-
-SLOFILES= $(SLO)$/salmathutils.obj \
- $(SLO)$/salcolorutils.obj \
- $(SLO)$/salgdiutils.obj \
- $(SLO)$/salnativewidgets.obj \
- $(SLO)$/salatsuifontutils.obj \
- $(SLO)$/salatslayout.obj \
- $(SLO)$/salgdi.obj \
- $(SLO)$/salvd.obj \
- $(SLO)$/salprn.obj \
- $(SLO)$/aquaprintview.obj \
- $(SLO)$/aquaprintaccessoryview.obj \
- $(SLO)$/salbmp.obj
-
-.IF "$(ENABLE_CAIRO)" == "TRUE"
-CDEFS+= -DCAIRO
-.ENDIF
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 3a88422a2160..94022b763a03 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -26,13 +26,15 @@
*
************************************************************************/
-#include "vcl/salgdi.hxx"
-#include "saldata.hxx"
-#include "salgdi.h"
-#include "vcl/sallayout.hxx"
-#include "salatsuifontutils.hxx"
#include "tools/debug.hxx"
+#include "aqua/saldata.hxx"
+#include "aqua/salgdi.h"
+#include "aqua/salatsuifontutils.hxx"
+
+#include "sallayout.hxx"
+#include "salgdi.hxx"
+
#include <math.h>
// =======================================================================
@@ -1093,7 +1095,7 @@ void ATSLayout::InvalidateMeasurements()
// glyph fallback is supported directly by Aqua
// so methods used only by MultiSalLayout can be dummy implementated
-bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& rPPV ) const { return false; }
+bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; }
void ATSLayout::InitFont() {}
void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void ATSLayout::DropGlyph( int /*nStart*/ ) {}
@@ -1145,7 +1147,7 @@ const ImplFontData* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) cons
// =======================================================================
-SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
+SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel*/ )
{
ATSLayout* pATSLayout = new ATSLayout( maATSUStyle, mfFontScale );
return pATSLayout;
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index c11ca9764400..a8ded318e1e0 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -33,10 +33,11 @@
#include <vector>
#include <set>
-#include "salgdi.h"
-#include "saldata.hxx"
#include "vcl/svapp.hxx"
-#include "salatsuifontutils.hxx"
+
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salatsuifontutils.hxx"
// we have to get the font attributes from the name table
// since neither head's macStyle nor OS/2's panose are easily available
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 7fc5ff74ed2e..bfb15f0a8076 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -29,19 +29,22 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "tools/color.hxx"
-#include "salbmp.h"
-#include "vcl/bitmap.hxx" // for BitmapSystemData
-#include "vcl/salbtype.hxx"
-#include "vcl/bmpfast.hxx"
+#include <boost/bind.hpp>
#include "basebmp/scanlineformats.hxx"
#include "basebmp/color.hxx"
+
#include "basegfx/vector/b2ivector.hxx"
-#include <boost/bind.hpp>
+#include "tools/color.hxx"
+
+#include "vcl/bitmap.hxx" // for BitmapSystemData
+#include "vcl/salbtype.hxx"
+
+#include "aqua/salbmp.h"
+#include "aqua/salinst.h"
-#include "salinst.h"
+#include "bmpfast.hxx"
// =======================================================================
@@ -663,7 +666,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
return aEmptyPalette;
}
-BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly )
+BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
{
if( !maUserBuffer.get() )
// || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) )
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index 664011b2684d..682537771178 100644
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.cxx
@@ -29,9 +29,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salcolorutils.hxx"
#include "vcl/salbtype.hxx"
+#include "aqua/salcolorutils.hxx"
+
// =======================================================================
SalColor GetSalColor( const float* pQuartzColor )
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index c64601ba48a3..9e658b24021e 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -29,21 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salconst.h"
-#include "salgdi.h"
-#include "salbmp.h"
-#include "salframe.h"
-#include "salcolorutils.hxx"
-#include "sft.hxx"
-#include "salatsuifontutils.hxx"
-
-#include "vcl/impfont.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/sysdata.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/region.h"
-
#include "osl/file.hxx"
#include "osl/process.h"
@@ -56,7 +41,24 @@
#include "basegfx/polygon/b2dpolygon.hxx"
#include "basegfx/polygon/b2dpolygontools.hxx"
#include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
+
+#include "vcl/sysdata.hxx"
+#include "vcl/svapp.hxx"
+
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salbmp.h"
+#include "aqua/salframe.h"
+#include "aqua/salcolorutils.hxx"
+#include "aqua/salatsuifontutils.hxx"
+
+#include "fontsubset.hxx"
+#include "impfont.hxx"
+#include "region.h"
+#include "sallayout.hxx"
+#include "sft.hxx"
+
using namespace vcl;
@@ -392,7 +394,7 @@ void AquaSalGraphics::updateResolution()
initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil );
}
-void AquaSalGraphics::initResolution( NSWindow* pWin )
+void AquaSalGraphics::initResolution( NSWindow* )
{
// #i100617# read DPI only once; there is some kind of weird caching going on
// if the main screen changes
@@ -1093,22 +1095,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints,
- const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*,
+ const SalPoint* const*, const sal_uInt8* const* )
{
return sal_False;
}
@@ -1194,7 +1196,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap
// -----------------------------------------------------------------------
-void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags )
+void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ )
{
ApplyXorContext();
@@ -1259,7 +1261,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor )
+void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor )
{
OSL_FAIL("not implemented for color masking!");
drawBitmap( pPosAry, rSalBitmap );
@@ -1361,7 +1363,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
// -----------------------------------------------------------------------
-static void DrawPattern50( void* info, CGContextRef rContext )
+static void DrawPattern50( void*, CGContextRef rContext )
{
static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } };
CGContextAddRects( rContext, aRects, 2 );
@@ -1628,7 +1630,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL
// -----------------------------------------------------------------------
-sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs )
+sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
{
return 0;
}
@@ -1725,8 +1727,8 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
// -----------------------------------------------------------------------
-bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
- const String& rFontFileURL, const String& rFontName )
+bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
+ const String& rFontFileURL, const String& /*rFontName*/ )
{
::rtl::OUString aUSytemPath;
OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
@@ -1884,7 +1886,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
// -----------------------------------------------------------------------
-sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel )
+sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int /*nFallbackLevel*/ )
{
if( !pReqFont )
{
@@ -2419,28 +2421,29 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
// -----------------------------------------------------------------------
const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
- const ImplFontData* pFontData, const Ucs2OStrMap** ppNonEncoded )
+ const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ )
{
return NULL;
}
// -----------------------------------------------------------------------
-const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData,
- const sal_Ucs* pUnicodes,
- sal_Int32* pWidths,
- FontSubsetInfo& rInfo,
- long* pDataLen )
+const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*,
+ const sal_Ucs* /*pUnicodes*/,
+ sal_Int32* /*pWidths*/,
+ FontSubsetInfo&,
+ long* /*pDataLen*/ )
{
return NULL;
}
// -----------------------------------------------------------------------
-void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen )
+void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ )
{
// TODO: implementing this only makes sense when the implementation of
// AquaSalGraphics::GetEmbedFontData() returns non-NULL
+ (void)pData;
DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n");
}
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 22316a50da8d..5480b630f373 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -29,20 +29,22 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salgdi.h"
-#include "salframe.h"
+#include <boost/bind.hpp>
#include "basebmp/scanlineformats.hxx"
#include "basebmp/color.hxx"
+
#include "basegfx/range/b2drectangle.hxx"
#include "basegfx/range/b2irange.hxx"
#include "basegfx/vector/b2ivector.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
#include "basegfx/polygon/b2dpolygontools.hxx"
-#include <boost/bind.hpp>
#include "vcl/svapp.hxx"
-#include "saldata.hxx"
+
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/saldata.hxx"
// ----------------------------------------------------------------------
@@ -270,7 +272,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtA
// -----------------------------------------------------------------------
-void AquaSalGraphics::UpdateWindow( NSRect& rRect )
+void AquaSalGraphics::UpdateWindow( NSRect& )
{
if( !mpFrame )
return;
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 26516902c5c1..7c02a276e278 100644
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salmathutils.hxx"
+#include "aqua/salmathutils.hxx"
#include <stdlib.h>
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 1ad5f5d3919c..81060fd38633 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -26,17 +26,17 @@
*
************************************************************************/
-#include "salconst.h"
-#include "salgdi.h"
-#include "salnativewidgets.h"
-#include "saldata.hxx"
-#include "salframe.h"
-
#include "vcl/salnativewidgets.hxx"
#include "vcl/decoview.hxx"
#include "vcl/svapp.hxx"
#include "vcl/timer.hxx"
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salnativewidgets.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+
#include "premac.h"
#include <Carbon/Carbon.h>
#include "postmac.h"
@@ -472,7 +472,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- const rtl::OUString& aCaption )
+ const rtl::OUString& )
{
sal_Bool bOK = sal_False;
@@ -1225,9 +1225,9 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
* aValue: An optional value (tristate/numerical/string)
* aCaption: A caption or title string (like button text etc)
*/
-sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption )
+sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/,
+ ControlState /*nState*/, const ImplControlValue& /*aValue*/,
+ const rtl::OUString& )
{
return( sal_False );
}
@@ -1246,8 +1246,8 @@ sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart
* aValue: An optional value (tristate/numerical/string)
* aCaption: A caption or title string (like button text etc)
*/
-sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const rtl::OUString& aCaption,
+sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
+ const ImplControlValue& aValue, const rtl::OUString&,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
{
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 18377308c91d..5183cb9d9a4c 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -29,18 +29,20 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "salprn.h"
-#include "aquaprintview.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "vcl/jobset.h"
-#include "vcl/salptype.hxx"
+#include <boost/bind.hpp>
+
#include "vcl/print.hxx"
#include "vcl/unohelp.hxx"
#include <sal/macros.h>
-#include <boost/bind.hpp>
+#include "aqua/salinst.h"
+#include "aqua/salprn.h"
+#include "aqua/aquaprintview.h"
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+
+#include "jobset.h"
+#include "salptype.hxx"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
@@ -174,7 +176,7 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* )
// -----------------------------------------------------------------------
-sal_Bool AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData )
+sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
{
return sal_False;
}
@@ -358,14 +360,14 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu
// -----------------------------------------------------------------------
-sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData )
+sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
{
return 0;
}
// -----------------------------------------------------------------------
-XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin )
+XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
{
return XubString();
}
@@ -434,7 +436,7 @@ static bool getUseNativeDialog()
return bNative;
}
-sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType )
+sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType )
{
switch( i_nType )
{
@@ -518,7 +520,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName,
const String& i_rJobName,
- const String& i_rAppName,
+ const String& /*i_rAppName*/,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController
)
@@ -769,13 +771,13 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName,
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::StartJob( const XubString* i_pFileName,
- const XubString& i_rJobName,
- const XubString& i_rAppName,
- sal_uLong i_nCopies,
- bool i_bCollate,
- bool i_bDirect,
- ImplJobSetup* i_pSetupData )
+sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/,
+ const XubString& /*i_rJobName*/,
+ const XubString& /*i_rAppName*/,
+ sal_uLong /*i_nCopies*/,
+ bool /*i_bCollate*/,
+ bool /*i_bDirect*/,
+ ImplJobSetup* )
{
OSL_FAIL( "should never be called" );
return sal_False;
@@ -816,7 +818,7 @@ sal_uLong AquaSalPrinter::GetErrorCode()
return mpInfoPrinter->GetErrorCode();
}
-void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData )
+void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
{
m_aPaperFormats.clear();
m_bPapersInit = true;
@@ -881,7 +883,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight,
return pMatch;
}
-int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* i_pSetupData )
+int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
{
return 900;
}
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 2aa8357b28f6..af5fa82958f9 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -29,15 +29,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salvd.h"
-#include "salinst.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include <vcl/svapp.hxx>
-
+#include "vcl/svapp.hxx"
#include "vcl/sysdata.hxx"
+#include "aqua/salvd.h"
+#include "aqua/salinst.h"
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+
// -----------------------------------------------------------------------
SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
@@ -150,7 +150,7 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics()
// -----------------------------------------------------------------------
-void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics *pGraphics )
+void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* )
{
mbGraphicsUsed = false;
}
diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/aqua/source/res/makefile.mk
deleted file mode 100644
index 8cc46caf443b..000000000000
--- a/vcl/aqua/source/res/makefile.mk
+++ /dev/null
@@ -1,53 +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=..$/..$/..
-TARGET=aquares
-
-# --- Settings -------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files ----------------------------------------------------
-
-.IF "$(OS)"!="MACOSX"
-
-dummy:
- @echo "Nothing to build for OS $(OS)"
-
-.ELSE # "$(OS)"!="MACOSX"
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxres
-ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF # "$(OS)"!="MACOSX"
-
diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk
deleted file mode 100644
index 7afbce885e4a..000000000000
--- a/vcl/aqua/source/window/makefile.mk
+++ /dev/null
@@ -1,63 +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=salwin
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="aqua"
-
-SLOFILES= \
- $(SLO)/salframe.obj \
- $(SLO)/salframeview.obj \
- $(SLO)/salmenu.obj \
- $(SLO)/salnsmenu.obj \
- $(SLO)/salobj.obj
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index afe6ee6d0130..eda3f5af3051 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -31,28 +31,31 @@
#include <string>
-#include "saldata.hxx"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salmenu.h"
-#include "saltimer.h"
-#include "salinst.h"
-#include "salframeview.h"
-#include "aqua11yfactory.h"
-#include "vcl/salwtype.hxx"
+#include "rtl/ustrbuf.hxx"
+
+#include "osl/file.h"
+
+#include "vcl/svapp.hxx"
#include "vcl/window.hxx"
#include "vcl/timer.hxx"
+#include "aqua/saldata.hxx"
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/salmenu.h"
+#include "aqua/saltimer.h"
+#include "aqua/salinst.h"
+#include "aqua/salframeview.h"
+#include "aqua/aqua11yfactory.h"
+
+#include "salwtype.hxx"
+
#include "premac.h"
// needed for theming
// FIXME: move theming code to salnativewidgets.cxx
#include <Carbon/Carbon.h>
#include "postmac.h"
-#include "boost/assert.hpp"
-#include "vcl/svapp.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/file.h"
using namespace std;
@@ -286,6 +289,7 @@ SalGraphics* AquaSalFrame::GetGraphics()
void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
{
+ (void)pGraphics;
DBG_ASSERT( pGraphics == mpGraphics, "graphics released on wrong frame" );
mbGraphics = FALSE;
}
@@ -479,7 +483,7 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
// -----------------------------------------------------------------------
-void AquaSalFrame::Enable( sal_Bool bEnable )
+void AquaSalFrame::Enable( sal_Bool )
{
}
@@ -862,7 +866,7 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
// -----------------------------------------------------------------------
-void AquaSalFrame::SetAlwaysOnTop( sal_Bool bOnTop )
+void AquaSalFrame::SetAlwaysOnTop( sal_Bool )
{
}
@@ -1034,7 +1038,7 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
// -----------------------------------------------------------------------
-void AquaSalFrame::EndExtTextInput( sal_uInt16 nFlags )
+void AquaSalFrame::EndExtTextInput( sal_uInt16 )
{
}
@@ -1556,7 +1560,7 @@ void AquaSalFrame::SimulateKeyPress( sal_uInt16 /*nKeyCode*/ )
{
}
-bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent )
+bool AquaSalFrame::SetPluginParent( SystemParentData* )
{
// plugin parent may be killed unexpectedly by
// plugging process;
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 57d605bed1ce..ade5594ec667 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -28,17 +28,18 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salframeview.h"
-#include "aqua11yfactory.h"
#include <sal/alloca.h>
#include <sal/macros.h>
-#include "vcl/window.hxx"
+#include "vcl/window.hxx"
#include "vcl/svapp.hxx"
+#include "aqua/salinst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/salframeview.h"
+#include "aqua/aqua11yfactory.h"
+
#define WHEEL_EVENT_FACTOR 1.5
static sal_uInt16 ImplGetModifierMask( unsigned int nMask )
@@ -207,6 +208,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidBecomeKey: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -237,6 +239,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidResignKey: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -248,6 +251,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidChangeScreen: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -256,6 +260,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidMove: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -267,6 +272,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidResize: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -279,6 +285,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidMiniaturize: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -291,6 +298,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)windowDidDeminiaturize: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -303,6 +311,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(BOOL)windowShouldClose: (NSNotification*)pNotification
{
+ (void)pNotification;
YIELD_GUARD;
BOOL bRet = YES;
@@ -322,6 +331,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)dockMenuItemTriggered: (id)sender
{
+ (void)sender;
YIELD_GUARD;
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -370,6 +380,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(void)unregisterDraggingDestinationHandler:(id)theHandler
{
+ (void)theHandler;
mDraggingDestinationHandler = nil;
}
@@ -421,6 +432,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(BOOL)acceptsFirstMouse: (NSEvent*)pEvent
{
+ (void)pEvent;
return YES;
}
@@ -731,6 +743,7 @@ private:
{
//Rotation : -(float)rotation;
// TODO: create new CommandType so rotation is available to the applications
+ (void)pEvent;
}
- (void)swipeWithEvent: (NSEvent*)pEvent
@@ -1026,294 +1039,352 @@ private:
-(void)insertTab: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_TAB character: '\t' modifiers: 0];
}
-(void)insertBacktab: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: (KEY_TAB | KEY_SHIFT) character: '\t' modifiers: 0];
}
-(void)moveLeft: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: 0];
}
-(void)moveLeftAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: NSShiftKeyMask];
}
-(void)moveBackwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0];
}
-(void)moveRight: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: 0];
}
-(void)moveRightAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: NSShiftKeyMask];
}
-(void)moveForwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordLeft: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordBackward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordBackwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordLeftAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)moveWordRight: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordForward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordForwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveWordRightAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)moveToEndOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToRightEndOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToEndOfLineAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToRightEndOfLineAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToBeginningOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToLeftEndOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToBeginningOfLineAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToLeftEndOfLineAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)moveToEndOfParagraph: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToEndOfParagraphAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphForward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphForwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToBeginningOfParagraph: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphBackward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveParagraphBackwardAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)moveToEndOfDocument: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)scrollToEndOfDocument: (id)aSender
{
+ (void)aSender;
// this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToEndOfDocumentAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToBeginningOfDocument: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)scrollToBeginningOfDocument: (id)aSender
{
+ (void)aSender;
// this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0];
}
-(void)moveUp: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_UP character: 0 modifiers: 0];
}
-(void)moveDown: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_DOWN character: 0 modifiers: 0];
}
-(void)insertNewline: (id)aSender
{
+ (void)aSender;
// #i91267# make enter and shift-enter work by evaluating the modifiers
[self sendKeyInputAndReleaseToFrame: KEY_RETURN character: '\n' modifiers: mpFrame->mnLastModifierFlags];
}
-(void)deleteBackward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0];
}
-(void)deleteForward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_DELETE character: 0x7f modifiers: 0];
}
-(void)deleteBackwardByDecomposingPreviousCharacter: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0];
}
-(void)deleteWordBackward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0];
}
-(void)deleteWordForward: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0];
}
-(void)deleteToBeginningOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0];
}
-(void)deleteToEndOfLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0];
}
-(void)deleteToBeginningOfParagraph: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)deleteToEndOfParagraph: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0];
}
-(void)insertLineBreak: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0];
}
-(void)insertParagraphSeparator: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0];
}
-(void)selectWord: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0 modifiers: 0];
}
-(void)selectLine: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0 modifiers: 0];
}
-(void)selectParagraph: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0];
}
-(void)selectAll: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0 modifiers: 0];
}
-(void)cancelOperation: (id)aSender
{
+ (void)aSender;
[self sendKeyInputAndReleaseToFrame: KEY_ESCAPE character: 0x1b modifiers: 0];
}
-(void)noop: (id)aSender
{
+ (void)aSender;
if( ! mbKeyHandled )
{
if( ! [self sendSingleCharacter:mpLastEvent] )
@@ -1513,12 +1584,14 @@ private:
- (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange
{
+ (void)theRange;
// FIXME
return nil;
}
- (unsigned int)characterIndexForPoint:(NSPoint)thePoint
{
+ (void)thePoint;
// FIXME
return 0;
}
@@ -1562,6 +1635,7 @@ private:
- (NSRect)firstRectForCharacterRange:(NSRange)theRange
{
+ (void)theRange;
SalExtTextInputPosEvent aPosEvent;
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent );
@@ -1607,7 +1681,8 @@ private:
-(void)unregisterMouseEventListener: (id)theListener
{
- mpMouseEventListener = nil;
+ (void)theListener;
+ mpMouseEventListener = nil;
}
-(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
@@ -1647,7 +1722,8 @@ private:
-(void)unregisterDraggingDestinationHandler:(id)theHandler
{
- mDraggingDestinationHandler = nil;
+ (void)theHandler;
+ mDraggingDestinationHandler = nil;
}
@end
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 0b4f41651aa0..ef76f4cf6e61 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -26,21 +26,23 @@
*
************************************************************************/
-#include "saldata.hxx"
-#include "salinst.h"
-#include "salmenu.h"
-#include "salnsmenu.h"
-#include "salframe.h"
-#include "salbmp.h"
-#include "vcl/svids.hrc"
+#include "rtl/ustrbuf.hxx"
+
#include "vcl/cmdevt.hxx"
#include "vcl/floatwin.hxx"
-#include "vcl/window.h"
#include "vcl/window.hxx"
#include "vcl/svapp.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "aqua11ywrapper.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+#include "aqua/salmenu.h"
+#include "aqua/salnsmenu.h"
+#include "aqua/salframe.h"
+#include "aqua/salbmp.h"
+#include "aqua/aqua11ywrapper.h"
+
+#include "svids.hrc"
+#include "window.h"
const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
@@ -80,12 +82,14 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
-(void)showPreferences: (id) sender
{
+ (void)sender;
YIELD_GUARD;
[self showDialog: SHOWDIALOG_ID_PREFERENCES];
}
-(void)showAbout: (id) sender
{
+ (void)sender;
YIELD_GUARD;
[self showDialog: SHOWDIALOG_ID_ABOUT];
@@ -592,7 +596,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos )
[mpMenu removeItemAtIndex: getItemIndexByPos(nPos)];
}
-void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos )
+void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned /*nPos*/ )
{
AquaSalMenuItem *pAquaSalMenuItem = static_cast<AquaSalMenuItem*>(pSalMenuItem);
AquaSalMenu *subAquaSalMenu = static_cast<AquaSalMenu*>(pSubMenu);
@@ -650,7 +654,7 @@ void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable )
}
}
-void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& rImage )
+void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Image& rImage )
{
AquaSalMenuItem* pSalMenuItem = static_cast<AquaSalMenuItem*>( pSMI );
if( ! pSalMenuItem || ! pSalMenuItem->mpMenuItem )
@@ -663,7 +667,7 @@ void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& r
[pImage release];
}
-void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, const XubString& i_rText )
+void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText )
{
if (!i_pSalMenuItem)
return;
@@ -700,7 +704,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con
}
}
-void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName )
+void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ )
{
sal_uInt16 nModifier;
sal_Unicode nCommandKey = 0;
@@ -783,7 +787,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons
[pString release];
}
-void AquaSalMenu::GetSystemMenuData( SystemMenuData* pData )
+void AquaSalMenu::GetSystemMenuData( SystemMenuData* )
{
}
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index 5c32d880e81f..b86caa49d870 100755
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -28,11 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "salinst.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salmenu.h"
-#include "salnsmenu.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salmenu.h"
+#include "aqua/salnsmenu.h"
#include "vcl/window.hxx"
@@ -45,6 +45,7 @@
-(void)menuNeedsUpdate: (NSMenu*)pMenu
{
+ (void)pMenu;
YIELD_GUARD;
if( mpMenu )
@@ -84,6 +85,7 @@
}
-(void)menuItemTriggered: (id)aSender
{
+ (void)aSender;
YIELD_GUARD;
const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL;
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 5bc239e26f29..a070a8f0be12 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -31,9 +31,9 @@
#include <string.h>
-#include "saldata.hxx"
-#include "salobj.h"
-#include "salframe.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salobj.h"
+#include "aqua/salframe.h"
// =======================================================================
@@ -115,7 +115,7 @@ sal_uInt16 AquaSalObject::GetClipRegionType()
// -----------------------------------------------------------------------
-void AquaSalObject::BeginSetClipRegion( sal_uLong nRectCount )
+void AquaSalObject::BeginSetClipRegion( sal_uLong )
{
mbClip = false;
}
@@ -209,7 +209,7 @@ void AquaSalObject::Show( sal_Bool bVisible )
// -----------------------------------------------------------------------
-void AquaSalObject::Enable( sal_Bool bEnable )
+void AquaSalObject::Enable( sal_Bool )
{
}
@@ -227,7 +227,7 @@ void AquaSalObject::SetBackground()
// -----------------------------------------------------------------------
-void AquaSalObject::SetBackground( SalColor nSalColor )
+void AquaSalObject::SetBackground( SalColor )
{
}
diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/accel.h
index bf3006c9ca7b..bf3006c9ca7b 100644
--- a/vcl/inc/vcl/accel.h
+++ b/vcl/inc/accel.h
diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/accmgr.hxx
index 2ffa2b366920..2ffa2b366920 100644
--- a/vcl/inc/vcl/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h
index 2fa38d9901db..2fa38d9901db 100644
--- a/vcl/aqua/inc/aqua11yfactory.h
+++ b/vcl/inc/aqua/aqua11yfactory.h
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx
index b9721619b8ac..b9721619b8ac 100644
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ b/vcl/inc/aqua/aqua11yfocustracker.hxx
diff --git a/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx
index cab8d8c89d58..cab8d8c89d58 100644
--- a/vcl/aqua/inc/aqua11ylistener.hxx
+++ b/vcl/inc/aqua/aqua11ylistener.hxx
diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index aebea78f0394..aebea78f0394 100644
--- a/vcl/aqua/inc/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h
index 2c5849f10e65..2c5849f10e65 100644
--- a/vcl/aqua/inc/aquaprintview.h
+++ b/vcl/inc/aqua/aquaprintview.h
diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/inc/aqua/aquavclevents.hxx
index 034edd3882b5..034edd3882b5 100644
--- a/vcl/aqua/inc/aquavclevents.hxx
+++ b/vcl/inc/aqua/aquavclevents.hxx
diff --git a/vcl/aqua/inc/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h
index 93003faecad7..93003faecad7 100644
--- a/vcl/aqua/inc/aquavcltypes.h
+++ b/vcl/inc/aqua/aquavcltypes.h
diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx
index bf9c70250005..bf9c70250005 100644
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ b/vcl/inc/aqua/keyboardfocuslistener.hxx
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/inc/aqua/salatsuifontutils.hxx
index 51079b8ec5d2..51079b8ec5d2 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/inc/aqua/salatsuifontutils.hxx
diff --git a/vcl/aqua/inc/salbmp.h b/vcl/inc/aqua/salbmp.h
index 33e671b05735..e0dd26554aac 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/inc/aqua/salbmp.h
@@ -30,16 +30,21 @@
#define _SV_SALBMP_H
#include "tools/gen.hxx"
-#include "vcl/sv.h"
+
+#include "basebmp/bitmapdevice.hxx"
+
#include "vcl/salbtype.hxx"
+
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+
#include "saldata.hxx"
-#include "vcl/salinst.hxx"
-#include "salconst.h"
-#include "vcl/salvd.hxx"
+#include "salinst.hxx"
+#include "salvd.hxx"
+#include "salbmp.hxx"
+
#include "salcolorutils.hxx"
-#include "vcl/salbmp.hxx"
-#include "salgdi.h"
-#include "basebmp/bitmapdevice.hxx"
+
// --------------
// - SalBitmap -
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/inc/aqua/salcolorutils.hxx
index ae6afdabb9ff..ae6afdabb9ff 100644
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ b/vcl/inc/aqua/salcolorutils.hxx
diff --git a/vcl/aqua/inc/salconst.h b/vcl/inc/aqua/salconst.h
index 50971a819c09..50971a819c09 100644
--- a/vcl/aqua/inc/salconst.h
+++ b/vcl/inc/aqua/salconst.h
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index d87938bd4474..ea831f593bfb 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -35,11 +35,11 @@
#include "com/sun/star/uno/Reference.hxx"
-#include "vcl/sv.h"
-#include "vcl/svdata.hxx"
-#include "vcl/salwtype.hxx"
#include "vcl/ptrstyle.hxx"
+#include "svdata.hxx"
+#include "salwtype.hxx"
+
#include <list>
#include <vector>
#include <map>
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx
index 8394d874bf10..8394d874bf10 100644
--- a/vcl/aqua/inc/salfontutils.hxx
+++ b/vcl/inc/aqua/salfontutils.hxx
diff --git a/vcl/aqua/inc/salframe.h b/vcl/inc/aqua/salframe.h
index 4025b0aea70a..4d205c08287f 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -29,14 +29,13 @@
#ifndef _SV_SALFRAME_H
#define _SV_SALFRAME_H
-
-#include "vcl/sv.h"
-#include "vcl/salframe.hxx"
#include "vcl/sysdata.hxx"
-#include "salmenu.h"
-#include "saldata.hxx"
-#include "aquavcltypes.h"
+#include "aqua/salmenu.h"
+#include "aqua/saldata.hxx"
+#include "aqua/aquavcltypes.h"
+
+#include "salframe.hxx"
#include <vector>
#include <utility>
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/inc/aqua/salframeview.h
index f28eb17f4e10..d4418d36bf5a 100644
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -29,7 +29,7 @@
#ifndef _VCL_SALFRAMEVIEW_H
#define _VCL_SALFRAMEVIEW_H
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
@interface SalFrameWindow : NSWindow
{
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/inc/aqua/salgdi.h
index c69f5d70bf96..078859f079b6 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -29,17 +29,17 @@
#ifndef _SV_SALGDI_H
#define _SV_SALGDI_H
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+
#include "premac.h"
#include <ApplicationServices/ApplicationServices.h>
#include "postmac.h"
-#include "vcl/sv.h"
-#include "vcl/outfont.hxx"
-#include "vcl/salgdi.hxx"
+#include "aqua/aquavcltypes.h"
#include <vcl/fontcapabilities.hxx>
-#include "aquavcltypes.h"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "outfont.hxx"
+#include "salgdi.hxx"
#include <vector>
diff --git a/vcl/aqua/inc/salinst.h b/vcl/inc/aqua/salinst.h
index 9bd65be14ac8..a53243f65966 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -29,14 +29,14 @@
#ifndef _SV_SALINST_H
#define _SV_SALINST_H
-#include "vcl/sv.h"
#include "osl/mutex.hxx"
#include "osl/thread.hxx"
-#include "vcl/salinst.hxx"
#include "osl/conditn.h"
#include <vcl/solarmutex.hxx>
-#include "aquavcltypes.h"
+#include "aqua/aquavcltypes.h"
+
+#include "salinst.hxx"
#include <list>
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx
index e81f68e46b0b..e81f68e46b0b 100644
--- a/vcl/aqua/inc/salmathutils.hxx
+++ b/vcl/inc/aqua/salmathutils.hxx
diff --git a/vcl/aqua/inc/salmenu.h b/vcl/inc/aqua/salmenu.h
index 71081ad48b77..84c7341889b7 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -33,8 +33,7 @@
#include <Cocoa/Cocoa.h>
#include "postmac.h"
-#include "vcl/sv.h"
-#include "vcl/salmenu.hxx"
+#include "salmenu.hxx"
#include <vector>
diff --git a/vcl/aqua/inc/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h
index fd6226c8030b..fd6226c8030b 100644
--- a/vcl/aqua/inc/salnativewidgets.h
+++ b/vcl/inc/aqua/salnativewidgets.h
diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h
index fac4aec75792..fac4aec75792 100644
--- a/vcl/aqua/inc/salnsmenu.h
+++ b/vcl/inc/aqua/salnsmenu.h
diff --git a/vcl/aqua/inc/salnstimer.h b/vcl/inc/aqua/salnstimer.h
index 5c4ba0eea430..5c4ba0eea430 100644
--- a/vcl/aqua/inc/salnstimer.h
+++ b/vcl/inc/aqua/salnstimer.h
diff --git a/vcl/aqua/inc/salobj.h b/vcl/inc/aqua/salobj.h
index 63f5fecb7279..0eca9e9badbd 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -29,9 +29,8 @@
#ifndef _SV_SALOBJ_H
#define _SV_SALOBJ_H
-#include "vcl/sv.h"
#include "vcl/sysdata.hxx"
-#include "vcl/salobj.hxx"
+#include "salobj.hxx"
class AquaSalFrame;
class AquaSalObject;
diff --git a/vcl/aqua/inc/salprn.h b/vcl/inc/aqua/salprn.h
index 86d456907a67..f2a188cc0340 100644
--- a/vcl/aqua/inc/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -29,9 +29,9 @@
#ifndef _SV_SALPRN_H
#define _SV_SALPRN_H
-#include "vcl/sv.h"
-#include "aquavcltypes.h"
-#include "vcl/salprn.hxx"
+#include "aqua/aquavcltypes.h"
+
+#include "salprn.hxx"
#include <boost/shared_array.hpp>
diff --git a/vcl/aqua/inc/salsys.h b/vcl/inc/aqua/salsys.h
index 64e1791668b1..15415712d896 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -29,8 +29,7 @@
#ifndef _SV_SALSYS_H
#define _SV_SALSYS_H
-#include "vcl/sv.h"
-#include "vcl/salsys.hxx"
+#include "salsys.hxx"
#include <list>
@@ -38,10 +37,6 @@
// - SalSystemData -
// -----------------
-//struct SalSystemData
-//{
-//};
-
class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
{
public:
diff --git a/vcl/aqua/inc/saltimer.h b/vcl/inc/aqua/saltimer.h
index 03772a2dfc2c..305bce14af07 100644
--- a/vcl/aqua/inc/saltimer.h
+++ b/vcl/inc/aqua/saltimer.h
@@ -33,7 +33,7 @@
#include <Cocoa/Cocoa.h>
#include "postmac.h"
-#include "vcl/saltimer.hxx"
+#include "saltimer.hxx"
class AquaSalTimer : public SalTimer
{
diff --git a/vcl/aqua/inc/salvd.h b/vcl/inc/aqua/salvd.h
index 6333fd31e460..a589430e9fb7 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -33,12 +33,11 @@
#include <ApplicationServices/ApplicationServices.h>
#include "postmac.h"
-#include "vcl/sv.h"
-#include "vcl/salgdi.hxx"
-#include "salconst.h"
-#include "salcolorutils.hxx"
-#include "vcl/salvd.hxx"
-#include "salgdi.h"
+#include "aqua/salconst.h"
+#include "aqua/salcolorutils.hxx"
+#include "aqua/salgdi.h"
+
+#include "salvd.hxx"
#if PRAGMA_ONCE
#pragma once
diff --git a/vcl/aqua/inc/svsys.h b/vcl/inc/aqua/svsys.h
index 291e7801db75..291e7801db75 100644
--- a/vcl/aqua/inc/svsys.h
+++ b/vcl/inc/aqua/svsys.h
diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h
index bdbe15840e0f..bdbe15840e0f 100644
--- a/vcl/aqua/inc/vclnsapp.h
+++ b/vcl/inc/aqua/vclnsapp.h
diff --git a/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index b43df0e115b2..b43df0e115b2 100644
--- a/vcl/inc/vcl/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/brdwin.hxx
index e6374ea032f5..e6374ea032f5 100644
--- a/vcl/inc/vcl/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index e0773257b029..e0773257b029 100644
--- a/vcl/inc/vcl/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/controldata.hxx
index b30184be2481..b30184be2481 100644
--- a/vcl/inc/vcl/controldata.hxx
+++ b/vcl/inc/controldata.hxx
diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/dbggui.hxx
index 61d878de3451..61d878de3451 100644
--- a/vcl/inc/vcl/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 41be5ba3fc38..41be5ba3fc38 100644
--- a/vcl/inc/vcl/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
diff --git a/vcl/inc/vcl/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index 1c3654c1a9ea..1c3654c1a9ea 100644
--- a/vcl/inc/vcl/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/fontcache.hxx
index ad261e8d8e6d..ad261e8d8e6d 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
diff --git a/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index f710434698de..99b627153fa3 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -33,9 +33,11 @@
#include <tools/string.hxx>
#include <cstdio>
+#include "vcl/dllapi.h"
+
namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font
-class FontSubsetInfo
+class VCL_DLLPUBLIC FontSubsetInfo
{
public:
explicit FontSubsetInfo( void );
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index dc11ba1637d8..42f90672f87b 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -51,11 +51,11 @@ namespace basegfx { class B2DPolyPolygon; }
class RawBitmap;
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
class ServerFontLayout;
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
namespace vcl
{
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 742ad2c3f5f5..742ad2c3f5f5 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index f605f190f669..c6c711d94dc7 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -43,7 +43,7 @@
#include <graphite2/Font.h>
#include <graphite2/Segment.h>
// Platform
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
#include <vcl/dllapi.h>
// Module
diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index b4a6e10be925..63adf526c2a1 100644
--- a/vcl/inc/vcl/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -33,7 +33,7 @@
#define GR_NAMESPACE
#ifndef MSC
-#include "vcl/graphite_layout.hxx"
+#include <graphite_layout.hxx>
// Modules
diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/helpwin.hxx
index 7862a4961bbd..7862a4961bbd 100644
--- a/vcl/inc/vcl/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 674bdf070c3a..674bdf070c3a 100644
--- a/vcl/inc/vcl/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 850531c64d9d..850531c64d9d 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/image.h
index 86f924993ed3..86f924993ed3 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/image.h
diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/impbmp.hxx
index c77e906bd8ae..c77e906bd8ae 100644
--- a/vcl/inc/vcl/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/impfont.hxx
index 40355af21518..40355af21518 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/impfont.hxx
diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/impgraph.hxx
index 22c409fb476a..6b6bce184770 100644
--- a/vcl/inc/vcl/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -34,6 +34,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/animate.hxx>
#include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphic.hxx>
#include <vcl/graph.h>
// ---------------
@@ -97,14 +98,19 @@ private:
void ImplSetDefaultType();
sal_Bool ImplIsSupportedGraphic() const;
- sal_Bool ImplIsTransparent() const;
- sal_Bool ImplIsAlpha() const;
- sal_Bool ImplIsAnimated() const;
+ sal_Bool ImplIsTransparent() const;
+ sal_Bool ImplIsAlpha() const;
+ sal_Bool ImplIsAnimated() const;
+ sal_Bool ImplIsEPS() const;
+ sal_Bool ImplIsRenderGraphic() const;
+ sal_Bool ImplHasRenderGraphic() const;
+
+ Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
+ BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
+ Animation ImplGetAnimation() const;
+ const GDIMetaFile& ImplGetGDIMetaFile() const;
+ ::vcl::RenderGraphic ImplGetRenderGraphic() const;
- Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
- BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
- Animation ImplGetAnimation() const;
- const GDIMetaFile& ImplGetGDIMetaFile() const;
Size ImplGetPrefSize() const;
void ImplSetPrefSize( const Size& rPrefSize );
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 41c4f565ef22..41c4f565ef22 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/impoct.hxx
index daf6a275ada1..daf6a275ada1 100644
--- a/vcl/inc/vcl/impoct.hxx
+++ b/vcl/inc/impoct.hxx
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/jobset.h
index b1cbdb9853f9..b1cbdb9853f9 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/jobset.h
diff --git a/vcl/inc/makefile.mk b/vcl/inc/makefile.mk
deleted file mode 100644
index f1f917284f71..000000000000
--- a/vcl/inc/makefile.mk
+++ /dev/null
@@ -1,49 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/outdata.hxx
index 2f4a9b5ed7aa..2f4a9b5ed7aa 100644
--- a/vcl/inc/vcl/outdata.hxx
+++ b/vcl/inc/outdata.hxx
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/outdev.h
index fc6bab815c48..43ba77df8ab7 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/outdev.h
@@ -30,7 +30,7 @@
#define _SV_OUTDEV_H
#include <tools/solar.h>
-#include <vcl/outfont.hxx>
+#include <outfont.hxx>
#include <vector>
#include <list>
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/outfont.hxx
index faf2b00793f2..faf2b00793f2 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/outfont.hxx
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/print.h
index db236f2a0f17..dc54ca28dc8b 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/print.h
@@ -32,6 +32,8 @@
#include "vcl/sv.h"
#include "vcl/dllapi.h"
+#include "rtl/ustring.hxx"
+
#include <vector>
#include <boost/unordered_map.hpp>
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/printdlg.hxx
index 247998303178..d162bc07ea8a 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -31,9 +31,9 @@
#include <vcl/dllapi.h>
-#include "vcl/print.hxx"
-#include "vcl/print.h"
+#include "print.h"
+#include "vcl/print.hxx"
#include "vcl/dialog.hxx"
#include "vcl/fixed.hxx"
#include "vcl/button.hxx"
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/printergfx.hxx
index 8bfd1c69a7d2..65d31e65e0aa 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/printergfx.hxx
@@ -30,7 +30,7 @@
#define _PSPRINT_PRINTERGFX_HXX_
#include "vcl/helper.hxx"
-#include "vcl/sallayout.hxx"
+#include "sallayout.hxx"
#include "osl/file.hxx"
#include "tools/gen.hxx"
diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/printerjob.hxx
index 62a1c078bc32..62a1c078bc32 100644
--- a/vcl/inc/vcl/printerjob.hxx
+++ b/vcl/inc/printerjob.hxx
diff --git a/vcl/inc/vcl/region.h b/vcl/inc/region.h
index 5814e981aac2..5814e981aac2 100644
--- a/vcl/inc/vcl/region.h
+++ b/vcl/inc/region.h
diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/salbmp.hxx
index d880be0d6d37..d880be0d6d37 100644
--- a/vcl/inc/vcl/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index e080cb91ff99..9d4eb0fc73f9 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -29,10 +29,12 @@
#ifndef _SV_SALDATABASIC_HXX
#define _SV_SALDATABASIC_HXX
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
#include <osl/module.h>
+#include "vcl/dllapi.h"
+
namespace psp
{
class PrinterInfoManager;
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/salframe.hxx
index f5b98756f5f6..51c6bcf7e73e 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -38,8 +38,8 @@
#include <vcl/sndstyle.hxx>
#endif // __cplusplus
-#include <vcl/salwtype.hxx>
-#include <vcl/salgeom.hxx>
+#include <salwtype.hxx>
+#include <salgeom.hxx>
#include <tools/gen.hxx>
#include <vcl/region.hxx>
diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/salgdi.hxx
index 5b9e59f68d8f..5b9e59f68d8f 100644
--- a/vcl/inc/vcl/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
diff --git a/vcl/inc/vcl/salgeom.hxx b/vcl/inc/salgeom.hxx
index c512d0a195fa..c512d0a195fa 100644
--- a/vcl/inc/vcl/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/salimestatus.hxx
index 13362c20071d..13362c20071d 100644
--- a/vcl/inc/vcl/salimestatus.hxx
+++ b/vcl/inc/salimestatus.hxx
diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/salinst.hxx
index d878dd7fea80..d878dd7fea80 100644
--- a/vcl/inc/vcl/salinst.hxx
+++ b/vcl/inc/salinst.hxx
diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/sallayout.hxx
index b91185769b27..b91185769b27 100644
--- a/vcl/inc/vcl/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/salmenu.hxx
index 63fb12ee4a84..63fb12ee4a84 100644
--- a/vcl/inc/vcl/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/salobj.hxx
index 4e781787b0c9..d83379d3a09a 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -32,7 +32,7 @@
#include <vcl/sv.h>
#include <vcl/dllapi.h>
#include <vcl/salgtype.hxx>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
struct SystemEnvData;
diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/salprn.hxx
index e820614e4cdd..e820614e4cdd 100644
--- a/vcl/inc/vcl/salprn.hxx
+++ b/vcl/inc/salprn.hxx
diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/salptype.hxx
index ca47f599271c..ca47f599271c 100644
--- a/vcl/inc/vcl/salptype.hxx
+++ b/vcl/inc/salptype.hxx
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/salsession.hxx
index c912565a920c..c912565a920c 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/salsession.hxx
diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/salsys.hxx
index 2f2f6d08e9e6..2f2f6d08e9e6 100644
--- a/vcl/inc/vcl/salsys.hxx
+++ b/vcl/inc/salsys.hxx
diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/saltimer.hxx
index 4bbaddb65b31..38dd20e69ff3 100644
--- a/vcl/inc/vcl/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +30,7 @@
#include <vcl/sv.h>
#include <vcl/dllapi.h>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
// ------------
// - SalTimer -
@@ -68,5 +67,3 @@ public:
};
#endif // _SV_SALTIMER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/salvd.hxx
index 68ed56a901d8..68ed56a901d8 100644
--- a/vcl/inc/vcl/salvd.hxx
+++ b/vcl/inc/salvd.hxx
diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/salwtype.hxx
index d8bd6c527f85..d8bd6c527f85 100644
--- a/vcl/inc/vcl/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 0ba501e976b1..1683e1af150c 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -69,6 +69,8 @@
#include <sal/types.h>
+#include "vcl/dllapi.h"
+
#include <vector>
#include "vcl/fontcapabilities.hxx"
@@ -289,7 +291,7 @@ namespace vcl
* @return value of SFErrCodes enum
* @ingroup sft
*/
- int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
+ int VCL_DLLPUBLIC OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
#if !defined(WIN32) && !defined(OS2)
/**
* TrueTypeFont constructor.
@@ -300,7 +302,7 @@ namespace vcl
* @return value of SFErrCodes enum
* @ingroup sft
*/
- int OpenTTFontFile(const char *fname, sal_uInt32 facenum, TrueTypeFont** ttf);
+ int VCL_DLLPUBLIC OpenTTFontFile(const char *fname, sal_uInt32 facenum, TrueTypeFont** ttf);
#endif
void getTTScripts(std::vector< sal_uInt32 > &rScriptTags, const unsigned char* pTable, size_t nLength);
@@ -313,7 +315,7 @@ namespace vcl
* TrueTypeFont destructor. Deallocates the memory.
* @ingroup sft
*/
- void CloseTTFont(TrueTypeFont *);
+ void VCL_DLLPUBLIC CloseTTFont(TrueTypeFont *);
/**
* Extracts TrueType control points, and stores them in an allocated array pointed to
@@ -514,7 +516,7 @@ namespace vcl
* MapString() replaces the UCS-2 characters in str with glyphIDs.
* @ingroup sft
*/
- int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical);
+ int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical);
/**
* Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
diff --git a/vcl/inc/vcl/subedit.hxx b/vcl/inc/subedit.hxx
index 17b22e2b5587..17b22e2b5587 100644
--- a/vcl/inc/vcl/subedit.hxx
+++ b/vcl/inc/subedit.hxx
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/svdata.hxx
index b28283f1a405..79daa17b7933 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -31,19 +31,25 @@
#include <osl/thread.hxx>
#include <rtl/ref.hxx>
+
#include "tools/gen.hxx"
#include "tools/shl.hxx"
#include "tools/link.hxx"
#include "tools/fldunit.hxx"
#include "tools/string.hxx"
-#include "vcl/vclevent.hxx"
-#include "vcl/sv.h"
#include "tools/color.hxx"
#include "tools/debug.hxx"
+
+#include "vcl/vclevent.hxx"
+#include "vcl/sv.h"
#include "vcl/dllapi.h"
-#include "com/sun/star/uno/Reference.hxx"
+
#include "unotools/options.hxx"
+#include "xconnection.hxx"
+
+#include "com/sun/star/uno/Reference.hxx"
+
#include <boost/unordered_map.hpp>
namespace com {
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/svids.hrc
index bc76c70e1ebe..bc76c70e1ebe 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/svids.hrc
diff --git a/vcl/util/hidother.src b/vcl/inc/svsys.h
index f966fcded1b3..df0b58c548ca 100644
--- a/vcl/util/hidother.src
+++ b/vcl/inc/svsys.h
@@ -25,7 +25,18 @@
*
************************************************************************/
-#include "vcl/svids.hrc"
+#ifndef _VCL_SVSYS_H
+#define _VCL_SVSYS_H
-hidspecial HID_PRINTDLG { HelpID = HID_PRINTDLG; };
+#ifdef WNT
+#include "win/svsys.h"
+#elif defined QUARTZ
+#include "aqua/svsys.h"
+#elif defined OS2
+#include "os2/svsys.h"
+#else
+#include "unx/svsys.h"
+#endif
+
+#endif
diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/textlayout.hxx
index 5902573f8746..5902573f8746 100644
--- a/vcl/inc/vcl/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/toolbox.h
index aec0c11cf790..aec0c11cf790 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/toolbox.h
diff --git a/vcl/unx/inc/XIM.h b/vcl/inc/unx/XIM.h
index 9a061edd1ed4..9a061edd1ed4 100644
--- a/vcl/unx/inc/XIM.h
+++ b/vcl/inc/unx/XIM.h
diff --git a/vcl/unx/inc/Xproto.h b/vcl/inc/unx/Xproto.h
index b6db98dbfe15..804b3ffa98cc 100644
--- a/vcl/unx/inc/Xproto.h
+++ b/vcl/inc/unx/Xproto.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,5 +47,3 @@
#include <tools/postx.h>
#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/inc/cdeint.hxx b/vcl/inc/unx/cdeint.hxx
index e88d221f3aff..c2b7d578b137 100644
--- a/vcl/unx/inc/cdeint.hxx
+++ b/vcl/inc/unx/cdeint.hxx
@@ -28,7 +28,7 @@
#ifndef _SV_CDEINT_HXX
#define _SV_CDEINT_HXX
-#include <dtint.hxx>
+#include <unx/dtint.hxx>
class CDEIntegrator : public DtIntegrator
{
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/inc/unx/dtint.hxx
index 010a0417d89b..010a0417d89b 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/inc/unx/dtint.hxx
diff --git a/vcl/unx/inc/plugins/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 2624f046a612..b54c0a517914 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -29,10 +29,10 @@
#ifndef __ATK_BRIDGE_HXX__
#define __ATK_BRIDGE_HXX__
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
-bool VCL_DLLPUBLIC InitAtkBridge(void);
-void VCL_DLLPUBLIC DeInitAtkBridge(void);
+bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void);
+void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void);
#endif
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index e4a1bb5e9527..5fa0c10f9f56 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -35,8 +35,8 @@
#include <gtk/gtk.h>
#include <tools/postx.h>
-#include <saldisp.hxx>
-#include <saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
#include <vcl/ptrstyle.hxx>
#include <list>
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 010844ec3c78..f4f01a4bb801 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -36,7 +36,7 @@
#include <gdk/gdkkeysyms.h>
#include <tools/postx.h>
-#include <vcl/salframe.hxx>
+#include <salframe.hxx>
#include <vcl/sysdata.hxx>
#include "tools/link.hxx"
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 4f7d66712ac7..33120ac8453a 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -35,7 +35,7 @@
#include <gdk/gdkkeysyms.h>
#include <tools/postx.h>
-#include <salgdi.h>
+#include <unx/salgdi.h>
class GtkSalGraphics : public X11SalGraphics
{
diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 07549776e9cf..506c78191115 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -29,8 +29,8 @@
#ifndef _VCL_GTKINST_HXX
#define _VCL_GTKINST_HXX
-#include <salinst.h>
-#include <salsys.h>
+#include <unx/salinst.h>
+#include <unx/salsys.h>
class GtkYieldMutex : public SalYieldMutex
{
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 72b33b0e5c3b..4822a7772be2 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -31,8 +31,8 @@
#include <vcl/sv.h>
#include <vcl/sysdata.hxx>
-#include <vcl/salobj.hxx>
-#include <plugins/gtk/gtkframe.hxx>
+#include <salobj.hxx>
+#include <unx/gtk/gtkframe.hxx>
class GtkSalObject : public SalObject
{
diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 22aee5aeb41a..43b76615e8ed 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -28,7 +28,7 @@
#ifndef _SAL_I18N_CALLBACK_HXX
#define _SAL_I18N_CALLBACK_HXX
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
#include <vector>
#ifdef __cplusplus
diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index b038d179f4a2..b038d179f4a2 100644
--- a/vcl/unx/inc/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 92931ec6353e..e363a47d0c85 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -29,13 +29,13 @@
#ifndef _SAL_I18N_INPUTMETHOD_HXX
#define _SAL_I18N_INPUTMETHOD_HXX
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
extern "C" char* GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize);
#define bUseInputMethodDefault True
-class VCL_DLLPUBLIC SalI18N_InputMethod
+class VCLPLUG_GEN_PUBLIC SalI18N_InputMethod
{
Bool mbUseable; // system supports locale as well as status
// and preedit style ?
diff --git a/vcl/unx/inc/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index e34d80900b79..e34d80900b79 100644
--- a/vcl/unx/inc/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 832f2a713091..0b88d778e966 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -34,7 +34,7 @@
#include <tools/gen.hxx>
#include <rtl/ustring.hxx>
-#include <vcl/salimestatus.hxx>
+#include <salimestatus.hxx>
#include <vector>
diff --git a/vcl/unx/inc/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index e077fdb67526..c1a1a2864861 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -30,9 +30,9 @@
#define _SAL_I18N_XKBDEXTENSION_HXX
#include <sal/types.h>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
-class VCL_DLLPUBLIC SalI18N_KeyboardExtension
+class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension
{
private:
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index 9125b33f1b20..6f04d0a01220 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -29,9 +29,9 @@
#ifndef _VCL_KDEDATA_HXX
#define _VCL_KDEDATA_HXX
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <salframe.h>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
+#include <unx/salframe.h>
class KDEData : public X11SalData
{
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/inc/unx/pspgraphics.h
index 80d1f5fb92cc..6a9a80647e42 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -31,9 +31,10 @@
#include "vcl/fontmanager.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/dllapi.h"
+
+#include "vclpluginapi.h"
+#include "salgdi.hxx"
+#include "sallayout.hxx"
namespace psp { struct JobData; class PrinterGfx; }
@@ -41,7 +42,7 @@ class ServerFont;
class ImplDevFontAttributes;
class SalInfoPrinter;
-class VCL_DLLPUBLIC PspGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC PspGraphics : public SalGraphics
{
psp::JobData* m_pJobData;
psp::PrinterGfx* m_pPrinterGfx;
diff --git a/vcl/unx/inc/salbmp.h b/vcl/inc/unx/salbmp.h
index f72f77b9909f..a389195308d3 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -29,13 +29,13 @@
#ifndef _SV_SALBMP_H
#define _SV_SALBMP_H
-#include <salstd.hxx>
+#include <unx/salstd.hxx>
#ifndef _SV_SALGTYPE
#include <vcl/salgtype.hxx>
#endif
-#include <saldisp.hxx>
-#include <vcl/salbmp.hxx>
-#include <vcl/dllapi.h>
+#include <unx/saldisp.hxx>
+#include <salbmp.hxx>
+#include <vclpluginapi.h>
struct BitmapBuffer;
class BitmapPalette;
@@ -47,7 +47,7 @@ class ImplSalBitmapCache;
// - SalBitmap -
// -------------
-class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap
+class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap
{
private:
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/inc/unx/saldata.hxx
index e967b0f7e4d0..7bce61cc9ce7 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -31,12 +31,12 @@
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <signal.h>
-#include <salstd.hxx>
-#include <vcl/salframe.hxx>
-#include <salinst.h>
-#include <vcl/saldatabasic.hxx>
+#include <unx/salstd.hxx>
+#include <salframe.hxx>
+#include <unx/salinst.h>
+#include <saldatabasic.hxx>
#include <osl/module.h>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class SalXLib;
@@ -53,7 +53,7 @@ typedef unsigned int pthread_t;
#endif
// -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalData : public SalData
+class VCLPLUG_GEN_PUBLIC X11SalData : public SalData
{
protected:
sal_Bool bNoExceptions_;
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 630e665c9def..6687762c1e9d 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -36,7 +36,7 @@ class SalVisual;
class SalXLib;
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include <salunx.h>
+#include <unx/salunx.h>
#include <vcl/salgtype.hxx>
#include <vcl/ptrstyle.hxx>
#include <sal/types.h>
@@ -45,8 +45,9 @@ class SalXLib;
#include <list>
#include <boost/unordered_map.hpp>
#include <tools/gen.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/dllapi.h>
+#include <salwtype.hxx>
+
+#include <vclpluginapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class BitmapPalette;
@@ -205,7 +206,7 @@ public:
typedef int(*YieldFunc)(int fd, void* data);
struct YieldEntry;
-class VCL_DLLPUBLIC SalXLib
+class VCLPLUG_GEN_PUBLIC SalXLib
{
protected:
timeval m_aTimeout;
@@ -276,7 +277,7 @@ extern "C" {
typedef Bool(*X_if_predicate)(Display*,XEvent*,XPointer);
}
-class VCL_DLLPUBLIC SalDisplay
+class VCLPLUG_GEN_PUBLIC SalDisplay
{
public:
struct RenderEntry
@@ -524,7 +525,7 @@ inline GC SalDisplay::GetGC( sal_uInt16 nDepth, int nScreen ) const
inline Display *SalColormap::GetXDisplay() const
{ return m_pDisplay->GetDisplay(); }
-class VCL_DLLPUBLIC SalX11Display : public SalDisplay
+class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay
{
public:
SalX11Display( Display* pDisp );
diff --git a/vcl/unx/inc/salframe.h b/vcl/inc/unx/salframe.h
index 0025afce2ad6..4bfe8958d728 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -29,18 +29,19 @@
#define _SV_SALFRAME_H
// -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#include <salstd.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/salwtype.hxx>
-#ifndef _SV_PTRSTYLE_HXX
+#include <unx/salstd.hxx>
+#include <unx/salunx.h>
+
+#include <salframe.hxx>
+#include <salwtype.hxx>
+#include <salinst.hxx>
+
#include <vcl/ptrstyle.hxx>
-#endif
-#include <vcl/salinst.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/timer.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
+
-#include <salunx.h>
#include <list>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -57,7 +58,7 @@ namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; }
#define SHOWSTATE_NORMAL 1
#define SHOWSTATE_HIDDEN 2
-class VCL_DLLPUBLIC X11SalFrame : public SalFrame
+class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
{
friend class vcl_sal::WMAdaptor;
friend class vcl_sal::NetWMAdaptor;
diff --git a/vcl/unx/inc/salgdi.h b/vcl/inc/unx/salgdi.h
index a2774099673b..7786ffe195ea 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -30,13 +30,16 @@
#define _SV_SALGDI_H
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include "salstd.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/salgtype.hxx"
#include "tools/fract.hxx"
-#include "vcl/dllapi.h"
-#include <vcl/vclenum.hxx>
-#include <vcl/sallayout.hxx>
+
+#include "vcl/salgtype.hxx"
+#include "vcl/vclenum.hxx"
+
+#include "salstd.hxx"
+#include "salgdi.hxx"
+#include "sallayout.hxx"
+#include "vclpluginapi.h"
+
#include <deque>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -87,7 +90,7 @@ public:
~CairoFontsCache();
};
-class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
{
friend class X11FontLayout;
friend class ServerFontLayout;
diff --git a/vcl/unx/inc/salinst.h b/vcl/inc/unx/salinst.h
index a571303333b3..4d264f7c9f45 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -32,11 +32,11 @@
#include <vcl/sv.h>
#include <osl/thread.hxx>
-#include <vcl/dllapi.h>
-#include <vcl/salinst.hxx>
+#include <vclpluginapi.h>
+#include <salinst.hxx>
#include <vcl/solarmutex.hxx>
-class VCL_DLLPUBLIC SalYieldMutex : public vcl::SolarMutexObject
+class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vcl::SolarMutexObject
{
protected:
sal_uIntPtr mnCount;
@@ -54,7 +54,7 @@ public:
};
// -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalInstance : public SalInstance
+class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalInstance
{
protected:
SalYieldMutex* mpSalYieldMutex;
diff --git a/vcl/unx/inc/salmenu.h b/vcl/inc/unx/salmenu.h
index e7b5effed653..e7b5effed653 100644
--- a/vcl/unx/inc/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
diff --git a/vcl/unx/inc/salobj.h b/vcl/inc/unx/salobj.h
index 577a3675fa3d..5f10027a0d8b 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -31,8 +31,9 @@
#include <vcl/sv.h>
#include <vcl/sysdata.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/dllapi.h>
+
+#include <vclpluginapi.h>
+#include <salobj.hxx>
class SalClipRegion
{
@@ -65,7 +66,7 @@ private:
};
-class X11SalObject : public SalObject
+class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
{
public:
SystemChildData maSystemChildData;
diff --git a/vcl/unx/inc/salprn.h b/vcl/inc/unx/salprn.h
index bf71205586fa..783c85b160b5 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -30,9 +30,10 @@
#define _SV_SALPRN_H
#include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
-#include "vcl/printerjob.hxx"
-#include "vcl/salprn.hxx"
+#include "printergfx.hxx"
+#include "printerjob.hxx"
+#include "salprn.hxx"
+#include "vclpluginapi.h"
class PspGraphics;
diff --git a/vcl/unx/inc/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 07056a91bdec..07056a91bdec 100644
--- a/vcl/unx/inc/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
diff --git a/vcl/unx/inc/salsys.h b/vcl/inc/unx/salsys.h
index 751222161022..e4ce898e9550 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -33,12 +33,12 @@
#include <vcl/sv.h>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
-#include <vcl/salsys.hxx>
-#include <vcl/dllapi.h>
+#include <salsys.hxx>
+#include <vclpluginapi.h>
#include <list>
-class VCL_DLLPUBLIC X11SalSystem : public SalSystem
+class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalSystem
{
public:
X11SalSystem() {}
diff --git a/vcl/unx/inc/saltimer.h b/vcl/inc/unx/saltimer.h
index 9820ba32d40c..f5c889cabe6e 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -29,7 +29,7 @@
#ifndef _SV_SALTIMER_H
#define _SV_SALTIMER_H
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
class X11SalTimer : public SalTimer
{
diff --git a/vcl/unx/inc/salunx.h b/vcl/inc/unx/salunx.h
index 1c331d06b9e8..f022f43ce028 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -38,8 +38,8 @@
#include <sys/time.h>
#include <strings.h>
#endif
-#include <svunx.h>
-#include <salstd.hxx>
+#include <unx/svunx.h>
+#include <unx/salstd.hxx>
// -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#define capacityof(a) (sizeof(a)/sizeof(*a))
diff --git a/vcl/unx/inc/salvd.h b/vcl/inc/unx/salvd.h
index 9add5c261bbd..42ce192ea76f 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -30,8 +30,8 @@
#define _SV_SALVD_H
// -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#include <salstd.hxx>
-#include <vcl/salvd.hxx>
+#include <unx/salstd.hxx>
+#include <salvd.hxx>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class SalDisplay;
diff --git a/vcl/unx/inc/sm.hxx b/vcl/inc/unx/sm.hxx
index b13d25cc5cc8..a7900d3981e7 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -28,10 +28,11 @@
#ifndef _VCL_SM_HXX
#define _VCL_SM_HXX
-#include <tools/link.hxx>
-#include <salunx.h>
+#include "tools/link.hxx"
+#include "unx/salunx.h"
#include <X11/SM/SMlib.h>
-#include <vcl/salsession.hxx>
+#include "salsession.hxx"
+#include "vclpluginapi.h"
class SessionManagerClient
{
@@ -61,7 +62,7 @@ class SessionManagerClient
DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void* );
DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void* );
public:
- static VCL_DLLPUBLIC void open(); // needed by other plugins, so export
+ static VCLPLUG_GEN_PUBLIC void open(); // needed by other plugins, so export
static void close();
static bool checkDocumentsSaved();
@@ -70,7 +71,7 @@ public:
static void interactionDone( bool bCancelShutdown );
static rtl::OUString getExecName();
- static VCL_DLLPUBLIC const ByteString& getSessionID();
+ static VCLPLUG_GEN_PUBLIC const ByteString& getSessionID();
};
class SalFrame;
diff --git a/vcl/unx/inc/soicon.hxx b/vcl/inc/unx/soicon.hxx
index cb3302cb777b..cb3302cb777b 100644
--- a/vcl/unx/inc/soicon.hxx
+++ b/vcl/inc/unx/soicon.hxx
diff --git a/vcl/unx/inc/strhelper.hxx b/vcl/inc/unx/strhelper.hxx
index 78db60567133..78db60567133 100644
--- a/vcl/unx/inc/strhelper.hxx
+++ b/vcl/inc/unx/strhelper.hxx
diff --git a/vcl/unx/inc/svsys.h b/vcl/inc/unx/svsys.h
index 149acc4cc644..0adc3e423329 100644
--- a/vcl/unx/inc/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -28,7 +28,7 @@
#ifndef _SV_SVSYS_H
#define _SV_SVSYS_H
-#include <svunx.h>
+#include <unx/svunx.h>
#endif // _SV_SVSYS_H
diff --git a/vcl/unx/inc/svunx.h b/vcl/inc/unx/svunx.h
index e3ea4cc3e790..e3ea4cc3e790 100644
--- a/vcl/unx/inc/svunx.h
+++ b/vcl/inc/unx/svunx.h
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index c6ef6d98bca8..dc0fe65f290b 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -31,12 +31,12 @@
#include <tools/string.hxx>
#include <tools/gen.hxx>
-#include <vcl/dllapi.h>
#ifndef _PREX_H
#include <tools/prex.h>
#include <X11/Xlib.h>
#include <tools/postx.h>
#endif
+#include <vclpluginapi.h>
#include <vector>
class SalDisplay;
@@ -44,7 +44,7 @@ class X11SalFrame;
namespace vcl_sal {
-class VCL_DLLPUBLIC WMAdaptor
+class VCLPLUG_GEN_PUBLIC WMAdaptor
{
public:
enum WMAtom {
diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h
index a78666bb243d..a78666bb243d 100644
--- a/vcl/unx/source/inc/airbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_curs.h
diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h
index 82d70f05bbb7..82d70f05bbb7 100644
--- a/vcl/unx/source/inc/airbrush_mask.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_mask.h
diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/inc/unx/x11_cursors/ase_curs.h
index 0a7c9bfd29c2..0a7c9bfd29c2 100644
--- a/vcl/unx/source/inc/ase_curs.h
+++ b/vcl/inc/unx/x11_cursors/ase_curs.h
diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/inc/unx/x11_cursors/ase_mask.h
index 4ded0773a72a..4ded0773a72a 100644
--- a/vcl/unx/source/inc/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/inc/unx/x11_cursors/asn_curs.h
index 68ab521de1a5..68ab521de1a5 100644
--- a/vcl/unx/source/inc/asn_curs.h
+++ b/vcl/inc/unx/x11_cursors/asn_curs.h
diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/inc/unx/x11_cursors/asn_mask.h
index 0e7a30e5a190..0e7a30e5a190 100644
--- a/vcl/unx/source/inc/asn_mask.h
+++ b/vcl/inc/unx/x11_cursors/asn_mask.h
diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/inc/unx/x11_cursors/asne_curs.h
index 8ba58f9639e2..8ba58f9639e2 100644
--- a/vcl/unx/source/inc/asne_curs.h
+++ b/vcl/inc/unx/x11_cursors/asne_curs.h
diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/inc/unx/x11_cursors/asne_mask.h
index 6408f127b1f4..6408f127b1f4 100644
--- a/vcl/unx/source/inc/asne_mask.h
+++ b/vcl/inc/unx/x11_cursors/asne_mask.h
diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/inc/unx/x11_cursors/asns_curs.h
index 3e039241ba61..3e039241ba61 100644
--- a/vcl/unx/source/inc/asns_curs.h
+++ b/vcl/inc/unx/x11_cursors/asns_curs.h
diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/inc/unx/x11_cursors/asns_mask.h
index 2a753501bc9d..2a753501bc9d 100644
--- a/vcl/unx/source/inc/asns_mask.h
+++ b/vcl/inc/unx/x11_cursors/asns_mask.h
diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/inc/unx/x11_cursors/asnswe_curs.h
index 599511e1d433..599511e1d433 100644
--- a/vcl/unx/source/inc/asnswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_curs.h
diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/inc/unx/x11_cursors/asnswe_mask.h
index a0bcb3c5310e..a0bcb3c5310e 100644
--- a/vcl/unx/source/inc/asnswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_mask.h
diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/inc/unx/x11_cursors/asnw_curs.h
index 139cd4e2ea5e..139cd4e2ea5e 100644
--- a/vcl/unx/source/inc/asnw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnw_curs.h
diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/inc/unx/x11_cursors/asnw_mask.h
index 6f7da9a88661..6f7da9a88661 100644
--- a/vcl/unx/source/inc/asnw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnw_mask.h
diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/inc/unx/x11_cursors/ass_curs.h
index ea98bf5b0404..ea98bf5b0404 100644
--- a/vcl/unx/source/inc/ass_curs.h
+++ b/vcl/inc/unx/x11_cursors/ass_curs.h
diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/inc/unx/x11_cursors/ass_mask.h
index ccb91615d34a..ccb91615d34a 100644
--- a/vcl/unx/source/inc/ass_mask.h
+++ b/vcl/inc/unx/x11_cursors/ass_mask.h
diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/inc/unx/x11_cursors/asse_curs.h
index 0df55658c10a..0df55658c10a 100644
--- a/vcl/unx/source/inc/asse_curs.h
+++ b/vcl/inc/unx/x11_cursors/asse_curs.h
diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/inc/unx/x11_cursors/asse_mask.h
index 1835e939f275..1835e939f275 100644
--- a/vcl/unx/source/inc/asse_mask.h
+++ b/vcl/inc/unx/x11_cursors/asse_mask.h
diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/inc/unx/x11_cursors/assw_curs.h
index 5956aa5bf40b..5956aa5bf40b 100644
--- a/vcl/unx/source/inc/assw_curs.h
+++ b/vcl/inc/unx/x11_cursors/assw_curs.h
diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/inc/unx/x11_cursors/assw_mask.h
index 3023b2a6061f..3023b2a6061f 100644
--- a/vcl/unx/source/inc/assw_mask.h
+++ b/vcl/inc/unx/x11_cursors/assw_mask.h
diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/inc/unx/x11_cursors/asw_curs.h
index 8064570cb8fe..8064570cb8fe 100644
--- a/vcl/unx/source/inc/asw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asw_curs.h
diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/inc/unx/x11_cursors/asw_mask.h
index 245c42e7d790..245c42e7d790 100644
--- a/vcl/unx/source/inc/asw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asw_mask.h
diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/inc/unx/x11_cursors/aswe_curs.h
index ed83d450c269..ed83d450c269 100644
--- a/vcl/unx/source/inc/aswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/aswe_curs.h
diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/inc/unx/x11_cursors/aswe_mask.h
index d2a97d7fa4c8..d2a97d7fa4c8 100644
--- a/vcl/unx/source/inc/aswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/aswe_mask.h
diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/inc/unx/x11_cursors/chain_curs.h
index ea319fb6b128..ea319fb6b128 100644
--- a/vcl/unx/source/inc/chain_curs.h
+++ b/vcl/inc/unx/x11_cursors/chain_curs.h
diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/inc/unx/x11_cursors/chain_mask.h
index 688835ecbd3e..688835ecbd3e 100644
--- a/vcl/unx/source/inc/chain_mask.h
+++ b/vcl/inc/unx/x11_cursors/chain_mask.h
diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/inc/unx/x11_cursors/chainnot_curs.h
index e327586e3110..e327586e3110 100644
--- a/vcl/unx/source/inc/chainnot_curs.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_curs.h
diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/inc/unx/x11_cursors/chainnot_mask.h
index 6666599ad64c..6666599ad64c 100644
--- a/vcl/unx/source/inc/chainnot_mask.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_mask.h
diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/inc/unx/x11_cursors/chart_curs.h
index f1fbd5557ad4..f1fbd5557ad4 100644
--- a/vcl/unx/source/inc/chart_curs.h
+++ b/vcl/inc/unx/x11_cursors/chart_curs.h
diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/inc/unx/x11_cursors/chart_mask.h
index 53f4ae125bda..53f4ae125bda 100644
--- a/vcl/unx/source/inc/chart_mask.h
+++ b/vcl/inc/unx/x11_cursors/chart_mask.h
diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/inc/unx/x11_cursors/copydata_curs.h
index a882a541a6d7..a882a541a6d7 100644
--- a/vcl/unx/source/dtrans/copydata_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydata_curs.h
diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/inc/unx/x11_cursors/copydata_mask.h
index 9cd73b08d106..9cd73b08d106 100644
--- a/vcl/unx/source/dtrans/copydata_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydata_mask.h
diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
index 353297212083..353297212083 100644
--- a/vcl/unx/source/inc/copydlnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
index b6ac40003814..b6ac40003814 100644
--- a/vcl/unx/source/inc/copydlnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/inc/unx/x11_cursors/copyfile_curs.h
index da1366c71c6c..da1366c71c6c 100644
--- a/vcl/unx/source/inc/copyfile_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_curs.h
diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/inc/unx/x11_cursors/copyfile_mask.h
index 5679ee8c2da8..5679ee8c2da8 100644
--- a/vcl/unx/source/inc/copyfile_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_mask.h
diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
index c761f67ae370..c761f67ae370 100644
--- a/vcl/unx/source/inc/copyfiles_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
index e6be0c5f105d..e6be0c5f105d 100644
--- a/vcl/unx/source/inc/copyfiles_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
index 9fdf78685365..9fdf78685365 100644
--- a/vcl/unx/source/inc/copyflnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
index 3b678164e0c6..3b678164e0c6 100644
--- a/vcl/unx/source/inc/copyflnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/inc/unx/x11_cursors/crook_curs.h
index 97db1feaa394..97db1feaa394 100644
--- a/vcl/unx/source/inc/crook_curs.h
+++ b/vcl/inc/unx/x11_cursors/crook_curs.h
diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/inc/unx/x11_cursors/crook_mask.h
index 534ad6da53fd..534ad6da53fd 100644
--- a/vcl/unx/source/inc/crook_mask.h
+++ b/vcl/inc/unx/x11_cursors/crook_mask.h
diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/inc/unx/x11_cursors/crop_curs.h
index 5647de80b196..5647de80b196 100644
--- a/vcl/unx/source/inc/crop_curs.h
+++ b/vcl/inc/unx/x11_cursors/crop_curs.h
diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/inc/unx/x11_cursors/crop_mask.h
index f7d3c87201c3..f7d3c87201c3 100644
--- a/vcl/unx/source/inc/crop_mask.h
+++ b/vcl/inc/unx/x11_cursors/crop_mask.h
diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/inc/unx/x11_cursors/detective_curs.h
index b2e3e2a375b9..b2e3e2a375b9 100644
--- a/vcl/unx/source/inc/detective_curs.h
+++ b/vcl/inc/unx/x11_cursors/detective_curs.h
diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/inc/unx/x11_cursors/detective_mask.h
index e731aff3c989..e731aff3c989 100644
--- a/vcl/unx/source/inc/detective_mask.h
+++ b/vcl/inc/unx/x11_cursors/detective_mask.h
diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/inc/unx/x11_cursors/drawarc_curs.h
index 08a3e324dae6..08a3e324dae6 100644
--- a/vcl/unx/source/inc/drawarc_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_curs.h
diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/inc/unx/x11_cursors/drawarc_mask.h
index b4e42dc824c6..b4e42dc824c6 100644
--- a/vcl/unx/source/inc/drawarc_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_mask.h
diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
index a84a2da70333..a84a2da70333 100644
--- a/vcl/unx/source/inc/drawbezier_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
index 13bac21a4594..13bac21a4594 100644
--- a/vcl/unx/source/inc/drawbezier_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
index 9905c240002d..9905c240002d 100644
--- a/vcl/unx/source/inc/drawcaption_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/inc/unx/x11_cursors/drawcaption_mask.h
index 98c0bc5aaf38..98c0bc5aaf38 100644
--- a/vcl/unx/source/inc/drawcaption_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcaption_mask.h
diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h
index c36720ad659e..c36720ad659e 100644
--- a/vcl/unx/source/inc/drawcirclecut_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h
diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h
index 885c210bda34..885c210bda34 100644
--- a/vcl/unx/source/inc/drawcirclecut_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h
diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/inc/unx/x11_cursors/drawconnect_curs.h
index 40f4e6dc3905..40f4e6dc3905 100644
--- a/vcl/unx/source/inc/drawconnect_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawconnect_curs.h
diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/inc/unx/x11_cursors/drawconnect_mask.h
index 270cdbac3fe6..270cdbac3fe6 100644
--- a/vcl/unx/source/inc/drawconnect_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawconnect_mask.h
diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/inc/unx/x11_cursors/drawcrook_curs.h
index e89e91322432..e89e91322432 100644
--- a/vcl/unx/source/inc/drawcrook_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcrook_curs.h
diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/inc/unx/x11_cursors/drawcrook_mask.h
index b42d2591d123..b42d2591d123 100644
--- a/vcl/unx/source/inc/drawcrook_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcrook_mask.h
diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/inc/unx/x11_cursors/drawcrop_curs.h
index 903c5b314418..903c5b314418 100644
--- a/vcl/unx/source/inc/drawcrop_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcrop_curs.h
diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/inc/unx/x11_cursors/drawcrop_mask.h
index eea6b4448146..eea6b4448146 100644
--- a/vcl/unx/source/inc/drawcrop_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcrop_mask.h
diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/inc/unx/x11_cursors/drawellipse_curs.h
index 5928139b81f3..5928139b81f3 100644
--- a/vcl/unx/source/inc/drawellipse_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawellipse_curs.h
diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/inc/unx/x11_cursors/drawellipse_mask.h
index 72ceedfb57ee..72ceedfb57ee 100644
--- a/vcl/unx/source/inc/drawellipse_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawellipse_mask.h
diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h
index 644d5bbb639d..644d5bbb639d 100644
--- a/vcl/unx/source/inc/drawfreehand_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h
diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h
index 959a54e827fe..959a54e827fe 100644
--- a/vcl/unx/source/inc/drawfreehand_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h
diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/inc/unx/x11_cursors/drawline_curs.h
index 84f78ccec876..84f78ccec876 100644
--- a/vcl/unx/source/inc/drawline_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawline_curs.h
diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/inc/unx/x11_cursors/drawline_mask.h
index 80784ca860b6..80784ca860b6 100644
--- a/vcl/unx/source/inc/drawline_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawline_mask.h
diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/inc/unx/x11_cursors/drawmirror_curs.h
index b68907138e42..b68907138e42 100644
--- a/vcl/unx/source/inc/drawmirror_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawmirror_curs.h
diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/inc/unx/x11_cursors/drawmirror_mask.h
index 231f109a24ae..231f109a24ae 100644
--- a/vcl/unx/source/inc/drawmirror_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawmirror_mask.h
diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/inc/unx/x11_cursors/drawpie_curs.h
index 1cc5933c88b3..1cc5933c88b3 100644
--- a/vcl/unx/source/inc/drawpie_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawpie_curs.h
diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/inc/unx/x11_cursors/drawpie_mask.h
index 880be6043497..880be6043497 100644
--- a/vcl/unx/source/inc/drawpie_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawpie_mask.h
diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h
index a101b1bff576..a101b1bff576 100644
--- a/vcl/unx/source/inc/drawpolygon_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h
diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h
index 660bee287c09..660bee287c09 100644
--- a/vcl/unx/source/inc/drawpolygon_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h
diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/inc/unx/x11_cursors/drawrect_curs.h
index 553df540aa29..553df540aa29 100644
--- a/vcl/unx/source/inc/drawrect_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawrect_curs.h
diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/inc/unx/x11_cursors/drawrect_mask.h
index 3bb39e1d98a8..3bb39e1d98a8 100644
--- a/vcl/unx/source/inc/drawrect_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawrect_mask.h
diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/inc/unx/x11_cursors/drawtext_curs.h
index 67726d6e5a2d..67726d6e5a2d 100644
--- a/vcl/unx/source/inc/drawtext_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawtext_curs.h
diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/inc/unx/x11_cursors/drawtext_mask.h
index ce1fc2c41053..ce1fc2c41053 100644
--- a/vcl/unx/source/inc/drawtext_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawtext_mask.h
diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/inc/unx/x11_cursors/fill_curs.h
index c8dfbb274f13..c8dfbb274f13 100644
--- a/vcl/unx/source/inc/fill_curs.h
+++ b/vcl/inc/unx/x11_cursors/fill_curs.h
diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/inc/unx/x11_cursors/fill_mask.h
index 32b25ae67660..32b25ae67660 100644
--- a/vcl/unx/source/inc/fill_mask.h
+++ b/vcl/inc/unx/x11_cursors/fill_mask.h
diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/inc/unx/x11_cursors/hshear_curs.h
index edaa9fe7958b..edaa9fe7958b 100644
--- a/vcl/unx/source/inc/hshear_curs.h
+++ b/vcl/inc/unx/x11_cursors/hshear_curs.h
diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/inc/unx/x11_cursors/hshear_mask.h
index 5c6f9a017e5a..5c6f9a017e5a 100644
--- a/vcl/unx/source/inc/hshear_mask.h
+++ b/vcl/inc/unx/x11_cursors/hshear_mask.h
diff --git a/vcl/unx/source/inc/invert50.h b/vcl/inc/unx/x11_cursors/invert50.h
index b1f4c1e86d18..b1f4c1e86d18 100644
--- a/vcl/unx/source/inc/invert50.h
+++ b/vcl/inc/unx/x11_cursors/invert50.h
diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/inc/unx/x11_cursors/linkdata_curs.h
index 054ef55ef2bb..054ef55ef2bb 100644
--- a/vcl/unx/source/dtrans/linkdata_curs.h
+++ b/vcl/inc/unx/x11_cursors/linkdata_curs.h
diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/inc/unx/x11_cursors/linkdata_mask.h
index 429c603066dc..429c603066dc 100644
--- a/vcl/unx/source/dtrans/linkdata_mask.h
+++ b/vcl/inc/unx/x11_cursors/linkdata_mask.h
diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/inc/unx/x11_cursors/linkfile_curs.h
index 5f68af135810..5f68af135810 100644
--- a/vcl/unx/source/inc/linkfile_curs.h
+++ b/vcl/inc/unx/x11_cursors/linkfile_curs.h
diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/inc/unx/x11_cursors/linkfile_mask.h
index fad8d6ad7624..fad8d6ad7624 100644
--- a/vcl/unx/source/inc/linkfile_mask.h
+++ b/vcl/inc/unx/x11_cursors/linkfile_mask.h
diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/inc/unx/x11_cursors/magnify_curs.h
index 4db8bb382b15..4db8bb382b15 100644
--- a/vcl/unx/source/inc/magnify_curs.h
+++ b/vcl/inc/unx/x11_cursors/magnify_curs.h
diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/inc/unx/x11_cursors/magnify_mask.h
index a7b5b027362d..a7b5b027362d 100644
--- a/vcl/unx/source/inc/magnify_mask.h
+++ b/vcl/inc/unx/x11_cursors/magnify_mask.h
diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/inc/unx/x11_cursors/mirror_curs.h
index c2488a6fd725..c2488a6fd725 100644
--- a/vcl/unx/source/inc/mirror_curs.h
+++ b/vcl/inc/unx/x11_cursors/mirror_curs.h
diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/inc/unx/x11_cursors/mirror_mask.h
index 60e8f1593b2b..60e8f1593b2b 100644
--- a/vcl/unx/source/inc/mirror_mask.h
+++ b/vcl/inc/unx/x11_cursors/mirror_mask.h
diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
index df99aab7ea0f..df99aab7ea0f 100644
--- a/vcl/unx/source/inc/movebezierweight_curs.h
+++ b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
index 831f427a9086..831f427a9086 100644
--- a/vcl/unx/source/inc/movebezierweight_mask.h
+++ b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/inc/unx/x11_cursors/movedata_curs.h
index 642bbd176e4b..642bbd176e4b 100644
--- a/vcl/unx/source/dtrans/movedata_curs.h
+++ b/vcl/inc/unx/x11_cursors/movedata_curs.h
diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/inc/unx/x11_cursors/movedata_mask.h
index f06c80f1728c..f06c80f1728c 100644
--- a/vcl/unx/source/dtrans/movedata_mask.h
+++ b/vcl/inc/unx/x11_cursors/movedata_mask.h
diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/inc/unx/x11_cursors/movedlnk_curs.h
index c163488d8d26..c163488d8d26 100644
--- a/vcl/unx/source/inc/movedlnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/movedlnk_curs.h
diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/inc/unx/x11_cursors/movedlnk_mask.h
index 8f3fa3cb92f6..8f3fa3cb92f6 100644
--- a/vcl/unx/source/inc/movedlnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/movedlnk_mask.h
diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/inc/unx/x11_cursors/movefile_curs.h
index 54c3ce91df96..54c3ce91df96 100644
--- a/vcl/unx/source/inc/movefile_curs.h
+++ b/vcl/inc/unx/x11_cursors/movefile_curs.h
diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/inc/unx/x11_cursors/movefile_mask.h
index 566b3fdeb8de..566b3fdeb8de 100644
--- a/vcl/unx/source/inc/movefile_mask.h
+++ b/vcl/inc/unx/x11_cursors/movefile_mask.h
diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/inc/unx/x11_cursors/movefiles_curs.h
index 95ec95bd8302..95ec95bd8302 100644
--- a/vcl/unx/source/inc/movefiles_curs.h
+++ b/vcl/inc/unx/x11_cursors/movefiles_curs.h
diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/inc/unx/x11_cursors/movefiles_mask.h
index 03a56a169218..03a56a169218 100644
--- a/vcl/unx/source/inc/movefiles_mask.h
+++ b/vcl/inc/unx/x11_cursors/movefiles_mask.h
diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/inc/unx/x11_cursors/moveflnk_curs.h
index 1f1fea56dead..1f1fea56dead 100644
--- a/vcl/unx/source/inc/moveflnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/moveflnk_curs.h
diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/inc/unx/x11_cursors/moveflnk_mask.h
index f8312aba525e..f8312aba525e 100644
--- a/vcl/unx/source/inc/moveflnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/moveflnk_mask.h
diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/inc/unx/x11_cursors/movepoint_curs.h
index 8ccf2d581455..8ccf2d581455 100644
--- a/vcl/unx/source/inc/movepoint_curs.h
+++ b/vcl/inc/unx/x11_cursors/movepoint_curs.h
diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/inc/unx/x11_cursors/movepoint_mask.h
index 547dfb03a87e..547dfb03a87e 100644
--- a/vcl/unx/source/inc/movepoint_mask.h
+++ b/vcl/inc/unx/x11_cursors/movepoint_mask.h
diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/inc/unx/x11_cursors/nodrop_curs.h
index 5c501d3876c4..5c501d3876c4 100644
--- a/vcl/unx/source/dtrans/nodrop_curs.h
+++ b/vcl/inc/unx/x11_cursors/nodrop_curs.h
diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/inc/unx/x11_cursors/nodrop_mask.h
index bd315dc28df1..bd315dc28df1 100644
--- a/vcl/unx/source/dtrans/nodrop_mask.h
+++ b/vcl/inc/unx/x11_cursors/nodrop_mask.h
diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/inc/unx/x11_cursors/null_curs.h
index 1f5687cbcf61..1f5687cbcf61 100644
--- a/vcl/unx/source/inc/null_curs.h
+++ b/vcl/inc/unx/x11_cursors/null_curs.h
diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/inc/unx/x11_cursors/null_mask.h
index e7ff46805d41..e7ff46805d41 100644
--- a/vcl/unx/source/inc/null_mask.h
+++ b/vcl/inc/unx/x11_cursors/null_mask.h
diff --git a/vcl/unx/source/inc/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
index 1e3cef066ddc..1e3cef066ddc 100644
--- a/vcl/unx/source/inc/paintbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
diff --git a/vcl/unx/source/inc/paintbrush_mask.h b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
index 4e3000d3b981..4e3000d3b981 100644
--- a/vcl/unx/source/inc/paintbrush_mask.h
+++ b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/inc/unx/x11_cursors/pivotcol_curs.h
index dcd7e321fd2e..dcd7e321fd2e 100644
--- a/vcl/unx/source/inc/pivotcol_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotcol_curs.h
diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/inc/unx/x11_cursors/pivotcol_mask.h
index b5537c03ec9f..b5537c03ec9f 100644
--- a/vcl/unx/source/inc/pivotcol_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotcol_mask.h
diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/inc/unx/x11_cursors/pivotdel_curs.h
index 18348b9e21df..18348b9e21df 100644
--- a/vcl/unx/source/inc/pivotdel_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotdel_curs.h
diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/inc/unx/x11_cursors/pivotdel_mask.h
index bf2e2379f194..bf2e2379f194 100644
--- a/vcl/unx/source/inc/pivotdel_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotdel_mask.h
diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/inc/unx/x11_cursors/pivotfld_curs.h
index 424179cbfe16..424179cbfe16 100644
--- a/vcl/unx/source/inc/pivotfld_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotfld_curs.h
diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/inc/unx/x11_cursors/pivotfld_mask.h
index e768b4b26889..e768b4b26889 100644
--- a/vcl/unx/source/inc/pivotfld_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotfld_mask.h
diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/inc/unx/x11_cursors/pivotrow_curs.h
index 1b6060ea5b8b..1b6060ea5b8b 100644
--- a/vcl/unx/source/inc/pivotrow_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotrow_curs.h
diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/inc/unx/x11_cursors/pivotrow_mask.h
index f6ea09498aa0..f6ea09498aa0 100644
--- a/vcl/unx/source/inc/pivotrow_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotrow_mask.h
diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/inc/unx/x11_cursors/rotate_curs.h
index c6550475c989..c6550475c989 100644
--- a/vcl/unx/source/inc/rotate_curs.h
+++ b/vcl/inc/unx/x11_cursors/rotate_curs.h
diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/inc/unx/x11_cursors/rotate_mask.h
index 12790cca4beb..12790cca4beb 100644
--- a/vcl/unx/source/inc/rotate_mask.h
+++ b/vcl/inc/unx/x11_cursors/rotate_mask.h
diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h
new file mode 100644
index 000000000000..e0d34e122336
--- /dev/null
+++ b/vcl/inc/unx/x11_cursors/salcursors.h
@@ -0,0 +1,162 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "unx/x11_cursors/nodrop_curs.h"
+#include "unx/x11_cursors/nodrop_mask.h"
+#include "unx/x11_cursors/magnify_curs.h"
+#include "unx/x11_cursors/magnify_mask.h"
+#include "unx/x11_cursors/rotate_curs.h"
+#include "unx/x11_cursors/rotate_mask.h"
+#include "unx/x11_cursors/hshear_curs.h"
+#include "unx/x11_cursors/hshear_mask.h"
+#include "unx/x11_cursors/vshear_curs.h"
+#include "unx/x11_cursors/vshear_mask.h"
+#include "unx/x11_cursors/drawline_curs.h"
+#include "unx/x11_cursors/drawline_mask.h"
+#include "unx/x11_cursors/drawrect_curs.h"
+#include "unx/x11_cursors/drawrect_mask.h"
+#include "unx/x11_cursors/drawpolygon_curs.h"
+#include "unx/x11_cursors/drawpolygon_mask.h"
+#include "unx/x11_cursors/drawbezier_curs.h"
+#include "unx/x11_cursors/drawbezier_mask.h"
+#include "unx/x11_cursors/drawarc_curs.h"
+#include "unx/x11_cursors/drawarc_mask.h"
+#include "unx/x11_cursors/drawpie_curs.h"
+#include "unx/x11_cursors/drawpie_mask.h"
+#include "unx/x11_cursors/drawcirclecut_curs.h"
+#include "unx/x11_cursors/drawcirclecut_mask.h"
+#include "unx/x11_cursors/drawellipse_curs.h"
+#include "unx/x11_cursors/drawellipse_mask.h"
+#include "unx/x11_cursors/drawconnect_curs.h"
+#include "unx/x11_cursors/drawconnect_mask.h"
+#include "unx/x11_cursors/drawtext_curs.h"
+#include "unx/x11_cursors/drawtext_mask.h"
+#include "unx/x11_cursors/mirror_curs.h"
+#include "unx/x11_cursors/mirror_mask.h"
+#include "unx/x11_cursors/crook_curs.h"
+#include "unx/x11_cursors/crook_mask.h"
+#include "unx/x11_cursors/crop_curs.h"
+#include "unx/x11_cursors/crop_mask.h"
+#include "unx/x11_cursors/movepoint_curs.h"
+#include "unx/x11_cursors/movepoint_mask.h"
+#include "unx/x11_cursors/movebezierweight_curs.h"
+#include "unx/x11_cursors/movebezierweight_mask.h"
+#include "unx/x11_cursors/drawfreehand_curs.h"
+#include "unx/x11_cursors/drawfreehand_mask.h"
+#include "unx/x11_cursors/drawcaption_curs.h"
+#include "unx/x11_cursors/drawcaption_mask.h"
+#include "unx/x11_cursors/movedata_curs.h"
+#include "unx/x11_cursors/movedata_mask.h"
+#include "unx/x11_cursors/copydata_curs.h"
+#include "unx/x11_cursors/copydata_mask.h"
+#include "unx/x11_cursors/linkdata_curs.h"
+#include "unx/x11_cursors/linkdata_mask.h"
+#include "unx/x11_cursors/movedlnk_curs.h"
+#include "unx/x11_cursors/movedlnk_mask.h"
+#include "unx/x11_cursors/copydlnk_curs.h"
+#include "unx/x11_cursors/copydlnk_mask.h"
+#include "unx/x11_cursors/movefile_curs.h"
+#include "unx/x11_cursors/movefile_mask.h"
+#include "unx/x11_cursors/copyfile_curs.h"
+#include "unx/x11_cursors/copyfile_mask.h"
+#include "unx/x11_cursors/linkfile_curs.h"
+#include "unx/x11_cursors/linkfile_mask.h"
+#include "unx/x11_cursors/moveflnk_curs.h"
+#include "unx/x11_cursors/moveflnk_mask.h"
+#include "unx/x11_cursors/copyflnk_curs.h"
+#include "unx/x11_cursors/copyflnk_mask.h"
+#include "unx/x11_cursors/movefiles_curs.h"
+#include "unx/x11_cursors/movefiles_mask.h"
+#include "unx/x11_cursors/copyfiles_curs.h"
+#include "unx/x11_cursors/copyfiles_mask.h"
+
+#include "unx/x11_cursors/chart_curs.h"
+#include "unx/x11_cursors/chart_mask.h"
+#include "unx/x11_cursors/detective_curs.h"
+#include "unx/x11_cursors/detective_mask.h"
+#include "unx/x11_cursors/pivotcol_curs.h"
+#include "unx/x11_cursors/pivotcol_mask.h"
+#include "unx/x11_cursors/pivotfld_curs.h"
+#include "unx/x11_cursors/pivotfld_mask.h"
+#include "unx/x11_cursors/pivotrow_curs.h"
+#include "unx/x11_cursors/pivotrow_mask.h"
+#include "unx/x11_cursors/pivotdel_curs.h"
+#include "unx/x11_cursors/pivotdel_mask.h"
+
+#include "unx/x11_cursors/chain_curs.h"
+#include "unx/x11_cursors/chain_mask.h"
+#include "unx/x11_cursors/chainnot_curs.h"
+#include "unx/x11_cursors/chainnot_mask.h"
+
+#include "unx/x11_cursors/timemove_curs.h"
+#include "unx/x11_cursors/timemove_mask.h"
+#include "unx/x11_cursors/timesize_curs.h"
+#include "unx/x11_cursors/timesize_mask.h"
+
+#include "unx/x11_cursors/ase_curs.h"
+#include "unx/x11_cursors/ase_mask.h"
+#include "unx/x11_cursors/asn_curs.h"
+#include "unx/x11_cursors/asn_mask.h"
+#include "unx/x11_cursors/asne_curs.h"
+#include "unx/x11_cursors/asne_mask.h"
+#include "unx/x11_cursors/asns_curs.h"
+#include "unx/x11_cursors/asns_mask.h"
+#include "unx/x11_cursors/asnswe_curs.h"
+#include "unx/x11_cursors/asnswe_mask.h"
+#include "unx/x11_cursors/asnw_curs.h"
+#include "unx/x11_cursors/asnw_mask.h"
+#include "unx/x11_cursors/ass_curs.h"
+#include "unx/x11_cursors/ass_mask.h"
+#include "unx/x11_cursors/asse_curs.h"
+#include "unx/x11_cursors/asse_mask.h"
+#include "unx/x11_cursors/assw_curs.h"
+#include "unx/x11_cursors/assw_mask.h"
+#include "unx/x11_cursors/asw_curs.h"
+#include "unx/x11_cursors/asw_mask.h"
+#include "unx/x11_cursors/aswe_curs.h"
+#include "unx/x11_cursors/aswe_mask.h"
+#include "unx/x11_cursors/null_curs.h"
+#include "unx/x11_cursors/null_mask.h"
+
+#include "unx/x11_cursors/airbrush_curs.h"
+#include "unx/x11_cursors/airbrush_mask.h"
+#include "unx/x11_cursors/fill_curs.h"
+#include "unx/x11_cursors/fill_mask.h"
+#include "unx/x11_cursors/vertcurs_curs.h"
+#include "unx/x11_cursors/vertcurs_mask.h"
+#include "unx/x11_cursors/tblsele_curs.h"
+#include "unx/x11_cursors/tblsele_mask.h"
+#include "unx/x11_cursors/tblsels_curs.h"
+#include "unx/x11_cursors/tblsels_mask.h"
+#include "unx/x11_cursors/tblselse_curs.h"
+#include "unx/x11_cursors/tblselse_mask.h"
+#include "unx/x11_cursors/tblselw_curs.h"
+#include "unx/x11_cursors/tblselw_mask.h"
+#include "unx/x11_cursors/tblselsw_curs.h"
+#include "unx/x11_cursors/tblselsw_mask.h"
+#include "unx/x11_cursors/paintbrush_curs.h"
+#include "unx/x11_cursors/paintbrush_mask.h"
diff --git a/vcl/unx/source/inc/tblsele_curs.h b/vcl/inc/unx/x11_cursors/tblsele_curs.h
index 21bcfd1fdd9f..21bcfd1fdd9f 100644
--- a/vcl/unx/source/inc/tblsele_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblsele_curs.h
diff --git a/vcl/unx/source/inc/tblsele_mask.h b/vcl/inc/unx/x11_cursors/tblsele_mask.h
index 2a555e83d884..2a555e83d884 100644
--- a/vcl/unx/source/inc/tblsele_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblsele_mask.h
diff --git a/vcl/unx/source/inc/tblsels_curs.h b/vcl/inc/unx/x11_cursors/tblsels_curs.h
index fb739951e9f4..fb739951e9f4 100644
--- a/vcl/unx/source/inc/tblsels_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblsels_curs.h
diff --git a/vcl/unx/source/inc/tblsels_mask.h b/vcl/inc/unx/x11_cursors/tblsels_mask.h
index 5a75aabe4c51..5a75aabe4c51 100644
--- a/vcl/unx/source/inc/tblsels_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblsels_mask.h
diff --git a/vcl/unx/source/inc/tblselse_curs.h b/vcl/inc/unx/x11_cursors/tblselse_curs.h
index fb34ff02b574..fb34ff02b574 100644
--- a/vcl/unx/source/inc/tblselse_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselse_curs.h
diff --git a/vcl/unx/source/inc/tblselse_mask.h b/vcl/inc/unx/x11_cursors/tblselse_mask.h
index fc289854e3ea..fc289854e3ea 100644
--- a/vcl/unx/source/inc/tblselse_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselse_mask.h
diff --git a/vcl/unx/source/inc/tblselsw_curs.h b/vcl/inc/unx/x11_cursors/tblselsw_curs.h
index a421a18b815d..a421a18b815d 100644
--- a/vcl/unx/source/inc/tblselsw_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselsw_curs.h
diff --git a/vcl/unx/source/inc/tblselsw_mask.h b/vcl/inc/unx/x11_cursors/tblselsw_mask.h
index 14b49a9863fb..14b49a9863fb 100644
--- a/vcl/unx/source/inc/tblselsw_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselsw_mask.h
diff --git a/vcl/unx/source/inc/tblselw_curs.h b/vcl/inc/unx/x11_cursors/tblselw_curs.h
index 2ee9a0d4af20..2ee9a0d4af20 100644
--- a/vcl/unx/source/inc/tblselw_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselw_curs.h
diff --git a/vcl/unx/source/inc/tblselw_mask.h b/vcl/inc/unx/x11_cursors/tblselw_mask.h
index 8fa5be7c724a..8fa5be7c724a 100644
--- a/vcl/unx/source/inc/tblselw_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselw_mask.h
diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/inc/unx/x11_cursors/timemove_curs.h
index ce5e2b6914b5..ce5e2b6914b5 100644
--- a/vcl/unx/source/inc/timemove_curs.h
+++ b/vcl/inc/unx/x11_cursors/timemove_curs.h
diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/inc/unx/x11_cursors/timemove_mask.h
index 42664e6998fb..42664e6998fb 100644
--- a/vcl/unx/source/inc/timemove_mask.h
+++ b/vcl/inc/unx/x11_cursors/timemove_mask.h
diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/inc/unx/x11_cursors/timesize_curs.h
index 99c75d4affb1..99c75d4affb1 100644
--- a/vcl/unx/source/inc/timesize_curs.h
+++ b/vcl/inc/unx/x11_cursors/timesize_curs.h
diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/inc/unx/x11_cursors/timesize_mask.h
index 68d03c95057f..68d03c95057f 100644
--- a/vcl/unx/source/inc/timesize_mask.h
+++ b/vcl/inc/unx/x11_cursors/timesize_mask.h
diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/inc/unx/x11_cursors/vertcurs_curs.h
index 5f8cfde93a8d..5f8cfde93a8d 100644
--- a/vcl/unx/source/inc/vertcurs_curs.h
+++ b/vcl/inc/unx/x11_cursors/vertcurs_curs.h
diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/inc/unx/x11_cursors/vertcurs_mask.h
index 05ac8246e52e..05ac8246e52e 100644
--- a/vcl/unx/source/inc/vertcurs_mask.h
+++ b/vcl/inc/unx/x11_cursors/vertcurs_mask.h
diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/inc/unx/x11_cursors/vshear_curs.h
index c8f0f7dd4b8b..c8f0f7dd4b8b 100644
--- a/vcl/unx/source/inc/vshear_curs.h
+++ b/vcl/inc/unx/x11_cursors/vshear_curs.h
diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/inc/unx/x11_cursors/vshear_mask.h
index 70b777a18d2f..70b777a18d2f 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/inc/unx/x11_cursors/vshear_mask.h
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 46f17b367412..9c9bba21db80 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -70,7 +70,7 @@ public:
SAL_DLLPRIVATE void ImplRestore();
DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* );
SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true, bool bRestore = false );
- SAL_DLLPRIVATE bool ImplHide();
+ SAL_DLLPRIVATE bool ImplHide( bool bStopTimer );
SAL_DLLPRIVATE void ImplNew();
public:
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index ffbd4867ecb8..4aaa2953d80b 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -70,6 +70,15 @@ class Gradient;
#define MTF_MIRROR_HORZ 0x00000001UL
#define MTF_MIRROR_VERT 0x00000002UL
+// -----------------------------
+// - Write flags for streaming -
+// -----------------------------
+
+#define GDIMETAFILE_WRITE_DEFAULT 0x00000000
+#define GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC 0x00000001
+
+typedef sal_uInt32 GDIMetaFileWriteFlags;
+
// ---------
// - Enums -
// ---------
@@ -237,7 +246,7 @@ public:
// Methoden zum Lesen und Schreiben des neuen Formats;
// die Read-Methode kann auch das alte Format lesen
SvStream& Read( SvStream& rIStm );
- SvStream& Write( SvStream& rOStm );
+ SvStream& Write( SvStream& rOStm, GDIMetaFileWriteFlags = GDIMETAFILE_WRITE_DEFAULT );
// Stream-Operatoren schreiben das alte Format (noch)
// und lesen sowohl das alte wie auch das neue Format
@@ -276,4 +285,4 @@ MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererSe
#endif // _SV_GDIMTF_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index 1d4362f00dc1..d86973b5686c 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.hxx
@@ -110,11 +110,12 @@ enum GfxLinkType
GFX_LINK_TYPE_NATIVE_WMF = 6, // Don't forget to update the following defines
GFX_LINK_TYPE_NATIVE_MET = 7, // Don't forget to update the following defines
GFX_LINK_TYPE_NATIVE_PCT = 8, // Don't forget to update the following defines
+ GFX_LINK_TYPE_NATIVE_SVG = 9, // Don't forget to update the following defines
GFX_LINK_TYPE_USER = 0xffff
};
#define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF
-#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_PCT
+#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_SVG
// -----------
// - GfxLink -
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index 3dfbb8d261d8..61da922acce6 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -36,6 +36,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/animate.hxx>
#include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphic.hxx>
#include <vcl/graph.h>
#include <vcl/gfxlink.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -116,9 +117,12 @@ public:
void SetDefaultType();
sal_Bool IsSupportedGraphic() const;
- sal_Bool IsTransparent() const;
- sal_Bool IsAlpha() const;
- sal_Bool IsAnimated() const;
+ sal_Bool IsTransparent() const;
+ sal_Bool IsAlpha() const;
+ sal_Bool IsAnimated() const;
+ sal_Bool IsEPS() const;
+ sal_Bool IsRenderGraphic() const;
+ sal_Bool HasRenderGraphic() const;
// #i102089# Access of Bitmap potentially will have to rasterconvert the Graphic
// if it is a MetaFile. To be able to control this conversion it is necessary to
@@ -128,8 +132,9 @@ public:
Bitmap GetBitmap(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const;
BitmapEx GetBitmapEx(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const;
- Animation GetAnimation() const;
- const GDIMetaFile& GetGDIMetaFile() const;
+ Animation GetAnimation() const;
+ const GDIMetaFile& GetGDIMetaFile() const;
+ ::vcl::RenderGraphic GetRenderGraphic() const;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const;
@@ -217,4 +222,4 @@ public:
#endif // _SV_GRAPH_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 7517b41ef03c..c296abb27e9d 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -40,7 +40,7 @@ enum type {
};
}
-struct JobData
+struct VCL_DLLPUBLIC JobData
{
int m_nCopies;
int m_nLeftMarginAdjust;
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index fd8f3b8e985b..87bc75fab2a0 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -43,6 +43,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/lineinfo.hxx>
+#include <vcl/rendergraphic.hxx>
class SvStream;
@@ -103,6 +104,7 @@ class SvStream;
#define META_LAYOUTMODE_ACTION (149)
#define META_TEXTLANGUAGE_ACTION (150)
#define META_OVERLINECOLOR_ACTION (151)
+#define META_RENDERGRAPHIC_ACTION (152)
#define META_COMMENT_ACTION (512)
@@ -111,6 +113,11 @@ class SvStream;
struct ImplMetaReadData
{
rtl_TextEncoding meActualCharSet;
+
+ ImplMetaReadData() :
+ meActualCharSet( RTL_TEXTENCODING_ASCII_US )
+ {
+ }
};
// ------------------------------------------------------------------------
@@ -118,6 +125,13 @@ struct ImplMetaReadData
struct ImplMetaWriteData
{
rtl_TextEncoding meActualCharSet;
+ GDIMetaFileWriteFlags mnWriteFlags;
+
+ ImplMetaWriteData() :
+ meActualCharSet( RTL_TEXTENCODING_ASCII_US ),
+ mnWriteFlags( GDIMETAFILE_WRITE_DEFAULT )
+ {
+ }
};
// ------------------------------------------------------------------------
@@ -1544,6 +1558,43 @@ public:
LanguageType GetTextLanguage() const { return meTextLanguage; }
};
+// ---------------------------
+// - MetaRenderGraphicAction -
+// ---------------------------
+
+class VCL_DLLPUBLIC MetaRenderGraphicAction : public MetaAction
+{
+private:
+
+ ::vcl::RenderGraphic maRenderGraphic;
+ Point maPoint;
+ Size maSize;
+ double mfRotateAngle;
+ double mfShearAngleX;
+ double mfShearAngleY;
+
+ virtual sal_Bool Compare( const MetaAction& ) const;
+
+public:
+ DECL_META_ACTION( RenderGraphic, META_RENDERGRAPHIC_ACTION )
+
+ MetaRenderGraphicAction( const Point& rPoint, const Size& rSize,
+ const vcl::RenderGraphic& rRenderData,
+ double fRotateAngle = 0.0,
+ double fShearAngleX = 0.0,
+ double fShearAngleY = 0.0 );
+
+ virtual void Move( long nHorzMove, long nVertMove );
+ virtual void Scale( double fScaleX, double fScaleY );
+
+ const ::vcl::RenderGraphic& GetRenderGraphic() const { return maRenderGraphic; }
+ const Point& GetPoint() const { return maPoint; }
+ const Size& GetSize() const { return maSize; }
+ double GetRotateAngle() const { return mfRotateAngle; }
+ double GetShearAngleX() const { return mfShearAngleX; }
+ double GetShearAngleY() const { return mfShearAngleY; }
+};
+
#endif // _SV_METAACT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index e6aaec2c9971..b0d694c5e75e 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -110,6 +110,7 @@ namespace vcl
class ExtOutDevData;
class ITextLayout;
struct FontCapabilities;
+ class RenderGraphic;
}
#define OUTDEV_BUFFER_SIZE 128
@@ -813,7 +814,19 @@ public:
void DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency);
- void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient );
+ void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize,
+ const Gradient& rTransparenceGradient );
+
+ /** Added return value to see if EPS could be painted directly.
+ Theoreticaly, handing over a matrix would be needed to handle
+ painting rotated EPS files (e.g. contained in Metafiles). This
+ would then need to be supported for Mac and PS printers, but
+ that's too much for now, wrote #i107046# for this */
+ bool DrawEPS( const Point& rPt, const Size& rSz,
+ const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
+
+ void DrawRenderGraphic( const Point& rPt, const Size& rSz,
+ const ::vcl::RenderGraphic& rRenderGraphic );
Color GetPixel( const Point& rPt ) const;
Color* GetPixel( const Polygon& rPts ) const;
@@ -1123,14 +1136,6 @@ public:
*/
sal_Bool HasAlpha();
- /** Added return value to see if EPS could be painted directly.
- Theoreticaly, handing over a matrix would be needed to handle
- painting rotated EPS files (e.g. contained in Metafiles). This
- would then need to be supported for Mac and PS printers, but
- that's too much for now, wrote #i107046# for this */
- bool DrawEPS( const Point& rPt, const Size& rSz,
- const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
-
/// request XCanvas render interface for this OutputDevice
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvas > GetCanvas() const;
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index f4b8039fc9e8..37dadb9a63db 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -53,8 +53,24 @@ namespace vcl
*/
struct PDFExtOutDevBookmarkEntry
{
+ /** ID of the link pointing to the bookmark, or -1 if the entry denotes a destination instead of a link.
+ */
sal_Int32 nLinkId;
+
+ /** ID of the named destination denoted by the bookmark, or -1 if the entry denotes a link instead of a named destination.
+ */
+ sal_Int32 nDestId;
+
+ /** link target name, respectively destination name
+ */
rtl::OUString aBookmark;
+
+ PDFExtOutDevBookmarkEntry()
+ :nLinkId( -1 )
+ ,nDestId( -1 )
+ ,aBookmark()
+ {
+ }
};
/*
@@ -196,6 +212,24 @@ public :
-1 if page id does not exist
*/
sal_Int32 CreateNamedDest( const String& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
+
+ /** registers a destination for which a destinatin ID needs to be known immediately, instead of later on setting it via
+ SetLinkDest.
+
+ This is used in contexts where a destination is referenced by means other than a link.
+
+ Later in the export process, a call to DescribeRegisteredDest must be made, providing the information about
+ the destination.
+
+ @return
+ the unique Id of the destination
+ */
+ sal_Int32 RegisterDest();
+
+ /** provides detailed information about a destination range which previously has been registered using RegisterDest.
+ */
+ void DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
+
//<---i56629
/** Create a new destination to be used in a link
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index b1f76046678d..9df687de8b05 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -940,6 +940,29 @@ The following structure describes the permissions used in PDF security
-1 if page id does not exist
*/
sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
+
+ /** creates a destination which is not intended to be referred to by a link, but by a public destination Id.
+
+ Form widgets, for instance, might refer to a destination, without ever actually creating a source link to
+ point to this destination. In such cases, a public destination Id will be assigned to the form widget,
+ and later on, the concrete destination data for this public Id will be registered using RegisterDestReference.
+
+ @param rRect
+ target rectangle on page to be displayed if dest is jumped to
+
+ @param nPageNr
+ number of page the dest is on (as returned by NewPage)
+ or -1 in which case the current page is used
+
+ @param eType
+ what dest type to use
+
+ @returns
+ the internal destination Id.
+ */
+ sal_Int32 RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
+
+
/** Set the destination for a link
<p>will change a URL type link to a dest link if necessary</p>
diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
deleted file mode 100644
index da91477f6a67..000000000000
--- a/vcl/inc/vcl/polyscan.hxx
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_POLYSCAN_HXX
-#define _SV_POLYSCAN_HXX
-
-#include <tools/gen.hxx>
-
-// -----------------
-// - ScanlinePoint -
-// -----------------
-
-struct ScanlinePoint
-{
- long mnX;
- ScanlinePoint* mpNext;
-
- ScanlinePoint() : mnX( 0L ), mpNext( NULL ) {};
- ScanlinePoint( long nX, ScanlinePoint* pNext ) : mnX( nX ), mpNext( pNext ) {};
- ~ScanlinePoint() {};
-
- void Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; }
-};
-
-// -------------------
-// - PolyScanSegment -
-// -------------------
-
-struct PolyScanSegment
-{
- long mnStart;
- long mnEnd;
-
- PolyScanSegment() : mnStart( 0L ), mnEnd( 0L ) {};
- PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {};
- ~PolyScanSegment() {};
-};
-
-// ----------------
-// - PolyScanline -
-// ----------------
-
-struct ScanlinePoint;
-class Polygon;
-class PolyPolygon;
-
-class PolyScanline
-{
-private:
-
- ScanlinePoint* mpFirst;
- ScanlinePoint* mpLast;
- ScanlinePoint* mpAct;
- long mnLeft;
- long mnRight;
-
- void ImplDelete();
-
-public:
-
- PolyScanline();
- ~PolyScanline();
-
- void Insert( long nX );
- void Set( long nStart, long nEnd );
- void Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); }
-
- inline sal_Bool GetFirstX( long& rX );
- inline sal_Bool GetNextX( long& rX );
-
- sal_Bool GetFirstSegment( PolyScanSegment& rSegment );
- sal_Bool GetNextSegment( PolyScanSegment& rSegment );
-};
-
-// ------------------------------------------------------------------------
-
-inline sal_Bool PolyScanline::GetFirstX( long& rX )
-{
- mpAct = mpFirst;
- return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False );
-}
-
-// ------------------------------------------------------------------------
-
-inline sal_Bool PolyScanline::GetNextX( long& rX )
-{
- return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False );
-}
-
-// ---------------
-// - PolyScanner -
-// ---------------
-
-class PolyScanner
-{
-private:
-
- PolyScanline* mpArray;
- long mnLeft;
- long mnTop;
- long mnRight;
- long mnBottom;
-
- PolyScanner() {};
-
-protected:
-
- void InsertLine( const Point& rStart, const Point& rEnd );
-
-public:
-
- PolyScanner( const Rectangle& rRect );
- PolyScanner( const Polygon& rPoly );
- PolyScanner( const PolyPolygon& rPolyPoly );
- ~PolyScanner();
-
- long Left() const { return mnLeft; }
- long Top() const { return mnTop; }
- long Right() const { return mnRight; }
- long Bottom() const { return mnBottom; }
-
- long Width() const { return( mnRight - mnLeft + 1L ); }
- long Height() const { return( mnBottom - mnTop + 1L ); }
-
- Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); }
-
- sal_uLong Count() const { return Height(); }
- PolyScanline* operator[]( sal_uLong nPos ) const;
-};
-
-#endif // _SV_POLYSCAN_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index 846835e22d3b..d36411714575 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -35,6 +35,8 @@
#include "tools/string.hxx"
#include "tools/stream.hxx"
+#include "vcl/dllapi.h"
+
#include "com/sun/star/lang/Locale.hpp"
#define PRINTER_PPDDIR "driver"
@@ -46,7 +48,7 @@ class PPDTranslator;
enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo };
-struct PPDValue
+struct VCL_DLLPUBLIC PPDValue
{
PPDValueType m_eType;
String m_aOption;
@@ -59,7 +61,7 @@ struct PPDValue
* PPDKey - a container for the available options (=values) of a PPD keyword
*/
-class PPDKey
+class VCL_DLLPUBLIC PPDKey
{
friend class PPDParser;
@@ -121,7 +123,7 @@ struct PPDKeyhash
class PPDContext;
class CUPSManager;
-class PPDParser
+class VCL_DLLPUBLIC PPDParser
{
friend class PPDContext;
friend class CUPSManager;
@@ -293,7 +295,7 @@ public:
* contents of a PPDParser.
*/
-class PPDContext
+class VCL_DLLPUBLIC PPDContext
{
typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
hash_type m_aCurrentValues;
diff --git a/vcl/inc/vcl/rendergraphic.hxx b/vcl/inc/vcl/rendergraphic.hxx
new file mode 100644
index 000000000000..0a0f475decd6
--- /dev/null
+++ b/vcl/inc/vcl/rendergraphic.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SV_RENDERGRAPHIC_HXX
+#define _SV_RENDERGRAPHIC_HXX
+
+#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <boost/shared_array.hpp>
+#include <memory>
+
+class SvStream;
+class MapMode;
+class Size;
+class BitmapEx;
+
+namespace vcl
+{
+ // -----------------
+ // - RenderGraphic -
+ // -----------------
+ class VCL_DLLPUBLIC RenderGraphic
+ {
+ public:
+
+ typedef boost::shared_array< sal_uInt8 > GraphicData;
+
+ friend VCL_DLLPUBLIC ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic );
+ friend VCL_DLLPUBLIC ::SvStream& operator<<( ::SvStream& rOStm, const RenderGraphic& rRenderGraphic );
+
+ public:
+
+ RenderGraphic( );
+
+ RenderGraphic( const RenderGraphic& rRenderGraphic );
+
+ RenderGraphic( const GraphicData& rGraphicData,
+ sal_uInt32 nGraphicDataLength,
+ const rtl::OUString& rGraphicDataMimeType );
+
+ RenderGraphic( const rtl::OUString& rGraphicDataMimeType,
+ sal_uInt32 nGraphicDataLength,
+ const sal_uInt8* pGraphicData = NULL );
+
+ virtual ~RenderGraphic();
+
+ RenderGraphic& operator=(const RenderGraphic& rRenderGraphic );
+
+ bool operator==(const RenderGraphic& rRenderGraphic ) const;
+
+ inline bool operator!=(const RenderGraphic& rRenderGraphic ) const
+ {
+ return( !( rRenderGraphic == *this ) );
+ }
+
+ bool IsEqual( const RenderGraphic& rRenderGraphic ) const;
+
+ bool operator!() const;
+
+ inline bool IsEmpty( ) const
+ {
+ return( !( *this ) );
+ }
+
+ inline const GraphicData& GetGraphicData( ) const
+ {
+ return( maGraphicData );
+ }
+
+ inline sal_uInt32 GetGraphicDataLength( ) const
+ {
+ return( mnGraphicDataLength );
+ }
+
+ inline const rtl::OUString& GetGraphicDataMimeType( ) const
+ {
+ return( maGraphicDataMimeType );
+ }
+
+ const MapMode& GetPrefMapMode() const;
+ const Size& GetPrefSize() const;
+
+ BitmapEx GetReplacement() const;
+
+ private:
+
+ void ImplCheckData();
+ void ImplGetDefaults() const;
+
+ private:
+
+ GraphicData maGraphicData;
+ sal_uInt32 mnGraphicDataLength;
+ rtl::OUString maGraphicDataMimeType;
+ mutable ::std::auto_ptr< MapMode > mapPrefMapMode;
+ mutable ::std::auto_ptr< Size > mapPrefSize;
+ };
+}
+
+#endif // _SV_RENDERHRAPHIC_HXX
diff --git a/vcl/inc/vcl/rendergraphicrasterizer.hxx b/vcl/inc/vcl/rendergraphicrasterizer.hxx
new file mode 100644
index 000000000000..f2166b03ffb3
--- /dev/null
+++ b/vcl/inc/vcl/rendergraphicrasterizer.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SV_RENDERGRAPHICRASTERIZER_HXX
+#define _SV_RENDERGRAPHICRASTERIZER_HXX
+
+#include <vcl/rendergraphic.hxx>
+#include <vcl/bitmapex.hxx>
+
+#include <com/sun/star/graphic/XGraphicRasterizer.hpp>
+
+#include <memory>
+#include <deque>
+
+#define VCL_RASTERIZER_UNLIMITED_EXTENT 0x00000000
+#define VCL_RASTERIZER_DEFAULT_EXTENT 0xffffffff
+
+namespace vcl
+{
+ // ---------------------------
+ // - RenderGraphicRasterizer -
+ // ---------------------------
+
+ class VCL_DLLPUBLIC RenderGraphicRasterizer
+ {
+ public:
+
+ RenderGraphicRasterizer( const RenderGraphic& rData );
+
+
+ RenderGraphicRasterizer( const RenderGraphicRasterizer& rRenderGraphicRasterizer );
+
+ virtual ~RenderGraphicRasterizer();
+
+ RenderGraphicRasterizer& operator=( const RenderGraphicRasterizer& rRenderGraphicRasterizer );
+
+ inline const RenderGraphic& GetRenderGraphic() const
+ {
+ return( maRenderGraphic );
+ }
+
+ const Size& GetDefaultSizePixel() const;
+
+ BitmapEx GetReplacement() const;
+
+ virtual Size GetPrefSize() const;
+
+ virtual MapMode GetPrefMapMode() const;
+
+ virtual const BitmapEx& Rasterize( const Size& rSizePixel_UnrotatedUnsheared,
+ double fRotateAngle = 0.0,
+ double fShearAngleX = 0.0,
+ double fShearAngleY = 0.0,
+ sal_uInt32 nMaxExtent = VCL_RASTERIZER_DEFAULT_EXTENT ) const;
+
+ protected:
+
+ RenderGraphic maRenderGraphic;
+ mutable com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicRasterizer > mxRasterizer;
+
+ virtual void InitializeRasterizer();
+
+ private:
+
+ RenderGraphicRasterizer();
+
+ mutable BitmapEx maBitmapEx;
+ mutable Size maDefaultSizePixel;
+ mutable double mfRotateAngle;
+ mutable double mfShearAngleX;
+ mutable double mfShearAngleY;
+
+ private:
+
+ typedef ::std::deque< RenderGraphicRasterizer > RenderGraphicRasterizerCache;
+
+ static RenderGraphicRasterizerCache& ImplGetCache();
+
+ static bool ImplInitializeFromCache( RenderGraphicRasterizer& rRasterizer );
+ static bool ImplRasterizeFromCache( RenderGraphicRasterizer& rRasterizer,
+ const Size& rSizePixel, double fRotateAngle,
+ double fShearAngleX, double fShearAngleY );
+ static void ImplUpdateCache( const RenderGraphicRasterizer& rRasterizer );
+};
+}
+
+#endif // _SV_RENDERGRAPHICRASTERIZER_HXX
diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx
index 93eb69bd439d..4b3e1e3ad772 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/vcl/inc/vcl/salctype.hxx
@@ -49,6 +49,7 @@
#define CVT_TIF (0x00000008UL)
#define CVT_WMF (0x00000009UL)
#define CVT_EMF (0x0000000aUL)
+#define CVT_SVG (0x0000000bUL)
// ---------------
// - ConvertData -
diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx
deleted file mode 100644
index 70d31381287f..000000000000
--- a/vcl/inc/vcl/svcompat.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SV_SVCOMPAT_HXX
-#define _SV_SVCOMPAT_HXX
-
-#include <sv.h>
-
-// -----------
-// - Defines -
-// -----------
-
-#define COMPAT_FORMAT( char1, char2, char3, char4 ) \
- ((sal_uLong)((((sal_uLong)(char)(char1)))| \
- (((sal_uLong)(char)(char2))<<8UL)| \
- (((sal_uLong)(char)(char3))<<16UL)| \
- ((sal_uLong)(char)(char4))<<24UL))
-
-
-class SvStream;
-
-// --------------
-// - ImplCompat -
-// --------------
-
-class ImplCompat
-{
- SvStream* mpRWStm;
- sal_uInt32 mnCompatPos;
- sal_uInt32 mnTotalSize;
- sal_uInt16 mnStmMode;
- sal_uInt16 mnVersion;
-
- ImplCompat() {}
- ImplCompat( const ImplCompat& rCompat ) {}
- ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; }
- sal_Bool operator==( const ImplCompat& rCompat ) { return sal_False; }
-
-public:
- ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 );
- ~ImplCompat();
-
- sal_uInt16 GetVersion() const { return mnVersion; }
-};
-
-#endif // _SV_SVCOMPAT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/svgread.hxx b/vcl/inc/vcl/svgread.hxx
new file mode 100644
index 000000000000..4427198eeb5a
--- /dev/null
+++ b/vcl/inc/vcl/svgread.hxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SV_SVGREAD_HXX
+#define _SV_SVGREAD_HXX
+
+#include <vcl/dllapi.h>
+#include <memory>
+
+// -------------
+// - SVGReader -
+// -------------
+
+class SvStream;
+class GDIMetaFile;
+
+namespace vcl
+{
+ class SVGReaderImpl;
+
+ class VCL_DLLPUBLIC SVGReader
+ {
+ public:
+
+ SVGReader( SvStream& rStm );
+ ~SVGReader();
+
+ /* rSVGMtf is an output parameter, that is also returned
+ by the method as well.
+
+ In case of a failure, the GDIMetaFile will not contain
+ any actions at all and thus GDIMetaFile::GetActionCount
+ will return 0.
+
+ In case of success, the GDIMetaFile will contain a
+ META_RENDERGRAPHIC_ACTION, containing the SVG raw data. The
+ data can be rendered by using the standard ways to output a
+ GDIMetaFile, e.g. calling GDIMetaFile::Play
+
+ */
+ GDIMetaFile& Read( GDIMetaFile& rSVGMtf );
+
+ private:
+
+ SVGReader();
+ SVGReader( const SVGReader& rReader );
+
+ inline SVGReader& operator=( const SVGReader& /* rReader */ ) { return( *this ); }
+
+ private:
+
+ std::auto_ptr< SVGReaderImpl > mapImpl;
+ };
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vcl/unobrok.hxx
deleted file mode 100644
index 67c83ea83952..000000000000
--- a/vcl/inc/vcl/unobrok.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _UNOBROK_HXX
-#define _UNOBROK_HXX
-
-#include <vcl/svdata.hxx>
-#include <osl/thread.hxx>
-
-namespace vcl_accept
-{
- sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr);
-}
-
-#endif // _UNOBROK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h
new file mode 100644
index 000000000000..462943b95401
--- /dev/null
+++ b/vcl/inc/vclpluginapi.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _VCLPLUGINAPI_H
+#define _VCLPLUGINAPI_H
+
+#include "sal/config.h"
+#include "sal/types.h"
+
+#if defined VCLPLUG_GEN_IMPLEMENTATION
+#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_GTK_IMPLEMENTATION
+#define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_KDE_IMPLEMENTATION
+#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_KDE4_IMPLEMENTATION
+#define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_SVP_IMPLEMENTATION
+#define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined DESKTOP_DETECTOR_IMPLEMENTATION
+#define DESKTOP_DETECTOR_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define DESKTOP_DETECTOR_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/wall2.hxx
index 162614262095..162614262095 100644
--- a/vcl/inc/vcl/wall2.hxx
+++ b/vcl/inc/wall2.hxx
diff --git a/vcl/win/inc/salbmp.h b/vcl/inc/win/salbmp.h
index 9ae4b4bef2ca..5cf92bcf3591 100644..100755
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -29,10 +29,9 @@
#ifndef _SV_SALBMP_H
#define _SV_SALBMP_H
-#include <wincomp.hxx>
#include <tools/gen.hxx>
-#include <vcl/sv.h>
-#include <vcl/salbmp.hxx>
+#include <win/wincomp.hxx>
+#include <salbmp.hxx>
// --------------
// - SalBitmap -
diff --git a/vcl/win/inc/saldata.hxx b/vcl/inc/win/saldata.hxx
index 95aa8f5434f2..ca0a19f4361a 100644
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -29,13 +29,13 @@
#ifndef _SV_SALDATA_HXX
#define _SV_SALDATA_HXX
-#include <vcl/sv.h>
-#include <vcl/svdata.hxx>
-#include <vcl/salwtype.hxx>
-#include <wincomp.hxx>
-
#include "osl/module.h"
+#include <svdata.hxx>
+#include <salwtype.hxx>
+
+#include <win/wincomp.hxx>
+
#include <set> // for hMenu validation
#include <map>
diff --git a/vcl/win/inc/salframe.h b/vcl/inc/win/salframe.h
index d3e7516f17f3..e62d60196a1e 100644..100755
--- a/vcl/win/inc/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -29,9 +29,8 @@
#ifndef _SV_SALFRAME_H
#define _SV_SALFRAME_H
-#include <vcl/sv.h>
#include <vcl/sysdata.hxx>
-#include <vcl/salframe.hxx>
+#include <salframe.hxx>
class WinSalGraphics;
diff --git a/vcl/win/inc/salgdi.h b/vcl/inc/win/salgdi.h
index a23963f81e7b..b7082baecad7 100644
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -29,11 +29,10 @@
#ifndef _SV_SALGDI_H
#define _SV_SALGDI_H
-#include <vcl/sv.h>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
#include <vcl/fontcapabilities.hxx>
#include "boost/scoped_ptr.hpp"
diff --git a/vcl/win/inc/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11b551b..3049f11b551b 100644
--- a/vcl/win/inc/salids.hrc
+++ b/vcl/inc/win/salids.hrc
diff --git a/vcl/win/inc/salinst.h b/vcl/inc/win/salinst.h
index 524cf3aca141..04ea296e13d4 100644
--- a/vcl/win/inc/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -29,8 +29,7 @@
#ifndef _SV_SALINST_H
#define _SV_SALINST_H
-#include <vcl/sv.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
// -------------------
// - SalInstanceData -
diff --git a/vcl/win/inc/salmenu.h b/vcl/inc/win/salmenu.h
index 59160dc8a8bc..99239d7b8191 100644..100755
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -29,10 +29,8 @@
#ifndef _SV_SALMENU_H
#define _SV_SALMENU_H
-#include <vcl/sv.h>
#include <vcl/bitmap.hxx>
-#include <vcl/salmenu.hxx>
-
+#include <salmenu.hxx>
class WinSalMenu : public SalMenu
{
diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/inc/win/salnativewidgets.h
index 515a4b44d02c..33ba8de4ba87 100644..100755
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/inc/win/salnativewidgets.h
@@ -32,8 +32,6 @@
#ifdef __cplusplus
-#include <vcl/sv.h>
-
/* SalControlHandleData:
*
* Holds platform specific theming data.
diff --git a/vcl/win/inc/salobj.h b/vcl/inc/win/salobj.h
index d96b5f4a93df..068d65a611f2 100644..100755
--- a/vcl/win/inc/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -29,8 +29,7 @@
#ifndef _SV_SALOBJ_H
#define _SV_SALOBJ_H
-#include <vcl/sv.h>
-#include <vcl/salobj.hxx>
+#include <salobj.hxx>
// -----------------
// - SalObjectData -
diff --git a/vcl/win/inc/salprn.h b/vcl/inc/win/salprn.h
index 123af2f79a90..6b399f99f971 100644..100755
--- a/vcl/win/inc/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -29,8 +29,7 @@
#ifndef _SV_SALPRN_H
#define _SV_SALPRN_H
-#include <vcl/sv.h>
-#include <vcl/salprn.hxx>
+#include <salprn.hxx>
// -----------------
// - SalDriverData -
diff --git a/vcl/win/inc/salsys.h b/vcl/inc/win/salsys.h
index 806c6b9df812..6f133b57d15f 100644..100755
--- a/vcl/win/inc/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -29,7 +29,7 @@
#ifndef _SV_SALSYS_H
#define _SV_SALSYS_H
-#include <vcl/salsys.hxx>
+#include <salsys.hxx>
#include <vector>
#include <map>
diff --git a/vcl/win/inc/saltimer.h b/vcl/inc/win/saltimer.h
index 41839ad2f0c2..d408e099eaaf 100644..100755
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -29,7 +29,7 @@
#ifndef _SV_SALTIMER_H
#define _SV_SALTIMER_H
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
class WinSalTimer : public SalTimer
{
diff --git a/vcl/win/inc/salvd.h b/vcl/inc/win/salvd.h
index 4e7416cf2b97..0f213ed5a6f3 100644..100755
--- a/vcl/win/inc/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -29,8 +29,7 @@
#ifndef _SV_SALVD_H
#define _SV_SALVD_H
-#include <vcl/sv.h>
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
class WinSalGraphics;
diff --git a/vcl/win/inc/svsys.h b/vcl/inc/win/svsys.h
index f7bc87b0c514..f7bc87b0c514 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/inc/win/svsys.h
diff --git a/vcl/win/inc/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index ab399453884c..6e20eb8e16e5 100644..100755
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -30,7 +30,6 @@
#define _SV_WINCOMP_HXX
#include <string.h>
-#include <vcl/sv.h>
// ----------
// - Strict -
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/window.h
index 12f6eedc2906..12f6eedc2906 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/window.h
diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/xconnection.hxx
index bd3270fa24c7..bd3270fa24c7 100644
--- a/vcl/inc/vcl/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index ea3c074103ab..9e0ccdba440b 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,57 +1,4 @@
vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
vc vcl usr1 - all vc_mkout NULL
-vc vcl\inc nmake - all vc_inc NULL
-vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL
-vc vcl\source\app nmake - all vc_app vc_inc NULL
-vc vcl\source\gdi nmake - all vc_gdi vc_inc NULL
-vc vcl\source\window nmake - all vc_win vc_inc NULL
-vc vcl\source\control nmake - all vc_ctrl vc_inc NULL
-vc vcl\source\src nmake - all vc_src vc_inc NULL
-vc vcl\source\helper nmake - all vc_hlp vc_inc NULL
-vc vcl\source\fontsubset nmake - all vc_fts vc_inc NULL
-vc vcl\source\salmain nmake - all vc_salmain vc_inc NULL
-vc vcl\os2\source\app nmake - p vc__appp vc_inc NULL
-vc vcl\os2\source\gdi nmake - p vc__gdip vc_inc NULL
-vc vcl\os2\source\window nmake - p vc__winp vc_inc NULL
-vc vcl\os2\source\src nmake - p vc__srcp vc_inc NULL
-vc vcl\source\components nmake - all vc_components vc_inc NULL
-vc vcl\win\source\app nmake - w vc__appw vc_inc NULL
-vc vcl\win\source\gdi nmake - w vc__gdiw vc_inc NULL
-vc vcl\win\source\window nmake - w vc__winw vc_inc NULL
-vc vcl\win\source\src nmake - w vc__srcw vc_inc NULL
-vc vcl\unx\source\plugadapt nmake - u vc__plug vc_inc NULL
-vc vcl\unx\source\desktopdetect nmake - u vc__desk vc_inc NULL
-vc vcl\unx\source\app nmake - u vc__appu vc_inc NULL
-vc vcl\unx\source\dtrans nmake - u vc__dtru vc_inc NULL
-vc vcl\unx\source\fontmanager nmake - u vc__ftmu vc_inc NULL
-vc vcl\unx\source\gdi nmake - u vc__gdiu vc_inc NULL
-vc vcl\unx\source\printer nmake - u vc__prnu vc_inc NULL
-vc vcl\unx\source\printergfx nmake - u vc__prgu vc_inc NULL
-vc vcl\unx\source\window nmake - u vc__winu vc_inc NULL
-vc vcl\unx\gtk\a11y nmake - u vc__gtky vc_inc NULL
-vc vcl\unx\gtk\app nmake - u vc__gtka vc_inc NULL
-vc vcl\unx\gtk\window nmake - u vc__gtkw vc_inc NULL
-vc vcl\unx\gtk\gdi nmake - u vc__gtkg vc_inc NULL
-vc vcl\unx\headless nmake - u vc__hl vc_inc NULL
-vc vcl\unx\kde nmake - u vc__kde vc_inc NULL
-vc vcl\unx\kde4 nmake - u vc__kde4 vc_inc NULL
-vc vcl\aqua\source\a11y nmake - u vc__aquy vc_inc NULL
-vc vcl\aqua\source\app nmake - u vc__appa vc_inc NULL
-vc vcl\aqua\source\dtrans nmake - u vc__dtra vc_inc NULL
-vc vcl\aqua\source\gdi nmake - u vc__gdia vc_inc NULL
-vc vcl\aqua\source\res nmake - u vc__resa NULL
-vc vcl\aqua\source\window nmake - u vc__wina vc_inc NULL
-vc vcl\mac\source\app nmake - m vc__appm vc_inc NULL
-vc vcl\mac\source\gdi nmake - m vc__gdim vc_inc NULL
-vc vcl\mac\source\window nmake - m vc__winm vc_inc NULL
-vc vcl\mac\source\src nmake - m vc__srcm vc_inc NULL
-vc vcl\util nmake - all vc_util vc__plug.u vc__desk.u vc__aquy.u vc__appa.u vc__dtra.u vc__appm.m vc__appu.u vc__dtru.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc__ftmu.u vc__prgu.u vc__prnu.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_fts vc_components NULL
-vc vcl\util\linksvp nmake - u vc_lsvp vc_util NULL
-vc vcl\workben nmake - all vc_wrkb vc_util vc_salmain NULL
-
-# memCheck works only within unix
-# memCheck is not right yet
-# vc vcl\qa\complex\memCheck nmake - u vc_qa_complex vc_util NULL
-# GPF
-# vc vcl\qa\complex\persistent_window_states nmake - all vc_qa_complex vc_util NULL
+vc vcl\prj nmake - all vc_prj NULL
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 00b703cf43b9..44207ff15e12 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,161 +1,3 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\vcl
-
-..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\bin%_EXT%\*.zip
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\vcl*.res %_DEST%\bin%_EXT%\vcl*.res
-..\%__SRC%\bin\vcl?????.dll %_DEST%\bin%_EXT%\vcl?????.dll
-..\%__SRC%\bin\vcl?????.sym %_DEST%\bin%_EXT%\vcl?????.sym
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\ivcl.lib %_DEST%\lib%_EXT%\ivcl.lib
-..\%__SRC%\misc\vcl?????.map %_DEST%\bin%_EXT%\vcl?????.map
-..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj
-..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o
-..\%__SRC%\lib\libvclmain.a %_DEST%\lib%_EXT%\libvclmain.a
-..\%__SRC%\lib\vclmain.lib %_DEST%\lib%_EXT%\vclmain.lib
-
-..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx
-..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx
-..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx
-..\inc\vcl\apptypes.hxx %_DEST%\inc%_EXT%\vcl\apptypes.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\bitmap.hxx %_DEST%\inc%_EXT%\vcl\bitmap.hxx
-..\inc\vcl\bitmapex.hxx %_DEST%\inc%_EXT%\vcl\bitmapex.hxx
-..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx
-..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx
-..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx
-..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h
-..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx
-..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h
-..\inc\vcl\combobox.hxx %_DEST%\inc%_EXT%\vcl\combobox.hxx
-..\inc\vcl\ctrl.hxx %_DEST%\inc%_EXT%\vcl\ctrl.hxx
-..\inc\vcl\cursor.hxx %_DEST%\inc%_EXT%\vcl\cursor.hxx
-..\inc\vcl\cvtgrf.hxx %_DEST%\inc%_EXT%\vcl\cvtgrf.hxx
-..\inc\vcl\cvtsvm.hxx %_DEST%\inc%_EXT%\vcl\cvtsvm.hxx
-..\inc\vcl\decoview.hxx %_DEST%\inc%_EXT%\vcl\decoview.hxx
-..\inc\vcl\dialog.hxx %_DEST%\inc%_EXT%\vcl\dialog.hxx
-..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx
-..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx
-..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
-..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx
-..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx
-..\inc\vcl\field.hxx %_DEST%\inc%_EXT%\vcl\field.hxx
-..\inc\vcl\fixbrd.hxx %_DEST%\inc%_EXT%\vcl\fixbrd.hxx
-..\inc\vcl\fixed.hxx %_DEST%\inc%_EXT%\vcl\fixed.hxx
-..\inc\vcl\floatwin.hxx %_DEST%\inc%_EXT%\vcl\floatwin.hxx
-..\inc\vcl\fntstyle.hxx %_DEST%\inc%_EXT%\vcl\fntstyle.hxx
-..\inc\vcl\font.hxx %_DEST%\inc%_EXT%\vcl\font.hxx
..\inc\vcl\fontcapabilities.hxx %_DEST%\inc%_EXT%\vcl\fontcapabilities.hxx
-..\inc\vcl\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx
-..\inc\vcl\gdimtf.hxx %_DEST%\inc%_EXT%\vcl\gdimtf.hxx
-..\inc\vcl\gfxlink.hxx %_DEST%\inc%_EXT%\vcl\gfxlink.hxx
-..\inc\vcl\gradient.hxx %_DEST%\inc%_EXT%\vcl\gradient.hxx
-..\inc\vcl\graph.h %_DEST%\inc%_EXT%\vcl\graph.h
-..\inc\vcl\graph.hxx %_DEST%\inc%_EXT%\vcl\graph.hxx
-..\inc\vcl\group.hxx %_DEST%\inc%_EXT%\vcl\group.hxx
-..\inc\vcl\hatch.hxx %_DEST%\inc%_EXT%\vcl\hatch.hxx
-..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx
-..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx
-..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx
-..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx
-..\inc\vcl\throbber.hxx %_DEST%\inc%_EXT%\vcl\throbber.hxx
-..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx
-..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
-..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
-..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx
-..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h
-..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx
-..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx
-..\inc\vcl\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx
-..\inc\vcl\longcurr.hxx %_DEST%\inc%_EXT%\vcl\longcurr.hxx
-..\inc\vcl\lstbox.h %_DEST%\inc%_EXT%\vcl\lstbox.h
-..\inc\vcl\lstbox.hxx %_DEST%\inc%_EXT%\vcl\lstbox.hxx
-..\inc\vcl\mapmod.hxx %_DEST%\inc%_EXT%\vcl\mapmod.hxx
-..\inc\vcl\menu.hxx %_DEST%\inc%_EXT%\vcl\menu.hxx
-..\inc\vcl\menubtn.hxx %_DEST%\inc%_EXT%\vcl\menubtn.hxx
-..\inc\vcl\metaact.hxx %_DEST%\inc%_EXT%\vcl\metaact.hxx
-..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx
-..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx
-..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx
-..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx
-..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
-..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
-..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
-..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
-..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx
-..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
-..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
-..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
-..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
-..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
-..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
-..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx
-..\inc\vcl\region.hxx %_DEST%\inc%_EXT%\vcl\region.hxx
-..\inc\vcl\salbtype.hxx %_DEST%\inc%_EXT%\vcl\salbtype.hxx
-..\inc\vcl\salctype.hxx %_DEST%\inc%_EXT%\vcl\salctype.hxx
-..\inc\vcl\salgtype.hxx %_DEST%\inc%_EXT%\vcl\salgtype.hxx
-..\inc\vcl\salstype.hxx %_DEST%\inc%_EXT%\vcl\salstype.hxx
-..\inc\vcl\salnativewidgets.hxx %_DEST%\inc%_EXT%\vcl\salnativewidgets.hxx
-..\inc\vcl\scrbar.hxx %_DEST%\inc%_EXT%\vcl\scrbar.hxx
-..\inc\vcl\seleng.hxx %_DEST%\inc%_EXT%\vcl\seleng.hxx
-..\inc\vcl\settings.hxx %_DEST%\inc%_EXT%\vcl\settings.hxx
-..\inc\vcl\slider.hxx %_DEST%\inc%_EXT%\vcl\slider.hxx
-..\inc\vcl\sndstyle.hxx %_DEST%\inc%_EXT%\vcl\sndstyle.hxx
..\inc\vcl\solarmutex.hxx %_DEST%\inc%_EXT%\vcl\solarmutex.hxx
-..\inc\vcl\sound.hxx %_DEST%\inc%_EXT%\vcl\sound.hxx
-..\inc\vcl\spin.h %_DEST%\inc%_EXT%\vcl\spin.h
-..\inc\vcl\spin.hxx %_DEST%\inc%_EXT%\vcl\spin.hxx
-..\inc\vcl\spinfld.hxx %_DEST%\inc%_EXT%\vcl\spinfld.hxx
-..\inc\vcl\split.hxx %_DEST%\inc%_EXT%\vcl\split.hxx
-..\inc\vcl\splitwin.hxx %_DEST%\inc%_EXT%\vcl\splitwin.hxx
-..\inc\vcl\status.hxx %_DEST%\inc%_EXT%\vcl\status.hxx
-..\inc\vcl\stdtext.hxx %_DEST%\inc%_EXT%\vcl\stdtext.hxx
-..\inc\vcl\sv.h %_DEST%\inc%_EXT%\vcl\sv.h
-..\inc\vcl\svapp.hxx %_DEST%\inc%_EXT%\vcl\svapp.hxx
-..\inc\vcl\symbol.hxx %_DEST%\inc%_EXT%\vcl\symbol.hxx
-..\inc\vcl\syschild.hxx %_DEST%\inc%_EXT%\vcl\syschild.hxx
-..\inc\vcl\sysdata.hxx %_DEST%\inc%_EXT%\vcl\sysdata.hxx
-..\inc\vcl\syswin.hxx %_DEST%\inc%_EXT%\vcl\syswin.hxx
-..\inc\vcl\tabctrl.hxx %_DEST%\inc%_EXT%\vcl\tabctrl.hxx
-..\inc\vcl\tabdlg.hxx %_DEST%\inc%_EXT%\vcl\tabdlg.hxx
-..\inc\vcl\tabpage.hxx %_DEST%\inc%_EXT%\vcl\tabpage.hxx
-..\inc\vcl\taskpanelist.hxx %_DEST%\inc%_EXT%\vcl\taskpanelist.hxx
-..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx
-..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx
-..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.hxx
-..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx
-..\inc\vcl\vclenum.hxx %_DEST%\inc%_EXT%\vcl\vclenum.hxx
-..\inc\vcl\vclevent.hxx %_DEST%\inc%_EXT%\vcl\vclevent.hxx
-..\inc\vcl\virdev.hxx %_DEST%\inc%_EXT%\vcl\virdev.hxx
-..\inc\vcl\waitobj.hxx %_DEST%\inc%_EXT%\vcl\waitobj.hxx
-..\inc\vcl\wall.hxx %_DEST%\inc%_EXT%\vcl\wall.hxx
-..\inc\vcl\window.hxx %_DEST%\inc%_EXT%\vcl\window.hxx
-..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx
-..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
-..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
-..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
-..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx
-..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx
-..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx
-..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
-..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx
-..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
-..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
-..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx
-..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
-..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
-..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
-..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
-..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
-..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx
-..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
-..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx
-..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
-..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
-..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
-..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx
-..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
diff --git a/vcl/util/makefile.pmk b/vcl/prj/makefile.mk
index 884eb499b532..c73a3d944bbf 100644
--- a/vcl/util/makefile.pmk
+++ b/vcl/prj/makefile.mk
@@ -25,10 +25,16 @@
#
#*************************************************************************
-.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua"
-USE_BUILTIN_RASTERIZER=true
-.ENDIF
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
-.IF "$(USE_BUILTIN_RASTERIZER)" != ""
-ADDCDEFS += -DUSE_BUILTIN_RASTERIZER
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 0380e9e58044..ccc509ced1f1 100644..100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -38,14 +38,10 @@
#include <cmath>
#include <limits.h>
-#include "vcl/svdata.hxx"
-#include "svsys.h"
-
-#ifdef WNT
-#undef min
-#endif
#include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
+
+#include "vos/mutex.hxx"
+
#include "vcl/svapp.hxx"
#include "vcl/event.hxx"
#include "vcl/lstbox.hxx"
@@ -58,13 +54,18 @@
#include "vcl/wrkwin.hxx"
#include "vcl/sound.hxx"
#include "vcl/threadex.hxx"
-#include "vcl/dbggui.hxx"
-#include "com/sun/star/i18n/XCharacterClassification.hpp"
+
+#include "svdata.hxx"
+#include "dbggui.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/unohelp2.hxx"
-#include <osl/mutex.hxx>
-#include "vcl/salinst.hxx"
+
+#include "salinst.hxx"
+#include "svdata.hxx"
+#include "svsys.h"
+
+#include "com/sun/star/i18n/XCharacterClassification.hpp"
#include <map>
#include <algorithm>
@@ -627,10 +628,9 @@ sal_Bool DbgWindow::Close()
// remember window position
ByteString aState( GetWindowState() );
DbgData* pData = DbgGetData();
- strncpy( pData->aDbgWinState,
- aState.GetBuffer(),
- std::min( sizeof( pData->aDbgWinState ),
- size_t(aState.Len() + 1U )) );
+ size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.Len() + 1U ))
+ ? sizeof( pData->aDbgWinState ) : size_t(aState.Len() + 1U );
+ strncpy( pData->aDbgWinState, aState.GetBuffer(), nCopy );
pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0;
// and save for next session
DbgSaveData( *pData );
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 41263675840f..75bab1a29694 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -29,16 +29,18 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "vcl/svdata.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/time.hxx"
+
#include "vcl/window.hxx"
#include "vcl/event.hxx"
#include "vcl/svapp.hxx"
#include "vcl/wrkwin.hxx"
#include "vcl/help.hxx"
-#include "vcl/helpwin.hxx"
-#include "tools/debug.hxx"
-#include "tools/diagnose_ex.h"
-#include "tools/time.hxx"
+
+#include "helpwin.hxx"
+#include "svdata.hxx"
// =======================================================================
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 0f9a8df94255..b55a988fa7da 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -29,16 +29,18 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "vcl/i18nhelp.hxx"
-
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/i18n/TransliterationModules.hpp"
#include "unotools/localedatawrapper.hxx"
#include "unotools/transliterationwrapper.hxx"
+
#include "i18npool/mslangid.hxx"
#include "rtl/ustrbuf.hxx"
+#include "vcl/i18nhelp.hxx"
+
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+
using namespace ::com::sun::star;
vcl::I18nHelper::I18nHelper( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, const ::com::sun::star::lang::Locale& rLocale )
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index cc6502a74896..57547d80a007 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -28,9 +28,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <vcl/idlemgr.hxx>
+
+
#include <vcl/svapp.hxx>
+#include <idlemgr.hxx>
+
// =======================================================================
struct ImplIdleData
diff --git a/vcl/source/app/makefile.mk b/vcl/source/app/makefile.mk
deleted file mode 100644
index 6e9c91f3c2e7..000000000000
--- a/vcl/source/app/makefile.mk
+++ /dev/null
@@ -1,71 +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=app
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile2.pmk
-
-CDEFS+=-DDLLPOSTFIX=$(DLLPOSTFIX)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/dbggui.obj \
- $(SLO)$/brand.obj \
- $(SLO)$/help.obj \
- $(SLO)$/idlemgr.obj \
- $(SLO)$/settings.obj \
- $(SLO)$/sound.obj \
- $(SLO)$/stdtext.obj \
- $(SLO)$/svapp.obj \
- $(SLO)$/svdata.obj \
- $(SLO)$/svmain.obj \
- $(SLO)$/svmainhook.obj \
- $(SLO)$/timer.obj \
- $(SLO)$/dndhelp.obj \
- $(SLO)$/unohelp.obj \
- $(SLO)$/unohelp2.obj \
- $(SLO)$/vclevent.obj \
- $(SLO)$/i18nhelp.obj \
- $(SLO)$/salvtables.obj \
- $(SLO)$/solarmutex.obj \
- $(SLO)$/session.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8cbd1d816f8c..d30637f1e54e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -29,16 +29,16 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <vcl/salframe.hxx>
-#include <vcl/salinst.hxx>
-#include <vcl/salvd.hxx>
-#include <vcl/salprn.hxx>
-#include <vcl/saltimer.hxx>
-#include <vcl/salimestatus.hxx>
-#include <vcl/salsys.hxx>
-#include <vcl/salbmp.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/salmenu.hxx>
+#include <salframe.hxx>
+#include <salinst.hxx>
+#include <salvd.hxx>
+#include <salprn.hxx>
+#include <saltimer.hxx>
+#include <salimestatus.hxx>
+#include <salsys.hxx>
+#include <salbmp.hxx>
+#include <salobj.hxx>
+#include <salmenu.hxx>
// this file contains the virtual destructors of the sal interface
// compilers ususally put their vtables where the destructor is
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 89aaf9026312..afcbab4bcc71 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -28,12 +28,17 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
-#include <vcl/salsession.hxx>
+
#include <cppuhelper/compbase1.hxx>
+
#include <tools/debug.hxx>
+
+#include <vcl/svapp.hxx>
+
+#include <svdata.hxx>
+#include <salinst.hxx>
+#include <salsession.hxx>
+
#include <com/sun/star/frame/XSessionManagerClient.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XSessionManagerListener2.hpp>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a55fec63e8b1..64cdeab7b61f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -30,25 +30,29 @@
#include "precompiled_vcl.hxx"
#include <svsys.h>
#include "tools/debug.hxx"
+
#include "i18npool/mslangid.hxx"
+
#include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
#include "vcl/event.hxx"
#include "vcl/settings.hxx"
#include "vcl/i18nhelp.hxx"
-#include "unotools/fontcfg.hxx"
#include "vcl/configsettings.hxx"
#include "vcl/gradient.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/bitmapex.hxx"
-#include "vcl/impimagetree.hxx"
+
+#include "unotools/fontcfg.hxx"
#include "unotools/localedatawrapper.hxx"
#include "unotools/collatorwrapper.hxx"
#include "unotools/configmgr.hxx"
#include "unotools/confignode.hxx"
-#include <unotools/syslocaleoptions.hxx>
+#include "unotools/syslocaleoptions.hxx"
using ::rtl::OUString;
+
+#include "svdata.hxx"
+#include "impimagetree.hxx"
// =======================================================================
DBG_NAME( AllSettings )
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index 13f832339977..5fe5b5d38143 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -28,18 +28,20 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+
#include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
+
#include <unotools/localfilehelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svsys.h>
-#include <vcl/salframe.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/sound.hxx>
-#include <vcl/salinst.hxx>
+
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
void Sound::Beep( SoundType eType, Window* pWindow )
{
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 3fc2e67cc488..d33fbd7da71f 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -29,11 +29,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
+#include <svids.hrc>
+#include <svdata.hxx>
// =======================================================================
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e4cf7bf32330..fe536addac98 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -29,51 +29,58 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "svsys.h"
-#include "vcl/salinst.hxx"
-#include "vcl/salframe.hxx"
-#include "vcl/salsys.hxx"
+//#include "svsys.h"
+
+#include "comphelper/processfactory.hxx"
+
+#include "osl/module.h"
+#include "osl/file.hxx"
+#include "osl/thread.h"
+
+#include "rtl/tencinfo.h"
+#include "rtl/instance.hxx"
+
+
#include "tools/tools.h"
#include "tools/debug.hxx"
#include "tools/time.hxx"
+
#include "i18npool/mslangid.hxx"
-#include "vcl/svdata.hxx"
+
+#include "unotools/syslocaleoptions.hxx"
+
#include "vcl/settings.hxx"
-#include "vcl/accmgr.hxx"
#include "vcl/keycod.hxx"
#include "vcl/event.hxx"
#include "vcl/vclevent.hxx"
#include "vcl/virdev.hxx"
-#include "vcl/window.h"
#include "vcl/wrkwin.hxx"
-#include "vcl/idlemgr.hxx"
#include "vcl/svapp.hxx"
#include "vcl/cvtgrf.hxx"
#include "vcl/unowrap.hxx"
-#include "vcl/xconnection.hxx"
-#include "vcl/svids.hrc"
#include "vcl/timer.hxx"
-
#include "vcl/unohelp.hxx"
+#include "vcl/lazydelete.hxx"
+
+#include "salinst.hxx"
+#include "salframe.hxx"
+#include "salsys.hxx"
+#include "svdata.hxx"
+#include "salimestatus.hxx"
+#include "xconnection.hxx"
+#include "window.h"
+#include "accmgr.hxx"
+#include "idlemgr.hxx"
+#include "svids.hrc"
#include "com/sun/star/uno/Reference.h"
#include "com/sun/star/awt/XToolkit.hpp"
#include "com/sun/star/uno/XNamingService.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "comphelper/processfactory.hxx"
-
-#include "osl/module.h"
-#include "osl/file.hxx"
#include "osl/mutex.hxx"
#include "osl/process.h"
-#include "osl/thread.h"
-#include "rtl/tencinfo.h"
-#include "rtl/instance.hxx"
-#include "vcl/salimestatus.hxx"
#include <utility>
-#include <vcl/lazydelete.hxx>
-#include <unotools/syslocaleoptions.hxx>
using namespace ::com::sun::star::uno;
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index ee46f14acae0..409b4dee1da7 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -33,33 +33,35 @@
#include <boost/ptr_container/ptr_vector.hpp>
+
#include <osl/file.hxx>
#include <osl/mutex.hxx>
#include <rtl/process.h>
-
#include "tools/debug.hxx"
#include "tools/resary.hxx"
-#include "vcl/salinst.hxx"
-#include "vcl/salframe.hxx"
+#include "unotools/fontcfg.hxx"
+
+#include "vos/mutex.hxx"
+
+#include "cppuhelper/implbase1.hxx"
+
+#include "uno/current_context.hxx"
+
#include "vcl/configsettings.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/window.h"
#include "vcl/svapp.hxx"
#include "vcl/wrkwin.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/button.hxx" // for Button::GetStandardText
#include "vcl/dockwin.hxx" // for DockingManager
-#include "vcl/salimestatus.hxx"
-#include "vcl/salsys.hxx"
-#include "vcl/svids.hrc"
-#include "vcl/xconnection.hxx"
-
-#include "unotools/fontcfg.hxx"
-
-#include "cppuhelper/implbase1.hxx"
-#include "uno/current_context.hxx"
+#include "salinst.hxx"
+#include "salframe.hxx"
+#include "svdata.hxx"
+#include "window.h"
+#include "salimestatus.hxx"
+#include "salsys.hxx"
+#include "svids.hrc"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/lang/XComponent.hpp"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 655bb0393563..b54ebd855433 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -29,6 +29,32 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include "rtl/logfile.hxx"
+
+#include "osl/file.hxx"
+
+#include "vos/signal.hxx"
+#include "vos/process.hxx"
+
+#include "tools/tools.h"
+#include "tools/debug.hxx"
+#include "tools/unqid.hxx"
+#include "tools/resmgr.hxx"
+
+#include "comphelper/processfactory.hxx"
+
+#include "unotools/syslocaleoptions.hxx"
+#include "unotools/fontcfg.hxx"
+
+#include "vcl/svapp.hxx"
+#include "vcl/wrkwin.hxx"
+#include "vcl/cvtgrf.hxx"
+#include "vcl/image.hxx"
+#include "vcl/settings.hxx"
+#include "vcl/unowrap.hxx"
+#include "vcl/configsettings.hxx"
+#include "vcl/lazydelete.hxx"
+
#ifdef WNT
#include <svsys.h>
#include <process.h> // for _beginthreadex
@@ -40,46 +66,29 @@
// building X11 graphics layers.
#if defined UNX && ! defined QUARTZ
-#include "svunx.h"
+//#include "svunx.h"
#endif
-#include "svsys.h"
-#include "vcl/salinst.hxx"
-#include "vcl/salwtype.hxx"
-#include "osl/signal.h"
-#include "tools/tools.h"
-#include "tools/debug.hxx"
-#include "tools/unqid.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/dbggui.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/wrkwin.hxx"
-#include "vcl/cvtgrf.hxx"
-#include "vcl/image.hxx"
-#include "tools/resmgr.hxx"
-#include "vcl/accmgr.hxx"
-#include "vcl/idlemgr.hxx"
-#include "vcl/outdev.h"
-#include "vcl/outfont.hxx"
-#include "vcl/print.h"
-#include "vcl/settings.hxx"
-#include "vcl/unowrap.hxx"
-#include "vcl/salsys.hxx"
-#include "vcl/saltimer.hxx"
-#include "vcl/salimestatus.hxx"
-#include "vcl/impimagetree.hxx"
-#include "vcl/xconnection.hxx"
+//#include "svsys.h"
+
+#include "salinst.hxx"
+#include "salwtype.hxx"
+#include "svdata.hxx"
+#include "dbggui.hxx"
+#include "accmgr.hxx"
+#include "idlemgr.hxx"
+#include "outdev.h"
+#include "outfont.hxx"
+#include "print.h"
+#include "salsys.hxx"
+#include "saltimer.hxx"
+#include "salimestatus.hxx"
+#include "impimagetree.hxx"
+#include "xconnection.hxx"
-#include "osl/file.hxx"
#include "osl/process.h"
-#include "comphelper/processfactory.hxx"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/lang/XComponent.hpp"
-#include "rtl/logfile.hxx"
-#include <unotools/syslocaleoptions.hxx>
-#include "unotools/fontcfg.hxx"
-#include "vcl/configsettings.hxx"
-#include "vcl/lazydelete.hxx"
#include "cppuhelper/implbase1.hxx"
#include "uno/current_context.hxx"
@@ -379,7 +388,9 @@ void DeInitVCL()
aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) );
aBuf.append( "\" type = \"" );
aBuf.append( typeid(*pWin).name() );
- aBuf.append( "\"\n" );
+ aBuf.append( "\", ptr = 0x" );
+ aBuf.append( sal_Int64( pWin ), 16 );
+ aBuf.append( "\n" );
}
}
DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() );
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 6c2d08b18659..fc2242522433 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -29,15 +29,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <svsys.h>
-#include <vcl/saltimer.hxx>
#include <tools/time.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/salinst.hxx>
#include <tools/debug.hxx>
+
+#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
+#include <saltimer.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
// =======================================================================
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 00fbaaeef3c4..57508219d8de 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -29,30 +29,28 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include <tools/tempfile.hxx>
+
+#include <osl/file.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
+
+#include <svdata.hxx>
+
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/XCharacterClassification.hpp>
-
#include <com/sun/star/awt/XExtendedToolkit.hpp>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-
-
#include <com/sun/star/registry/XImplementationRegistration.hpp>
-#include <cppuhelper/servicefactory.hxx>
-
-#include <tools/tempfile.hxx>
-#include <osl/file.hxx>
-
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
using namespace ::rtl;
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index f7614c99046b..0ce3cc90f633 100644
--- a/