diff options
49 files changed, 1487 insertions, 622 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk new file mode 100644 index 000000000000..4a96d194e7f6 --- /dev/null +++ b/vcl/Library_desktop_detector.mk @@ -0,0 +1,83 @@ +#************************************************************************* +# +# 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_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 100644 index 000000000000..a8d39c2bba53 --- /dev/null +++ b/vcl/Library_vcl.mk @@ -0,0 +1,348 @@ +#************************************************************************* +# +# 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)) + +$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) + +$(eval $(call gb_Library_add_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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 ($(GUI),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=\"$(gb_Library_SYSPRE)cui$(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 \ +)) + +ifneq ($(ENABLE_GRAPHITE),) +$(eval $(call gb_Library_add_linked_static_libs,vcl,\ + graphite \ +)) +endif +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + freetype \ +)) +endif + +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/unx/generic/printer/cupsmgr \ + vcl/unx/generic/printer/jobdata \ + vcl/unx/generic/printer/ppdparser \ + vcl/unx/generic/printer/printerinfomanager \ + 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 \ +)) +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/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/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/salgdilayout \ + vcl/source/gdi/sallayout \ + vcl/source/gdi/salmisc \ + vcl/source/gdi/salnativewidgets-none \ + vcl/source/gdi/textlayout \ + vcl/source/gdi/virdev \ + vcl/source/gdi/wall \ + vcl/source/glyphs/gcach_ftyp \ + vcl/source/glyphs/gcach_layout \ + vcl/source/glyphs/gcach_rbmp \ + vcl/source/glyphs/glyphcache \ + vcl/source/glyphs/graphite_adaptors \ + vcl/source/glyphs/graphite_cache \ + vcl/source/glyphs/graphite_features \ + vcl/source/glyphs/graphite_layout \ + vcl/source/glyphs/graphite_serverfont \ + vcl/source/glyphs/graphite_textsrc \ + 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 \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/unx/generic/plugadapt/salplug \ +)) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ + -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ + -D_XSALSET_LIBNAME=\"$(gb_Library_SYSPRE)spa$(gb_Library_OOOEXT)\" \ +)) +ifneq ($(ENABLE_FONTCONFIG),) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DENABLE_FONTCONFIG \ +)) +endif +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + ole32 \ + shell32 \ + user32 \ + uuid \ +)) +else +$(eval $(call gb_Library_add_linked_libs,vcl,\ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +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 100644 index 000000000000..c7eb9b2b214e --- /dev/null +++ b/vcl/Library_vclplug_gen.mk @@ -0,0 +1,129 @@ +#************************************************************************* +# +# 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_add_precompiled_header,vclplug_gen,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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 \ +)) + +$(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=\"$(gb_Library_SYSPRE)spa$(gb_Library_OOOEXT)\" \ + -DVCLPLUG_GEN_IMPLEMENTATION \ +)) + +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 100644 index 000000000000..3107702680a0 --- /dev/null +++ b/vcl/Library_vclplug_gtk.mk @@ -0,0 +1,117 @@ +#************************************************************************* +# +# 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_add_precompiled_header,vclplug_gtk,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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)\" \ +)) + +$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ + $$(LDFLAGS) \ + $$(GTK_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 \ +)) + +$(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 100644 index 000000000000..4ea34bd0fb8a --- /dev/null +++ b/vcl/Library_vclplug_kde.mk @@ -0,0 +1,95 @@ +#************************************************************************* +# +# 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_add_precompiled_header,vclplug_kde,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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 100644 index 000000000000..d7204583e8f0 --- /dev/null +++ b/vcl/Library_vclplug_kde4.mk @@ -0,0 +1,101 @@ +#************************************************************************* +# +# 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_add_precompiled_header,vclplug_kde4,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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 100644 index 000000000000..c559cf6d6c8e --- /dev/null +++ b/vcl/Library_vclplug_svp.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_svp)) + +$(eval $(call gb_Library_add_precompiled_header,vclplug_svp,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(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 \ +)) + +$(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/Makefile b/vcl/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/vcl/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk new file mode 100644 index 000000000000..5cb49b312507 --- /dev/null +++ b/vcl/Module_vcl.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# 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_Module_Module,vcl)) + +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vcl \ + Package_inc \ +)) +# FIXME: WiP +# StaticLibrary_vclmain \ + +ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_gen \ + Library_vclplug_svp \ + Library_desktop_detector \ +)) + +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 + + +# 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..f3177b01c5dd --- /dev/null +++ b/vcl/Package_inc.mk @@ -0,0 +1,164 @@ +#************************************************************************* +# +# 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/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/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/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/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk new file mode 100755 index 000000000000..9e6275f345d5 --- /dev/null +++ b/vcl/StaticLibrary_vclmain.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# 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_add_package_headers,vclmain,vcl_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/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index a34212128741..a57f5f0fd553 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -32,9 +32,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/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx index b9438e97c06e..ead0e0974713 100644 --- a/vcl/inc/saldatabasic.hxx +++ b/vcl/inc/saldatabasic.hxx @@ -32,6 +32,8 @@ #include <salinst.hxx> #include <osl/module.h> +#include "vcl/dllapi.h" + namespace psp { class PrinterInfoManager; diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 88ba2844e1e0..7758545dd37c 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -68,6 +68,8 @@ #include <sal/types.h> +#include "vcl/dllapi.h" + #include <vector> namespace vcl @@ -286,7 +288,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. @@ -297,14 +299,14 @@ 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 /** * 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 @@ -505,7 +507,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/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 959b3aec1fb1..9d51ed0cc194 100644 --- a/vcl/inc/unx/gtk/atkbridge.hxx +++ b/vcl/inc/unx/gtk/atkbridge.hxx @@ -28,9 +28,9 @@ #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/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index a22a57b976c8..c54749772dd3 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -28,13 +28,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/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index db6517cbea0b..2d75ea6f7d23 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -29,9 +29,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/inc/unx/pspgraphics.h b/vcl/inc/unx/pspgraphics.h index f0015c301229..b78c1916ae78 100644 --- a/vcl/inc/unx/pspgraphics.h +++ b/vcl/inc/unx/pspgraphics.h @@ -30,8 +30,8 @@ #include "vcl/fontmanager.hxx" -#include "vcl/dllapi.h" +#include "vclpluginapi.h" #include "salgdi.hxx" #include "sallayout.hxx" @@ -41,7 +41,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/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 1da035536179..5f70373322fc 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -34,7 +34,7 @@ #endif #include <unx/saldisp.hxx> #include <salbmp.hxx> -#include <vcl/dllapi.h> +#include <vclpluginapi.h> struct BitmapBuffer; class BitmapPalette; @@ -46,7 +46,7 @@ class ImplSalBitmapCache; // - SalBitmap - // ------------- -class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap +class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap { private: diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index 566d17e98a32..ea2a9994baed 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -37,7 +37,7 @@ #ifndef _OSL_MODULE_H #include <osl/module.h> #endif -#include <vcl/dllapi.h> +#include <vclpluginapi.h> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= class SalXLib; @@ -55,7 +55,7 @@ typedef unsigned int pthread_t; #endif // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -class VCL_DLLPUBLIC X11SalData : public SalData +class VCLPLUG_GEN_PUBLIC X11SalData : public SalData { protected: BOOL bNoExceptions_; diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index c83c1c56e1c5..6ed61c4a24c8 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -49,7 +49,8 @@ class SalXLib; #include <hash_map> #include <tools/gen.hxx> #include <salwtype.hxx> -#include <vcl/dllapi.h> + +#include <vclpluginapi.h> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= class BitmapPalette; @@ -208,7 +209,7 @@ public: typedef int(*YieldFunc)(int fd, void* data); struct YieldEntry; -class VCL_DLLPUBLIC SalXLib +class VCLPLUG_GEN_PUBLIC SalXLib { protected: timeval m_aTimeout; @@ -279,7 +280,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( USHORT 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/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 9f063975173d..3526e12badfe 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -38,7 +38,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/sysdata.hxx> #include <vcl/timer.hxx> -#include <vcl/dllapi.h> +#include <vclpluginapi.h> #include <list> @@ -57,7 +57,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/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index a8804f1b3778..761df76d7ace 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -29,13 +29,16 @@ #define _SV_SALGDI_H // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "tools/fract.hxx" + +#include "vcl/salgtype.hxx" +#include "vcl/vclenum.hxx" + #include "salstd.hxx" #include "salgdi.hxx" -#include "vcl/salgtype.hxx" -#include "tools/fract.hxx" -#include "vcl/dllapi.h" -#include <vcl/vclenum.hxx> -#include <sallayout.hxx> +#include "sallayout.hxx" +#include "vclpluginapi.h" + #include <deque> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -73,7 +76,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/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 15cb4f1c7e65..6b21737f81f5 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -36,10 +36,10 @@ #ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> #endif -#include <vcl/dllapi.h> +#include <vclpluginapi.h> #include <salinst.hxx> -class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex +class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vos::OMutex { protected: ULONG mnCount; @@ -57,7 +57,7 @@ public: }; // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -class VCL_DLLPUBLIC X11SalInstance : public SalInstance +class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalInstance { protected: SalYieldMutex* mpSalYieldMutex; diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index d2f63dad99aa..d2da11686b42 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -30,8 +30,8 @@ #include <vcl/sv.h> #include <vcl/sysdata.hxx> -#include <vcl/dllapi.h> +#include <vclpluginapi.h> #include <salobj.hxx> class SalClipRegion @@ -65,7 +65,7 @@ private: }; -class X11SalObject : public SalObject +class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject { public: SystemChildData maSystemChildData; diff --git a/vcl/inc/unx/salprn.h b/vcl/inc/unx/salprn.h index b65792e1351a..1232b6fbc619 100644 --- a/vcl/inc/unx/salprn.h +++ b/vcl/inc/unx/salprn.h @@ -32,6 +32,7 @@ #include "printergfx.hxx" #include "printerjob.hxx" #include "salprn.hxx" +#include "vclpluginapi.h" class PspGraphics; @@ -107,7 +108,7 @@ public: class Timer; namespace vcl_sal { -class VCL_DLLPUBLIC PrinterUpdate +class VCLPLUG_GEN_PUBLIC PrinterUpdate { static Timer* pPrinterUpdateTimer; static int nActiveJobs; diff --git a/vcl/inc/unx/salsys.h b/vcl/inc/unx/salsys.h index a62a3384a17e..3b21985b8282 100644 --- a/vcl/inc/unx/salsys.h +++ b/vcl/inc/unx/salsys.h @@ -37,11 +37,11 @@ #include <vos/thread.hxx> #endif #include <salsys.hxx> -#include <vcl/dllapi.h> +#include <vclpluginapi.h> #include <list> -class VCL_DLLPUBLIC X11SalSystem : public SalSystem +class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalSystem { public: X11SalSystem() {} diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 4c6a0c356c36..f5123f3e7ae0 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -27,10 +27,11 @@ #ifndef _VCL_SM_HXX #define _VCL_SM_HXX -#include <tools/link.hxx> -#include <unx/salunx.h> +#include "tools/link.hxx" +#include "unx/salunx.h" #include <X11/SM/SMlib.h> -#include <salsession.hxx> +#include "salsession.hxx" +#include "vclpluginapi.h" class SessionManagerClient { @@ -60,7 +61,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(); @@ -69,7 +70,7 @@ public: static void interactionDone( bool bCancelShutdown ); static String getExecName(); - static VCL_DLLPUBLIC const ByteString& getSessionID(); + static VCLPLUG_GEN_PUBLIC const ByteString& getSessionID(); }; class SalFrame; diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index e8620db29c6f..88f0e62024a9 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -32,12 +32,12 @@ #include <tools/string.hxx> #endif #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; @@ -45,7 +45,7 @@ class X11SalFrame; namespace vcl_sal { -class VCL_DLLPUBLIC WMAdaptor +class VCLPLUG_GEN_PUBLIC WMAdaptor { public: enum WMAtom { diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx index 18330ae3508d..fcdcf933bbd3 100644 --- a/vcl/inc/vcl/jobdata.hxx +++ b/vcl/inc/vcl/jobdata.hxx @@ -39,7 +39,7 @@ enum type { }; } -struct JobData +struct VCL_DLLPUBLIC JobData { int m_nCopies; int m_nLeftMarginAdjust; diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index c7a1e09b81e4..e9272d433d07 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -34,6 +34,8 @@ #include "tools/string.hxx" #include "tools/stream.hxx" +#include "vcl/dllapi.h" + #include "com/sun/star/lang/Locale.hpp" #define PRINTER_PPDDIR "driver" @@ -45,7 +47,7 @@ class PPDTranslator; enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo }; -struct PPDValue +struct VCL_DLLPUBLIC PPDValue { PPDValueType m_eType; String m_aOption; @@ -58,7 +60,7 @@ struct PPDValue * PPDKey - a container for the available options (=values) of a PPD keyword */ -class PPDKey +class VCL_DLLPUBLIC PPDKey { friend class PPDParser; @@ -120,7 +122,7 @@ struct PPDKeyhash class PPDContext; class CUPSManager; -class PPDParser +class VCL_DLLPUBLIC PPDParser { friend class PPDContext; friend class CUPSManager; @@ -296,7 +298,7 @@ public: * contents of a PPDParser. */ -class PPDContext +class VCL_DLLPUBLIC PPDContext { typedef ::std::hash_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; hash_type m_aCurrentValues; diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h new file mode 100644 index 000000000000..3fe781a7bb97 --- /dev/null +++ b/vcl/inc/vclpluginapi.h @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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 diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index 6707cf5f4c47..1cebe9d1b319 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,57 +1,4 @@ vc vcl : l10n 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 SO:print_header cpputools shell 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\generic\plugadapt nmake - u vc__plug vc_inc NULL -vc vcl\unx\generic\desktopdetect nmake - u vc__desk vc_inc NULL -vc vcl\unx\generic\app nmake - u vc__appu vc_inc NULL -vc vcl\unx\generic\dtrans nmake - u vc__dtru vc_inc NULL -vc vcl\unx\generic\fontmanager nmake - u vc__ftmu vc_inc NULL -vc vcl\unx\generic\gdi nmake - u vc__gdiu vc_inc NULL -vc vcl\unx\generic\printer nmake - u vc__prnu vc_inc NULL -vc vcl\unx\generic\printergfx nmake - u vc__prgu vc_inc NULL -vc vcl\unx\generic\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 ba5949b00fad..8b137891791f 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -1,154 +1 @@ -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%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component -..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj -..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o - -..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx -..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx -..\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\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\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.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\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx -..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.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\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h -..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx -..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx -..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx -..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx -..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx -..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx -..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.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\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx -..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.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\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.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\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx -..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.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\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx -..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx -..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx -..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx -..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx -..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx -..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx -..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx -..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.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\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\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\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx -..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx -..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx -..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx -..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx -..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx -..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx -..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx -..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx -..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx -..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx -..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.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\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\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\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.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\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx -..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx -..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx -..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx -..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx -..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.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\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx -..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx diff --git a/vcl/prj/makefile.mk b/vcl/prj/makefile.mk new file mode 100644 index 000000000000..c73a3d944bbf --- /dev/null +++ b/vcl/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx deleted file mode 100644 index 8cd45cf58224..000000000000 --- a/vcl/source/glyphs/gcach_vdev.cxx +++ /dev/null @@ -1,287 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -#include <gcach_vdev.hxx> - -#include <vcl/svapp.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/outfont.hxx> -#include <vcl/virdev.hxx> -#include <vcl/metric.hxx> - -// ======================================================================= -// VirtDevServerFont -// ======================================================================= - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::AnnounceFonts( ImplDevFontList* pToAdd ) -{ - // TODO: get fonts on server but not on client, - // problem is that currently there is no serverside virtual device... - VirtualDevice vdev( 1 ); - long nCount = vdev.GetDevFontCount(); - - for( int i = 0; i < nCount; ++i ) - { - const FontInfo aFontInfo = vdev.GetDevFont( i ); - - ImplFontData& rData = *new ImplFontData; - rData.SetSysData( new FontSysData( (void*)SERVERFONT_MAGIC ) ); - - rData.maName = aFontInfo.GetName(); - rData.maStyleName = aFontInfo.GetStyleName(); - rData.mnWidth = aFontInfo.GetWidth(); - rData.mnHeight = aFontInfo.GetHeight(); - rData.meFamily = aFontInfo.GetFamily(); - rData.meCharSet = aFontInfo.GetCharSet(); - rData.mePitch = aFontInfo.GetPitch(); - rData.meWidthType = aFontInfo.GetWidthType(); - rData.meWeight = aFontInfo.GetWeight(); - rData.meItalic = aFontInfo.GetItalic(); - rData.meType = aFontInfo.GetType(); - rData.meFamily = aFontInfo.GetFamily(); - - rData.mbOrientation = true; // TODO: where to get this info? - rData.mbDevice = false; - rData.mnQuality = 0; // prefer client-side fonts if available - - pToAdd->Add( &rData ); - } -} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::ClearFontList() -{ - // TODO -} - -// ----------------------------------------------------------------------- - -VirtDevServerFont* VirtDevServerFont::CreateFont( const ImplFontSelectData& rFSD ) -{ - VirtDevServerFont* pServerFont = NULL; - // TODO: search list of VirtDevServerFonts, return NULL if not found - // pServerFont = new VirtDevServerFont( rFSD ); - return pServerFont; -} - -// ----------------------------------------------------------------------- - -VirtDevServerFont::VirtDevServerFont( const ImplFontSelectData& rFSD ) -: ServerFont( rFSD) -{} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const -{ - const ImplFontSelectData& aFSD = GetFontSelData(); - - Font aFont; - aFont.SetName ( aFSD.maName ); - aFont.SetStyleName ( aFSD.maStyleName ); - aFont.SetHeight ( aFSD.mnHeight ); - aFont.SetWidth ( aFSD.mnWidth ); - aFont.SetOrientation( aFSD.mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - FontMetric aMetric( vdev.GetFontMetric( aFont ) ); - - rFactor = 0x100; - - rTo.mnAscent = aMetric.GetAscent(); - rTo.mnDescent = aMetric.GetDescent(); - rTo.mnIntLeading = aMetric.GetIntLeading(); - rTo.mnExtLeading = aMetric.GetExtLeading(); - rTo.mnSlant = aMetric.GetSlant(); - rTo.meType = aMetric.GetType(); - rTo.mnFirstChar = 0x0020; // TODO: where to get this info? - rTo.mnLastChar = 0xFFFE; // TODO: where to get this info? - - rTo.mnWidth = aFSD.mnWidth; - rTo.maName = aFSD.maName; - rTo.maStyleName = aFSD.maStyleName; - rTo.mnOrientation = aFSD.mnOrientation; - rTo.meFamily = aFSD.meFamily; - rTo.meCharSet = aFSD.meCharSet; - rTo.meWeight = aFSD.meWeight; - rTo.meItalic = aFSD.meItalic; - rTo.mePitch = aFSD.mePitch; - rTo.mbDevice = FALSE; -} - -// ----------------------------------------------------------------------- - -int VirtDevServerFont::GetGlyphIndex( sal_Unicode aChar ) const -{ - return aChar; -} - -// ----------------------------------------------------------------------- - -void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const -{ - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - // get glyph metrics - sal_Int32 nCharWidth = 10; -// TODO: vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth ); - rGD.SetCharWidth( nCharWidth ); - - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - Rectangle aRect; - if( vdev.GetTextBoundRect( aRect, aGlyphStr, 0, 1 ) ) - { - rGD.SetOffset( aRect.Top(), aRect.Left() ); - rGD.SetDelta( vdev.GetTextWidth( nGlyphIndex ), 0 ); - rGD.SetSize( aRect.GetSize() ); - } -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetAntialiasAdvice( void ) const -{ - return false; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const -{ - /* - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - - // draw bitmap - vdev.SetOutputSizePixel( aSize, TRUE ); - vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), aGlyphStr ); - - // create new glyph item - - const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize ); - rGD.SetBitmap( new Bitmap( rBitmap ) ); - return true; - */ - return false; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const -{ - return false; -} - -// ----------------------------------------------------------------------- - -int VirtDevServerFont::GetGlyphKernValue( int, int ) const -{ - return 0; -} - -// ----------------------------------------------------------------------- - -ULONG VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const -{ - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - ULONG nPairs = vdev.GetKerningPairCount(); - if( nPairs > 0 ) - { - KerningPair* const pKernPairs = new KerningPair[ nPairs ]; - vdev.GetKerningPairs( nPairs, pKernPairs ); - - *ppImplKernPairs = new ImplKernPairData[ nPairs ]; - ImplKernPairData* pTo = *ppImplKernPairs; - KerningPair* pFrom = pKernPairs; - for ( ULONG n = 0; n < nPairs; n++ ) - { - pTo->mnChar1 = pFrom->nChar1; - pTo->mnChar2 = pFrom->nChar2; - pTo->mnKern = pFrom->nKern; - ++pFrom; - ++pTo; - } - - delete[] pKernPairs; - } - - return nPairs; -} - -// ----------------------------------------------------------------------- - -bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const -{ - return false; - /* - Font aFont; - aFont.SetName ( GetFontSelData().maName ); - aFont.SetStyleName ( GetFontSelData().maStyleName ); - aFont.SetHeight ( GetFontSelData().mnHeight ); - aFont.SetWidth ( GetFontSelData().mnWidth ); - aFont.SetOrientation( GetFontSelData().mnOrientation ); - aFont.SetVertical ( GetFontSelData().mbVertical ); - - VirtualDevice vdev( 1 ); - vdev.SetFont( aFont ); - - const bool bOptimize = true; - - sal_Unicode aChar = nGlyphIndex; - String aGlyphStr( &aChar, 1 ); - return vdev.GetTextOutline( rPolyPoly, aGlyphStr, 0, 1, bOptimize ); - */ -} - -// ======================================================================= diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx deleted file mode 100644 index e2349169ee13..000000000000 --- a/vcl/source/glyphs/gcach_vdev.hxx +++ /dev/null @@ -1,57 +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. - * - ************************************************************************/ - -#include <vcl/glyphcache.hxx> - -// ----------------------------------------------------------------------- - -class VirtDevServerFont : public ServerFont -{ -public: - virtual bool GetAntialiasAdvice( void ) const; - virtual bool GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const; - virtual bool GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const; - virtual bool GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const; - -protected: - friend class GlyphCache; - static void AnnounceFonts( ImplDevFontList* ); - static void ClearFontList(); - - static VirtDevServerFont* CreateFont( const ImplFontSelectData& ); - virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const; - virtual ULONG GetKernPairs( ImplKernPairData** ) const; - virtual int GetGlyphKernValue( int, int ) const; - - virtual int GetGlyphIndex( sal_Unicode ) const; - virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const; - -private: - VirtDevServerFont( const ImplFontSelectData& ); -}; - -// ----------------------------------------------------------------------- diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 7f00b73b0808..58f235bea25e 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -29,7 +29,6 @@ #include "precompiled_vcl.hxx" #include <vcl/abstdlg.hxx> -#include "cuilib.hxx" #include <osl/module.hxx> #include <tools/string.hxx> @@ -42,7 +41,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() { FuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( CUI_DLL_NAME ) ) ) ) fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") ); if ( fp ) diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 98bce72d6bce..156b1a340051 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -102,7 +102,7 @@ sal_Bool SalYieldMutex::tryToAcquire() // plugin factory function extern "C" { - VCL_DLLPUBLIC SalInstance* create_SalInstance() + VCLPLUG_GEN_PUBLIC SalInstance* create_SalInstance() { /* #i92121# workaround deadlocks in the X11 implementation */ diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 03429982c2d1..777e5aa921d3 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -33,13 +33,13 @@ #include <X11/Xatom.h> #include <tools/postx.h> -#include "vcl/dllapi.h" - #include "rtl/ustrbuf.hxx" #include "osl/module.h" #include "osl/process.h" #include "osl/thread.h" +#include "vclpluginapi.h" + #include <unistd.h> using namespace rtl; @@ -253,7 +253,7 @@ static bool is_cde_desktop( Display* pDisplay ) extern "C" { -VCL_DLLPUBLIC rtl::OUString get_desktop_environment() +DESKTOP_DETECTOR_PUBLIC rtl::OUString get_desktop_environment() { rtl::OUStringBuffer aRet( 8 ); static const char *pOverride = getenv( "OOO_FORCE_DESKTOP" ); diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx index 4e041e51aec2..a65c75174858 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.hxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx @@ -31,7 +31,6 @@ #include <tools/prex.h> #include <X11/extensions/Xrender.h> #include <tools/postx.h> -#include <vcl/dllapi.h> #include <glyphcache.hxx> diff --git a/vcl/unx/generic/gdi/salprnpsp.cxx b/vcl/unx/generic/gdi/salprnpsp.cxx index c961c321a2d3..a67e6dd6c211 100644 --- a/vcl/unx/generic/gdi/salprnpsp.cxx +++ b/vcl/unx/generic/gdi/salprnpsp.cxx @@ -73,8 +73,6 @@ using namespace com::sun::star; * static helpers */ -#include "rtsname.hxx" - static oslModule driverLib = NULL; extern "C" { diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 29970e1299e6..00058bf24461 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -67,7 +67,6 @@ static SalInstance* tryInstance( const OUString& rModuleBase ) aModName.appendAscii( SAL_DLLPREFIX"vclplug_" ); aModName.append( rModuleBase ); aModName.appendAscii( SAL_DLLPOSTFIX ); - aModName.appendAscii( SAL_DLLEXTENSION ); OUString aModule = aModName.makeStringAndClear(); oslModule aMod = osl_loadModuleRelative( diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index caf3249b5f46..97fe10f4d7ce 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -1135,8 +1135,6 @@ bool CUPSManager::addOrRemovePossible() const return (m_nDests && m_pDests && ! isCUPSDisabled())? false : PrinterInfoManager::addOrRemovePossible(); } -#include <rtsname.hxx> - const char* CUPSManager::authenticateUser( const char* /*pIn*/ ) { const char* pRet = NULL; diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 22adb201aa72..b94bf1061178 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -130,7 +130,7 @@ extern "C" return true; } - VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule pModule ) + VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule pModule ) { /* #i92121# workaround deadlocks in the X11 implementation */ diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx index f53cf97e0eed..147034d33439 100644 --- a/vcl/unx/headless/svpprn.hxx +++ b/vcl/unx/headless/svpprn.hxx @@ -34,6 +34,8 @@ #include "printerjob.hxx" #include "salprn.hxx" +#include "vclpluginapi.h" + class PspGraphics; class PspSalInfoPrinter : public SalInfoPrinter @@ -102,7 +104,7 @@ public: class Timer; namespace vcl_sal { -class VCL_DLLPUBLIC PrinterUpdate +class VCLPLUG_SVP_PUBLIC PrinterUpdate { static Timer* pPrinterUpdateTimer; static int nActiveJobs; diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index d3b94fdb5456..b97d57fb3714 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -45,9 +45,6 @@ #include <sys/time.h> #include <unistd.h> #endif -#include <unx/kde/kdedata.hxx> -#include "unx/i18n_im.hxx" -#include "unx/i18n_xkb.hxx" #include <osl/thread.h> #include <osl/process.h> @@ -58,6 +55,12 @@ #include <vos/process.hxx> #include <vos/mutex.hxx> +#include "unx/kde/kdedata.hxx" +#include "unx/i18n_im.hxx" +#include "unx/i18n_xkb.hxx" + +#include "vclpluginapi.h" + /* #i59042# override KApplications method for session management * since it will interfere badly with our own. */ @@ -227,7 +230,7 @@ void KDEData::Init() **********************************************************************/ extern "C" { - VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule ) + VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance( oslModule ) { /* #i92121# workaround deadlocks in the X11 implementation */ diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 5e3a85256313..94d28d2e698a 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -39,11 +39,11 @@ VCLKDEApplication::VCLKDEApplication() : disp = 0; } -bool VCLKDEApplication::x11EventFilter(XEvent* event) +bool VCLKDEApplication::x11EventFilter(XEvent* ev) { //if we have a display and the display consumes the event //do not process the event in qt - if (disp && disp->Dispatch(event) > 0) + if (disp && disp->Dispatch(ev) > 0) { return true; } diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 962a882af26b..063cdf2bef86 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -35,6 +35,8 @@ #include "KDEData.hxx" #include "KDESalInstance.hxx" +#include "vclpluginapi.h" + #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -43,7 +45,7 @@ /// entry point for the KDE4 VCL plugin extern "C" { - VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule ) + VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule ) { /* #i92121# workaround deadlocks in the X11 implementation */ |