diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/AllLangResTarget_vcl.mk (renamed from vcl/aqua/source/res/makefile.mk) | 46 | ||||
-rw-r--r-- | vcl/Library_desktop_detector.mk | 85 | ||||
-rwxr-xr-x | vcl/Library_vcl.mk | 511 | ||||
-rwxr-xr-x | vcl/Library_vclplug_gen.mk | 205 | ||||
-rwxr-xr-x | vcl/Library_vclplug_gtk.mk | 127 | ||||
-rwxr-xr-x | vcl/Library_vclplug_kde.mk | 93 | ||||
-rwxr-xr-x | vcl/Library_vclplug_kde4.mk | 99 | ||||
-rwxr-xr-x | vcl/Library_vclplug_svp.mk | 97 | ||||
-rw-r--r-- | vcl/Makefile (renamed from vcl/source/salmain/makefile.mk) | 19 | ||||
-rw-r--r-- | vcl/Module_vcl.mk (renamed from vcl/aqua/source/app/makefile.mk) | 69 | ||||
-rw-r--r-- | vcl/Package_inc.mk | 168 | ||||
-rw-r--r-- | vcl/Package_osx.mk (renamed from vcl/util/target.pmk) | 21 | ||||
-rwxr-xr-x | vcl/StaticLibrary_vclmain.mk | 62 | ||||
-rwxr-xr-x | vcl/WinResTarget_vcl.mk | 123 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yactionwrapper.h | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yactionwrapper.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ycomponentwrapper.h | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yfactory.mm | 8 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yfocuslistener.cxx | 9 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yfocuslistener.hxx | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yfocustracker.cxx | 13 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ylistener.cxx | 13 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yrolehelper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yrolehelper.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yselectionwrapper.h | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yselectionwrapper.mm | 6 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytablewrapper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytablewrapper.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextwrapper.h | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextwrapper.mm | 22 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yutil.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yvaluewrapper.h | 6 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapper.mm | 23 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperbutton.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperbutton.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercheckbox.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercombobox.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercombobox.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappergroup.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappergroup.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperlist.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperlist.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperrow.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperrow.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm | 3 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappersplitter.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappersplitter.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperstatictext.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertabgroup.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertextarea.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertextarea.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertoolbar.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/documentfocuslistener.hxx | 7 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/makefile.mk | 88 | ||||
-rw-r--r-- | vcl/aqua/source/app/saldata.cxx | 7 | ||||
-rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 42 | ||||
-rwxr-xr-x | vcl/aqua/source/app/salnstimer.mm | 11 | ||||
-rw-r--r-- | vcl/aqua/source/app/salsys.cxx | 13 | ||||
-rw-r--r-- | vcl/aqua/source/app/saltimer.cxx | 10 | ||||
-rwxr-xr-x | vcl/aqua/source/app/vclnsapp.mm | 38 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 2 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/DragSource.cxx | 75 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/DropTarget.cxx | 22 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/aqua_clipboard.cxx | 4 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/aqua_service.cxx | 86 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/makefile.mk | 68 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/service_entry.cxx | 11 | ||||
-rw-r--r-- | vcl/aqua/source/dtrans/test_aquacb.cxx | 208 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 13 | ||||
-rwxr-xr-x | vcl/aqua/source/gdi/aquaprintview.mm | 6 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/makefile.mk | 74 | ||||
-rwxr-xr-x | vcl/aqua/source/gdi/salatslayout.cxx | 16 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salatsuifontutils.cxx | 7 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salbmp.cxx | 19 | ||||
-rwxr-xr-x | vcl/aqua/source/gdi/salcolorutils.cxx | 3 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 73 | ||||
-rwxr-xr-x | vcl/aqua/source/gdi/salgdiutils.cxx | 12 | ||||
-rwxr-xr-x | vcl/aqua/source/gdi/salmathutils.cxx | 2 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salnativewidgets.cxx | 24 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salprn.cxx | 46 | ||||
-rw-r--r-- | vcl/aqua/source/gdi/salvd.cxx | 16 | ||||
-rw-r--r-- | vcl/aqua/source/window/makefile.mk | 63 | ||||
-rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 38 | ||||
-rwxr-xr-x | vcl/aqua/source/window/salframeview.mm | 92 | ||||
-rw-r--r-- | vcl/aqua/source/window/salmenu.cxx | 34 | ||||
-rwxr-xr-x | vcl/aqua/source/window/salnsmenu.mm | 12 | ||||
-rw-r--r-- | vcl/aqua/source/window/salobj.cxx | 12 | ||||
-rw-r--r-- | vcl/inc/accel.h (renamed from vcl/inc/vcl/accel.h) | 0 | ||||
-rw-r--r-- | vcl/inc/accmgr.hxx (renamed from vcl/inc/vcl/accmgr.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aqua11yfactory.h (renamed from vcl/aqua/inc/aqua11yfactory.h) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aqua11yfocustracker.hxx (renamed from vcl/aqua/inc/aqua11yfocustracker.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aqua11ylistener.hxx (renamed from vcl/aqua/inc/aqua11ylistener.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aqua11ywrapper.h (renamed from vcl/aqua/inc/aqua11ywrapper.h) | 0 | ||||
-rwxr-xr-x | vcl/inc/aqua/aquaprintview.h (renamed from vcl/aqua/inc/aquaprintview.h) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aquavclevents.hxx (renamed from vcl/aqua/inc/aquavclevents.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/aquavcltypes.h (renamed from vcl/aqua/inc/aquavcltypes.h) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/keyboardfocuslistener.hxx (renamed from vcl/aqua/inc/keyboardfocuslistener.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/salatsuifontutils.hxx (renamed from vcl/aqua/inc/salatsuifontutils.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/salbmp.h (renamed from vcl/aqua/inc/salbmp.h) | 19 | ||||
-rwxr-xr-x | vcl/inc/aqua/salcolorutils.hxx (renamed from vcl/aqua/inc/salcolorutils.hxx) | 0 | ||||
-rwxr-xr-x | vcl/inc/aqua/salconst.h (renamed from vcl/aqua/inc/salconst.h) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/saldata.hxx (renamed from vcl/aqua/inc/saldata.hxx) | 6 | ||||
-rw-r--r-- | vcl/inc/aqua/salfontutils.hxx (renamed from vcl/aqua/inc/salfontutils.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/salframe.h (renamed from vcl/aqua/inc/salframe.h) | 11 | ||||
-rwxr-xr-x | vcl/inc/aqua/salframeview.h (renamed from vcl/aqua/inc/salframeview.h) | 2 | ||||
-rw-r--r-- | vcl/inc/aqua/salgdi.h (renamed from vcl/aqua/inc/salgdi.h) | 10 | ||||
-rw-r--r-- | vcl/inc/aqua/salinst.h (renamed from vcl/aqua/inc/salinst.h) | 6 | ||||
-rwxr-xr-x | vcl/inc/aqua/salmathutils.hxx (renamed from vcl/aqua/inc/salmathutils.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/salmenu.h (renamed from vcl/aqua/inc/salmenu.h) | 3 | ||||
-rwxr-xr-x | vcl/inc/aqua/salnativewidgets.h (renamed from vcl/aqua/inc/salnativewidgets.h) | 0 | ||||
-rwxr-xr-x | vcl/inc/aqua/salnsmenu.h (renamed from vcl/aqua/inc/salnsmenu.h) | 0 | ||||
-rwxr-xr-x | vcl/inc/aqua/salnstimer.h (renamed from vcl/aqua/inc/salnstimer.h) | 0 | ||||
-rw-r--r-- | vcl/inc/aqua/salobj.h (renamed from vcl/aqua/inc/salobj.h) | 3 | ||||
-rw-r--r-- | vcl/inc/aqua/salprn.h (renamed from vcl/aqua/inc/salprn.h) | 6 | ||||
-rw-r--r-- | vcl/inc/aqua/salsys.h (renamed from vcl/aqua/inc/salsys.h) | 7 | ||||
-rw-r--r-- | vcl/inc/aqua/saltimer.h (renamed from vcl/aqua/inc/saltimer.h) | 2 | ||||
-rw-r--r-- | vcl/inc/aqua/salvd.h (renamed from vcl/aqua/inc/salvd.h) | 11 | ||||
-rw-r--r-- | vcl/inc/aqua/svsys.h (renamed from vcl/aqua/inc/svsys.h) | 0 | ||||
-rwxr-xr-x | vcl/inc/aqua/vclnsapp.h (renamed from vcl/aqua/inc/vclnsapp.h) | 0 | ||||
-rw-r--r-- | vcl/inc/bmpfast.hxx (renamed from vcl/inc/vcl/bmpfast.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/brdwin.hxx (renamed from vcl/inc/vcl/brdwin.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/canvasbitmap.hxx (renamed from vcl/inc/vcl/canvasbitmap.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/controldata.hxx (renamed from vcl/inc/vcl/controldata.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/dbggui.hxx (renamed from vcl/inc/vcl/dbggui.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/dndevdis.hxx (renamed from vcl/inc/vcl/dndevdis.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/dndlcon.hxx (renamed from vcl/inc/vcl/dndlcon.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/fontcache.hxx (renamed from vcl/inc/vcl/fontcache.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/fontsubset.hxx (renamed from vcl/inc/vcl/fontsubset.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/glyphcache.hxx (renamed from vcl/inc/vcl/glyphcache.hxx) | 6 | ||||
-rw-r--r-- | vcl/inc/graphite_adaptors.hxx (renamed from vcl/inc/vcl/graphite_adaptors.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/graphite_cache.hxx (renamed from vcl/inc/vcl/graphite_cache.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/graphite_features.hxx (renamed from vcl/inc/vcl/graphite_features.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/graphite_layout.hxx (renamed from vcl/inc/vcl/graphite_layout.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/graphite_serverfont.hxx (renamed from vcl/inc/vcl/graphite_serverfont.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/helpwin.hxx (renamed from vcl/inc/vcl/helpwin.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/idlemgr.hxx (renamed from vcl/inc/vcl/idlemgr.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/ilstbox.hxx (renamed from vcl/inc/vcl/ilstbox.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/image.h (renamed from vcl/inc/vcl/image.h) | 0 | ||||
-rw-r--r-- | vcl/inc/impbmp.hxx (renamed from vcl/inc/vcl/impbmp.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/impfont.hxx (renamed from vcl/inc/vcl/impfont.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/impgraph.hxx (renamed from vcl/inc/vcl/impgraph.hxx) | 20 | ||||
-rw-r--r-- | vcl/inc/impimagetree.hxx (renamed from vcl/inc/vcl/impimagetree.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/impoct.hxx (renamed from vcl/inc/vcl/impoct.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/impprn.hxx (renamed from vcl/inc/vcl/impprn.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/jobset.h (renamed from vcl/inc/vcl/jobset.h) | 0 | ||||
-rw-r--r-- | vcl/inc/makefile.mk | 49 | ||||
-rw-r--r-- | vcl/inc/outdata.hxx (renamed from vcl/inc/vcl/outdata.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/outdev.h (renamed from vcl/inc/vcl/outdev.h) | 2 | ||||
-rw-r--r-- | vcl/inc/outfont.hxx (renamed from vcl/inc/vcl/outfont.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/print.h (renamed from vcl/inc/vcl/print.h) | 2 | ||||
-rw-r--r-- | vcl/inc/printdlg.hxx (renamed from vcl/inc/vcl/prndlg.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/printergfx.hxx (renamed from vcl/inc/vcl/printergfx.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/printerjob.hxx (renamed from vcl/inc/vcl/printerjob.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/region.h (renamed from vcl/inc/vcl/region.h) | 0 | ||||
-rw-r--r-- | vcl/inc/salbmp.hxx (renamed from vcl/inc/vcl/salbmp.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/saldatabasic.hxx (renamed from vcl/inc/vcl/saldatabasic.hxx) | 6 | ||||
-rw-r--r-- | vcl/inc/salframe.hxx (renamed from vcl/inc/vcl/salframe.hxx) | 4 | ||||
-rwxr-xr-x | vcl/inc/salgdi.hxx (renamed from vcl/inc/vcl/salgdi.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salgeom.hxx (renamed from vcl/inc/vcl/salgeom.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salimestatus.hxx (renamed from vcl/inc/vcl/salimestatus.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salinst.hxx (renamed from vcl/inc/vcl/salinst.hxx) | 0 | ||||
-rwxr-xr-x | vcl/inc/sallayout.hxx (renamed from vcl/inc/vcl/sallayout.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salmenu.hxx (renamed from vcl/inc/vcl/salmenu.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salobj.hxx (renamed from vcl/inc/vcl/salobj.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/salprn.hxx (renamed from vcl/inc/vcl/salprn.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salptype.hxx (renamed from vcl/inc/vcl/salptype.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salsession.hxx (renamed from vcl/inc/vcl/salsession.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salsys.hxx (renamed from vcl/inc/vcl/salsys.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/saltimer.hxx (renamed from vcl/inc/vcl/saltimer.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/salvd.hxx (renamed from vcl/inc/vcl/salvd.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/salwtype.hxx (renamed from vcl/inc/vcl/salwtype.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/sft.hxx | 10 | ||||
-rw-r--r-- | vcl/inc/subedit.hxx (renamed from vcl/inc/vcl/subedit.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/svdata.hxx (renamed from vcl/inc/vcl/svdata.hxx) | 13 | ||||
-rw-r--r-- | vcl/inc/svids.hrc (renamed from vcl/inc/vcl/svids.hrc) | 0 | ||||
-rw-r--r-- | vcl/inc/svsys.h (renamed from vcl/util/hidother.src) | 15 | ||||
-rwxr-xr-x | vcl/inc/textlayout.hxx (renamed from vcl/inc/vcl/textlayout.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/toolbox.h (renamed from vcl/inc/vcl/toolbox.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/XIM.h (renamed from vcl/unx/inc/XIM.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/Xproto.h (renamed from vcl/unx/inc/Xproto.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/cdeint.hxx (renamed from vcl/unx/inc/cdeint.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/dtint.hxx (renamed from vcl/unx/inc/dtint.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/atkbridge.hxx (renamed from vcl/unx/inc/plugins/gtk/atkbridge.hxx) | 6 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkdata.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkframe.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkgdi.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkinst.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkobject.hxx (renamed from vcl/unx/inc/plugins/gtk/gtkobject.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_cb.hxx (renamed from vcl/unx/inc/i18n_cb.hxx) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_ic.hxx (renamed from vcl/unx/inc/i18n_ic.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_im.hxx (renamed from vcl/unx/inc/i18n_im.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_keysym.hxx (renamed from vcl/unx/inc/i18n_keysym.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_status.hxx (renamed from vcl/unx/inc/i18n_status.hxx) | 5 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_xkb.hxx (renamed from vcl/unx/inc/i18n_xkb.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/kde/kdedata.hxx (renamed from vcl/unx/inc/plugins/kde/kdedata.hxx) | 6 | ||||
-rw-r--r-- | vcl/inc/unx/pspgraphics.h (renamed from vcl/unx/inc/pspgraphics.h) | 9 | ||||
-rw-r--r-- | vcl/inc/unx/salbmp.h (renamed from vcl/unx/inc/salbmp.h) | 10 | ||||
-rw-r--r-- | vcl/inc/unx/saldata.hxx (renamed from vcl/unx/inc/saldata.hxx) | 12 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx (renamed from vcl/unx/inc/saldisp.hxx) | 13 | ||||
-rw-r--r-- | vcl/inc/unx/salfont.h (renamed from vcl/unx/inc/salfont.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/salframe.h (renamed from vcl/unx/inc/salframe.h) | 19 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h (renamed from vcl/unx/inc/salgdi.h) | 17 | ||||
-rw-r--r-- | vcl/inc/unx/salinst.h (renamed from vcl/unx/inc/salinst.h) | 8 | ||||
-rw-r--r-- | vcl/inc/unx/salmenu.h (renamed from vcl/unx/inc/salmenu.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/salobj.h (renamed from vcl/unx/inc/salobj.h) | 7 | ||||
-rw-r--r-- | vcl/inc/unx/salprn.h (renamed from vcl/unx/inc/salprn.h) | 9 | ||||
-rw-r--r-- | vcl/inc/unx/salstd.hxx (renamed from vcl/unx/inc/salstd.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/salsys.h (renamed from vcl/unx/inc/salsys.h) | 6 | ||||
-rw-r--r-- | vcl/inc/unx/saltimer.h (renamed from vcl/unx/inc/saltimer.h) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salunx.h (renamed from vcl/unx/inc/salunx.h) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/salvd.h (renamed from vcl/unx/inc/salvd.h) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/sm.hxx (renamed from vcl/unx/inc/sm.hxx) | 11 | ||||
-rw-r--r-- | vcl/inc/unx/soicon.hxx (renamed from vcl/unx/inc/soicon.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/strhelper.hxx (renamed from vcl/unx/inc/strhelper.hxx) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/svsys.h (renamed from vcl/unx/inc/svsys.h) | 2 | ||||
-rw-r--r-- | vcl/inc/unx/svunx.h (renamed from vcl/unx/inc/svunx.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/wmadaptor.hxx (renamed from vcl/unx/inc/wmadaptor.hxx) | 4 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/airbrush_curs.h (renamed from vcl/unx/source/inc/airbrush_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/airbrush_mask.h (renamed from vcl/unx/source/inc/airbrush_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/ase_curs.h (renamed from vcl/unx/source/inc/ase_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/ase_mask.h (renamed from vcl/unx/source/inc/ase_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asn_curs.h (renamed from vcl/unx/source/inc/asn_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asn_mask.h (renamed from vcl/unx/source/inc/asn_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asne_curs.h (renamed from vcl/unx/source/inc/asne_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asne_mask.h (renamed from vcl/unx/source/inc/asne_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asns_curs.h (renamed from vcl/unx/source/inc/asns_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asns_mask.h (renamed from vcl/unx/source/inc/asns_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asnswe_curs.h (renamed from vcl/unx/source/inc/asnswe_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asnswe_mask.h (renamed from vcl/unx/source/inc/asnswe_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asnw_curs.h (renamed from vcl/unx/source/inc/asnw_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asnw_mask.h (renamed from vcl/unx/source/inc/asnw_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/ass_curs.h (renamed from vcl/unx/source/inc/ass_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/ass_mask.h (renamed from vcl/unx/source/inc/ass_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asse_curs.h (renamed from vcl/unx/source/inc/asse_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asse_mask.h (renamed from vcl/unx/source/inc/asse_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/assw_curs.h (renamed from vcl/unx/source/inc/assw_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/assw_mask.h (renamed from vcl/unx/source/inc/assw_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asw_curs.h (renamed from vcl/unx/source/inc/asw_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/asw_mask.h (renamed from vcl/unx/source/inc/asw_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/aswe_curs.h (renamed from vcl/unx/source/inc/aswe_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/aswe_mask.h (renamed from vcl/unx/source/inc/aswe_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chain_curs.h (renamed from vcl/unx/source/inc/chain_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chain_mask.h (renamed from vcl/unx/source/inc/chain_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chainnot_curs.h (renamed from vcl/unx/source/inc/chainnot_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chainnot_mask.h (renamed from vcl/unx/source/inc/chainnot_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chart_curs.h (renamed from vcl/unx/source/inc/chart_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/chart_mask.h (renamed from vcl/unx/source/inc/chart_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copydata_curs.h (renamed from vcl/unx/source/dtrans/copydata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copydata_mask.h (renamed from vcl/unx/source/dtrans/copydata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copydlnk_curs.h (renamed from vcl/unx/source/inc/copydlnk_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copydlnk_mask.h (renamed from vcl/unx/source/inc/copydlnk_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyfile_curs.h (renamed from vcl/unx/source/inc/copyfile_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyfile_mask.h (renamed from vcl/unx/source/inc/copyfile_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyfiles_curs.h (renamed from vcl/unx/source/inc/copyfiles_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyfiles_mask.h (renamed from vcl/unx/source/inc/copyfiles_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyflnk_curs.h (renamed from vcl/unx/source/inc/copyflnk_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/copyflnk_mask.h (renamed from vcl/unx/source/inc/copyflnk_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/crook_curs.h (renamed from vcl/unx/source/inc/crook_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/crook_mask.h (renamed from vcl/unx/source/inc/crook_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/crop_curs.h (renamed from vcl/unx/source/inc/crop_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/crop_mask.h (renamed from vcl/unx/source/inc/crop_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/detective_curs.h (renamed from vcl/unx/source/inc/detective_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/detective_mask.h (renamed from vcl/unx/source/inc/detective_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawarc_curs.h (renamed from vcl/unx/source/inc/drawarc_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawarc_mask.h (renamed from vcl/unx/source/inc/drawarc_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawbezier_curs.h (renamed from vcl/unx/source/inc/drawbezier_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawbezier_mask.h (renamed from vcl/unx/source/inc/drawbezier_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcaption_curs.h (renamed from vcl/unx/source/inc/drawcaption_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcaption_mask.h (renamed from vcl/unx/source/inc/drawcaption_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcirclecut_curs.h (renamed from vcl/unx/source/inc/drawcirclecut_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcirclecut_mask.h (renamed from vcl/unx/source/inc/drawcirclecut_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawconnect_curs.h (renamed from vcl/unx/source/inc/drawconnect_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawconnect_mask.h (renamed from vcl/unx/source/inc/drawconnect_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcrook_curs.h (renamed from vcl/unx/source/inc/drawcrook_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcrook_mask.h (renamed from vcl/unx/source/inc/drawcrook_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcrop_curs.h (renamed from vcl/unx/source/inc/drawcrop_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawcrop_mask.h (renamed from vcl/unx/source/inc/drawcrop_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawellipse_curs.h (renamed from vcl/unx/source/inc/drawellipse_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawellipse_mask.h (renamed from vcl/unx/source/inc/drawellipse_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawfreehand_curs.h (renamed from vcl/unx/source/inc/drawfreehand_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawfreehand_mask.h (renamed from vcl/unx/source/inc/drawfreehand_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawline_curs.h (renamed from vcl/unx/source/inc/drawline_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawline_mask.h (renamed from vcl/unx/source/inc/drawline_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawmirror_curs.h (renamed from vcl/unx/source/inc/drawmirror_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawmirror_mask.h (renamed from vcl/unx/source/inc/drawmirror_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawpie_curs.h (renamed from vcl/unx/source/inc/drawpie_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawpie_mask.h (renamed from vcl/unx/source/inc/drawpie_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawpolygon_curs.h (renamed from vcl/unx/source/inc/drawpolygon_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawpolygon_mask.h (renamed from vcl/unx/source/inc/drawpolygon_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawrect_curs.h (renamed from vcl/unx/source/inc/drawrect_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawrect_mask.h (renamed from vcl/unx/source/inc/drawrect_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawtext_curs.h (renamed from vcl/unx/source/inc/drawtext_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/drawtext_mask.h (renamed from vcl/unx/source/inc/drawtext_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/fill_curs.h (renamed from vcl/unx/source/inc/fill_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/fill_mask.h (renamed from vcl/unx/source/inc/fill_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/hshear_curs.h (renamed from vcl/unx/source/inc/hshear_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/hshear_mask.h (renamed from vcl/unx/source/inc/hshear_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/invert50.h (renamed from vcl/unx/source/inc/invert50.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/linkdata_curs.h (renamed from vcl/unx/source/dtrans/linkdata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/linkdata_mask.h (renamed from vcl/unx/source/dtrans/linkdata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/linkfile_curs.h (renamed from vcl/unx/source/inc/linkfile_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/linkfile_mask.h (renamed from vcl/unx/source/inc/linkfile_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/magnify_curs.h (renamed from vcl/unx/source/inc/magnify_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/magnify_mask.h (renamed from vcl/unx/source/inc/magnify_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/mirror_curs.h (renamed from vcl/unx/source/inc/mirror_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/mirror_mask.h (renamed from vcl/unx/source/inc/mirror_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movebezierweight_curs.h (renamed from vcl/unx/source/inc/movebezierweight_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movebezierweight_mask.h (renamed from vcl/unx/source/inc/movebezierweight_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movedata_curs.h (renamed from vcl/unx/source/dtrans/movedata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movedata_mask.h (renamed from vcl/unx/source/dtrans/movedata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movedlnk_curs.h (renamed from vcl/unx/source/inc/movedlnk_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movedlnk_mask.h (renamed from vcl/unx/source/inc/movedlnk_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movefile_curs.h (renamed from vcl/unx/source/inc/movefile_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movefile_mask.h (renamed from vcl/unx/source/inc/movefile_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movefiles_curs.h (renamed from vcl/unx/source/inc/movefiles_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movefiles_mask.h (renamed from vcl/unx/source/inc/movefiles_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/moveflnk_curs.h (renamed from vcl/unx/source/inc/moveflnk_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/moveflnk_mask.h (renamed from vcl/unx/source/inc/moveflnk_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movepoint_curs.h (renamed from vcl/unx/source/inc/movepoint_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/movepoint_mask.h (renamed from vcl/unx/source/inc/movepoint_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/nodrop_curs.h (renamed from vcl/unx/source/dtrans/nodrop_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/nodrop_mask.h (renamed from vcl/unx/source/dtrans/nodrop_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/null_curs.h (renamed from vcl/unx/source/inc/null_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/null_mask.h (renamed from vcl/unx/source/inc/null_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/paintbrush_curs.h (renamed from vcl/unx/source/inc/paintbrush_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/paintbrush_mask.h (renamed from vcl/unx/source/inc/paintbrush_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotcol_curs.h (renamed from vcl/unx/source/inc/pivotcol_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotcol_mask.h (renamed from vcl/unx/source/inc/pivotcol_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotdel_curs.h (renamed from vcl/unx/source/inc/pivotdel_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotdel_mask.h (renamed from vcl/unx/source/inc/pivotdel_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotfld_curs.h (renamed from vcl/unx/source/inc/pivotfld_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotfld_mask.h (renamed from vcl/unx/source/inc/pivotfld_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotrow_curs.h (renamed from vcl/unx/source/inc/pivotrow_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/pivotrow_mask.h (renamed from vcl/unx/source/inc/pivotrow_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/rotate_curs.h (renamed from vcl/unx/source/inc/rotate_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/rotate_mask.h (renamed from vcl/unx/source/inc/rotate_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/salcursors.h | 162 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblsele_curs.h (renamed from vcl/unx/source/inc/tblsele_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblsele_mask.h (renamed from vcl/unx/source/inc/tblsele_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblsels_curs.h (renamed from vcl/unx/source/inc/tblsels_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblsels_mask.h (renamed from vcl/unx/source/inc/tblsels_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselse_curs.h (renamed from vcl/unx/source/inc/tblselse_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselse_mask.h (renamed from vcl/unx/source/inc/tblselse_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselsw_curs.h (renamed from vcl/unx/source/inc/tblselsw_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselsw_mask.h (renamed from vcl/unx/source/inc/tblselsw_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselw_curs.h (renamed from vcl/unx/source/inc/tblselw_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/tblselw_mask.h (renamed from vcl/unx/source/inc/tblselw_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/timemove_curs.h (renamed from vcl/unx/source/inc/timemove_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/timemove_mask.h (renamed from vcl/unx/source/inc/timemove_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/timesize_curs.h (renamed from vcl/unx/source/inc/timesize_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/timesize_mask.h (renamed from vcl/unx/source/inc/timesize_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/vertcurs_curs.h (renamed from vcl/unx/source/inc/vertcurs_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/vertcurs_mask.h (renamed from vcl/unx/source/inc/vertcurs_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/vshear_curs.h (renamed from vcl/unx/source/inc/vshear_curs.h) | 0 | ||||
-rw-r--r-- | vcl/inc/unx/x11_cursors/vshear_mask.h (renamed from vcl/unx/source/inc/vshear_mask.h) | 0 | ||||
-rw-r--r-- | vcl/inc/vcl/cursor.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/gdimtf.hxx | 12 | ||||
-rw-r--r-- | vcl/inc/vcl/gfxlink.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/vcl/graph.hxx | 16 | ||||
-rw-r--r-- | vcl/inc/vcl/jobdata.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/metaact.hxx | 51 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/inc/vcl/outdev.hxx | 23 | ||||
-rw-r--r-- | vcl/inc/vcl/pdfextoutdevdata.hxx | 34 | ||||
-rw-r--r-- | vcl/inc/vcl/pdfwriter.hxx | 23 | ||||
-rw-r--r-- | vcl/inc/vcl/polyscan.hxx | 155 | ||||
-rw-r--r-- | vcl/inc/vcl/ppdparser.hxx | 10 | ||||
-rw-r--r-- | vcl/inc/vcl/rendergraphic.hxx | 124 | ||||
-rw-r--r-- | vcl/inc/vcl/rendergraphicrasterizer.hxx | 111 | ||||
-rw-r--r-- | vcl/inc/vcl/salctype.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/svgread.hxx (renamed from vcl/inc/vcl/svcompat.hxx) | 74 | ||||
-rw-r--r-- | vcl/inc/vclpluginapi.h (renamed from vcl/inc/vcl/unobrok.hxx) | 49 | ||||
-rw-r--r-- | vcl/inc/wall2.hxx (renamed from vcl/inc/vcl/wall2.hxx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salbmp.h (renamed from vcl/win/inc/salbmp.h) | 5 | ||||
-rwxr-xr-x | vcl/inc/win/saldata.hxx (renamed from vcl/win/inc/saldata.hxx) | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salframe.h (renamed from vcl/win/inc/salframe.h) | 3 | ||||
-rwxr-xr-x | vcl/inc/win/salgdi.h (renamed from vcl/win/inc/salgdi.h) | 9 | ||||
-rw-r--r-- | vcl/inc/win/salids.hrc (renamed from vcl/win/inc/salids.hrc) | 0 | ||||
-rwxr-xr-x | vcl/inc/win/salinst.h (renamed from vcl/win/inc/salinst.h) | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salmenu.h (renamed from vcl/win/inc/salmenu.h) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salnativewidgets.h (renamed from vcl/win/inc/salnativewidgets.h) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salobj.h (renamed from vcl/win/inc/salobj.h) | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salprn.h (renamed from vcl/win/inc/salprn.h) | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salsys.h (renamed from vcl/win/inc/salsys.h) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/saltimer.h (renamed from vcl/win/inc/saltimer.h) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/salvd.h (renamed from vcl/win/inc/salvd.h) | 3 | ||||
-rw-r--r-- | vcl/inc/win/svsys.h (renamed from vcl/win/inc/svsys.h) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/inc/win/wincomp.hxx (renamed from vcl/win/inc/wincomp.hxx) | 1 | ||||
-rw-r--r-- | vcl/inc/window.h (renamed from vcl/inc/vcl/window.h) | 0 | ||||
-rw-r--r-- | vcl/inc/xconnection.hxx (renamed from vcl/inc/vcl/xconnection.hxx) | 0 | ||||
-rw-r--r-- | vcl/prj/build.lst | 55 | ||||
-rw-r--r-- | vcl/prj/d.lst | 158 | ||||
-rw-r--r-- | vcl/prj/makefile.mk (renamed from vcl/util/makefile.pmk) | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/app/dbggui.cxx | 30 | ||||
-rw-r--r-- | vcl/source/app/help.cxx | 12 | ||||
-rw-r--r-- | vcl/source/app/i18nhelp.cxx | 10 | ||||
-rw-r--r-- | vcl/source/app/idlemgr.cxx | 5 | ||||
-rw-r--r-- | vcl/source/app/makefile.mk | 69 | ||||
-rw-r--r-- | vcl/source/app/salvtables.cxx | 20 | ||||
-rw-r--r-- | vcl/source/app/session.cxx | 13 | ||||
-rw-r--r-- | vcl/source/app/settings.cxx | 13 | ||||
-rw-r--r-- | vcl/source/app/sound.cxx | 17 | ||||
-rw-r--r-- | vcl/source/app/stdtext.cxx | 6 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 50 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 32 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 82 | ||||
-rw-r--r-- | vcl/source/app/timer.cxx | 12 | ||||
-rw-r--r-- | vcl/source/app/unohelp.cxx | 22 | ||||
-rw-r--r-- | vcl/source/app/vclevent.cxx | 3 | ||||
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 15 | ||||
-rw-r--r-- | vcl/source/components/factory.cxx | 15 | ||||
-rw-r--r-- | vcl/source/components/fontident.cxx | 14 | ||||
-rw-r--r-- | vcl/source/components/makefile.mk | 21 | ||||
-rw-r--r-- | vcl/source/components/rasterizer_rsvg.cxx | 640 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 22 | ||||
-rw-r--r-- | vcl/source/control/combobox.cxx | 14 | ||||
-rw-r--r-- | vcl/source/control/ctrl.cxx | 15 | ||||
-rwxr-xr-x | vcl/source/control/edit.cxx | 15 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 7 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 13 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 8 | ||||
-rw-r--r-- | vcl/source/control/group.cxx | 8 | ||||
-rw-r--r-- | vcl/source/control/ilstbox.cxx | 20 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/lstbox.cxx | 22 | ||||
-rw-r--r-- | vcl/source/control/makefile.mk | 78 | ||||
-rw-r--r-- | vcl/source/control/scrbar.cxx | 3 | ||||
-rw-r--r-- | vcl/source/control/spinfld.cxx | 6 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 9 | ||||
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 3 | ||||
-rw-r--r-- | vcl/source/fontsubset/fontsubset.cxx | 5 | ||||
-rw-r--r-- | vcl/source/fontsubset/makefile.mk | 51 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap.cxx | 15 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 17 | ||||
-rw-r--r-- | vcl/source/gdi/bmpacc.cxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/bmpacc3.cxx | 7 | ||||
-rw-r--r-- | vcl/source/gdi/bmpfast.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/configsettings.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/cvtgrf.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/font.cxx | 15 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 768 | ||||
-rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/graph.cxx | 34 | ||||
-rw-r--r-- | vcl/source/gdi/image.cxx | 13 | ||||
-rw-r--r-- | vcl/source/gdi/imagerepository.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/impbmp.cxx | 13 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 67 | ||||
-rw-r--r-- | vcl/source/gdi/impimage.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/impimagetree.cxx | 11 | ||||
-rw-r--r-- | vcl/source/gdi/jobset.cxx | 8 | ||||
-rwxr-xr-x | vcl/source/gdi/makefile.mk | 94 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 90 | ||||
-rw-r--r-- | vcl/source/gdi/metric.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/octree.cxx | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/source/gdi/outdev.cxx | 31 | ||||
-rwxr-xr-x | vcl/source/gdi/outdev2.cxx | 25 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/gdi/outdev3.cxx | 52 | ||||
-rw-r--r-- | vcl/source/gdi/outdev4.cxx | 17 | ||||
-rw-r--r-- | vcl/source/gdi/outdev5.cxx | 13 | ||||
-rw-r--r-- | vcl/source/gdi/outdev6.cxx | 45 | ||||
-rwxr-xr-x | vcl/source/gdi/outdevnative.cxx | 3 | ||||
-rw-r--r-- | vcl/source/gdi/outmap.cxx | 18 | ||||
-rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 53 | ||||
-rw-r--r-- | vcl/source/gdi/pdffontcache.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/pdffontcache.hxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 46 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 17 | ||||
-rw-r--r-- | vcl/source/gdi/polyscan.cxx | 358 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 26 | ||||
-rw-r--r-- | vcl/source/gdi/print2.cxx | 37 | ||||
-rwxr-xr-x | vcl/source/gdi/print3.cxx | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/source/gdi/region.cxx | 13 | ||||
-rw-r--r-- | vcl/source/gdi/rendergraphic.cxx | 240 | ||||
-rw-r--r-- | vcl/source/gdi/rendergraphicrasterizer.cxx | 400 | ||||
-rwxr-xr-x | vcl/source/gdi/salgdilayout.cxx | 29 | ||||
-rwxr-xr-x | vcl/source/gdi/sallayout.cxx | 11 | ||||
-rw-r--r-- | vcl/source/gdi/salmisc.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/salnativewidgets-none.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/svcompat.cxx | 78 | ||||
-rw-r--r-- | vcl/source/gdi/svgread.cxx | 131 | ||||
-rwxr-xr-x | vcl/source/gdi/textlayout.cxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/virdev.cxx | 17 | ||||
-rw-r--r-- | vcl/source/gdi/wall.cxx | 7 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 7 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_ftyp.hxx | 2 | ||||
-rwxr-xr-x | vcl/source/glyphs/gcach_layout.cxx | 4 | ||||
-rwxr-xr-x | vcl/source/glyphs/gcach_rbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_vdev.cxx | 287 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_vdev.hxx | 57 | ||||
-rw-r--r-- | vcl/source/glyphs/glyphcache.cxx | 8 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_adaptors.cxx | 8 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_cache.cxx | 6 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_features.cxx | 2 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 10 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_serverfont.cxx | 6 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_textsrc.cxx | 2 | ||||
-rw-r--r-- | vcl/source/glyphs/graphite_textsrc.hxx | 12 | ||||
-rw-r--r-- | vcl/source/glyphs/makefile.mk | 80 | ||||
-rw-r--r-- | vcl/source/helper/canvasbitmap.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/lazydelete.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/makefile.mk | 55 | ||||
-rw-r--r-- | vcl/source/helper/xconnection.cxx | 9 | ||||
-rw-r--r-- | vcl/source/salmain/salmain.cxx | 3 | ||||
-rw-r--r-- | vcl/source/src/btntext.src | 4 | ||||
-rw-r--r-- | vcl/source/src/helptext.src | 4 | ||||
-rw-r--r-- | vcl/source/src/images.src | 4 | ||||
-rw-r--r-- | vcl/source/src/makefile.mk | 57 | ||||
-rw-r--r-- | vcl/source/src/menu.src | 5 | ||||
-rw-r--r-- | vcl/source/src/print.src | 2 | ||||
-rw-r--r-- | vcl/source/src/stdtext.src | 4 | ||||
-rw-r--r-- | vcl/source/src/units.src | 4 | ||||
-rw-r--r-- | vcl/source/window/abstdlg.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/accel.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/accmgr.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/arrange.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/brdwin.cxx | 13 | ||||
-rw-r--r-- | vcl/source/window/btndlg.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/cursor.cxx | 24 | ||||
-rw-r--r-- | vcl/source/window/dialog.cxx | 10 | ||||
-rw-r--r-- | vcl/source/window/dlgctrl.cxx | 7 | ||||
-rw-r--r-- | vcl/source/window/dndevdis.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/dndlcon.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/dockingarea.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 13 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/floatwin.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/introwin.cxx | 11 | ||||
-rw-r--r-- | vcl/source/window/keycod.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/makefile.mk | 106 | ||||
-rwxr-xr-x | vcl/source/window/menu.cxx | 19 | ||||
-rw-r--r-- | vcl/source/window/msgbox.cxx | 16 | ||||
-rwxr-xr-x | vcl/source/window/printdlg.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/seleng.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/split.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/splitwin.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/status.cxx | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/window/syschild.cxx | 20 | ||||
-rw-r--r-- | vcl/source/window/syswin.cxx | 12 | ||||
-rw-r--r-- | vcl/source/window/tabpage.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/taskpanelist.cxx | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/window/toolbox.cxx | 22 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/window/window.cxx | 78 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 27 | ||||
-rw-r--r-- | vcl/source/window/window4.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 45 | ||||
-rw-r--r-- | vcl/source/window/wpropset.cxx | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/source/window/wrkwin.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx (renamed from vcl/unx/source/app/i18n_cb.cxx) | 20 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx (renamed from vcl/unx/source/app/i18n_ic.cxx) | 25 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_im.cxx (renamed from vcl/unx/source/app/i18n_im.cxx) | 13 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_keysym.cxx (renamed from vcl/unx/source/app/i18n_keysym.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx (renamed from vcl/unx/source/app/i18n_status.cxx) | 18 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_wrp.cxx (renamed from vcl/unx/source/app/i18n_wrp.cxx) | 3 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_xkb.cxx (renamed from vcl/unx/source/app/i18n_xkb.cxx) | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/keysymnames.cxx (renamed from vcl/unx/source/app/keysymnames.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/randrwrapper.cxx (renamed from vcl/unx/source/app/randrwrapper.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldata.cxx (renamed from vcl/unx/source/app/saldata.cxx) | 22 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx (renamed from vcl/unx/source/app/saldisp.cxx) | 30 | ||||
-rw-r--r-- | vcl/unx/generic/app/salinst.cxx (renamed from vcl/unx/source/app/salinst.cxx) | 27 | ||||
-rw-r--r-- | vcl/unx/generic/app/salsys.cxx (renamed from vcl/unx/source/app/salsys.cxx) | 17 | ||||
-rw-r--r-- | vcl/unx/generic/app/saltimer.cxx (renamed from vcl/unx/source/app/saltimer.cxx) | 10 | ||||
-rw-r--r-- | vcl/unx/generic/app/sm.cxx (renamed from vcl/unx/source/app/sm.cxx) | 15 | ||||
-rw-r--r-- | vcl/unx/generic/app/soicon.cxx (renamed from vcl/unx/source/app/soicon.cxx) | 21 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx (renamed from vcl/unx/source/app/wmadaptor.cxx) | 17 | ||||
-rw-r--r-- | vcl/unx/generic/desktopdetect/desktopdetector.cxx (renamed from vcl/unx/source/desktopdetect/desktopdetector.cxx) | 8 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.cxx (renamed from vcl/unx/source/dtrans/X11_clipboard.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.hxx (renamed from vcl/unx/source/dtrans/X11_clipboard.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_dndcontext.cxx (renamed from vcl/unx/source/dtrans/X11_dndcontext.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_dndcontext.hxx (renamed from vcl/unx/source/dtrans/X11_dndcontext.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_droptarget.cxx (renamed from vcl/unx/source/dtrans/X11_droptarget.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx (renamed from vcl/unx/source/dtrans/X11_selection.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx (renamed from vcl/unx/source/dtrans/X11_selection.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_service.cxx (renamed from vcl/unx/source/dtrans/X11_service.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.cxx (renamed from vcl/unx/source/dtrans/X11_transferable.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.hxx (renamed from vcl/unx/source/dtrans/X11_transferable.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/bmp.cxx (renamed from vcl/unx/source/dtrans/bmp.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/bmp.hxx (renamed from vcl/unx/source/dtrans/bmp.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/config.cxx (renamed from vcl/unx/source/dtrans/config.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/copydata_curs.h (renamed from vcl/unx/source/inc/copydata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/copydata_mask.h (renamed from vcl/unx/source/inc/copydata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/linkdata_curs.h (renamed from vcl/unx/source/inc/linkdata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/linkdata_mask.h (renamed from vcl/unx/source/inc/linkdata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/movedata_curs.h (renamed from vcl/unx/source/inc/movedata_curs.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/movedata_mask.h (renamed from vcl/unx/source/inc/movedata_mask.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/nodrop_curs.h (renamed from vcl/unx/source/inc/nodrop_curs.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/nodrop_mask.h (renamed from vcl/unx/source/inc/nodrop_mask.h) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/adobeenc.tab (renamed from vcl/unx/source/fontmanager/adobeenc.tab) | 0 | ||||
-rwxr-xr-x | vcl/unx/generic/fontmanager/afm_hash.cpp (renamed from vcl/unx/source/fontmanager/afm_hash.cpp) | 0 | ||||
-rwxr-xr-x | vcl/unx/generic/fontmanager/afm_keyword_list (renamed from vcl/unx/source/fontmanager/afm_keyword_list) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontcache.cxx (renamed from vcl/unx/source/fontmanager/fontcache.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx (renamed from vcl/unx/source/fontmanager/fontconfig.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx (renamed from vcl/unx/source/fontmanager/fontmanager.cxx) | 11 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/helper.cxx (renamed from vcl/unx/source/fontmanager/helper.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/parseAFM.cxx (renamed from vcl/unx/source/fontmanager/parseAFM.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/parseAFM.hxx (renamed from vcl/unx/source/fontmanager/parseAFM.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/cdeint.cxx (renamed from vcl/unx/source/gdi/cdeint.cxx) | 11 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/dtint.cxx (renamed from vcl/unx/source/gdi/dtint.cxx) | 26 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/dtsetenum.hxx (renamed from vcl/unx/source/gdi/dtsetenum.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.cxx (renamed from vcl/unx/source/gdi/gcach_xpeer.cxx) | 19 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.hxx (renamed from vcl/unx/source/gdi/gcach_xpeer.hxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/pspgraphics.cxx (renamed from vcl/unx/source/gdi/pspgraphics.cxx) | 36 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx (renamed from vcl/unx/source/gdi/salbmp.cxx) | 23 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salcvt.cxx (renamed from vcl/unx/source/gdi/salcvt.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salcvt.hxx (renamed from vcl/unx/source/gdi/salcvt.hxx) | 3 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx (renamed from vcl/unx/source/gdi/salgdi.cxx) | 28 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx (renamed from vcl/unx/source/gdi/salgdi2.cxx) | 20 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx (renamed from vcl/unx/source/gdi/salgdi3.cxx) | 46 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salprnpsp.cxx (renamed from vcl/unx/source/gdi/salprnpsp.cxx) | 28 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx (renamed from vcl/unx/source/gdi/salvd.cxx) | 16 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.cxx (renamed from vcl/unx/source/gdi/xrender_peer.cxx) | 11 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.hxx (renamed from vcl/unx/source/gdi/xrender_peer.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx (renamed from vcl/unx/source/plugadapt/salplug.cxx) | 6 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx (renamed from vcl/unx/source/printer/cupsmgr.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/jobdata.cxx (renamed from vcl/unx/source/printer/jobdata.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx (renamed from vcl/unx/source/printer/ppdparser.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx (renamed from vcl/unx/source/printer/printerinfomanager.cxx) | 3 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/bitmap_gfx.cxx (renamed from vcl/unx/source/printergfx/bitmap_gfx.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/common_gfx.cxx (renamed from vcl/unx/source/printergfx/common_gfx.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/glyphset.cxx (renamed from vcl/unx/source/printergfx/glyphset.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/glyphset.hxx (renamed from vcl/unx/source/printergfx/glyphset.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/printerjob.cxx (renamed from vcl/unx/source/printergfx/printerjob.cxx) | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/psheader.ps (renamed from vcl/unx/source/printergfx/psheader.ps) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/psputil.cxx (renamed from vcl/unx/source/printergfx/psputil.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/psputil.hxx (renamed from vcl/unx/source/printergfx/psputil.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/printergfx/text_gfx.cxx (renamed from vcl/unx/source/printergfx/text_gfx.cxx) | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.cxx (renamed from vcl/unx/source/window/FWS.cxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.hxx (renamed from vcl/unx/source/window/FWS.hxx) | 0 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx (renamed from vcl/unx/source/window/salframe.cxx) | 52 | ||||
-rw-r--r-- | vcl/unx/generic/window/salobj.cxx (renamed from vcl/unx/source/window/salobj.cxx) | 33 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkbridge.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkfactory.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/makefile.mk | 93 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 15 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtksys.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/app/makefile.mk | 76 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/makefile.mk | 67 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 21 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/window/makefile.mk | 79 | ||||
-rw-r--r-- | vcl/unx/headless/makefile.mk | 66 | ||||
-rw-r--r-- | vcl/unx/headless/svpbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svpdummies.hxx | 7 | ||||
-rw-r--r-- | vcl/unx/headless/svpframe.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svpgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/headless/svpgdi.hxx | 5 | ||||
-rw-r--r-- | vcl/unx/headless/svpinst.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/headless/svpinst.hxx | 7 | ||||
-rw-r--r-- | vcl/unx/headless/svpprn.cxx | 15 | ||||
-rw-r--r-- | vcl/unx/headless/svpprn.hxx | 11 | ||||
-rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 41 | ||||
-rw-r--r-- | vcl/unx/headless/svppspgraphics.hxx | 5 | ||||
-rw-r--r-- | vcl/unx/headless/svptext.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/headless/svpvd.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde/kdedata.cxx | 15 | ||||
-rw-r--r-- | vcl/unx/kde/makefile.mk | 81 | ||||
-rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 19 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEData.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalDisplay.hxx | 3 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 7 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalFrame.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalGraphics.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalInstance.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEXLib.hxx | 3 | ||||
-rw-r--r-- | vcl/unx/kde4/VCLKDEApplication.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde4/main.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/kde4/makefile.mk | 88 | ||||
-rw-r--r-- | vcl/unx/source/app/makefile.mk | 110 | ||||
-rw-r--r-- | vcl/unx/source/desktopdetect/makefile.mk | 57 | ||||
-rw-r--r-- | vcl/unx/source/dtrans/makefile.mk | 68 | ||||
-rw-r--r-- | vcl/unx/source/fontmanager/makefile.mk | 72 | ||||
-rw-r--r-- | vcl/unx/source/gdi/makefile.mk | 101 | ||||
-rw-r--r-- | vcl/unx/source/inc/salcursors.h | 162 | ||||
-rw-r--r-- | vcl/unx/source/plugadapt/makefile.mk | 59 | ||||
-rw-r--r-- | vcl/unx/source/printer/makefile.mk | 70 | ||||
-rw-r--r-- | vcl/unx/source/printergfx/makefile.mk | 65 | ||||
-rw-r--r-- | vcl/unx/source/window/makefile.mk | 59 | ||||
-rw-r--r-- | vcl/util/linksvp/makefile.mk | 65 | ||||
-rw-r--r-- | vcl/util/makefile.mk | 2 | ||||
-rw-r--r-- | vcl/util/makefile2.pmk | 41 | ||||
-rw-r--r-- | vcl/vcl.macosx.component (renamed from vcl/util/vcl.macosx.component) | 3 | ||||
-rw-r--r-- | vcl/vcl.unx.component (renamed from vcl/util/vcl.component) | 3 | ||||
-rw-r--r-- | vcl/vcl.windows.component (renamed from vcl/util/vcl.windows.component) | 3 | ||||
-rw-r--r-- | vcl/win/source/app/MAKEFILE.MK | 53 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/app/saldata.cxx | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/app/salinfo.cxx | 28 | ||||
-rwxr-xr-x | vcl/win/source/app/salinst.cxx | 31 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/app/salshl.cxx | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/app/saltimer.cxx | 6 | ||||
-rw-r--r-- | vcl/win/source/gdi/MAKEFILE.MK | 69 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/gdi/salbmp.cxx | 14 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/win/source/gdi/salgdi.cxx | 17 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/win/source/gdi/salgdi2.cxx | 16 | ||||
-rwxr-xr-x | vcl/win/source/gdi/salgdi3.cxx | 46 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi_gdiplus.cxx | 8 | ||||
-rwxr-xr-x | vcl/win/source/gdi/salnativewidgets-luna.cxx | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | vcl/win/source/gdi/salprn.cxx | 28 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/gdi/salvd.cxx | 13 | ||||
-rwxr-xr-x | vcl/win/source/gdi/winlayout.cxx | 26 | ||||
-rw-r--r-- | vcl/win/source/src/MAKEFILE.MK | 130 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/src/salsrc.rc | 2 | ||||
-rw-r--r-- | vcl/win/source/window/MAKEFILE.MK | 60 | ||||
-rwxr-xr-x | vcl/win/source/window/salframe.cxx | 51 | ||||
-rwxr-xr-x | vcl/win/source/window/salmenu.cxx | 18 | ||||
-rwxr-xr-x[-rw-r--r--] | vcl/win/source/window/salobj.cxx | 16 |
726 files changed, 6843 insertions, 6589 deletions
diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/AllLangResTarget_vcl.mk index 2043504450e7..9a3453af2810 100644 --- a/vcl/aqua/source/res/makefile.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2009 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,41 +14,41 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=..$/..$/.. -TARGET=aquares +$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl)) -# --- Settings ------------------------------------------------- +$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl)) -.INCLUDE : settings.mk +$(eval $(call gb_AllLangResTarget_add_srs,vcl,\ + vcl/source/src \ +)) -# --- Files ---------------------------------------------------- +$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) -.IF "$(OS)"!="MACOSX" +$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) -dummy: - @echo "Nothing to build for OS $(OS)" +$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ + vcl/source/src/btntext.src \ + vcl/source/src/helptext.src \ + vcl/source/src/images.src \ + vcl/source/src/menu.src \ + vcl/source/src/print.src \ + vcl/source/src/stdtext.src \ + vcl/source/src/units.src \ +)) -.ELSE # "$(OS)"!="MACOSX" - -ZIPFLAGS = -r -ZIP1TARGET = osxres -#ZIP1DIR = -ZIP1LIST = MainMenu.nib/*.nib cursors/*.png - -# --- Targets -------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF # "$(OS)"!="MACOSX" +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk new file mode 100644 index 000000000000..49151cb19ff5 --- /dev/null +++ b/vcl/Library_desktop_detector.mk @@ -0,0 +1,85 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,desktop_detector)) + +#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) + +$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) + +$(eval $(call gb_Library_set_include,desktop_detector,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_kde,\ + $$(DEFS) \ + -DDESKTOP_DETECTOR_IMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,desktop_detector,\ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ + vcl/unx/generic/desktopdetect/desktopdetector \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,desktop_detector,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk new file mode 100755 index 000000000000..fa5b3013a9fe --- /dev/null +++ b/vcl/Library_vcl.mk @@ -0,0 +1,511 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vcl)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx)) +else ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows)) +else +$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) +endif + +$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) + +$(eval $(call gb_Library_set_include,vcl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_set_cxxflags,vcl,\ + $$(CXXFLAGS) \ + $$(FREETYPE_CFLAGS) \ +)) +endif + +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DVCL_DLLIMPLEMENTATION \ + -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \ + -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \ +)) + +$(eval $(call gb_Library_add_linked_libs,vcl,\ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ +)) + +ifneq ($(ENABLE_GRAPHITE),) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + graphite_dll \ +)) +endif +endif +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + freetype \ +)) +endif + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_set_cxxflags,vcl,\ + $$(CXXFLAGS) \ + $$(OBJCXXFLAGS) \ +)) +ifeq ($(ENABLE_CAIRO),TRUE) +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DCAIRO \ +)) +endif +$(eval $(call gb_Library_add_objcxxobjects,vcl,\ + vcl/aqua/source/a11y/aqua11yactionwrapper \ + vcl/aqua/source/a11y/aqua11ycomponentwrapper \ + vcl/aqua/source/a11y/aqua11yfactory \ + vcl/aqua/source/a11y/aqua11yrolehelper \ + vcl/aqua/source/a11y/aqua11yselectionwrapper \ + vcl/aqua/source/a11y/aqua11ytablewrapper \ + vcl/aqua/source/a11y/aqua11ytextattributeswrapper \ + vcl/aqua/source/a11y/aqua11ytextwrapper \ + vcl/aqua/source/a11y/aqua11yutil \ + vcl/aqua/source/a11y/aqua11yvaluewrapper \ + vcl/aqua/source/a11y/aqua11ywrapper \ + vcl/aqua/source/a11y/aqua11ywrapperbutton \ + vcl/aqua/source/a11y/aqua11ywrappercheckbox \ + vcl/aqua/source/a11y/aqua11ywrappercombobox \ + vcl/aqua/source/a11y/aqua11ywrappergroup \ + vcl/aqua/source/a11y/aqua11ywrapperlist \ + vcl/aqua/source/a11y/aqua11ywrapperradiobutton \ + vcl/aqua/source/a11y/aqua11ywrapperradiogroup \ + vcl/aqua/source/a11y/aqua11ywrapperrow \ + vcl/aqua/source/a11y/aqua11ywrapperscrollarea \ + vcl/aqua/source/a11y/aqua11ywrapperscrollbar \ + vcl/aqua/source/a11y/aqua11ywrappersplitter \ + vcl/aqua/source/a11y/aqua11ywrapperstatictext \ + vcl/aqua/source/a11y/aqua11ywrappertabgroup \ + vcl/aqua/source/a11y/aqua11ywrappertextarea \ + vcl/aqua/source/a11y/aqua11ywrappertoolbar \ + vcl/aqua/source/app/salnstimer \ + vcl/aqua/source/app/vclnsapp \ + vcl/aqua/source/gdi/aquaprintaccessoryview \ + vcl/aqua/source/gdi/aquaprintview \ + vcl/aqua/source/window/salframeview \ + vcl/aqua/source/window/salnsmenu \ +)) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/aqua/source/a11y/aqua11yfocuslistener \ + vcl/aqua/source/a11y/aqua11yfocustracker \ + vcl/aqua/source/a11y/aqua11ylistener \ + vcl/aqua/source/a11y/documentfocuslistener \ + vcl/aqua/source/app/saldata \ + vcl/aqua/source/app/salinst \ + vcl/aqua/source/app/salsys \ + vcl/aqua/source/app/saltimer \ + vcl/aqua/source/dtrans/DataFlavorMapping \ + vcl/aqua/source/dtrans/DragActionConversion \ + vcl/aqua/source/dtrans/DragSource \ + vcl/aqua/source/dtrans/DragSourceContext \ + vcl/aqua/source/dtrans/DropTarget \ + vcl/aqua/source/dtrans/HtmlFmtFlt \ + vcl/aqua/source/dtrans/OSXTransferable \ + vcl/aqua/source/dtrans/PictToBmpFlt \ + vcl/aqua/source/dtrans/aqua_clipboard \ + vcl/aqua/source/dtrans/service_entry \ + vcl/aqua/source/gdi/salatslayout \ + vcl/aqua/source/gdi/salatsuifontutils \ + vcl/aqua/source/gdi/salbmp \ + vcl/aqua/source/gdi/salcolorutils \ + vcl/aqua/source/gdi/salgdi \ + vcl/aqua/source/gdi/salgdiutils \ + vcl/aqua/source/gdi/salmathutils \ + vcl/aqua/source/gdi/salnativewidgets \ + vcl/aqua/source/gdi/salprn \ + vcl/aqua/source/gdi/salvd \ + vcl/aqua/source/window/salframe \ + vcl/aqua/source/window/salmenu \ + vcl/aqua/source/window/salobj \ +)) +endif + +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ + -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ + -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ +)) +## handle fontconfig +ifneq ($(ENABLE_FONTCONFIG),) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DENABLE_FONTCONFIG \ +)) +## handle CUPS +ifneq ($(ENABLE_CUPS),) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DENABLE_CUPS \ +)) +endif +endif +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/glyphs/gcach_ftyp \ + vcl/source/glyphs/gcach_layout \ + vcl/source/glyphs/gcach_rbmp \ + vcl/source/glyphs/glyphcache \ + vcl/unx/generic/fontmanager/fontcache \ + vcl/unx/generic/fontmanager/fontconfig \ + vcl/unx/generic/fontmanager/fontmanager \ + vcl/unx/generic/fontmanager/helper \ + vcl/unx/generic/fontmanager/parseAFM \ + vcl/unx/generic/plugadapt/salplug \ + vcl/unx/generic/printer/cupsmgr \ + vcl/unx/generic/printer/jobdata \ + vcl/unx/generic/printer/ppdparser \ + vcl/unx/generic/printer/printerinfomanager \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/win/source/app/saldata \ + vcl/win/source/app/salinfo \ + vcl/win/source/app/salinst \ + vcl/win/source/app/salshl \ + vcl/win/source/app/saltimer \ + vcl/win/source/gdi/salbmp \ + vcl/win/source/gdi/salgdi \ + vcl/win/source/gdi/salgdi2 \ + vcl/win/source/gdi/salgdi3 \ + vcl/win/source/gdi/salgdi_gdiplus \ + vcl/win/source/gdi/salnativewidgets-luna \ + vcl/win/source/gdi/salprn \ + vcl/win/source/gdi/salvd \ + vcl/win/source/gdi/winlayout \ + vcl/win/source/gdi/wntgdi \ + vcl/win/source/window/salframe \ + vcl/win/source/window/salmenu \ + vcl/win/source/window/salobj \ +)) + +$(eval $(call gb_Library_add_nativeres,vcl,src)) + +endif + +$(eval $(call gb_Library_add_cobjects,vcl,\ + vcl/source/fontsubset/list \ +)) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/app/dbggui \ + vcl/source/app/dndhelp \ + vcl/source/app/help \ + vcl/source/app/i18nhelp \ + vcl/source/app/idlemgr \ + vcl/source/app/salvtables \ + vcl/source/app/session \ + vcl/source/app/settings \ + vcl/source/app/sound \ + vcl/source/app/stdtext \ + vcl/source/app/svapp \ + vcl/source/app/svdata \ + vcl/source/app/svmain \ + vcl/source/app/svmainhook \ + vcl/source/app/timer \ + vcl/source/app/unohelp2 \ + vcl/source/app/unohelp \ + vcl/source/app/vclevent \ + vcl/source/components/display \ + vcl/source/components/dtranscomp \ + vcl/source/components/factory \ + vcl/source/components/fontident \ + vcl/source/components/rasterizer_rsvg \ + vcl/source/components/stringmirror \ + vcl/source/control/button \ + vcl/source/control/combobox \ + vcl/source/control/ctrl \ + vcl/source/control/edit \ + vcl/source/control/field2 \ + vcl/source/control/field \ + vcl/source/control/fixbrd \ + vcl/source/control/fixed \ + vcl/source/control/group \ + vcl/source/control/ilstbox \ + vcl/source/control/imgctrl \ + vcl/source/control/longcurr \ + vcl/source/control/lstbox \ + vcl/source/control/menubtn \ + vcl/source/control/morebtn \ + vcl/source/control/quickselectionengine \ + vcl/source/control/scrbar \ + vcl/source/control/slider \ + vcl/source/control/spinbtn \ + vcl/source/control/spinfld \ + vcl/source/control/tabctrl \ + vcl/source/control/throbber \ + vcl/source/fontsubset/cff \ + vcl/source/fontsubset/fontsubset \ + vcl/source/fontsubset/gsub \ + vcl/source/fontsubset/sft \ + vcl/source/fontsubset/ttcr \ + vcl/source/fontsubset/xlat \ + vcl/source/gdi/alpha \ + vcl/source/gdi/animate \ + vcl/source/gdi/base14 \ + vcl/source/gdi/bitmap2 \ + vcl/source/gdi/bitmap3 \ + vcl/source/gdi/bitmap4 \ + vcl/source/gdi/bitmap \ + vcl/source/gdi/bitmapex \ + vcl/source/gdi/bmpacc2 \ + vcl/source/gdi/bmpacc3 \ + vcl/source/gdi/bmpacc \ + vcl/source/gdi/bmpconv \ + vcl/source/gdi/bmpfast \ + vcl/source/gdi/configsettings \ + vcl/source/gdi/cvtgrf \ + vcl/source/gdi/cvtsvm \ + vcl/source/gdi/extoutdevdata \ + vcl/source/gdi/font \ + vcl/source/gdi/gdimtf \ + vcl/source/gdi/gfxlink \ + vcl/source/gdi/gradient \ + vcl/source/gdi/graph \ + vcl/source/gdi/graphictools \ + vcl/source/gdi/hatch \ + vcl/source/gdi/image \ + vcl/source/gdi/imagerepository \ + vcl/source/gdi/impanmvw \ + vcl/source/gdi/impbmp \ + vcl/source/gdi/impgraph \ + vcl/source/gdi/impimage \ + vcl/source/gdi/impimagetree \ + vcl/source/gdi/impvect \ + vcl/source/gdi/jobset \ + vcl/source/gdi/lineinfo \ + vcl/source/gdi/mapmod \ + vcl/source/gdi/metaact \ + vcl/source/gdi/metric \ + vcl/source/gdi/octree \ + vcl/source/gdi/oldprintadaptor \ + vcl/source/gdi/outdev2 \ + vcl/source/gdi/outdev3 \ + vcl/source/gdi/outdev4 \ + vcl/source/gdi/outdev5 \ + vcl/source/gdi/outdev6 \ + vcl/source/gdi/outdev \ + vcl/source/gdi/outdevnative \ + vcl/source/gdi/outmap \ + vcl/source/gdi/pdfextoutdevdata \ + vcl/source/gdi/pdffontcache \ + vcl/source/gdi/pdfwriter \ + vcl/source/gdi/pdfwriter_impl2 \ + vcl/source/gdi/pdfwriter_impl \ + vcl/source/gdi/pngread \ + vcl/source/gdi/pngwrite \ + vcl/source/gdi/print2 \ + vcl/source/gdi/print3 \ + vcl/source/gdi/print \ + vcl/source/gdi/regband \ + vcl/source/gdi/region \ + vcl/source/gdi/rendergraphic \ + vcl/source/gdi/rendergraphicrasterizer \ + vcl/source/gdi/salgdilayout \ + vcl/source/gdi/sallayout \ + vcl/source/gdi/salmisc \ + vcl/source/gdi/salnativewidgets-none \ + vcl/source/gdi/svgread \ + vcl/source/gdi/textlayout \ + vcl/source/gdi/virdev \ + vcl/source/gdi/wall \ + vcl/source/helper/canvasbitmap \ + vcl/source/helper/canvastools \ + vcl/source/helper/evntpost \ + vcl/source/helper/lazydelete \ + vcl/source/helper/strhelper \ + vcl/source/helper/threadex \ + vcl/source/helper/xconnection \ + vcl/source/salmain/salmain \ + vcl/source/window/abstdlg \ + vcl/source/window/accel \ + vcl/source/window/accmgr \ + vcl/source/window/arrange \ + vcl/source/window/brdwin \ + vcl/source/window/btndlg \ + vcl/source/window/cmdevt \ + vcl/source/window/cursor \ + vcl/source/window/decoview \ + vcl/source/window/dialog \ + vcl/source/window/dlgctrl \ + vcl/source/window/dndevdis \ + vcl/source/window/dndlcon \ + vcl/source/window/dockingarea \ + vcl/source/window/dockmgr \ + vcl/source/window/dockwin \ + vcl/source/window/floatwin \ + vcl/source/window/introwin \ + vcl/source/window/javachild \ + vcl/source/window/keycod \ + vcl/source/window/keyevent \ + vcl/source/window/menu \ + vcl/source/window/mnemonic \ + vcl/source/window/mnemonicengine \ + vcl/source/window/mouseevent \ + vcl/source/window/msgbox \ + vcl/source/window/popupmenuwindow \ + vcl/source/window/printdlg \ + vcl/source/window/scrwnd \ + vcl/source/window/seleng \ + vcl/source/window/split \ + vcl/source/window/splitwin \ + vcl/source/window/status \ + vcl/source/window/syschild \ + vcl/source/window/syswin \ + vcl/source/window/tabdlg \ + vcl/source/window/tabpage \ + vcl/source/window/taskpanelist \ + vcl/source/window/toolbox2 \ + vcl/source/window/toolbox \ + vcl/source/window/window2 \ + vcl/source/window/window3 \ + vcl/source/window/window4 \ + vcl/source/window/window \ + vcl/source/window/winproc \ + vcl/source/window/wpropset \ + vcl/source/window/wrkwin \ +)) + +## handle Graphite +ifneq ($(ENABLE_GRAPHITE),) +$(eval $(call gb_Library_set_defs,vcl,\ + $$(DEFS) \ + -DENABLE_GRAPHITE \ +)) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/glyphs/graphite_cache \ + vcl/source/glyphs/graphite_features \ + vcl/source/glyphs/graphite_layout \ + vcl/source/glyphs/graphite_textsrc \ +)) +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/glyphs/graphite_adaptors \ + vcl/source/glyphs/graphite_serverfont \ +)) +ifeq ($(SYSTEM_GRAPHITE),YES) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + $(GRAPHITE_LIBS) +)) +else +$(eval $(call gb_Library_add_linked_static_libs,vcl,\ + graphite \ +)) +endif +endif +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),SOLARIS) +ifeq ($(CPUNAME)$(CPU),SPARCU) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + -R/usr/sfw/lib/64 \ +)) +else +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + -R/usr/sfw/lib \ +)) +endif +endif + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + AppleRemote \ +)) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + -framework QuickTime \ + -framework Cocoa \ + -framework Carbon \ + -framework CoreFoundation \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + /ENTRY:LibMain@12 \ +)) +$(eval $(call gb_Library_add_linked_libs,vcl,\ + advapi32 \ + gdi32 \ + gdiplus \ + imm32 \ + kernel32 \ + mpr \ + msimg32 \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ + winspool \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk new file mode 100755 index 000000000000..9d0dea8b580f --- /dev/null +++ b/vcl/Library_vclplug_gen.mk @@ -0,0 +1,205 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vclplug_gen)) + +$(eval $(call gb_Library_set_include,vclplug_gen,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ + vcl/unx/generic/app/i18n_cb \ + vcl/unx/generic/app/i18n_ic \ + vcl/unx/generic/app/i18n_im \ + vcl/unx/generic/app/i18n_keysym \ + vcl/unx/generic/app/i18n_status \ + vcl/unx/generic/app/i18n_wrp \ + vcl/unx/generic/app/i18n_xkb \ + vcl/unx/generic/app/keysymnames \ + vcl/unx/generic/app/randrwrapper \ + vcl/unx/generic/app/saldata \ + vcl/unx/generic/app/saldisp \ + vcl/unx/generic/app/salinst \ + vcl/unx/generic/app/salsys \ + vcl/unx/generic/app/saltimer \ + vcl/unx/generic/app/sm \ + vcl/unx/generic/app/soicon \ + vcl/unx/generic/app/wmadaptor \ + vcl/unx/generic/dtrans/bmp \ + vcl/unx/generic/dtrans/config \ + vcl/unx/generic/dtrans/X11_clipboard \ + vcl/unx/generic/dtrans/X11_dndcontext \ + vcl/unx/generic/dtrans/X11_droptarget \ + vcl/unx/generic/dtrans/X11_selection \ + vcl/unx/generic/dtrans/X11_service \ + vcl/unx/generic/dtrans/X11_transferable \ + vcl/unx/generic/gdi/cdeint \ + vcl/unx/generic/gdi/dtint \ + vcl/unx/generic/gdi/gcach_xpeer \ + vcl/unx/generic/gdi/pspgraphics \ + vcl/unx/generic/gdi/salbmp \ + vcl/unx/generic/gdi/salcvt \ + vcl/unx/generic/gdi/salgdi2 \ + vcl/unx/generic/gdi/salgdi3 \ + vcl/unx/generic/gdi/salgdi \ + vcl/unx/generic/gdi/salprnpsp \ + vcl/unx/generic/gdi/salvd \ + vcl/unx/generic/gdi/xrender_peer \ + vcl/unx/generic/printergfx/bitmap_gfx \ + vcl/unx/generic/printergfx/common_gfx \ + vcl/unx/generic/printergfx/glyphset \ + vcl/unx/generic/printergfx/printerjob \ + vcl/unx/generic/printergfx/psputil \ + vcl/unx/generic/printergfx/text_gfx \ + vcl/unx/generic/window/FWS \ + vcl/unx/generic/window/salframe \ + vcl/unx/generic/window/salobj \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ + -DVCLPLUG_GEN_IMPLEMENTATION \ +)) + + +## handle RandR +ifneq ($(ENABLE_RANDR),) +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DUSE_RANDR \ +)) +ifeq ($(XRANDR_DLOPEN),FALSE) +$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ + $$(CXXFLAGS) \ + $$(XRANDR_CFLAGS) \ +)) +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + $(XRANDR_LIBS) \ +)) +else +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DXRANDR_DLOPEN \ +)) +endif +endif + +## handle Xinerama +ifneq ($(USE_XINERAMA),NO) +ifneq ($(OS),SOLARIS) +# not Solaris +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DUSE_XINERAMA_XORG \ +)) +ifeq ($(XINERAMA_LINK),dynamic) +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + -lXinerama \ +)) +else +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ +)) +endif +else +# Solaris +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DUSE_XINERAMA_XSUN \ +)) +ifeq ($(USE_XINERAMA_VERSION),Xorg) +# Solaris, Xorg +ifeq ($(XINERAMA_LINK),dynamic) +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + -lXinerama \ +)) +else +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ +)) +endif +endif +endif +endif + +## handle Render linking +ifeq ($(XRENDER_LINK),YES) +$(eval $(call gb_Library_set_defs,vclplug_gen,\ + $$(DEFS) \ + -DXRENDER_LINK \ +)) +$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ + $$(LDFLAGS) \ + $(shell pkg-config --libs xrender) \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk new file mode 100755 index 000000000000..145b6743edba --- /dev/null +++ b/vcl/Library_vclplug_gtk.mk @@ -0,0 +1,127 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vclplug_gtk)) + +$(eval $(call gb_Library_set_include,vclplug_gtk,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\ + $$(CXXFLAGS) \ + $$(GTK_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_gtk,\ + $$(DEFS) \ + -DVCLPLUG_GTK_IMPLEMENTATION \ + -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ +)) + +ifneq ($(ENABLE_DBUS),) +$(eval $(call gb_Library_set_defs,vclplug_gtk,\ + $$(DEFS) \ + -DENABLE_DBUS \ +)) +$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ + $$(LDFLAGS) \ + $(shell pkg-config --libs dbus-glib-1)\ +)) +endif + +$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ + $$(LDFLAGS) \ + $$(GTK_LIBS) \ + $$(GTHREAD_LIBS) \ +)) + +$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ + vclplug_gen \ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ + vcl/unx/gtk/a11y/atkaction \ + vcl/unx/gtk/a11y/atkbridge \ + vcl/unx/gtk/a11y/atkcomponent \ + vcl/unx/gtk/a11y/atkeditabletext \ + vcl/unx/gtk/a11y/atkfactory \ + vcl/unx/gtk/a11y/atkhypertext \ + vcl/unx/gtk/a11y/atkimage \ + vcl/unx/gtk/a11y/atklistener \ + vcl/unx/gtk/a11y/atkregistry \ + vcl/unx/gtk/a11y/atkselection \ + vcl/unx/gtk/a11y/atktable \ + vcl/unx/gtk/a11y/atktextattributes \ + vcl/unx/gtk/a11y/atktext \ + vcl/unx/gtk/a11y/atkutil \ + vcl/unx/gtk/a11y/atkvalue \ + vcl/unx/gtk/a11y/atkwindow \ + vcl/unx/gtk/a11y/atkwrapper \ + vcl/unx/gtk/app/gtkdata \ + vcl/unx/gtk/app/gtkinst \ + vcl/unx/gtk/app/gtksys \ + vcl/unx/gtk/gdi/salnativewidgets-gtk \ + vcl/unx/gtk/window/gtkframe \ + vcl/unx/gtk/window/gtkobject \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk new file mode 100755 index 000000000000..a3fc45513707 --- /dev/null +++ b/vcl/Library_vclplug_kde.mk @@ -0,0 +1,93 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vclplug_kde)) + +$(eval $(call gb_Library_set_include,vclplug_kde,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\ + $$(CXXFLAGS) \ + $$(KDE_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_kde,\ + $$(DEFS) \ + -DVCLPLUG_KDE_IMPLEMENTATION \ +)) + +$(eval $(call gb_Library_set_ldflags,vclplug_kde,\ + $$(KDE_LIBS)\ + $$(LDFLAGS) \ +)) + +$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ + vclplug_gen \ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ + vcl/unx/kde/kdedata \ + vcl/unx/kde/salnativewidgets-kde \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk new file mode 100755 index 000000000000..30fc756b4a35 --- /dev/null +++ b/vcl/Library_vclplug_kde4.mk @@ -0,0 +1,99 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vclplug_kde4)) + +$(eval $(call gb_Library_set_include,vclplug_kde4,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\ + $$(CXXFLAGS) \ + $$(KDE4_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_kde4,\ + $$(DEFS) \ + -DVCLPLUG_KDE4_IMPLEMENTATION \ +)) + +$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\ + $$(KDE4_LIBS)\ + $$(LDFLAGS) \ +)) + +$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ + vclplug_gen \ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ + vcl/unx/kde4/KDEData \ + vcl/unx/kde4/KDESalDisplay \ + vcl/unx/kde4/KDESalFrame \ + vcl/unx/kde4/KDESalGraphics \ + vcl/unx/kde4/KDESalInstance \ + vcl/unx/kde4/KDEXLib \ + vcl/unx/kde4/main \ + vcl/unx/kde4/VCLKDEApplication \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk new file mode 100755 index 000000000000..1289c6b53a83 --- /dev/null +++ b/vcl/Library_vclplug_svp.mk @@ -0,0 +1,97 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,vclplug_svp)) + +$(eval $(call gb_Library_set_include,vclplug_svp,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,vclplug_svp,\ + $$(DEFS) \ + -DVCLPLUG_SVP_IMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ + vcl \ + tl \ + utl \ + sot \ + ucbhelper \ + basegfx \ + basebmp \ + comphelper \ + cppuhelper \ + icuuc \ + icule \ + i18nisolang1 \ + i18npaper \ + i18nutil \ + jvmaccess \ + stl \ + cppu \ + sal \ + vos3 \ + X11 \ + Xext \ + SM \ + ICE \ +)) + +$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ + vcl/unx/generic/printergfx/bitmap_gfx \ + vcl/unx/generic/printergfx/common_gfx \ + vcl/unx/generic/printergfx/glyphset \ + vcl/unx/generic/printergfx/printerjob \ + vcl/unx/generic/printergfx/psputil \ + vcl/unx/generic/printergfx/text_gfx \ + vcl/unx/headless/svpbmp \ + vcl/unx/headless/svpdummies \ + vcl/unx/headless/svpelement \ + vcl/unx/headless/svpframe \ + vcl/unx/headless/svpgdi \ + vcl/unx/headless/svpinst \ + vcl/unx/headless/svpprn \ + vcl/unx/headless/svppspgraphics \ + vcl/unx/headless/svptext \ + vcl/unx/headless/svpvd \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ + dl \ + m \ + pthread \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/source/salmain/makefile.mk b/vcl/Makefile index 9c790bf28d75..a79aff831024 100644 --- a/vcl/source/salmain/makefile.mk +++ b/vcl/Makefile @@ -25,17 +25,14 @@ # #************************************************************************* -PRJ = ..$/.. -PRJNAME = vcl -TARGET = salmain -ENABLE_EXCEPTIONS = TRUE +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -.INCLUDE: settings.mk +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -OBJFILES = $(OBJ)$/salmain.obj +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -LIB1TARGET=$(LB)$/vclmain.lib -LIB1ARCHIV=$(LB)$/libvclmain.a -LIB1FILES=$(LB)$/salmain.lib - -.INCLUDE: target.mk +# vim: set noet sw=4 ts=4: diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/Module_vcl.mk index a0ddcbc02226..929f60988bb1 100644 --- a/vcl/aqua/source/app/makefile.mk +++ b/vcl/Module_vcl.mk @@ -25,39 +25,50 @@ # #************************************************************************* -PRJ=..$/..$/.. -PRJNAME=vcl -TARGET=salapp -.INCLUDE : $(PRJ)$/util$/makefile.pmk -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Module_Module,vcl)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vcl \ + StaticLibrary_vclmain \ + Package_inc \ + AllLangResTarget_vcl \ +)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_gen \ + Library_vclplug_svp \ + Library_desktop_detector \ +)) -# --- Files -------------------------------------------------------- +ifneq ($(ENABLE_GTK),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_gtk \ +)) +endif +ifneq ($(ENABLE_KDE),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_kde \ +)) +endif +ifneq ($(ENABLE_KDE4),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_kde4 \ +)) +endif +endif -.IF "$(GUIBASE)"!="aqua" +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Module_add_targets,vcl,\ + Package_osx \ +)) +endif -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= $(SLO)$/salinst.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/vclnsapp.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/salnstimer.obj \ - $(SLO)$/salsys.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk +ifeq ($(GUIBASE),WIN) +$(eval $(call gb_Module_add_targets,vcl,\ + WinResTarget_vcl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk new file mode 100644 index 000000000000..f45f2b9c3917 --- /dev/null +++ b/vcl/Package_inc.mk @@ -0,0 +1,168 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,vcl_inc,$(SRCDIR)/vcl/inc)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/abstdlg.hxx,vcl/abstdlg.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/animate.hxx,vcl/animate.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/apptypes.hxx,vcl/apptypes.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/canvastools.hxx,vcl/canvastools.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.h,vcl/cmdevt.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.hxx,vcl/cmdevt.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.h,vcl/combobox.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.hxx,vcl/combobox.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/configsettings.hxx,vcl/configsettings.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/controllayout.hxx,vcl/controllayout.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ctrl.hxx,vcl/ctrl.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cursor.hxx,vcl/cursor.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtgrf.hxx,vcl/cvtgrf.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtsvm.hxx,vcl/cvtsvm.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/decoview.hxx,vcl/decoview.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dialog.hxx,vcl/dialog.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dllapi.h,vcl/dllapi.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dndhelp.hxx,vcl/dndhelp.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockingarea.hxx,vcl/dockingarea.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockwin.hxx,vcl/dockwin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/edit.hxx,vcl/edit.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/event.hxx,vcl/event.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/evntpost.hxx,vcl/evntpost.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/extoutdevdata.hxx,vcl/extoutdevdata.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixbrd.hxx,vcl/fixbrd.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.h,vcl/graph.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.hxx,vcl/graph.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphictools.hxx,vcl/graphictools.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/group.hxx,vcl/group.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/hatch.hxx,vcl/hatch.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/helper.hxx,vcl/helper.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/help.hxx,vcl/help.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/i18nhelp.hxx,vcl/i18nhelp.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/image.hxx,vcl/image.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ImageListProvider.hxx,vcl/ImageListProvider.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imagerepository.hxx,vcl/imagerepository.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imgctrl.hxx,vcl/imgctrl.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/impdel.hxx,vcl/impdel.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/inputctx.hxx,vcl/inputctx.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/introwin.hxx,vcl/introwin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/javachild.hxx,vcl/javachild.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycod.hxx,vcl/keycod.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lazydelete.hxx,vcl/lazydelete.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lineinfo.hxx,vcl/lineinfo.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/longcurr.hxx,vcl/longcurr.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.h,vcl/lstbox.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.hxx,vcl/lstbox.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mapmod.hxx,vcl/mapmod.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menubtn.hxx,vcl/menubtn.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menu.hxx,vcl/menu.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metaact.hxx,vcl/metaact.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metric.hxx,vcl/metric.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonicengine.hxx,vcl/mnemonicengine.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonic.hxx,vcl/mnemonic.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/morebtn.hxx,vcl/morebtn.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/msgbox.hxx,vcl/msgbox.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/octree.hxx,vcl/octree.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/oldprintadaptor.hxx,vcl/oldprintadaptor.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/outdev.hxx,vcl/outdev.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfextoutdevdata.hxx,vcl/pdfextoutdevdata.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfwriter.hxx,vcl/pdfwriter.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngread.hxx,vcl/pngread.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngwrite.hxx,vcl/pngwrite.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pointr.hxx,vcl/pointr.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/popupmenuwindow.hxx,vcl/popupmenuwindow.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ppdparser.hxx,vcl/ppdparser.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/printerinfomanager.hxx,vcl/printerinfomanager.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/print.hxx,vcl/print.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prntypes.hxx,vcl/prntypes.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ptrstyle.hxx,vcl/ptrstyle.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/quickselectionengine.hxx,vcl/quickselectionengine.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/regband.hxx,vcl/regband.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/region.hxx,vcl/region.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphicrasterizer.hxx,vcl/rendergraphicrasterizer.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphic.hxx,vcl/rendergraphic.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salnativewidgets.hxx,vcl/salnativewidgets.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/split.hxx,vcl/split.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/splitwin.hxx,vcl/splitwin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/status.hxx,vcl/status.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sv.h,vcl/sv.h)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgread.hxx,vcl/svgread.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabctrl.hxx,vcl/tabctrl.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabdlg.hxx,vcl/tabdlg.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabpage.hxx,vcl/tabpage.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/taskpanelist.hxx,vcl/taskpanelist.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/threadex.hxx,vcl/threadex.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/throbber.hxx,vcl/throbber.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/timer.hxx,vcl/timer.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/toolbox.hxx,vcl/toolbox.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp2.hxx,vcl/unohelp2.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp.hxx,vcl/unohelp.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unowrap.hxx,vcl/unowrap.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclenum.hxx,vcl/vclenum.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclevent.hxx,vcl/vclevent.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx)) +$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx)) + diff --git a/vcl/util/target.pmk b/vcl/Package_osx.mk index 8ec15475bc90..414479a88fed 100644 --- a/vcl/util/target.pmk +++ b/vcl/Package_osx.mk @@ -14,26 +14,23 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # #************************************************************************* -ALLSLO: $(SLOFILES) -SOSHL: $(SHL1TARGETN) +### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess +$(eval $(call gb_Package_Package,vcl_zip,)) +$(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip)) -WHOLEPRJ .SETDIR=$(PRJ)$/prj: - make debug linkinc prjpch compinc - @echo "READY" - -ONLYDLL .SETDIR=$(PRJ)$/util: $(SLOFILES) - $(RM) ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll - dmake debug=t prjpch=t linkinc=t compinc=t ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll - @echo "READY" +/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png + cd $(SRCDIR)/vcl/aqua/source/res ; \ + mkdir -p $(dir $@) ; \ + zip $@ MainMenu.nib/*.nib cursors/*.png diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk new file mode 100755 index 000000000000..ccf800b38ce6 --- /dev/null +++ b/vcl/StaticLibrary_vclmain.mk @@ -0,0 +1,62 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) + +$(eval $(call gb_StaticLibrary_set_include,vclmain,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\ + vcl/source/salmain/salmain \ +)) + +# HACK for now +# We really should fix the clients of this to link against the static library +# Instead of this evil linking of an object from $(OUTDIR) +define StaticLibrary_salmain_hack +$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1) +$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain))) + +$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain) + $$(call gb_Deliver_deliver,$$<,$$@) + +endef + +ifeq ($(OS),WNT) +$(eval $(call StaticLibrary_salmain_hack,salmain.obj)) +else +$(eval $(call StaticLibrary_salmain_hack,salmain.o)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk new file mode 100755 index 000000000000..68fe30c0826c --- /dev/null +++ b/vcl/WinResTarget_vcl.mk @@ -0,0 +1,123 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) + +$(eval $(call gb_WinResTarget_set_include,vcl/src,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_WinResTarget_add_file,vcl/src,\ + vcl/win/source/src/salsrc \ +)) +$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ + vcl/win/source/src/dtext.cur \ + vcl/win/source/src/50.bmp \ + vcl/win/source/src/copydata.cur \ + vcl/win/source/src/dpie.cur \ + vcl/win/source/src/movedata.cur \ + vcl/win/source/src/rotate.cur \ + vcl/win/source/src/50.png \ + vcl/win/source/src/copydlnk.cur \ + vcl/win/source/src/dpolygon.cur \ + vcl/win/source/src/movedlnk.cur \ + vcl/win/source/src/salsrc.rc \ + vcl/win/source/src/airbrush.cur \ + vcl/win/source/src/copyf.cur \ + vcl/win/source/src/drect.cur \ + vcl/win/source/src/movef.cur \ + vcl/win/source/src/sd.ico \ + vcl/win/source/src/ase.cur \ + vcl/win/source/src/copyf2.cur \ + vcl/win/source/src/dtext.cur \ + vcl/win/source/src/movef2.cur \ + vcl/win/source/src/tblsele.cur \ + vcl/win/source/src/asn.cur \ + vcl/win/source/src/copyflnk.cur \ + vcl/win/source/src/fill.cur \ + vcl/win/source/src/moveflnk.cur \ + vcl/win/source/src/tblsels.cur \ + vcl/win/source/src/asne.cur \ + vcl/win/source/src/crook.cur \ + vcl/win/source/src/hand.cur \ + vcl/win/source/src/movept.cur \ + vcl/win/source/src/tblselse.cur \ + vcl/win/source/src/asns.cur \ + vcl/win/source/src/crop.cur \ + vcl/win/source/src/help.cur \ + vcl/win/source/src/neswsize.cur \ + vcl/win/source/src/tblselsw.cur \ + vcl/win/source/src/asnswe.cur \ + vcl/win/source/src/cross.cur \ + vcl/win/source/src/hshear.cur \ + vcl/win/source/src/notallow.cur \ + vcl/win/source/src/tblselw.cur \ + vcl/win/source/src/asnw.cur \ + vcl/win/source/src/darc.cur \ + vcl/win/source/src/hsize.cur \ + vcl/win/source/src/nullptr.cur \ + vcl/win/source/src/timemove.cur \ + vcl/win/source/src/ass.cur \ + vcl/win/source/src/dbezier.cur \ + vcl/win/source/src/hsizebar.cur \ + vcl/win/source/src/nwsesize.cur \ + vcl/win/source/src/timesize.cur \ + vcl/win/source/src/asse.cur \ + vcl/win/source/src/dcapt.cur \ + vcl/win/source/src/hsplit.cur \ + vcl/win/source/src/pen.cur \ + vcl/win/source/src/vshear.cur \ + vcl/win/source/src/assw.cur \ + vcl/win/source/src/dcirccut.cur \ + vcl/win/source/src/linkdata.cur \ + vcl/win/source/src/pivotcol.cur \ + vcl/win/source/src/vsize.cur \ + vcl/win/source/src/asw.cur \ + vcl/win/source/src/dconnect.cur \ + vcl/win/source/src/linkf.cur \ + vcl/win/source/src/pivotdel.cur \ + vcl/win/source/src/vsizebar.cur \ + vcl/win/source/src/aswe.cur \ + vcl/win/source/src/dellipse.cur \ + vcl/win/source/src/magnify.cur \ + vcl/win/source/src/pivotfld.cur \ + vcl/win/source/src/vsplit.cur \ + vcl/win/source/src/chain.cur \ + vcl/win/source/src/detectiv.cur \ + vcl/win/source/src/mirror.cur \ + vcl/win/source/src/pivotrow.cur \ + vcl/win/source/src/vtext.cur \ + vcl/win/source/src/chainnot.cur \ + vcl/win/source/src/dfree.cur \ + vcl/win/source/src/move.cur \ + vcl/win/source/src/pntbrsh.cur \ + vcl/win/source/src/chart.cur \ + vcl/win/source/src/dline.cur \ + vcl/win/source/src/movebw.cur \ + vcl/win/source/src/refhand.cur \ +)) diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h index 3a7f13f8a545..94388a98e3c3 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11ACTIONWRAPPER_H #define _SV_AQUA11ACTIONWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yActionWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm index fcd49fd67ff4..e49ad251faad 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11yactionwrapper.h" // Wrapper for XAccessibleAction diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index 6d44f62b5611..a1a3fbab5ce3 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11COMPONENTWRAPPER_H #define _SV_AQUA11COMPONENTWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yComponentWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm index 5dcdf4bb9f61..41b66d19e578 100644 --- a/vcl/aqua/source/a11y/aqua11yfactory.mm +++ b/vcl/aqua/source/a11y/aqua11yfactory.mm @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "aqua11yfactory.h" +#include "aqua/salinst.h" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" + #include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" #include "aqua11yrolehelper.h" #include "aqua11ywrapperbutton.h" #include "aqua11ywrapperstatictext.h" @@ -49,6 +50,7 @@ #include "aqua11ywrappertabgroup.h" #include "aqua11ywrappertoolbar.h" #include "aqua11ytablewrapper.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx index 9ac9401abd62..1a7c72eac9ec 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx @@ -28,12 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" -#include "aqua11yfactory.h" - #include <salhelper/refobj.hxx> +#include "aqua/aqua11yfocustracker.hxx" +#include "aqua/aqua11yfactory.h" + +#include "aqua11yfocuslistener.hxx" + using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index 1fdd340c698e..db114be14771 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -30,8 +30,8 @@ #include <salhelper/refobj.hxx> -#include "keyboardfocuslistener.hxx" -#include "aquavcltypes.h" +#include "aqua/keyboardfocuslistener.hxx" +#include "aqua/aquavcltypes.h" // #include <com/sun/star/accessibility/XAccessibleContext.hpp> diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx index 2a8ebb39bd80..c901eea915a6 100644 --- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx @@ -28,7 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aqua11yfocustracker.hxx" +#include "vcl/svapp.hxx" +#include "vcl/window.hxx" +#include "vcl/toolbox.hxx" +#include "vcl/menu.hxx" + +#include "aqua/aqua11yfocustracker.hxx" + #include "documentfocuslistener.hxx" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @@ -37,11 +43,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include "vcl/svapp.hxx" -#include "vcl/window.hxx" -#include "vcl/toolbox.hxx" -#include "vcl/menu.hxx" - using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx index 7f680f43b3a6..36e2c7ab2220 100644 --- a/vcl/aqua/source/a11y/aqua11ylistener.cxx +++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx @@ -25,12 +25,13 @@ * ************************************************************************/ -#include "aqua11ylistener.hxx" -#include "aqua11yfactory.h" -#include "aqua11yfocustracker.hxx" +#include "aqua/salinst.h" +#include "aqua/aqua11ylistener.hxx" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" +#include "aqua/aqua11ywrapper.h" + #include "aqua11ytextwrapper.h" -#include "aqua11ywrapper.h" -#include "salinst.h" #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -74,7 +75,7 @@ AquaA11yEventListener::~AquaA11yEventListener() //------------------------------------------------------------------------------ void SAL_CALL -AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException ) +AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h index f847eb3f41c3..c15c39903432 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.h +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11ROLEHELPER_H #define _SV_AQUA11ROLEHELPER_H -#include "salinst.h" +#include "aqua/salinst.h" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @interface AquaA11yRoleHelper : NSObject diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm index b8ebdb08c3df..cfc052e96beb 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/aqua11yfactory.h" + #include "aqua11yrolehelper.h" -#include "aqua11yfactory.h" + #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index bf290990faa2..20bb99938ef0 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11SELECTIONWRAPPER_H #define _SV_AQUA11SELECTIONWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11ySelectionWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm index 9368c599d131..a215bf913cf1 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm @@ -28,8 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "aqua11yfactory.h" +#include "aqua/salinst.h" +#include "aqua/aqua11yfactory.h" + #include "aqua11yselectionwrapper.h" using namespace ::com::sun::star::accessibility; @@ -67,6 +68,7 @@ using namespace ::com::sun::star::uno; +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + (void)wrapper; if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] ) { return YES; diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h index 7bf3e44a2945..ed70ed219b6e 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11TABLEWRAPPER_H #define _SV_AQUA11TABLEWRAPPER_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" #define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000 diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm index 98454ab8d57b..110cb42ffee7 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm @@ -28,8 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/aqua11yfactory.h" + #include "aqua11ytablewrapper.h" -#include "aqua11yfactory.h" using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::awt; diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h index fcf185ca5478..0aa271a7f1e2 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h @@ -28,8 +28,7 @@ #ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H #define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H -#include <com/sun/star/uno/Sequence.hxx> -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yTextAttributesWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 60b12c762b25..948e0dfa95aa 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/salinst.h" + #include "aqua11ytextattributeswrapper.h" -#include "salinst.h" + #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index b132bdd0f12a..34ba1611b7b3 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11TEXTWRAPPER_H #define _SV_AQUA11TEXTWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yTextWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm index 89c164e5e0b9..d956d2beb0b7 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm @@ -28,10 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ytextwrapper.h" #include "aqua11ytextattributeswrapper.h" #include "aqua11yutil.h" + #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/awt/Rectangle.hpp> @@ -49,8 +51,11 @@ using namespace ::rtl; return CreateNSString ( [ wrapper accessibleText ] -> getText() ); } -+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value { ++(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value +{ // TODO + (void)wrapper; + (void)value; } +(id)numberOfCharactersAttributeForElement:(AquaA11yWrapper *)wrapper { @@ -103,15 +108,22 @@ using namespace ::rtl; return [ NSValue valueWithRange: NSMakeRange ( 0, [ wrapper accessibleText ] -> getCharacterCount() ) ]; } -+(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value { ++(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value +{ // do nothing + (void)wrapper; + (void)value; } -+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper { ++(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper +{ + (void)wrapper; return [ [ NSArray alloc ] init ]; // unsupported } -+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper { ++(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper +{ + (void)wrapper; return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported } diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/aqua/source/a11y/aqua11yutil.mm index 4749a3b40822..74de0a19aa41 100644 --- a/vcl/aqua/source/a11y/aqua11yutil.mm +++ b/vcl/aqua/source/a11y/aqua11yutil.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquavcltypes.h" +#include "aqua/aquavcltypes.h" + #include "aqua11yutil.h" using namespace ::com::sun::star::awt; diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index 1dbafe33baea..35573f855549 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -28,9 +28,9 @@ #ifndef _SV_AQUA11VALUEWRAPPER_H #define _SV_AQUA11VALUEWRAPPER_H -#include "salinst.h" -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/salinst.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yValueWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index c2724a372f9f..bf8de98c3318 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" +#include "aqua/aqua11ylistener.hxx" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" + +#include "aqua11yfocuslistener.hxx" #include "aqua11yactionwrapper.h" #include "aqua11ycomponentwrapper.h" -#include "aqua11ylistener.hxx" #include "aqua11yselectionwrapper.h" #include "aqua11ytablewrapper.h" #include "aqua11ytextwrapper.h" #include "aqua11yvaluewrapper.h" -#include "aqua11yfactory.h" -#include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" #include "aqua11yrolehelper.h" #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -163,7 +164,8 @@ static BOOL isPopupMenuOpen = NO; if ( ! asGetter ) { [ methodName appendString: @"set" ]; } - NSString * firstChar = [ attribute substringWithRange: NSMakeRange ( 2, 1 ) ]; // drop leading "AX" and get first char + NSRange aRange = { 2, 1 }; + NSString * firstChar = [ attribute substringWithRange: aRange ]; // drop leading "AX" and get first char if ( asGetter ) { [ methodName appendString: [ firstChar lowercaseString ] ]; } else { @@ -830,7 +832,10 @@ static BOOL isPopupMenuOpen = NO; return nil; // TODO: to be completed } --(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { +-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute +{ + (void)value; + (void)attribute; return NO; // TODO } diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h index aa35062d15c4..78c54e2c35ea 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERBUTTON_H #define _SV_AQUA11WRAPPERBUTTON_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperButton : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm index 48f1804c58a2..e51ceff14af9 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperbutton.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index b1c5fc751e52..e1016a6fe551 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERCHECKBOX_H #define _SV_AQUA11WRAPPERCHECKBOX_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperCheckBox : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm index 25f012e1163f..6bf2aa2f8340 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrappercheckbox.h" #include "aqua11yvaluewrapper.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index e18da11dd0ad..c9b71585aea3 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERCOMBOBOX_H #define _SV_AQUA11WRAPPERCOMBOBOX_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @interface AquaA11yWrapperComboBox : AquaA11yWrapper diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm index 16fa1372fe4e..6f8e9d05d112 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm @@ -28,9 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrappercombobox.h" #include "aqua11yrolehelper.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h index 7757e067ee22..bdbfb6e6b264 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERGROUP_H #define _SV_AQUA11WRAPPERGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm index 42298f9c745b..536cc9bba8eb 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappergroup.h" // Wrapper for AXGroup role diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h index 95df8323467b..db9bf7511af6 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERLIST_H #define _SV_AQUA11WRAPPERLIST_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperList : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm index eeb210d70e65..d70679ed6966 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperlist.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 3fc6558c633c..276f1c162e8c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H #define _SV_AQUA11WRAPPERRADIOBUTTON_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRadioButton : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm index 930f940c4971..4c1e9047d65e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperradiobutton.h" #include "aqua11ytextwrapper.h" #include "aqua11yvaluewrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h index 544b709223b3..4c138372e27e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERRADIOGROUP_H #define _SV_AQUA11WRAPPERRADIOGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRadioGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm index f89ac78b044c..52e71620ceed 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperradiogroup.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h index 252af6f5987f..deaa4f07248f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERROW_H #define _SV_AQUA11WRAPPERROW_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRow : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm index d49e229218bf..0fd65fd01365 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperrow.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h index 2c206fd0904b..e1e37a45d36e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSCROLLAREA_H #define _SV_AQUA11WRAPPERSCROLLAREA_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperScrollArea : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm index f375e5ce788d..8a481b64926d 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperscrollarea.h" #include "aqua11ywrapperscrollbar.h" #include "aqua11yrolehelper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h index 1070c682cd5e..df57418803fa 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSCROLLBAR_H #define _SV_AQUA11WRAPPERSCROLLBAR_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperScrollBar : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm index 826da647055b..42b67b739602 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperscrollbar.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h index 084a72ea7a18..a114e6fb7a74 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSPLITTER_H #define _SV_AQUA11WRAPPERSPLITTER_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperSplitter : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm index 4dc645c006c8..37821f25e423 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappersplitter.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h index c21e5573d125..aef2957557d4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSTATICTEXT_H #define _SV_AQUA11WRAPPERSTATICTEXT_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperStaticText : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm index 7192e64b2e7c..d5afe0962904 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperstatictext.h" // Wrapper for AXStaticText role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h index be72b9e27396..7fda77789015 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTABGROUP_H #define _SV_AQUA11WRAPPERTABGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperTabGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm index 708ae5440c4f..fb4e66ad9b90 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertabgroup.h" // Wrapper for AXTabGroup role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h index 724f85994053..e47795d976b3 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTEXTAREA_H #define _SV_AQUA11WRAPPERTEXTAREA_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperTextArea : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm index 9a425eb2b893..a90fe7ae28aa 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertextarea.h" // Wrapper for AXTextArea role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h index e7ac0a25acec..4ab947484cc4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTOOLBAR_H #define _SV_AQUA11WRAPPERTOOLBAR_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperToolbar : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm index 28990355af55..29ddaf540266 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertoolbar.h" // Wrapper for AXToolbar role diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 863bc59d173f..3f02d3fc0ada 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -28,15 +28,12 @@ #ifndef _DOCUMENTFOCUSLISTENER_HXX_ #define _DOCUMENTFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#include "aqua11yfocustracker.hxx" +#include "aqua/aqua11yfocustracker.hxx" + #include <set> // ------------------------- diff --git a/vcl/aqua/source/a11y/makefile.mk b/vcl/aqua/source/a11y/makefile.mk deleted file mode 100644 index 0a16281e5a69..000000000000 --- a/vcl/aqua/source/a11y/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=sala11y -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= \ - $(SLO)$/aqua11ywrapper.obj \ - $(SLO)$/aqua11yfactory.obj \ - $(SLO)$/aqua11yfocuslistener.obj \ - $(SLO)$/aqua11yfocustracker.obj \ - $(SLO)$/aqua11ylistener.obj \ - $(SLO)$/aqua11yrolehelper.obj \ - $(SLO)$/aqua11yactionwrapper.obj \ - $(SLO)$/aqua11ycomponentwrapper.obj \ - $(SLO)$/aqua11yselectionwrapper.obj \ - $(SLO)$/aqua11ytablewrapper.obj \ - $(SLO)$/aqua11ytextattributeswrapper.obj \ - $(SLO)$/aqua11ytextwrapper.obj \ - $(SLO)$/aqua11yutil.obj \ - $(SLO)$/aqua11yvaluewrapper.obj \ - $(SLO)$/aqua11ywrapperbutton.obj \ - $(SLO)$/aqua11ywrappercheckbox.obj \ - $(SLO)$/aqua11ywrappercombobox.obj \ - $(SLO)$/aqua11ywrappergroup.obj \ - $(SLO)$/aqua11ywrapperlist.obj \ - $(SLO)$/aqua11ywrapperradiobutton.obj \ - $(SLO)$/aqua11ywrapperradiogroup.obj \ - $(SLO)$/aqua11ywrapperrow.obj \ - $(SLO)$/aqua11ywrapperscrollarea.obj \ - $(SLO)$/aqua11ywrapperscrollbar.obj \ - $(SLO)$/aqua11ywrappersplitter.obj \ - $(SLO)$/aqua11ywrapperstatictext.obj \ - $(SLO)$/aqua11ywrappertabgroup.obj \ - $(SLO)$/aqua11ywrappertextarea.obj \ - $(SLO)$/aqua11ywrappertoolbar.obj \ - $(SLO)$/documentfocuslistener.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 3cb878636ad3..7b8174e16703 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -28,9 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saldata.hxx" -#include "salnsmenu.h" -#include "salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salnsmenu.h" +#include "aqua/salinst.h" + #import "apple_remote/RemoteMainController.h" oslThreadKey SalData::s_aAutoReleaseKey = 0; diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 352396a7fb2b..7a07718efaac 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -32,25 +32,30 @@ #include "tools/fsys.hxx" #include "tools/getprocessworkingdir.hxx" +#include <tools/solarmutex.hxx> + #include "osl/process.h" + #include "rtl/ustrbuf.hxx" + #include "vcl/svapp.hxx" -#include "vcl/print.h" -#include "vcl/salimestatus.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" -#include "vcl/impbmp.hxx" - -#include "saldata.hxx" -#include "salinst.h" -#include "salframe.h" -#include "salobj.h" -#include "salsys.h" -#include "salvd.h" -#include "salbmp.h" -#include "salprn.h" -#include "saltimer.h" -#include "vclnsapp.h" + +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/salframe.h" +#include "aqua/salobj.h" +#include "aqua/salsys.h" +#include "aqua/salvd.h" +#include "aqua/salbmp.h" +#include "aqua/salprn.h" +#include "aqua/saltimer.h" +#include "aqua/vclnsapp.h" + +#include "print.h" +#include "impbmp.hxx" +#include "salimestatus.hxx" #include <comphelper/processfactory.hxx> @@ -66,7 +71,6 @@ #import "apple_remote/RemoteMainController.h" #include "apple_remote/RemoteControl.h" #include "postmac.h" -#include <tools/solarmutex.hxx> using namespace std; using namespace ::com::sun::star; @@ -890,7 +894,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ ) { return NULL; } @@ -976,7 +980,7 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) // ----------------------------------------------------------------------- -void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) +void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) { } @@ -1058,13 +1062,13 @@ void AquaSalInstance::DestroySystem( SalSystem* pSystem ) // ----------------------------------------------------------------------- -void AquaSalInstance::SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ) +void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) ) { } // ----------------------------------------------------------------------- -void AquaSalInstance::SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ) +void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) ) { } diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm index 73e49fd99c61..f44c3d698f73 100755 --- a/vcl/aqua/source/app/salnstimer.mm +++ b/vcl/aqua/source/app/salnstimer.mm @@ -28,16 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saltimer.h" -#include "salnstimer.h" -#include "salinst.h" -#include "saldata.hxx" +#include "aqua/saltimer.h" +#include "aqua/salnstimer.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" -#include "vcl/svdata.hxx" +#include "svdata.hxx" @implementation TimerCallbackCaller -(void)timerElapsed:(NSTimer*)pTimer { + (void)pTimer; ImplSVData* pSVData = ImplGetSVData(); if( AquaSalTimer::bDispatchTimer ) { diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index cf5cf00b7fe4..21da319b42b7 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -29,14 +29,17 @@ #include "precompiled_vcl.hxx" #include "tools/rc.hxx" -#include "vcl/svids.hrc" -#include "vcl/button.hxx" -#include "salsys.h" -#include "saldata.hxx" -#include "salinst.h" #include "rtl/ustrbuf.hxx" +#include "vcl/button.hxx" + +#include "aqua/salsys.h" +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" + +#include "svids.hrc" + using namespace rtl; // ======================================================================= diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index 9abcc18bf6af..b482453704af 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saltimer.h" -#include "salnstimer.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salinst.h" +#include "aqua/saltimer.h" +#include "aqua/salnstimer.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salinst.h" // ======================================================================= diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index 455e7c64c6a4..cfb4d5e62454 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -28,18 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vclnsapp.h" -#include "salinst.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salframeview.h" +#include "rtl/ustrbuf.hxx" #include "vcl/window.hxx" #include "vcl/svapp.hxx" #include "vcl/cmdevt.hxx" -#include "rtl/ustrbuf.hxx" -#include "vcl/impimagetree.hxx" +#include "aqua/vclnsapp.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salframeview.h" + +#include "impimagetree.hxx" #include "premac.h" #import "Carbon/Carbon.h" @@ -52,6 +53,7 @@ { // do nothing, this is just to start an NSThread and therefore put // Cocoa into multithread mode + (void)param; } @end @@ -284,11 +286,13 @@ -(NSMenu*)applicationDockMenu:(NSApplication *)sender { + (void)sender; return AquaSalInstance::GetDynamicDockMenu(); } -(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile { + (void)app; const rtl::OUString aFile( GetOUString( pFile ) ); if( ! AquaSalInstance::isOnCommandLine( aFile ) ) { @@ -301,6 +305,7 @@ -(void)application: (NSApplication*) app openFiles: (NSArray*)files { + (void)app; rtl::OUStringBuffer aFileList( 256 ); NSEnumerator* it = [files objectEnumerator]; @@ -330,6 +335,7 @@ -(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile { + (void)app; const rtl::OUString aFile( GetOUString( pFile ) ); const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(), APPEVENT_PRINT_STRING, aFile ); @@ -338,6 +344,9 @@ } -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels { + (void)app; + (void)printSettings; + (void)bShowPrintPanels; // currently ignores print settings an bShowPrintPanels rtl::OUStringBuffer aFileList( 256 ); @@ -360,6 +369,7 @@ -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app { + (void)app; NSApplicationTerminateReply aReply = NSTerminateNow; { YIELD_GUARD; @@ -387,6 +397,7 @@ -(void)systemColorsChanged: (NSNotification*) pNotification { + (void)pNotification; YIELD_GUARD; const SalData* pSalData = GetSalData(); @@ -396,6 +407,7 @@ -(void)screenParametersChanged: (NSNotification*) pNotification { + (void)pNotification; YIELD_GUARD; SalData* pSalData = GetSalData(); @@ -408,11 +420,13 @@ -(void)scrollbarVariantChanged: (NSNotification*) pNotification { + (void)pNotification; GetSalData()->mpFirstInstance->delayedSettingsChanged( true ); } -(void)scrollbarSettingsChanged: (NSNotification*) pNotification { + (void)pNotification; GetSalData()->mpFirstInstance->delayedSettingsChanged( false ); } @@ -436,7 +450,9 @@ #pragma mark - #pragma mark NSApplication Delegates -- (void)applicationWillBecomeActive:(NSNotification *)aNotification { +- (void)applicationWillBecomeActive:(NSNotification *)pNotification +{ + (void)pNotification; if (GetSalData()->mpMainController->remoteControl) { // [remoteControl startListening: self]; @@ -452,7 +468,9 @@ } } -- (void)applicationWillResignActive:(NSNotification *)aNotification { +- (void)applicationWillResignActive:(NSNotification *)pNotification +{ + (void)pNotification; if (GetSalData()->mpMainController->remoteControl) { // [remoteControl stopListening: self]; @@ -470,6 +488,8 @@ - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { + (void)pApp; + (void)bWinVisible; NSObject* pHdl = GetSalData()->mpDockIconClickHandler; if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] ) { diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index 01f989cbc1c1..98cbdcc7c5e2 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -619,7 +619,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe return dp; } -DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor, NSArray* systemData) const +DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* /*systemFlavor*/, NSArray* systemData) const { return DataProviderPtr_t(new FileListDataProvider(systemData)); } diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index dab882e75716..f3e73b765c94 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include <rtl/unload.h> + +#include "rtl/unload.h" +#include "rtl/ustring.hxx" #include "comphelper/makesequence.hxx" @@ -38,9 +41,9 @@ #include "DragSourceContext.hxx" #include "aqua_clipboard.hxx" #include "DragActionConversion.hxx" -#include "salframe.h" -#include <rtl/ustring.h> +#include "aqua/salframe.h" + #include <memory> @@ -114,44 +117,50 @@ Sequence<OUString> dragSource_getSupportedServiceNames() -(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint { - DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - mDragSource, - DNDConstants::ACTION_COPY, - DNDConstants::ACTION_COPY); - - mDragSource->mXDragSrcListener->dragEnter(dsde); + (void)anImage; + (void)aPoint; + DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + mDragSource, + DNDConstants::ACTION_COPY, + DNDConstants::ACTION_COPY); + + mDragSource->mXDragSrcListener->dragEnter(dsde); } -(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation { - // an internal drop can accept the drop but fail with dropComplete( false ) - // this is different than the Cocoa API - bool bDropSuccess = operation != NSDragOperationNone; - if( DragSource::g_DropSuccessSet ) - bDropSuccess = DragSource::g_DropSuccess; - - DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - static_cast< XDragSource* >(mDragSource), - SystemToOfficeDragActions(operation), - bDropSuccess ); - - mDragSource->mXDragSrcListener->dragDropEnd(dsde); - mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>(); + (void)anImage; + (void)aPoint; + // an internal drop can accept the drop but fail with dropComplete( false ) + // this is different than the Cocoa API + bool bDropSuccess = operation != NSDragOperationNone; + if( DragSource::g_DropSuccessSet ) + bDropSuccess = DragSource::g_DropSuccess; + + DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + static_cast< XDragSource* >(mDragSource), + SystemToOfficeDragActions(operation), + bDropSuccess ); + + mDragSource->mXDragSrcListener->dragDropEnd(dsde); + mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>(); } -(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint { - DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - mDragSource, - DNDConstants::ACTION_COPY, - DNDConstants::ACTION_COPY); - - mDragSource->mXDragSrcListener->dragOver(dsde); + (void)draggedImage; + (void)screenPoint; + DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + mDragSource, + DNDConstants::ACTION_COPY, + DNDConstants::ACTION_COPY); + + mDragSource->mXDragSrcListener->dragOver(dsde); } @end @@ -241,8 +250,8 @@ sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ ) void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, sal_Int8 sourceActions, - sal_Int32 cursor, - sal_Int32 image, + sal_Int32 /*cursor*/, + sal_Int32 /*image*/, const uno::Reference<XTransferable >& transferable, const uno::Reference<XDragSourceListener >& listener ) throw( RuntimeException) diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 103b6dc47d44..b55a70872372 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -50,8 +50,8 @@ #include <Carbon/Carbon.h> #include <postmac.h> -#include <salframe.h> -#include <salframeview.h> +#include <aqua/salframe.h> +#include <aqua/salframeview.h> using namespace rtl; using namespace cppu; @@ -317,20 +317,20 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } - void DropTarget::draggingExited(id sender) - { +void DropTarget::draggingExited(id /*sender*/) +{ DropTargetEvent dte(static_cast<OWeakObject*>(this), 0); fire_dragExit(dte); mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; SetThemeCursor(kThemeArrowCursor); - } +} - BOOL DropTarget::prepareForDragOperation(id sender) - { +BOOL DropTarget::prepareForDragOperation(id /*sender*/) +{ return 1; - } +} BOOL DropTarget::performDragOperation(id sender) @@ -372,13 +372,13 @@ BOOL DropTarget::performDragOperation(id sender) } - void DropTarget::concludeDragOperation(id sender) - { +void DropTarget::concludeDragOperation(id /*sender*/) +{ mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; mXCurrentDragClipboard = uno::Reference<XClipboard>(); SetThemeCursor(kThemeArrowCursor); - } +} // called from WeakComponentImplHelperX::dispose diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index abffeebcb6c1..657211be5dc8 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -254,7 +254,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard } -void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification) +void AquaClipboard::applicationDidBecomeActive(NSNotification*) { ClearableMutexGuard aGuard(m_aMutex); @@ -378,7 +378,7 @@ OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException } -sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& /*ServiceName*/ ) throw( RuntimeException ) { return sal_False; } diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx deleted file mode 100644 index 57ef1f11175c..000000000000 --- a/vcl/aqua/source/dtrans/aqua_service.cxx +++ /dev/null @@ -1,86 +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 "aqua_clipboard.hxx" -#include <cppuhelper/factory.hxx> -#include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> - -using namespace rtl; -using namespace com::sun::star::uno; -using namespace com::sun::star::registry; -using namespace cppu; -using namespace com::sun::star::lang; -using namespace com::sun::star::datatransfer::clipboard; -using namespace aqua; - -namespace aqua { - -Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) -{ - return Reference< XInterface >( static_cast< XClipboard* >( new AquaClipboard(rServiceManager) ) ); -} - -} // namespace aqua - -extern "C" -{ - -void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey ) -{ - void* pRet = 0; - - if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, AQUA_CLIPBOARD_IMPL_NAME ) ) ) - { - Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ); - - //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) ) - Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory( - reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), - OUString::createFromAscii( pImplName ), - createInstance, - aSNS ) ); - if ( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - } - - return pRet; -} - -} // extern "C" diff --git a/vcl/aqua/source/dtrans/makefile.mk b/vcl/aqua/source/dtrans/makefile.mk deleted file mode 100644 index 369799c9a260..000000000000 --- a/vcl/aqua/source/dtrans/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=dtransaqua -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -.IF "$(OS)"!="MACOSX" -dummy: - @echo "Nothing to build for this platform" -.ELSE # "$(OS)"!="MACOSX" -.IF "$(GUIBASE)"!="aqua" -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE - -CFLAGSCXX+=-fconstant-cfstrings -x objective-c++ -fobjc-exceptions - -SLOFILES= \ - $(SLO)$/aqua_clipboard.obj \ - $(SLO)$/DataFlavorMapping.obj \ - $(SLO)$/OSXTransferable.obj \ - $(SLO)$/HtmlFmtFlt.obj \ - $(SLO)$/PictToBmpFlt.obj \ - $(SLO)$/DropTarget.obj \ - $(SLO)$/DragSource.obj \ - $(SLO)$/service_entry.obj \ - $(SLO)$/DragSourceContext.obj \ - $(SLO)$/DragActionConversion.obj - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -.ENDIF # "$(GUIBASE)"!="aqua" -.ENDIF # "$(OS)"!="MACOSX" - diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx index ca207c23bdee..327fba900508 100644 --- a/vcl/aqua/source/dtrans/service_entry.cxx +++ b/vcl/aqua/source/dtrans/service_entry.cxx @@ -28,13 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saldata.hxx" -#include "salinst.h" +#include "osl/diagnose.h" + +#include "vcl/svapp.hxx" + +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" + #include "DragSource.hxx" #include "DropTarget.hxx" #include "aqua_clipboard.hxx" -#include "osl/diagnose.h" -#include "vcl/svapp.hxx" using namespace ::osl; using namespace ::rtl; diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx deleted file mode 100644 index 85c87c6b9ba9..000000000000 --- a/vcl/aqua/source/dtrans/test_aquacb.cxx +++ /dev/null @@ -1,208 +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 "aqua_clipboard.hxx" -#include <cppuhelper/servicefactory.hxx> -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#include <com/sun/star/lang/XComponent.hpp> - -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ -#include <cppuhelper/implbase2.hxx> -#endif -#include <rtl/ustring.hxx> -#include <sal/types.h> -#include <osl/diagnose.h> - -#include <stdio.h> - -using namespace ::rtl; -using namespace ::std; -using namespace ::cppu; -using namespace ::com::sun::star::datatransfer; -using namespace ::com::sun::star::datatransfer::clipboard; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::lang; - -Reference< XTransferable > rXTransfRead; - -class TestTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable > -{ -public: - TestTransferable(); - virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException); - virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors() throw(RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); - virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException); - -private: - Sequence< DataFlavor > m_seqDFlv; - OUString m_Data; -}; - -TestTransferable::TestTransferable() : - m_seqDFlv( 1 ), - m_Data( RTL_CONSTASCII_USTRINGPARAM( "This is a test string" ) ) -{ - DataFlavor df; - - df.MimeType = OUString::createFromAscii( "text/html" ); - df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 ); - - m_seqDFlv[0] = df; -} - -Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor ) - throw(UnsupportedFlavorException, IOException, RuntimeException) -{ - Any anyData; - - if ( aFlavor.MimeType == m_seqDFlv[0].MimeType ) - { - OString aStr( m_Data.getStr(), m_Data.getLength(), 1252 ); - Sequence< sal_Int8 > sOfChars( aStr.getLength() ); - sal_Int32 lenStr = aStr.getLength(); - - for ( sal_Int32 i = 0; i < lenStr; ++i ) - sOfChars[i] = aStr[i]; - - anyData = makeAny( sOfChars ); - } - - return anyData; -} - -Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors() - throw(RuntimeException) -{ - return m_seqDFlv; -} - -sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) - throw(RuntimeException) -{ - sal_Int32 nLength = m_seqDFlv.getLength(); - sal_Bool bRet = sal_False; - - for ( sal_Int32 i = 0; i < nLength; ++i ) - { - if ( m_seqDFlv[i].MimeType == aFlavor.MimeType ) - { - bRet = sal_True; - break; - } - } - - return bRet; -} - -void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) - throw(RuntimeException) -{ -} - -int SAL_CALL main( int argc, char** argv ) -{ - if(argc != 2) - { - fprintf( stderr, "usage: %s <my rdb file>\n", argv[0] ); - return 1; - } - - //------------------------------------------------- - // get the global service-manager - //------------------------------------------------- - OUString rdbName = OUString::createFromAscii( argv[1] ); - Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - - // Print a message if an error occured. - if ( !g_xFactory.is() ) - { - OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); - return(-1); - } - - //------------------------------------------------- - // try to get an Interface to a XFilePicker Service - //------------------------------------------------- - - Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new TestTransferable ) ); - - Reference< XClipboard > xClipboard( g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ) ), UNO_QUERY ); - if ( !xClipboard.is() ) - { - OSL_ENSURE( sal_False, "Error creating FolderPicker Service" ); - return(-1); - } - - Reference< XTypeProvider > rXTypProv( xClipboard, UNO_QUERY ); - - if ( rXTypProv.is() ) - { - Sequence< Type > seqType = rXTypProv->getTypes(); - sal_Int32 nLen = seqType.getLength(); - for ( sal_Int32 i = 0; i < nLen; i++ ) - { - Type nxtType = seqType[i]; - } - - Sequence< sal_Int8 > seqInt8 = rXTypProv->getImplementationId(); - } - - xClipboard->setContents( rXTransf, Reference< XClipboardOwner >( rXTransf, UNO_QUERY ) ); - - rXTransfRead = xClipboard->getContents(); - - // destroy the transferable explicitly - rXTransfRead = Reference< XTransferable>(); - - // destroy the clipboard - xClipboard = Reference< XClipboard >(); - - //-------------------------------------------------- - // shutdown the service manager - //-------------------------------------------------- - - // Cast factory to XComponent - Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - - if ( !xComponent.is() ) - OSL_ENSURE(sal_False, "Error shuting down"); - - // Dispose and clear factory - xComponent->dispose(); - g_xFactory.clear(); - g_xFactory = Reference< XMultiServiceFactory >(); - - return 0; -} diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm index 82119fb9c50a..8786ed7d0013 100644 --- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm +++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm @@ -28,18 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquaprintview.h" -#include "salinst.h" +#include "tools/resary.hxx" + #include "vcl/print.hxx" #include "vcl/image.hxx" #include "vcl/virdev.hxx" -#include "vcl/svdata.hxx" #include "vcl/svapp.hxx" #include "vcl/unohelp.hxx" -#include "vcl/svids.hrc" +#include "aqua/aquaprintview.h" +#include "aqua/salinst.h" -#include "tools/resary.hxx" +#include "svdata.hxx" +#include "svids.hrc" #include "com/sun/star/i18n/XBreakIterator.hpp" #include "com/sun/star/i18n/WordType.hpp" @@ -918,7 +919,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach [pProto release]; } -static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset, +static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/, const rtl::OUString& rText, const rtl::OUString& rProperty, const Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue, std::vector<ColumnItem >& rLeftColumn, diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm index 11b4b9088591..692435fc00f0 100755 --- a/vcl/aqua/source/gdi/aquaprintview.mm +++ b/vcl/aqua/source/gdi/aquaprintview.mm @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquaprintview.h" -#include "salprn.h" #include "vcl/print.hxx" +#include "aqua/aquaprintview.h" +#include "aqua/salprn.h" + @implementation AquaPrintView -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter { @@ -64,6 +65,7 @@ -(NSPoint)locationOfPrintRect: (NSRect)aRect { + (void)aRect; NSPoint aPoint = { 0, 0 }; return aPoint; } diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk deleted file mode 100644 index 2aea58e49250..000000000000 --- a/vcl/aqua/source/gdi/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salgdi -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= $(SLO)$/salmathutils.obj \ - $(SLO)$/salcolorutils.obj \ - $(SLO)$/salgdiutils.obj \ - $(SLO)$/salnativewidgets.obj \ - $(SLO)$/salatsuifontutils.obj \ - $(SLO)$/salatslayout.obj \ - $(SLO)$/salgdi.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/salprn.obj \ - $(SLO)$/aquaprintview.obj \ - $(SLO)$/aquaprintaccessoryview.obj \ - $(SLO)$/salbmp.obj - -.IF "$(ENABLE_CAIRO)" == "TRUE" -CDEFS+= -DCAIRO -.ENDIF - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 9626e2fcbdce..62e783522a88 100755 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -25,13 +25,15 @@ * ************************************************************************/ -#include "vcl/salgdi.hxx" -#include "saldata.hxx" -#include "salgdi.h" -#include "vcl/sallayout.hxx" -#include "salatsuifontutils.hxx" #include "tools/debug.hxx" +#include "aqua/saldata.hxx" +#include "aqua/salgdi.h" +#include "aqua/salatsuifontutils.hxx" + +#include "sallayout.hxx" +#include "salgdi.hxx" + #include <math.h> // ======================================================================= @@ -1203,7 +1205,7 @@ void PolyArgs::ClosePolygon() // glyph fallback is supported directly by Aqua // so methods used only by MultiSalLayout can be dummy implementated -bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& rPPV ) const { return false; } +bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; } void ATSLayout::InitFont() {} void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {} void ATSLayout::DropGlyph( int /*nStart*/ ) {} @@ -1255,7 +1257,7 @@ const ImplFontData* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) cons // ======================================================================= -SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel*/ ) { ATSLayout* pATSLayout = new ATSLayout( maATSUStyle, mfFontScale ); return pATSLayout; diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx index 8281c41ceeab..61fcd78586b3 100644 --- a/vcl/aqua/source/gdi/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx @@ -32,10 +32,11 @@ #include <vector> #include <set> -#include "salgdi.h" -#include "saldata.hxx" #include "vcl/svapp.hxx" -#include "salatsuifontutils.hxx" + +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" +#include "aqua/salatsuifontutils.hxx" // we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index e54c7edd6fe5..d73b3eb25511 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -28,19 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/color.hxx" -#include "salbmp.h" -#include "vcl/bitmap.hxx" // for BitmapSystemData -#include "vcl/salbtype.hxx" -#include "vcl/bmpfast.hxx" +#include <boost/bind.hpp> #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" + #include "basegfx/vector/b2ivector.hxx" -#include <boost/bind.hpp> +#include "tools/color.hxx" + +#include "vcl/bitmap.hxx" // for BitmapSystemData +#include "vcl/salbtype.hxx" + +#include "aqua/salbmp.h" +#include "aqua/salinst.h" -#include "salinst.h" +#include "bmpfast.hxx" // ======================================================================= @@ -655,7 +658,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome ) return aEmptyPalette; } -BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly ) +BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) { if( !maUserBuffer.get() ) // || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) ) diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx index ec33b2dd8f8d..37b6ec65a108 100755 --- a/vcl/aqua/source/gdi/salcolorutils.cxx +++ b/vcl/aqua/source/gdi/salcolorutils.cxx @@ -28,9 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salcolorutils.hxx" #include "vcl/salbtype.hxx" +#include "aqua/salcolorutils.hxx" + // ======================================================================= SalColor GetSalColor( const float* pQuartzColor ) diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 62906a5df268..3c228ffcfa40 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -28,21 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salconst.h" -#include "salgdi.h" -#include "salbmp.h" -#include "salframe.h" -#include "salcolorutils.hxx" -#include "sft.hxx" -#include "salatsuifontutils.hxx" - -#include "vcl/impfont.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" -#include "vcl/region.h" - #include "osl/file.hxx" #include "osl/process.h" @@ -55,7 +40,24 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "vcl/sysdata.hxx" +#include "vcl/svapp.hxx" + +#include "aqua/salconst.h" +#include "aqua/salgdi.h" +#include "aqua/salbmp.h" +#include "aqua/salframe.h" +#include "aqua/salcolorutils.hxx" +#include "aqua/salatsuifontutils.hxx" + +#include "fontsubset.hxx" +#include "impfont.hxx" +#include "region.h" +#include "sallayout.hxx" +#include "sft.hxx" + using namespace vcl; @@ -344,7 +346,7 @@ void AquaSalGraphics::updateResolution() initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil ); } -void AquaSalGraphics::initResolution( NSWindow* pWin ) +void AquaSalGraphics::initResolution( NSWindow* ) { // #i100617# read DPI only once; there is some kind of weird caching going on // if the main screen changes @@ -1045,22 +1047,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, - const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*, + const SalPoint* const*, const sal_uInt8* const* ) { return sal_False; } @@ -1146,7 +1148,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap // ----------------------------------------------------------------------- -void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags ) +void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ) { ApplyXorContext(); @@ -1228,7 +1230,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS // ----------------------------------------------------------------------- -void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor ) +void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor ) { DBG_ERROR("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); @@ -1330,7 +1332,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY ) // ----------------------------------------------------------------------- -static void DrawPattern50( void* info, CGContextRef rContext ) +static void DrawPattern50( void*, CGContextRef rContext ) { static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } }; CGContextAddRects( rContext, aRects, 2 ); @@ -1597,7 +1599,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL // ----------------------------------------------------------------------- -sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) +sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) { return 0; } @@ -1694,8 +1696,8 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // ----------------------------------------------------------------------- -bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const String& rFontFileURL, const String& rFontName ) +bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, + const String& rFontFileURL, const String& /*rFontName*/ ) { ::rtl::OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); @@ -1853,7 +1855,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) // ----------------------------------------------------------------------- -sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel ) +sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int /*nFallbackLevel*/ ) { if( !pReqFont ) { @@ -2393,28 +2395,29 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti // ----------------------------------------------------------------------- const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( - const ImplFontData* pFontData, const Ucs2OStrMap** ppNonEncoded ) + const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } // ----------------------------------------------------------------------- -const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData, - const sal_Ucs* pUnicodes, - sal_Int32* pWidths, - FontSubsetInfo& rInfo, - long* pDataLen ) +const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*, + const sal_Ucs* /*pUnicodes*/, + sal_Int32* /*pWidths*/, + FontSubsetInfo&, + long* /*pDataLen*/ ) { return NULL; } // ----------------------------------------------------------------------- -void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen ) +void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of // AquaSalGraphics::GetEmbedFontData() returns non-NULL + (void)pData; DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 9bafb50d19fc..1652dadfbdfb 100755 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -28,20 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salgdi.h" -#include "salframe.h" +#include <boost/bind.hpp> #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" + #include "basegfx/range/b2drectangle.hxx" #include "basegfx/range/b2irange.hxx" #include "basegfx/vector/b2ivector.hxx" #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" -#include <boost/bind.hpp> #include "vcl/svapp.hxx" -#include "saldata.hxx" + +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/saldata.hxx" // ---------------------------------------------------------------------- @@ -269,7 +271,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtA // ----------------------------------------------------------------------- -void AquaSalGraphics::UpdateWindow( NSRect& rRect ) +void AquaSalGraphics::UpdateWindow( NSRect& ) { if( !mpFrame ) return; diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx index 8df44acbf730..1a0011068194 100755 --- a/vcl/aqua/source/gdi/salmathutils.cxx +++ b/vcl/aqua/source/gdi/salmathutils.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salmathutils.hxx" +#include "aqua/salmathutils.hxx" #include <stdlib.h> diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index d2763411e039..f66c7aa2b32d 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -25,17 +25,17 @@ * ************************************************************************/ -#include "salconst.h" -#include "salgdi.h" -#include "salnativewidgets.h" -#include "saldata.hxx" -#include "salframe.h" - #include "vcl/salnativewidgets.hxx" #include "vcl/decoview.hxx" #include "vcl/svapp.hxx" #include "vcl/timer.hxx" +#include "aqua/salconst.h" +#include "aqua/salgdi.h" +#include "aqua/salnativewidgets.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" + #include "premac.h" #include <Carbon/Carbon.h> #include "postmac.h" @@ -475,7 +475,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ) + const rtl::OUString& ) { sal_Bool bOK = sal_False; @@ -1228,9 +1228,9 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ) +sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/, + ControlState /*nState*/, const ImplControlValue& /*aValue*/, + const rtl::OUString& ) { return( sal_False ); } @@ -1249,8 +1249,8 @@ sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, +sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/, + const ImplControlValue& aValue, const rtl::OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index ed80110cacc6..92a4e92f6849 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -28,17 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "salprn.h" -#include "aquaprintview.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "vcl/jobset.h" -#include "vcl/salptype.hxx" +#include <boost/bind.hpp> + #include "vcl/print.hxx" #include "vcl/unohelp.hxx" -#include <boost/bind.hpp> +#include "aqua/salinst.h" +#include "aqua/salprn.h" +#include "aqua/aquaprintview.h" +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" + +#include "jobset.h" +#include "salptype.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/container/XNameAccess.hpp" @@ -176,7 +178,7 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* ) // ----------------------------------------------------------------------- -sal_Bool AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) +sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) { return sal_False; } @@ -360,14 +362,14 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu // ----------------------------------------------------------------------- -sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData ) +sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) { return 0; } // ----------------------------------------------------------------------- -XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) +XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { return XubString(); } @@ -436,7 +438,7 @@ static bool getUseNativeDialog() return bNative; } -sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ) +sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType ) { switch( i_nType ) { @@ -520,7 +522,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, - const String& i_rAppName, + const String& /*i_rAppName*/, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) @@ -771,13 +773,13 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName, // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const XubString* i_pFileName, - const XubString& i_rJobName, - const XubString& i_rAppName, - sal_uLong i_nCopies, - bool i_bCollate, - bool i_bDirect, - ImplJobSetup* i_pSetupData ) +sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/, + const XubString& /*i_rJobName*/, + const XubString& /*i_rAppName*/, + sal_uLong /*i_nCopies*/, + bool /*i_bCollate*/, + bool /*i_bDirect*/, + ImplJobSetup* ) { DBG_ERROR( "should never be called" ); return sal_False; @@ -818,7 +820,7 @@ sal_uLong AquaSalPrinter::GetErrorCode() return mpInfoPrinter->GetErrorCode(); } -void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData ) +void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) { m_aPaperFormats.clear(); m_bPapersInit = true; @@ -883,7 +885,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight, return pMatch; } -int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) +int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* ) { return 900; } diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index b40f5e602ebe..8e77c67c7854 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -28,15 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salvd.h" -#include "salinst.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "salframe.h" -#include <vcl/svapp.hxx> - +#include "vcl/svapp.hxx" #include "vcl/sysdata.hxx" +#include "aqua/salvd.h" +#include "aqua/salinst.h" +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" + // ----------------------------------------------------------------------- SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, @@ -149,7 +149,7 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics() // ----------------------------------------------------------------------- -void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics *pGraphics ) +void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk deleted file mode 100644 index 7afbce885e4a..000000000000 --- a/vcl/aqua/source/window/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salwin -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= \ - $(SLO)/salframe.obj \ - $(SLO)/salframeview.obj \ - $(SLO)/salmenu.obj \ - $(SLO)/salnsmenu.obj \ - $(SLO)/salobj.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 676014be2277..8749774459d3 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -30,28 +30,31 @@ #include <string> -#include "saldata.hxx" -#include "salgdi.h" -#include "salframe.h" -#include "salmenu.h" -#include "saltimer.h" -#include "salinst.h" -#include "salframeview.h" -#include "aqua11yfactory.h" -#include "vcl/salwtype.hxx" +#include "rtl/ustrbuf.hxx" + +#include "osl/file.h" + +#include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" +#include "aqua/saldata.hxx" +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/salmenu.h" +#include "aqua/saltimer.h" +#include "aqua/salinst.h" +#include "aqua/salframeview.h" +#include "aqua/aqua11yfactory.h" + +#include "salwtype.hxx" + #include "premac.h" // needed for theming // FIXME: move theming code to salnativewidgets.cxx #include <Carbon/Carbon.h> #include "postmac.h" -#include "boost/assert.hpp" -#include "vcl/svapp.hxx" -#include "rtl/ustrbuf.hxx" -#include "osl/file.h" using namespace std; @@ -285,6 +288,7 @@ SalGraphics* AquaSalFrame::GetGraphics() void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { + (void)pGraphics; DBG_ASSERT( pGraphics == mpGraphics, "graphics released on wrong frame" ); mbGraphics = FALSE; } @@ -478,7 +482,7 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate) // ----------------------------------------------------------------------- -void AquaSalFrame::Enable( sal_Bool bEnable ) +void AquaSalFrame::Enable( sal_Bool ) { } @@ -863,7 +867,7 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void AquaSalFrame::SetAlwaysOnTop( sal_Bool ) { } @@ -1035,7 +1039,7 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext ) // ----------------------------------------------------------------------- -void AquaSalFrame::EndExtTextInput( sal_uInt16 nFlags ) +void AquaSalFrame::EndExtTextInput( sal_uInt16 ) { } @@ -1543,7 +1547,7 @@ SalPointerState AquaSalFrame::GetPointerState() return state; } -bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent ) +bool AquaSalFrame::SetPluginParent( SystemParentData* ) { // plugin parent may be killed unexpectedly by // plugging process; diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index ba8751307c70..dd2deefdeeaa 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -28,16 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "salgdi.h" -#include "salframe.h" -#include "salframeview.h" -#include "aqua11yfactory.h" #include <sal/alloca.h> -#include "vcl/window.hxx" +#include "vcl/window.hxx" #include "vcl/svapp.hxx" +#include "aqua/salinst.h" +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/salframeview.h" +#include "aqua/aqua11yfactory.h" + #define WHEEL_EVENT_FACTOR 1.5 static sal_uInt16 ImplGetModifierMask( unsigned int nMask ) @@ -206,6 +207,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidBecomeKey: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -236,6 +238,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidResignKey: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -247,6 +250,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidChangeScreen: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -255,6 +259,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidMove: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -266,6 +271,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidResize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -278,6 +284,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidMiniaturize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -290,6 +297,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidDeminiaturize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -302,6 +310,7 @@ static AquaSalFrame* getMouseContainerFrame() -(BOOL)windowShouldClose: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; BOOL bRet = YES; @@ -321,6 +330,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)dockMenuItemTriggered: (id)sender { + (void)sender; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -369,6 +379,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)unregisterDraggingDestinationHandler:(id)theHandler { + (void)theHandler; mDraggingDestinationHandler = nil; } @@ -420,6 +431,7 @@ static AquaSalFrame* getMouseContainerFrame() -(BOOL)acceptsFirstMouse: (NSEvent*)pEvent { + (void)pEvent; return YES; } @@ -730,6 +742,7 @@ private: { //Rotation : -(float)rotation; // TODO: create new CommandType so rotation is available to the applications + (void)pEvent; } - (void)swipeWithEvent: (NSEvent*)pEvent @@ -1025,294 +1038,352 @@ private: -(void)insertTab: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_TAB character: '\t' modifiers: 0]; } -(void)insertBacktab: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: (KEY_TAB | KEY_SHIFT) character: '\t' modifiers: 0]; } -(void)moveLeft: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: 0]; } -(void)moveLeftAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: NSShiftKeyMask]; } -(void)moveBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0]; } -(void)moveRight: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: 0]; } -(void)moveRightAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: NSShiftKeyMask]; } -(void)moveForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0 modifiers: 0]; } -(void)moveWordLeft: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordLeftAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordRight: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordRightAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveToEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfParagraphAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfDocument: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToEndOfDocument: (id)aSender { + (void)aSender; // this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToEndOfDocumentAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocument: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToBeginningOfDocument: (id)aSender { + (void)aSender; // this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveUp: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_UP character: 0 modifiers: 0]; } -(void)moveDown: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_DOWN character: 0 modifiers: 0]; } -(void)insertNewline: (id)aSender { + (void)aSender; // #i91267# make enter and shift-enter work by evaluating the modifiers [self sendKeyInputAndReleaseToFrame: KEY_RETURN character: '\n' modifiers: mpFrame->mnLastModifierFlags]; } -(void)deleteBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0]; } -(void)deleteForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_DELETE character: 0x7f modifiers: 0]; } -(void)deleteBackwardByDecomposingPreviousCharacter: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0]; } -(void)deleteWordBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)deleteWordForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)deleteToBeginningOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToBeginningOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)deleteToEndOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)insertLineBreak: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0]; } -(void)insertParagraphSeparator: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectWord: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0 modifiers: 0]; } -(void)selectLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0 modifiers: 0]; } -(void)selectParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectAll: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0 modifiers: 0]; } -(void)cancelOperation: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_ESCAPE character: 0x1b modifiers: 0]; } -(void)noop: (id)aSender { + (void)aSender; if( ! mbKeyHandled ) { if( ! [self sendSingleCharacter:mpLastEvent] ) @@ -1512,12 +1583,14 @@ private: - (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange { + (void)theRange; // FIXME return nil; } - (unsigned int)characterIndexForPoint:(NSPoint)thePoint { + (void)thePoint; // FIXME return 0; } @@ -1561,6 +1634,7 @@ private: - (NSRect)firstRectForCharacterRange:(NSRange)theRange { + (void)theRange; SalExtTextInputPosEvent aPosEvent; mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent ); @@ -1606,7 +1680,8 @@ private: -(void)unregisterMouseEventListener: (id)theListener { - mpMouseEventListener = nil; + (void)theListener; + mpMouseEventListener = nil; } -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender @@ -1646,7 +1721,8 @@ private: -(void)unregisterDraggingDestinationHandler:(id)theHandler { - mDraggingDestinationHandler = nil; + (void)theHandler; + mDraggingDestinationHandler = nil; } @end diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index fa045776c448..c237b10f1512 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -25,21 +25,23 @@ * ************************************************************************/ -#include "saldata.hxx" -#include "salinst.h" -#include "salmenu.h" -#include "salnsmenu.h" -#include "salframe.h" -#include "salbmp.h" -#include "vcl/svids.hrc" +#include "rtl/ustrbuf.hxx" + #include "vcl/cmdevt.hxx" #include "vcl/floatwin.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/svapp.hxx" -#include "rtl/ustrbuf.hxx" -#include "aqua11ywrapper.h" +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/salmenu.h" +#include "aqua/salnsmenu.h" +#include "aqua/salframe.h" +#include "aqua/salbmp.h" +#include "aqua/aqua11ywrapper.h" + +#include "svids.hrc" +#include "window.h" const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; @@ -79,12 +81,14 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; -(void)showPreferences: (id) sender { + (void)sender; YIELD_GUARD; [self showDialog: SHOWDIALOG_ID_PREFERENCES]; } -(void)showAbout: (id) sender { + (void)sender; YIELD_GUARD; [self showDialog: SHOWDIALOG_ID_ABOUT]; @@ -591,7 +595,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos ) [mpMenu removeItemAtIndex: getItemIndexByPos(nPos)]; } -void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) +void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned /*nPos*/ ) { AquaSalMenuItem *pAquaSalMenuItem = static_cast<AquaSalMenuItem*>(pSalMenuItem); AquaSalMenu *subAquaSalMenu = static_cast<AquaSalMenu*>(pSubMenu); @@ -649,7 +653,7 @@ void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) } } -void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& rImage ) +void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Image& rImage ) { AquaSalMenuItem* pSalMenuItem = static_cast<AquaSalMenuItem*>( pSMI ); if( ! pSalMenuItem || ! pSalMenuItem->mpMenuItem ) @@ -662,7 +666,7 @@ void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& r [pImage release]; } -void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, const XubString& i_rText ) +void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText ) { if (!i_pSalMenuItem) return; @@ -699,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con } } -void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; @@ -782,7 +786,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons [pString release]; } -void AquaSalMenu::GetSystemMenuData( SystemMenuData* pData ) +void AquaSalMenu::GetSystemMenuData( SystemMenuData* ) { } diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm index 015c43aed70f..fcc2392a01a9 100755 --- a/vcl/aqua/source/window/salnsmenu.mm +++ b/vcl/aqua/source/window/salnsmenu.mm @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salmenu.h" -#include "salnsmenu.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salmenu.h" +#include "aqua/salnsmenu.h" #include "vcl/window.hxx" @@ -45,6 +45,7 @@ -(void)menuNeedsUpdate: (NSMenu*)pMenu { + (void)pMenu; YIELD_GUARD; if( mpMenu ) @@ -84,6 +85,7 @@ } -(void)menuItemTriggered: (id)aSender { + (void)aSender; YIELD_GUARD; const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL; diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 3df1347e3b10..6b5952bee8a1 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -30,9 +30,9 @@ #include <string.h> -#include "saldata.hxx" -#include "salobj.h" -#include "salframe.h" +#include "aqua/saldata.hxx" +#include "aqua/salobj.h" +#include "aqua/salframe.h" // ======================================================================= @@ -114,7 +114,7 @@ sal_uInt16 AquaSalObject::GetClipRegionType() // ----------------------------------------------------------------------- -void AquaSalObject::BeginSetClipRegion( sal_uLong nRectCount ) +void AquaSalObject::BeginSetClipRegion( sal_uLong ) { mbClip = false; } @@ -208,7 +208,7 @@ void AquaSalObject::Show( sal_Bool bVisible ) // ----------------------------------------------------------------------- -void AquaSalObject::Enable( sal_Bool bEnable ) +void AquaSalObject::Enable( sal_Bool ) { } @@ -226,7 +226,7 @@ void AquaSalObject::SetBackground() // ----------------------------------------------------------------------- -void AquaSalObject::SetBackground( SalColor nSalColor ) +void AquaSalObject::SetBackground( SalColor ) { } diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/accel.h index 284868748c89..284868748c89 100644 --- a/vcl/inc/vcl/accel.h +++ b/vcl/inc/accel.h diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/accmgr.hxx index 553503380b15..553503380b15 100644 --- a/vcl/inc/vcl/accmgr.hxx +++ b/vcl/inc/accmgr.hxx diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h index 30f355dd502c..30f355dd502c 100644 --- a/vcl/aqua/inc/aqua11yfactory.h +++ b/vcl/inc/aqua/aqua11yfactory.h diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx index 1dbf68c4a5ef..1dbf68c4a5ef 100644 --- a/vcl/aqua/inc/aqua11yfocustracker.hxx +++ b/vcl/inc/aqua/aqua11yfocustracker.hxx diff --git a/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx index 461b149e4650..461b149e4650 100644 --- a/vcl/aqua/inc/aqua11ylistener.hxx +++ b/vcl/inc/aqua/aqua11ylistener.hxx diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h index 44640966d760..44640966d760 100644 --- a/vcl/aqua/inc/aqua11ywrapper.h +++ b/vcl/inc/aqua/aqua11ywrapper.h diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h index 391a9546f63a..391a9546f63a 100755 --- a/vcl/aqua/inc/aquaprintview.h +++ b/vcl/inc/aqua/aquaprintview.h diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/inc/aqua/aquavclevents.hxx index 8e03c59d0954..8e03c59d0954 100644 --- a/vcl/aqua/inc/aquavclevents.hxx +++ b/vcl/inc/aqua/aquavclevents.hxx diff --git a/vcl/aqua/inc/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h index 7346282963d7..7346282963d7 100644 --- a/vcl/aqua/inc/aquavcltypes.h +++ b/vcl/inc/aqua/aquavcltypes.h diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx index 71eba2f46c02..71eba2f46c02 100644 --- a/vcl/aqua/inc/keyboardfocuslistener.hxx +++ b/vcl/inc/aqua/keyboardfocuslistener.hxx diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/inc/aqua/salatsuifontutils.hxx index 81e60871ae86..81e60871ae86 100644 --- a/vcl/aqua/inc/salatsuifontutils.hxx +++ b/vcl/inc/aqua/salatsuifontutils.hxx diff --git a/vcl/aqua/inc/salbmp.h b/vcl/inc/aqua/salbmp.h index c95c326f1548..0f86332ca761 100644 --- a/vcl/aqua/inc/salbmp.h +++ b/vcl/inc/aqua/salbmp.h @@ -29,16 +29,21 @@ #define _SV_SALBMP_H #include "tools/gen.hxx" -#include "vcl/sv.h" + +#include "basebmp/bitmapdevice.hxx" + #include "vcl/salbtype.hxx" + +#include "aqua/salconst.h" +#include "aqua/salgdi.h" + #include "saldata.hxx" -#include "vcl/salinst.hxx" -#include "salconst.h" -#include "vcl/salvd.hxx" +#include "salinst.hxx" +#include "salvd.hxx" +#include "salbmp.hxx" + #include "salcolorutils.hxx" -#include "vcl/salbmp.hxx" -#include "salgdi.h" -#include "basebmp/bitmapdevice.hxx" + // -------------- // - SalBitmap - diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/inc/aqua/salcolorutils.hxx index 74ccb69756fd..74ccb69756fd 100755 --- a/vcl/aqua/inc/salcolorutils.hxx +++ b/vcl/inc/aqua/salcolorutils.hxx diff --git a/vcl/aqua/inc/salconst.h b/vcl/inc/aqua/salconst.h index 2046ec20a806..2046ec20a806 100755 --- a/vcl/aqua/inc/salconst.h +++ b/vcl/inc/aqua/salconst.h diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/inc/aqua/saldata.hxx index dd5df5751973..5dc528b04f4b 100644 --- a/vcl/aqua/inc/saldata.hxx +++ b/vcl/inc/aqua/saldata.hxx @@ -34,11 +34,11 @@ #include "com/sun/star/uno/Reference.hxx" -#include "vcl/sv.h" -#include "vcl/svdata.hxx" -#include "vcl/salwtype.hxx" #include "vcl/ptrstyle.hxx" +#include "svdata.hxx" +#include "salwtype.hxx" + #include <list> #include <vector> #include <map> diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx index 6f9f61efda70..6f9f61efda70 100644 --- a/vcl/aqua/inc/salfontutils.hxx +++ b/vcl/inc/aqua/salfontutils.hxx diff --git a/vcl/aqua/inc/salframe.h b/vcl/inc/aqua/salframe.h index 06ca66f8803f..8852b538f537 100644 --- a/vcl/aqua/inc/salframe.h +++ b/vcl/inc/aqua/salframe.h @@ -28,14 +28,13 @@ #ifndef _SV_SALFRAME_H #define _SV_SALFRAME_H - -#include "vcl/sv.h" -#include "vcl/salframe.hxx" #include "vcl/sysdata.hxx" -#include "salmenu.h" -#include "saldata.hxx" -#include "aquavcltypes.h" +#include "aqua/salmenu.h" +#include "aqua/saldata.hxx" +#include "aqua/aquavcltypes.h" + +#include "salframe.hxx" #include <vector> #include <utility> diff --git a/vcl/aqua/inc/salframeview.h b/vcl/inc/aqua/salframeview.h index a41e5cf656ba..c79539cf14e8 100755 --- a/vcl/aqua/inc/salframeview.h +++ b/vcl/inc/aqua/salframeview.h @@ -28,7 +28,7 @@ #ifndef _VCL_SALFRAMEVIEW_H #define _VCL_SALFRAMEVIEW_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface SalFrameWindow : NSWindow { diff --git a/vcl/aqua/inc/salgdi.h b/vcl/inc/aqua/salgdi.h index 7c0acc7598a8..50f2bb1156b9 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/inc/aqua/salgdi.h @@ -28,16 +28,16 @@ #ifndef _SV_SALGDI_H #define _SV_SALGDI_H +#include "basegfx/polygon/b2dpolypolygon.hxx" + #include "premac.h" #include <ApplicationServices/ApplicationServices.h> #include "postmac.h" -#include "vcl/sv.h" -#include "vcl/outfont.hxx" -#include "vcl/salgdi.hxx" -#include "aquavcltypes.h" +#include "aqua/aquavcltypes.h" -#include "basegfx/polygon/b2dpolypolygon.hxx" +#include "outfont.hxx" +#include "salgdi.hxx" #include <vector> diff --git a/vcl/aqua/inc/salinst.h b/vcl/inc/aqua/salinst.h index 514876b0e1f4..62baaa2762f8 100644 --- a/vcl/aqua/inc/salinst.h +++ b/vcl/inc/aqua/salinst.h @@ -28,13 +28,13 @@ #ifndef _SV_SALINST_H #define _SV_SALINST_H -#include "vcl/sv.h" #include "vos/mutex.hxx" #include "vos/thread.hxx" -#include "vcl/salinst.hxx" #include "osl/conditn.h" -#include "aquavcltypes.h" +#include "aqua/aquavcltypes.h" + +#include "salinst.hxx" #include <list> diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx index 6106dc328740..6106dc328740 100755 --- a/vcl/aqua/inc/salmathutils.hxx +++ b/vcl/inc/aqua/salmathutils.hxx diff --git a/vcl/aqua/inc/salmenu.h b/vcl/inc/aqua/salmenu.h index 63dfb6c48a91..6a83c4a7add3 100644 --- a/vcl/aqua/inc/salmenu.h +++ b/vcl/inc/aqua/salmenu.h @@ -32,8 +32,7 @@ #include <Cocoa/Cocoa.h> #include "postmac.h" -#include "vcl/sv.h" -#include "vcl/salmenu.hxx" +#include "salmenu.hxx" #include <vector> diff --git a/vcl/aqua/inc/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h index 11d4ea5c1c62..11d4ea5c1c62 100755 --- a/vcl/aqua/inc/salnativewidgets.h +++ b/vcl/inc/aqua/salnativewidgets.h diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h index e9b2cbe922b8..e9b2cbe922b8 100755 --- a/vcl/aqua/inc/salnsmenu.h +++ b/vcl/inc/aqua/salnsmenu.h diff --git a/vcl/aqua/inc/salnstimer.h b/vcl/inc/aqua/salnstimer.h index e29fef43b6b4..e29fef43b6b4 100755 --- a/vcl/aqua/inc/salnstimer.h +++ b/vcl/inc/aqua/salnstimer.h diff --git a/vcl/aqua/inc/salobj.h b/vcl/inc/aqua/salobj.h index c411287a4686..423e63715065 100644 --- a/vcl/aqua/inc/salobj.h +++ b/vcl/inc/aqua/salobj.h @@ -28,9 +28,8 @@ #ifndef _SV_SALOBJ_H #define _SV_SALOBJ_H -#include "vcl/sv.h" #include "vcl/sysdata.hxx" -#include "vcl/salobj.hxx" +#include "salobj.hxx" class AquaSalFrame; class AquaSalObject; diff --git a/vcl/aqua/inc/salprn.h b/vcl/inc/aqua/salprn.h index 5458a5b51bd6..725fc9a43861 100644 --- a/vcl/aqua/inc/salprn.h +++ b/vcl/inc/aqua/salprn.h @@ -28,9 +28,9 @@ #ifndef _SV_SALPRN_H #define _SV_SALPRN_H -#include "vcl/sv.h" -#include "aquavcltypes.h" -#include "vcl/salprn.hxx" +#include "aqua/aquavcltypes.h" + +#include "salprn.hxx" #include <boost/shared_array.hpp> diff --git a/vcl/aqua/inc/salsys.h b/vcl/inc/aqua/salsys.h index ae20706a1756..dbb2ea0b20ea 100644 --- a/vcl/aqua/inc/salsys.h +++ b/vcl/inc/aqua/salsys.h @@ -28,8 +28,7 @@ #ifndef _SV_SALSYS_H #define _SV_SALSYS_H -#include "vcl/sv.h" -#include "vcl/salsys.hxx" +#include "salsys.hxx" #include <list> @@ -37,10 +36,6 @@ // - SalSystemData - // ----------------- -//struct SalSystemData -//{ -//}; - class VCL_DLLPUBLIC AquaSalSystem : public SalSystem { public: diff --git a/vcl/aqua/inc/saltimer.h b/vcl/inc/aqua/saltimer.h index dacb9b09de39..f2840eee45ea 100644 --- a/vcl/aqua/inc/saltimer.h +++ b/vcl/inc/aqua/saltimer.h @@ -32,7 +32,7 @@ #include <Cocoa/Cocoa.h> #include "postmac.h" -#include "vcl/saltimer.hxx" +#include "saltimer.hxx" class AquaSalTimer : public SalTimer { diff --git a/vcl/aqua/inc/salvd.h b/vcl/inc/aqua/salvd.h index 949ad70d5b36..6f184167d22a 100644 --- a/vcl/aqua/inc/salvd.h +++ b/vcl/inc/aqua/salvd.h @@ -32,12 +32,11 @@ #include <ApplicationServices/ApplicationServices.h> #include "postmac.h" -#include "vcl/sv.h" -#include "vcl/salgdi.hxx" -#include "salconst.h" -#include "salcolorutils.hxx" -#include "vcl/salvd.hxx" -#include "salgdi.h" +#include "aqua/salconst.h" +#include "aqua/salcolorutils.hxx" +#include "aqua/salgdi.h" + +#include "salvd.hxx" #if PRAGMA_ONCE #pragma once diff --git a/vcl/aqua/inc/svsys.h b/vcl/inc/aqua/svsys.h index 1edce25cea28..1edce25cea28 100644 --- a/vcl/aqua/inc/svsys.h +++ b/vcl/inc/aqua/svsys.h diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h index f25593d335a7..f25593d335a7 100755 --- a/vcl/aqua/inc/vclnsapp.h +++ b/vcl/inc/aqua/vclnsapp.h diff --git a/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/bmpfast.hxx index de330704b74f..de330704b74f 100644 --- a/vcl/inc/vcl/bmpfast.hxx +++ b/vcl/inc/bmpfast.hxx diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/brdwin.hxx index 7e1dfb6b0b39..7e1dfb6b0b39 100644 --- a/vcl/inc/vcl/brdwin.hxx +++ b/vcl/inc/brdwin.hxx diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 6b719ef988ef..6b719ef988ef 100644 --- a/vcl/inc/vcl/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/controldata.hxx index 0be0f5bd402e..0be0f5bd402e 100644 --- a/vcl/inc/vcl/controldata.hxx +++ b/vcl/inc/controldata.hxx diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/dbggui.hxx index 0526a109a376..0526a109a376 100644 --- a/vcl/inc/vcl/dbggui.hxx +++ b/vcl/inc/dbggui.hxx diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/dndevdis.hxx index 5b91bd0713ec..5b91bd0713ec 100644 --- a/vcl/inc/vcl/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx diff --git a/vcl/inc/vcl/dndlcon.hxx b/vcl/inc/dndlcon.hxx index 5a41a20e4271..5a41a20e4271 100644 --- a/vcl/inc/vcl/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/fontcache.hxx index 7747b99015fe..7747b99015fe 100644 --- a/vcl/inc/vcl/fontcache.hxx +++ b/vcl/inc/fontcache.hxx diff --git a/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/fontsubset.hxx index a34212128741..a57f5f0fd553 100644 --- a/vcl/inc/vcl/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/vcl/glyphcache.hxx b/vcl/inc/glyphcache.hxx index a44935bf0e54..a818ef6a75c3 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/glyphcache.hxx @@ -49,11 +49,11 @@ namespace basegfx { class B2DPolyPolygon; } class RawBitmap; -#include <vcl/outfont.hxx> -#include <vcl/impfont.hxx> +#include <outfont.hxx> +#include <impfont.hxx> class ServerFontLayout; -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> // ======================================================================= diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/graphite_adaptors.hxx index 66f264faf9ef..753523f4aa0d 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/graphite_adaptors.hxx @@ -44,11 +44,11 @@ #endif #ifndef _SV_SALGDI_HXX -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> #endif #ifndef _SV_SALLAYOUT_HXX -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #endif // Module diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/graphite_cache.hxx index af1392ed4d4b..af1392ed4d4b 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/graphite_cache.hxx diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/graphite_features.hxx index 47b8f062e299..47b8f062e299 100644 --- a/vcl/inc/vcl/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index ebd323bebf28..d4f89d4cb91d 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -48,7 +48,7 @@ #include <graphite/SegmentAux.h> #include <postextstl.h> // Platform -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #include <vcl/dllapi.h> // Module diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index cdaed20476e2..819180b30bf6 100644 --- a/vcl/inc/vcl/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -32,8 +32,8 @@ #define GR_NAMESPACE #ifndef MSC -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_adaptors.hxx> +#include <graphite_layout.hxx> +#include <graphite_adaptors.hxx> // Modules diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/helpwin.hxx index fc3e2d5ffce8..fc3e2d5ffce8 100644 --- a/vcl/inc/vcl/helpwin.hxx +++ b/vcl/inc/helpwin.hxx diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 93da741827eb..93da741827eb 100644 --- a/vcl/inc/vcl/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/ilstbox.hxx index b509464bae4e..b509464bae4e 100644 --- a/vcl/inc/vcl/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx diff --git a/vcl/inc/vcl/image.h b/vcl/inc/image.h index 6ae9ad3a9c4a..6ae9ad3a9c4a 100644 --- a/vcl/inc/vcl/image.h +++ b/vcl/inc/image.h diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/impbmp.hxx index 778cc0f8f750..778cc0f8f750 100644 --- a/vcl/inc/vcl/impbmp.hxx +++ b/vcl/inc/impbmp.hxx diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/impfont.hxx index cc4271932b47..cc4271932b47 100644 --- a/vcl/inc/vcl/impfont.hxx +++ b/vcl/inc/impfont.hxx diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/impgraph.hxx index 7164952ea51b..e136fcc06ade 100644 --- a/vcl/inc/vcl/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -33,6 +33,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/rendergraphic.hxx> #include <vcl/graph.h> // --------------- @@ -96,14 +97,19 @@ private: void ImplSetDefaultType(); sal_Bool ImplIsSupportedGraphic() const; - sal_Bool ImplIsTransparent() const; - sal_Bool ImplIsAlpha() const; - sal_Bool ImplIsAnimated() const; + sal_Bool ImplIsTransparent() const; + sal_Bool ImplIsAlpha() const; + sal_Bool ImplIsAnimated() const; + sal_Bool ImplIsEPS() const; + sal_Bool ImplIsRenderGraphic() const; + sal_Bool ImplHasRenderGraphic() const; + + Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; + BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; + Animation ImplGetAnimation() const; + const GDIMetaFile& ImplGetGDIMetaFile() const; + ::vcl::RenderGraphic ImplGetRenderGraphic() const; - Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; - BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; - Animation ImplGetAnimation() const; - const GDIMetaFile& ImplGetGDIMetaFile() const; Size ImplGetPrefSize() const; void ImplSetPrefSize( const Size& rPrefSize ); diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/impimagetree.hxx index 9649fe2f5ec8..9649fe2f5ec8 100644 --- a/vcl/inc/vcl/impimagetree.hxx +++ b/vcl/inc/impimagetree.hxx diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/impoct.hxx index 8b0e85021db9..8b0e85021db9 100644 --- a/vcl/inc/vcl/impoct.hxx +++ b/vcl/inc/impoct.hxx diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/impprn.hxx index 883bd55c66be..883bd55c66be 100644 --- a/vcl/inc/vcl/impprn.hxx +++ b/vcl/inc/impprn.hxx diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/jobset.h index 981194080ede..981194080ede 100644 --- a/vcl/inc/vcl/jobset.h +++ b/vcl/inc/jobset.h diff --git a/vcl/inc/makefile.mk b/vcl/inc/makefile.mk deleted file mode 100644 index f1f917284f71..000000000000 --- a/vcl/inc/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=vcl -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/outdata.hxx index 5d2852444767..5d2852444767 100644 --- a/vcl/inc/vcl/outdata.hxx +++ b/vcl/inc/outdata.hxx diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/outdev.h index 6ca85bff768a..50aee1fbe049 100644 --- a/vcl/inc/vcl/outdev.h +++ b/vcl/inc/outdev.h @@ -29,7 +29,7 @@ #define _SV_OUTDEV_H #include <tools/solar.h> -#include <vcl/outfont.hxx> +#include <outfont.hxx> #include <vector> #include <list> diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/outfont.hxx index aabc6bd2797f..aabc6bd2797f 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/outfont.hxx diff --git a/vcl/inc/vcl/print.h b/vcl/inc/print.h index 7ac0d04d6dac..b90eaae756bf 100644 --- a/vcl/inc/vcl/print.h +++ b/vcl/inc/print.h @@ -31,6 +31,8 @@ #include "vcl/sv.h" #include "vcl/dllapi.h" +#include "rtl/ustring.hxx" + #include <vector> #include <hash_map> diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/printdlg.hxx index 39f326d6d089..8201610593af 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -30,9 +30,9 @@ #include <vcl/dllapi.h> -#include "vcl/print.hxx" -#include "vcl/print.h" +#include "print.h" +#include "vcl/print.hxx" #include "vcl/dialog.hxx" #include "vcl/fixed.hxx" #include "vcl/button.hxx" diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/printergfx.hxx index 4198c9d5e86e..c11bfa867148 100644 --- a/vcl/inc/vcl/printergfx.hxx +++ b/vcl/inc/printergfx.hxx @@ -29,7 +29,7 @@ #define _PSPRINT_PRINTERGFX_HXX_ #include "vcl/helper.hxx" -#include "vcl/sallayout.hxx" +#include "sallayout.hxx" #include "osl/file.hxx" #include "tools/gen.hxx" diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/printerjob.hxx index cdf8745febcc..cdf8745febcc 100644 --- a/vcl/inc/vcl/printerjob.hxx +++ b/vcl/inc/printerjob.hxx diff --git a/vcl/inc/vcl/region.h b/vcl/inc/region.h index b45ab91be149..b45ab91be149 100644 --- a/vcl/inc/vcl/region.h +++ b/vcl/inc/region.h diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/salbmp.hxx index b19c2ac33aeb..b19c2ac33aeb 100644 --- a/vcl/inc/vcl/salbmp.hxx +++ b/vcl/inc/salbmp.hxx diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx index d3c1a7254513..0a27089ceb47 100644 --- a/vcl/inc/vcl/saldatabasic.hxx +++ b/vcl/inc/saldatabasic.hxx @@ -28,10 +28,12 @@ #ifndef _SV_SALDATABASIC_HXX #define _SV_SALDATABASIC_HXX -#include <vcl/svdata.hxx> -#include <vcl/salinst.hxx> +#include <svdata.hxx> +#include <salinst.hxx> #include <osl/module.h> +#include "vcl/dllapi.h" + namespace psp { class PrinterInfoManager; diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/salframe.hxx index 672f290b9d45..8fbbe96ba8bf 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -39,8 +39,8 @@ #include <vcl/sndstyle.hxx> #endif // __cplusplus -#include <vcl/salwtype.hxx> -#include <vcl/salgeom.hxx> +#include <salwtype.hxx> +#include <salgeom.hxx> #include <tools/gen.hxx> #include <vcl/region.hxx> diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/salgdi.hxx index 1a9b9ccaea59..1a9b9ccaea59 100755 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/salgdi.hxx diff --git a/vcl/inc/vcl/salgeom.hxx b/vcl/inc/salgeom.hxx index 3d59e6199fa7..3d59e6199fa7 100644 --- a/vcl/inc/vcl/salgeom.hxx +++ b/vcl/inc/salgeom.hxx diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/salimestatus.hxx index 20184a059d9a..20184a059d9a 100644 --- a/vcl/inc/vcl/salimestatus.hxx +++ b/vcl/inc/salimestatus.hxx diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/salinst.hxx index 51f1f5b3b4e0..51f1f5b3b4e0 100644 --- a/vcl/inc/vcl/salinst.hxx +++ b/vcl/inc/salinst.hxx diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/sallayout.hxx index bb5c6e829a70..bb5c6e829a70 100755 --- a/vcl/inc/vcl/sallayout.hxx +++ b/vcl/inc/sallayout.hxx diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/salmenu.hxx index 030952388dfb..030952388dfb 100644 --- a/vcl/inc/vcl/salmenu.hxx +++ b/vcl/inc/salmenu.hxx diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/salobj.hxx index 157d817d7d0a..5ece9e93613d 100644 --- a/vcl/inc/vcl/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -31,7 +31,7 @@ #include <vcl/sv.h> #include <vcl/dllapi.h> #include <vcl/salgtype.hxx> -#include <vcl/salwtype.hxx> +#include <salwtype.hxx> struct SystemEnvData; diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/salprn.hxx index 572b766ea909..572b766ea909 100644 --- a/vcl/inc/vcl/salprn.hxx +++ b/vcl/inc/salprn.hxx diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/salptype.hxx index 136821b76855..136821b76855 100644 --- a/vcl/inc/vcl/salptype.hxx +++ b/vcl/inc/salptype.hxx diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/salsession.hxx index c11054a79eef..c11054a79eef 100644 --- a/vcl/inc/vcl/salsession.hxx +++ b/vcl/inc/salsession.hxx diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/salsys.hxx index da16d8d5b656..da16d8d5b656 100644 --- a/vcl/inc/vcl/salsys.hxx +++ b/vcl/inc/salsys.hxx diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/saltimer.hxx index 9e69b83e6042..38dd20e69ff3 100644 --- a/vcl/inc/vcl/saltimer.hxx +++ b/vcl/inc/saltimer.hxx @@ -30,7 +30,7 @@ #include <vcl/sv.h> #include <vcl/dllapi.h> -#include <vcl/salwtype.hxx> +#include <salwtype.hxx> // ------------ // - SalTimer - diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/salvd.hxx index 6bf4b820a176..6bf4b820a176 100644 --- a/vcl/inc/vcl/salvd.hxx +++ b/vcl/inc/salvd.hxx diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/salwtype.hxx index 55753465a860..55753465a860 100644 --- a/vcl/inc/vcl/salwtype.hxx +++ b/vcl/inc/salwtype.hxx diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 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/vcl/subedit.hxx b/vcl/inc/subedit.hxx index 3ea1eaffa864..3ea1eaffa864 100644 --- a/vcl/inc/vcl/subedit.hxx +++ b/vcl/inc/subedit.hxx diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/svdata.hxx index 9c91915823b2..5dba6441cd1c 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -29,20 +29,27 @@ #define _SV_SVDATA_HXX #include "rtl/ref.hxx" + #include "vos/thread.hxx" + #include "tools/string.hxx" #include "tools/gen.hxx" #include "tools/shl.hxx" #include "tools/link.hxx" #include "tools/fldunit.hxx" -#include "vcl/vclevent.hxx" -#include "vcl/sv.h" #include "tools/color.hxx" #include "tools/debug.hxx" + +#include "vcl/vclevent.hxx" +#include "vcl/sv.h" #include "vcl/dllapi.h" -#include "com/sun/star/uno/Reference.hxx" + #include "unotools/options.hxx" +#include "xconnection.hxx" + +#include "com/sun/star/uno/Reference.hxx" + #include <hash_map> namespace com { diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/svids.hrc index 61622bcabade..61622bcabade 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/svids.hrc diff --git a/vcl/util/hidother.src b/vcl/inc/svsys.h index f966fcded1b3..df0b58c548ca 100644 --- a/vcl/util/hidother.src +++ b/vcl/inc/svsys.h @@ -25,7 +25,18 @@ * ************************************************************************/ -#include "vcl/svids.hrc" +#ifndef _VCL_SVSYS_H +#define _VCL_SVSYS_H -hidspecial HID_PRINTDLG { HelpID = HID_PRINTDLG; }; +#ifdef WNT +#include "win/svsys.h" +#elif defined QUARTZ +#include "aqua/svsys.h" +#elif defined OS2 +#include "os2/svsys.h" +#else +#include "unx/svsys.h" +#endif + +#endif diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/textlayout.hxx index 183cb5ac9b0f..183cb5ac9b0f 100755 --- a/vcl/inc/vcl/textlayout.hxx +++ b/vcl/inc/textlayout.hxx diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/toolbox.h index 4fd3238647d0..4fd3238647d0 100644 --- a/vcl/inc/vcl/toolbox.h +++ b/vcl/inc/toolbox.h diff --git a/vcl/unx/inc/XIM.h b/vcl/inc/unx/XIM.h index b00634090b5d..b00634090b5d 100644 --- a/vcl/unx/inc/XIM.h +++ b/vcl/inc/unx/XIM.h diff --git a/vcl/unx/inc/Xproto.h b/vcl/inc/unx/Xproto.h index 804b3ffa98cc..804b3ffa98cc 100644 --- a/vcl/unx/inc/Xproto.h +++ b/vcl/inc/unx/Xproto.h diff --git a/vcl/unx/inc/cdeint.hxx b/vcl/inc/unx/cdeint.hxx index 91cbf33caf47..572f358955c1 100644 --- a/vcl/unx/inc/cdeint.hxx +++ b/vcl/inc/unx/cdeint.hxx @@ -27,7 +27,7 @@ #ifndef _SV_CDEINT_HXX #define _SV_CDEINT_HXX -#include <dtint.hxx> +#include <unx/dtint.hxx> class CDEIntegrator : public DtIntegrator { diff --git a/vcl/unx/inc/dtint.hxx b/vcl/inc/unx/dtint.hxx index 6e6cf13575ed..6e6cf13575ed 100644 --- a/vcl/unx/inc/dtint.hxx +++ b/vcl/inc/unx/dtint.hxx diff --git a/vcl/unx/inc/plugins/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 959b3aec1fb1..9d51ed0cc194 100644 --- a/vcl/unx/inc/plugins/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/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index b650cffbae8b..bba4399b76c5 100644 --- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -34,8 +34,8 @@ #include <gtk/gtk.h> #include <tools/postx.h> -#include <saldisp.hxx> -#include <saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/saldata.hxx> #include <vcl/ptrstyle.hxx> #include <list> diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 1ddc9e24e4f1..d03537361056 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -35,7 +35,7 @@ #include <gdk/gdkkeysyms.h> #include <tools/postx.h> -#include <vcl/salframe.hxx> +#include <salframe.hxx> #include <vcl/sysdata.hxx> #include "tools/link.hxx" diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 57a639f8ad5b..bc16e94f832e 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -34,7 +34,7 @@ #include <gdk/gdkkeysyms.h> #include <tools/postx.h> -#include <salgdi.h> +#include <unx/salgdi.h> class GtkSalGraphics : public X11SalGraphics { diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index a9f788831199..40e18b41f7dc 100644 --- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -28,8 +28,8 @@ #ifndef _VCL_GTKINST_HXX #define _VCL_GTKINST_HXX -#include <salinst.h> -#include <salsys.h> +#include <unx/salinst.h> +#include <unx/salsys.h> class GtkYieldMutex : public SalYieldMutex { diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 67434f038617..18c2fa95d13d 100644 --- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -30,8 +30,8 @@ #include <vcl/sv.h> #include <vcl/sysdata.hxx> -#include <vcl/salobj.hxx> -#include <plugins/gtk/gtkframe.hxx> +#include <salobj.hxx> +#include <unx/gtk/gtkframe.hxx> class GtkSalObject : public SalObject { diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx index 97fd7f1fb6c8..3a84aa2667c1 100644 --- a/vcl/unx/inc/i18n_cb.hxx +++ b/vcl/inc/unx/i18n_cb.hxx @@ -27,7 +27,7 @@ #ifndef _SAL_I18N_CALLBACK_HXX #define _SAL_I18N_CALLBACK_HXX -#include <vcl/salwtype.hxx> +#include <salwtype.hxx> #include <vector> #ifdef __cplusplus diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 977d7f3e3a6f..977d7f3e3a6f 100644 --- a/vcl/unx/inc/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index a22a57b976c8..c54749772dd3 100644 --- a/vcl/unx/inc/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/unx/inc/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx index 641d00dc02c0..641d00dc02c0 100644 --- a/vcl/unx/inc/i18n_keysym.hxx +++ b/vcl/inc/unx/i18n_keysym.hxx diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index 7202cf6e0eef..46e4e48f76e1 100644 --- a/vcl/unx/inc/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -32,10 +32,9 @@ #include <tools/link.hxx> #include <tools/gen.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif -#include <vcl/salimestatus.hxx> + +#include <salimestatus.hxx> #include <vector> diff --git a/vcl/unx/inc/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index db6517cbea0b..2d75ea6f7d23 100644 --- a/vcl/unx/inc/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/unx/inc/plugins/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx index 210799493638..1f23da40a3f8 100644 --- a/vcl/unx/inc/plugins/kde/kdedata.hxx +++ b/vcl/inc/unx/kde/kdedata.hxx @@ -28,9 +28,9 @@ #ifndef _VCL_KDEDATA_HXX #define _VCL_KDEDATA_HXX -#include <saldisp.hxx> -#include <saldata.hxx> -#include <salframe.h> +#include <unx/saldisp.hxx> +#include <unx/saldata.hxx> +#include <unx/salframe.h> class KDEData : public X11SalData { diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/inc/unx/pspgraphics.h index 7d9a2b8a3d0e..7b39ec80537c 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/inc/unx/pspgraphics.h @@ -30,9 +30,10 @@ #include "vcl/fontmanager.hxx" -#include "vcl/salgdi.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/dllapi.h" + +#include "vclpluginapi.h" +#include "salgdi.hxx" +#include "sallayout.hxx" namespace psp { struct JobData; class PrinterGfx; } @@ -40,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/unx/inc/salbmp.h b/vcl/inc/unx/salbmp.h index 121966345f75..d5ecdec34961 100644 --- a/vcl/unx/inc/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -28,13 +28,13 @@ #ifndef _SV_SALBMP_H #define _SV_SALBMP_H -#include <salstd.hxx> +#include <unx/salstd.hxx> #ifndef _SV_SALGTYPE #include <vcl/salgtype.hxx> #endif -#include <saldisp.hxx> -#include <vcl/salbmp.hxx> -#include <vcl/dllapi.h> +#include <unx/saldisp.hxx> +#include <salbmp.hxx> +#include <vclpluginapi.h> struct BitmapBuffer; class BitmapPalette; @@ -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/unx/inc/saldata.hxx b/vcl/inc/unx/saldata.hxx index 42240237a5ec..ac26f81548b4 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -30,14 +30,14 @@ // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include <signal.h> -#include <salstd.hxx> -#include <vcl/salframe.hxx> -#include <salinst.h> -#include <vcl/saldatabasic.hxx> +#include <unx/salstd.hxx> +#include <salframe.hxx> +#include <unx/salinst.h> +#include <saldatabasic.hxx> #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: sal_Bool bNoExceptions_; diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 3333dc3faef4..b97044f8036d 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -35,7 +35,7 @@ class SalVisual; class SalXLib; // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include <salunx.h> +#include <unx/salunx.h> #include <vcl/salgtype.hxx> #ifndef _SV_PTRSTYLE_HXX #include <vcl/ptrstyle.hxx> @@ -48,8 +48,9 @@ class SalXLib; #include <list> #include <hash_map> #include <tools/gen.hxx> -#include <vcl/salwtype.hxx> -#include <vcl/dllapi.h> +#include <salwtype.hxx> + +#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( sal_uInt16 nDepth, int nScreen ) const inline Display *SalColormap::GetXDisplay() const { return m_pDisplay->GetDisplay(); } -class VCL_DLLPUBLIC SalX11Display : public SalDisplay +class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay { public: SalX11Display( Display* pDisp ); diff --git a/vcl/unx/inc/salfont.h b/vcl/inc/unx/salfont.h index b3fbe93137f3..b3fbe93137f3 100644 --- a/vcl/unx/inc/salfont.h +++ b/vcl/inc/unx/salfont.h diff --git a/vcl/unx/inc/salframe.h b/vcl/inc/unx/salframe.h index dde04b79f3ac..02dc58f67d2b 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -28,18 +28,19 @@ #define _SV_SALFRAME_H // -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -#include <salstd.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salwtype.hxx> -#ifndef _SV_PTRSTYLE_HXX +#include <unx/salstd.hxx> +#include <unx/salunx.h> + +#include <salframe.hxx> +#include <salwtype.hxx> +#include <salinst.hxx> + #include <vcl/ptrstyle.hxx> -#endif -#include <vcl/salinst.hxx> #include <vcl/sysdata.hxx> #include <vcl/timer.hxx> -#include <vcl/dllapi.h> +#include <vclpluginapi.h> + -#include <salunx.h> #include <list> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -56,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/unx/inc/salgdi.h b/vcl/inc/unx/salgdi.h index 2cf3190590f3..a6f30ee92930 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -29,13 +29,16 @@ #define _SV_SALGDI_H // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "salstd.hxx" -#include "vcl/salgdi.hxx" -#include "vcl/salgtype.hxx" #include "tools/fract.hxx" -#include "vcl/dllapi.h" -#include <vcl/vclenum.hxx> -#include <vcl/sallayout.hxx> + +#include "vcl/salgtype.hxx" +#include "vcl/vclenum.hxx" + +#include "salstd.hxx" +#include "salgdi.hxx" +#include "sallayout.hxx" +#include "vclpluginapi.h" + #include <deque> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -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/unx/inc/salinst.h b/vcl/inc/unx/salinst.h index 2f53a979a485..31da4b1a86bd 100644 --- a/vcl/unx/inc/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 <vcl/salinst.hxx> +#include <vclpluginapi.h> +#include <salinst.hxx> -class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex +class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vos::OMutex { protected: sal_uIntPtr 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/unx/inc/salmenu.h b/vcl/inc/unx/salmenu.h index 09a753ff1d98..09a753ff1d98 100644 --- a/vcl/unx/inc/salmenu.h +++ b/vcl/inc/unx/salmenu.h diff --git a/vcl/unx/inc/salobj.h b/vcl/inc/unx/salobj.h index c843708f0c2e..c9c6bfe4a8e7 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -30,8 +30,9 @@ #include <vcl/sv.h> #include <vcl/sysdata.hxx> -#include <vcl/salobj.hxx> -#include <vcl/dllapi.h> + +#include <vclpluginapi.h> +#include <salobj.hxx> class SalClipRegion { @@ -64,7 +65,7 @@ private: }; -class X11SalObject : public SalObject +class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject { public: SystemChildData maSystemChildData; diff --git a/vcl/unx/inc/salprn.h b/vcl/inc/unx/salprn.h index 7b42ad74c923..3f23836828d8 100644 --- a/vcl/unx/inc/salprn.h +++ b/vcl/inc/unx/salprn.h @@ -29,9 +29,10 @@ #define _SV_SALPRN_H #include "vcl/jobdata.hxx" -#include "vcl/printergfx.hxx" -#include "vcl/printerjob.hxx" -#include "vcl/salprn.hxx" +#include "printergfx.hxx" +#include "printerjob.hxx" +#include "salprn.hxx" +#include "vclpluginapi.h" class PspGraphics; @@ -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/unx/inc/salstd.hxx b/vcl/inc/unx/salstd.hxx index cc03b3fb35a4..cc03b3fb35a4 100644 --- a/vcl/unx/inc/salstd.hxx +++ b/vcl/inc/unx/salstd.hxx diff --git a/vcl/unx/inc/salsys.h b/vcl/inc/unx/salsys.h index 1da7cae8564a..3b21985b8282 100644 --- a/vcl/unx/inc/salsys.h +++ b/vcl/inc/unx/salsys.h @@ -36,12 +36,12 @@ #ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> #endif -#include <vcl/salsys.hxx> -#include <vcl/dllapi.h> +#include <salsys.hxx> +#include <vclpluginapi.h> #include <list> -class VCL_DLLPUBLIC X11SalSystem : public SalSystem +class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalSystem { public: X11SalSystem() {} diff --git a/vcl/unx/inc/saltimer.h b/vcl/inc/unx/saltimer.h index ba52b96c073a..f92c6df7c8a5 100644 --- a/vcl/unx/inc/saltimer.h +++ b/vcl/inc/unx/saltimer.h @@ -28,7 +28,7 @@ #ifndef _SV_SALTIMER_H #define _SV_SALTIMER_H -#include <vcl/saltimer.hxx> +#include <saltimer.hxx> class X11SalTimer : public SalTimer { diff --git a/vcl/unx/inc/salunx.h b/vcl/inc/unx/salunx.h index 8be91cbd3bce..8e82258e51a2 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/inc/unx/salunx.h @@ -36,8 +36,8 @@ #include <sys/time.h> #include <strings.h> #endif -#include <svunx.h> -#include <salstd.hxx> +#include <unx/svunx.h> +#include <unx/salstd.hxx> // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #define capacityof(a) (sizeof(a)/sizeof(*a)) diff --git a/vcl/unx/inc/salvd.h b/vcl/inc/unx/salvd.h index c6bf12165ae9..d5f6b0988147 100644 --- a/vcl/unx/inc/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -29,8 +29,8 @@ #define _SV_SALVD_H // -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -#include <salstd.hxx> -#include <vcl/salvd.hxx> +#include <unx/salstd.hxx> +#include <salvd.hxx> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= class SalDisplay; diff --git a/vcl/unx/inc/sm.hxx b/vcl/inc/unx/sm.hxx index b4339bb8567e..f5123f3e7ae0 100644 --- a/vcl/unx/inc/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 <salunx.h> +#include "tools/link.hxx" +#include "unx/salunx.h" #include <X11/SM/SMlib.h> -#include <vcl/salsession.hxx> +#include "salsession.hxx" +#include "vclpluginapi.h" class SessionManagerClient { @@ -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/unx/inc/soicon.hxx b/vcl/inc/unx/soicon.hxx index 4efaea4e736f..4efaea4e736f 100644 --- a/vcl/unx/inc/soicon.hxx +++ b/vcl/inc/unx/soicon.hxx diff --git a/vcl/unx/inc/strhelper.hxx b/vcl/inc/unx/strhelper.hxx index cd0220b77e05..cd0220b77e05 100644 --- a/vcl/unx/inc/strhelper.hxx +++ b/vcl/inc/unx/strhelper.hxx diff --git a/vcl/unx/inc/svsys.h b/vcl/inc/unx/svsys.h index d4077d0998e9..a2ee16f7091d 100644 --- a/vcl/unx/inc/svsys.h +++ b/vcl/inc/unx/svsys.h @@ -27,6 +27,6 @@ #ifndef _SV_SVSYS_H #define _SV_SVSYS_H -#include <svunx.h> +#include <unx/svunx.h> #endif // _SV_SVSYS_H diff --git a/vcl/unx/inc/svunx.h b/vcl/inc/unx/svunx.h index e7d6150b79f4..e7d6150b79f4 100644 --- a/vcl/unx/inc/svunx.h +++ b/vcl/inc/unx/svunx.h diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index e8620db29c6f..88f0e62024a9 100644 --- a/vcl/unx/inc/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/unx/source/inc/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h index 293c9757e77b..293c9757e77b 100644 --- a/vcl/unx/source/inc/airbrush_curs.h +++ b/vcl/inc/unx/x11_cursors/airbrush_curs.h diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h index 811ea2819669..811ea2819669 100644 --- a/vcl/unx/source/inc/airbrush_mask.h +++ b/vcl/inc/unx/x11_cursors/airbrush_mask.h diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/inc/unx/x11_cursors/ase_curs.h index 52b67f56d2ae..52b67f56d2ae 100644 --- a/vcl/unx/source/inc/ase_curs.h +++ b/vcl/inc/unx/x11_cursors/ase_curs.h diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/inc/unx/x11_cursors/ase_mask.h index 5dbd5c134dbf..5dbd5c134dbf 100644 --- a/vcl/unx/source/inc/ase_mask.h +++ b/vcl/inc/unx/x11_cursors/ase_mask.h diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/inc/unx/x11_cursors/asn_curs.h index 3b5f4364b5e2..3b5f4364b5e2 100644 --- a/vcl/unx/source/inc/asn_curs.h +++ b/vcl/inc/unx/x11_cursors/asn_curs.h diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/inc/unx/x11_cursors/asn_mask.h index 902fe80df8a1..902fe80df8a1 100644 --- a/vcl/unx/source/inc/asn_mask.h +++ b/vcl/inc/unx/x11_cursors/asn_mask.h diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/inc/unx/x11_cursors/asne_curs.h index 0939b1d07e4b..0939b1d07e4b 100644 --- a/vcl/unx/source/inc/asne_curs.h +++ b/vcl/inc/unx/x11_cursors/asne_curs.h diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/inc/unx/x11_cursors/asne_mask.h index 9ab55c293218..9ab55c293218 100644 --- a/vcl/unx/source/inc/asne_mask.h +++ b/vcl/inc/unx/x11_cursors/asne_mask.h diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/inc/unx/x11_cursors/asns_curs.h index fef8fe2f4ab5..fef8fe2f4ab5 100644 --- a/vcl/unx/source/inc/asns_curs.h +++ b/vcl/inc/unx/x11_cursors/asns_curs.h diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/inc/unx/x11_cursors/asns_mask.h index f90cb95ee721..f90cb95ee721 100644 --- a/vcl/unx/source/inc/asns_mask.h +++ b/vcl/inc/unx/x11_cursors/asns_mask.h diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/inc/unx/x11_cursors/asnswe_curs.h index fd6ddaca65cb..fd6ddaca65cb 100644 --- a/vcl/unx/source/inc/asnswe_curs.h +++ b/vcl/inc/unx/x11_cursors/asnswe_curs.h diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/inc/unx/x11_cursors/asnswe_mask.h index e48da90e3de5..e48da90e3de5 100644 --- a/vcl/unx/source/inc/asnswe_mask.h +++ b/vcl/inc/unx/x11_cursors/asnswe_mask.h diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/inc/unx/x11_cursors/asnw_curs.h index cb3a35d793c7..cb3a35d793c7 100644 --- a/vcl/unx/source/inc/asnw_curs.h +++ b/vcl/inc/unx/x11_cursors/asnw_curs.h diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/inc/unx/x11_cursors/asnw_mask.h index e583957c4bae..e583957c4bae 100644 --- a/vcl/unx/source/inc/asnw_mask.h +++ b/vcl/inc/unx/x11_cursors/asnw_mask.h diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/inc/unx/x11_cursors/ass_curs.h index ea942cefe942..ea942cefe942 100644 --- a/vcl/unx/source/inc/ass_curs.h +++ b/vcl/inc/unx/x11_cursors/ass_curs.h diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/inc/unx/x11_cursors/ass_mask.h index b35298183cb1..b35298183cb1 100644 --- a/vcl/unx/source/inc/ass_mask.h +++ b/vcl/inc/unx/x11_cursors/ass_mask.h diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/inc/unx/x11_cursors/asse_curs.h index 4b30e81882ff..4b30e81882ff 100644 --- a/vcl/unx/source/inc/asse_curs.h +++ b/vcl/inc/unx/x11_cursors/asse_curs.h diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/inc/unx/x11_cursors/asse_mask.h index ad74b0cf724a..ad74b0cf724a 100644 --- a/vcl/unx/source/inc/asse_mask.h +++ b/vcl/inc/unx/x11_cursors/asse_mask.h diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/inc/unx/x11_cursors/assw_curs.h index d26c36e79ed4..d26c36e79ed4 100644 --- a/vcl/unx/source/inc/assw_curs.h +++ b/vcl/inc/unx/x11_cursors/assw_curs.h diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/inc/unx/x11_cursors/assw_mask.h index ea47a3ee27e9..ea47a3ee27e9 100644 --- a/vcl/unx/source/inc/assw_mask.h +++ b/vcl/inc/unx/x11_cursors/assw_mask.h diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/inc/unx/x11_cursors/asw_curs.h index 7b9b2199955a..7b9b2199955a 100644 --- a/vcl/unx/source/inc/asw_curs.h +++ b/vcl/inc/unx/x11_cursors/asw_curs.h diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/inc/unx/x11_cursors/asw_mask.h index df934399fe91..df934399fe91 100644 --- a/vcl/unx/source/inc/asw_mask.h +++ b/vcl/inc/unx/x11_cursors/asw_mask.h diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/inc/unx/x11_cursors/aswe_curs.h index f06d2140559e..f06d2140559e 100644 --- a/vcl/unx/source/inc/aswe_curs.h +++ b/vcl/inc/unx/x11_cursors/aswe_curs.h diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/inc/unx/x11_cursors/aswe_mask.h index c04dbf5deafb..c04dbf5deafb 100644 --- a/vcl/unx/source/inc/aswe_mask.h +++ b/vcl/inc/unx/x11_cursors/aswe_mask.h diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/inc/unx/x11_cursors/chain_curs.h index 95b4fbe66c2e..95b4fbe66c2e 100644 --- a/vcl/unx/source/inc/chain_curs.h +++ b/vcl/inc/unx/x11_cursors/chain_curs.h diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/inc/unx/x11_cursors/chain_mask.h index 91d89bbed3c6..91d89bbed3c6 100644 --- a/vcl/unx/source/inc/chain_mask.h +++ b/vcl/inc/unx/x11_cursors/chain_mask.h diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/inc/unx/x11_cursors/chainnot_curs.h index 841e2efdec63..841e2efdec63 100644 --- a/vcl/unx/source/inc/chainnot_curs.h +++ b/vcl/inc/unx/x11_cursors/chainnot_curs.h diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/inc/unx/x11_cursors/chainnot_mask.h index 9fbed6408c54..9fbed6408c54 100644 --- a/vcl/unx/source/inc/chainnot_mask.h +++ b/vcl/inc/unx/x11_cursors/chainnot_mask.h diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/inc/unx/x11_cursors/chart_curs.h index 9346fbd8f2c0..9346fbd8f2c0 100644 --- a/vcl/unx/source/inc/chart_curs.h +++ b/vcl/inc/unx/x11_cursors/chart_curs.h diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/inc/unx/x11_cursors/chart_mask.h index d4804fb6c85b..d4804fb6c85b 100644 --- a/vcl/unx/source/inc/chart_mask.h +++ b/vcl/inc/unx/x11_cursors/chart_mask.h diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/inc/unx/x11_cursors/copydata_curs.h index e3d0e3e76530..e3d0e3e76530 100644 --- a/vcl/unx/source/dtrans/copydata_curs.h +++ b/vcl/inc/unx/x11_cursors/copydata_curs.h diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/inc/unx/x11_cursors/copydata_mask.h index f25b0863d807..f25b0863d807 100644 --- a/vcl/unx/source/dtrans/copydata_mask.h +++ b/vcl/inc/unx/x11_cursors/copydata_mask.h diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/inc/unx/x11_cursors/copydlnk_curs.h index 8e22a5bee37b..8e22a5bee37b 100644 --- a/vcl/unx/source/inc/copydlnk_curs.h +++ b/vcl/inc/unx/x11_cursors/copydlnk_curs.h diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/inc/unx/x11_cursors/copydlnk_mask.h index 02ee5db5fbc1..02ee5db5fbc1 100644 --- a/vcl/unx/source/inc/copydlnk_mask.h +++ b/vcl/inc/unx/x11_cursors/copydlnk_mask.h diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/inc/unx/x11_cursors/copyfile_curs.h index c74a1da26b66..c74a1da26b66 100644 --- a/vcl/unx/source/inc/copyfile_curs.h +++ b/vcl/inc/unx/x11_cursors/copyfile_curs.h diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/inc/unx/x11_cursors/copyfile_mask.h index c13089abaea5..c13089abaea5 100644 --- a/vcl/unx/source/inc/copyfile_mask.h +++ b/vcl/inc/unx/x11_cursors/copyfile_mask.h diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/inc/unx/x11_cursors/copyfiles_curs.h index e6a9b7a668af..e6a9b7a668af 100644 --- a/vcl/unx/source/inc/copyfiles_curs.h +++ b/vcl/inc/unx/x11_cursors/copyfiles_curs.h diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/inc/unx/x11_cursors/copyfiles_mask.h index f904b7848f64..f904b7848f64 100644 --- a/vcl/unx/source/inc/copyfiles_mask.h +++ b/vcl/inc/unx/x11_cursors/copyfiles_mask.h diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/inc/unx/x11_cursors/copyflnk_curs.h index b76368923f31..b76368923f31 100644 --- a/vcl/unx/source/inc/copyflnk_curs.h +++ b/vcl/inc/unx/x11_cursors/copyflnk_curs.h diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/inc/unx/x11_cursors/copyflnk_mask.h index b8fac92fdd75..b8fac92fdd75 100644 --- a/vcl/unx/source/inc/copyflnk_mask.h +++ b/vcl/inc/unx/x11_cursors/copyflnk_mask.h diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/inc/unx/x11_cursors/crook_curs.h index 6e4d5f613959..6e4d5f613959 100644 --- a/vcl/unx/source/inc/crook_curs.h +++ b/vcl/inc/unx/x11_cursors/crook_curs.h diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/inc/unx/x11_cursors/crook_mask.h index 7493f3a501dc..7493f3a501dc 100644 --- a/vcl/unx/source/inc/crook_mask.h +++ b/vcl/inc/unx/x11_cursors/crook_mask.h diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/inc/unx/x11_cursors/crop_curs.h index a546ce6c1ba8..a546ce6c1ba8 100644 --- a/vcl/unx/source/inc/crop_curs.h +++ b/vcl/inc/unx/x11_cursors/crop_curs.h diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/inc/unx/x11_cursors/crop_mask.h index 5a10726cf36c..5a10726cf36c 100644 --- a/vcl/unx/source/inc/crop_mask.h +++ b/vcl/inc/unx/x11_cursors/crop_mask.h diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/inc/unx/x11_cursors/detective_curs.h index 9d8a0d6a1c47..9d8a0d6a1c47 100644 --- a/vcl/unx/source/inc/detective_curs.h +++ b/vcl/inc/unx/x11_cursors/detective_curs.h diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/inc/unx/x11_cursors/detective_mask.h index 14402a37b641..14402a37b641 100644 --- a/vcl/unx/source/inc/detective_mask.h +++ b/vcl/inc/unx/x11_cursors/detective_mask.h diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/inc/unx/x11_cursors/drawarc_curs.h index daea116e186e..daea116e186e 100644 --- a/vcl/unx/source/inc/drawarc_curs.h +++ b/vcl/inc/unx/x11_cursors/drawarc_curs.h diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/inc/unx/x11_cursors/drawarc_mask.h index c9e2b6dd8737..c9e2b6dd8737 100644 --- a/vcl/unx/source/inc/drawarc_mask.h +++ b/vcl/inc/unx/x11_cursors/drawarc_mask.h diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/inc/unx/x11_cursors/drawbezier_curs.h index ea677d4734aa..ea677d4734aa 100644 --- a/vcl/unx/source/inc/drawbezier_curs.h +++ b/vcl/inc/unx/x11_cursors/drawbezier_curs.h diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/inc/unx/x11_cursors/drawbezier_mask.h index 17c1075d07a7..17c1075d07a7 100644 --- a/vcl/unx/source/inc/drawbezier_mask.h +++ b/vcl/inc/unx/x11_cursors/drawbezier_mask.h diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/inc/unx/x11_cursors/drawcaption_curs.h index 3fe104f3673e..3fe104f3673e 100644 --- a/vcl/unx/source/inc/drawcaption_curs.h +++ b/vcl/inc/unx/x11_cursors/drawcaption_curs.h diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/inc/unx/x11_cursors/drawcaption_mask.h index 70b39e37b65e..70b39e37b65e 100644 --- a/vcl/unx/source/inc/drawcaption_mask.h +++ b/vcl/inc/unx/x11_cursors/drawcaption_mask.h diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h index dc632873dd3b..dc632873dd3b 100644 --- a/vcl/unx/source/inc/drawcirclecut_curs.h +++ b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h index 1f96be33b86a..1f96be33b86a 100644 --- a/vcl/unx/source/inc/drawcirclecut_mask.h +++ b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/inc/unx/x11_cursors/drawconnect_curs.h index 994f34b96e0e..994f34b96e0e 100644 --- a/vcl/unx/source/inc/drawconnect_curs.h +++ b/vcl/inc/unx/x11_cursors/drawconnect_curs.h diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/inc/unx/x11_cursors/drawconnect_mask.h index 187cf31cfd1a..187cf31cfd1a 100644 --- a/vcl/unx/source/inc/drawconnect_mask.h +++ b/vcl/inc/unx/x11_cursors/drawconnect_mask.h diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/inc/unx/x11_cursors/drawcrook_curs.h index 4fdba0e8442a..4fdba0e8442a 100644 --- a/vcl/unx/source/inc/drawcrook_curs.h +++ b/vcl/inc/unx/x11_cursors/drawcrook_curs.h diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/inc/unx/x11_cursors/drawcrook_mask.h index 657fcff2b4fd..657fcff2b4fd 100644 --- a/vcl/unx/source/inc/drawcrook_mask.h +++ b/vcl/inc/unx/x11_cursors/drawcrook_mask.h diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/inc/unx/x11_cursors/drawcrop_curs.h index 7f574e1ab351..7f574e1ab351 100644 --- a/vcl/unx/source/inc/drawcrop_curs.h +++ b/vcl/inc/unx/x11_cursors/drawcrop_curs.h diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/inc/unx/x11_cursors/drawcrop_mask.h index ac2e8885bdbb..ac2e8885bdbb 100644 --- a/vcl/unx/source/inc/drawcrop_mask.h +++ b/vcl/inc/unx/x11_cursors/drawcrop_mask.h diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/inc/unx/x11_cursors/drawellipse_curs.h index bddc330d71d2..bddc330d71d2 100644 --- a/vcl/unx/source/inc/drawellipse_curs.h +++ b/vcl/inc/unx/x11_cursors/drawellipse_curs.h diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/inc/unx/x11_cursors/drawellipse_mask.h index 0ac5f200eab1..0ac5f200eab1 100644 --- a/vcl/unx/source/inc/drawellipse_mask.h +++ b/vcl/inc/unx/x11_cursors/drawellipse_mask.h diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h index 75795c088c8e..75795c088c8e 100644 --- a/vcl/unx/source/inc/drawfreehand_curs.h +++ b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h index 29edf44a9999..29edf44a9999 100644 --- a/vcl/unx/source/inc/drawfreehand_mask.h +++ b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/inc/unx/x11_cursors/drawline_curs.h index 2d2aa162fac6..2d2aa162fac6 100644 --- a/vcl/unx/source/inc/drawline_curs.h +++ b/vcl/inc/unx/x11_cursors/drawline_curs.h diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/inc/unx/x11_cursors/drawline_mask.h index d66b0fd09aaa..d66b0fd09aaa 100644 --- a/vcl/unx/source/inc/drawline_mask.h +++ b/vcl/inc/unx/x11_cursors/drawline_mask.h diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/inc/unx/x11_cursors/drawmirror_curs.h index 3f61e751befb..3f61e751befb 100644 --- a/vcl/unx/source/inc/drawmirror_curs.h +++ b/vcl/inc/unx/x11_cursors/drawmirror_curs.h diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/inc/unx/x11_cursors/drawmirror_mask.h index 5394dd74576a..5394dd74576a 100644 --- a/vcl/unx/source/inc/drawmirror_mask.h +++ b/vcl/inc/unx/x11_cursors/drawmirror_mask.h diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/inc/unx/x11_cursors/drawpie_curs.h index 327b15258d3d..327b15258d3d 100644 --- a/vcl/unx/source/inc/drawpie_curs.h +++ b/vcl/inc/unx/x11_cursors/drawpie_curs.h diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/inc/unx/x11_cursors/drawpie_mask.h index 6b5e5ac4ff0d..6b5e5ac4ff0d 100644 --- a/vcl/unx/source/inc/drawpie_mask.h +++ b/vcl/inc/unx/x11_cursors/drawpie_mask.h diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h index ee68c707444c..ee68c707444c 100644 --- a/vcl/unx/source/inc/drawpolygon_curs.h +++ b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h index 8b82e237233c..8b82e237233c 100644 --- a/vcl/unx/source/inc/drawpolygon_mask.h +++ b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/inc/unx/x11_cursors/drawrect_curs.h index c2508d37fad5..c2508d37fad5 100644 --- a/vcl/unx/source/inc/drawrect_curs.h +++ b/vcl/inc/unx/x11_cursors/drawrect_curs.h diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/inc/unx/x11_cursors/drawrect_mask.h index 955152f312c9..955152f312c9 100644 --- a/vcl/unx/source/inc/drawrect_mask.h +++ b/vcl/inc/unx/x11_cursors/drawrect_mask.h diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/inc/unx/x11_cursors/drawtext_curs.h index c5049670b9ec..c5049670b9ec 100644 --- a/vcl/unx/source/inc/drawtext_curs.h +++ b/vcl/inc/unx/x11_cursors/drawtext_curs.h diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/inc/unx/x11_cursors/drawtext_mask.h index e27ce2514306..e27ce2514306 100644 --- a/vcl/unx/source/inc/drawtext_mask.h +++ b/vcl/inc/unx/x11_cursors/drawtext_mask.h diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/inc/unx/x11_cursors/fill_curs.h index 792ea50e4f00..792ea50e4f00 100644 --- a/vcl/unx/source/inc/fill_curs.h +++ b/vcl/inc/unx/x11_cursors/fill_curs.h diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/inc/unx/x11_cursors/fill_mask.h index 67681f243f7b..67681f243f7b 100644 --- a/vcl/unx/source/inc/fill_mask.h +++ b/vcl/inc/unx/x11_cursors/fill_mask.h diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/inc/unx/x11_cursors/hshear_curs.h index 7f6092b648de..7f6092b648de 100644 --- a/vcl/unx/source/inc/hshear_curs.h +++ b/vcl/inc/unx/x11_cursors/hshear_curs.h diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/inc/unx/x11_cursors/hshear_mask.h index 6d09b3b0af01..6d09b3b0af01 100644 --- a/vcl/unx/source/inc/hshear_mask.h +++ b/vcl/inc/unx/x11_cursors/hshear_mask.h diff --git a/vcl/unx/source/inc/invert50.h b/vcl/inc/unx/x11_cursors/invert50.h index 7c0d00ce8fa4..7c0d00ce8fa4 100644 --- a/vcl/unx/source/inc/invert50.h +++ b/vcl/inc/unx/x11_cursors/invert50.h diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/inc/unx/x11_cursors/linkdata_curs.h index c60edc3b99d0..c60edc3b99d0 100644 --- a/vcl/unx/source/dtrans/linkdata_curs.h +++ b/vcl/inc/unx/x11_cursors/linkdata_curs.h diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/inc/unx/x11_cursors/linkdata_mask.h index cf0f89f63b1b..cf0f89f63b1b 100644 --- a/vcl/unx/source/dtrans/linkdata_mask.h +++ b/vcl/inc/unx/x11_cursors/linkdata_mask.h diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/inc/unx/x11_cursors/linkfile_curs.h index fb676ae2a04b..fb676ae2a04b 100644 --- a/vcl/unx/source/inc/linkfile_curs.h +++ b/vcl/inc/unx/x11_cursors/linkfile_curs.h diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/inc/unx/x11_cursors/linkfile_mask.h index 28ff46c4fae4..28ff46c4fae4 100644 --- a/vcl/unx/source/inc/linkfile_mask.h +++ b/vcl/inc/unx/x11_cursors/linkfile_mask.h diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/inc/unx/x11_cursors/magnify_curs.h index 76114ca410d5..76114ca410d5 100644 --- a/vcl/unx/source/inc/magnify_curs.h +++ b/vcl/inc/unx/x11_cursors/magnify_curs.h diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/inc/unx/x11_cursors/magnify_mask.h index db4213943b6e..db4213943b6e 100644 --- a/vcl/unx/source/inc/magnify_mask.h +++ b/vcl/inc/unx/x11_cursors/magnify_mask.h diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/inc/unx/x11_cursors/mirror_curs.h index 0f0f1b360224..0f0f1b360224 100644 --- a/vcl/unx/source/inc/mirror_curs.h +++ b/vcl/inc/unx/x11_cursors/mirror_curs.h diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/inc/unx/x11_cursors/mirror_mask.h index da9c00435162..da9c00435162 100644 --- a/vcl/unx/source/inc/mirror_mask.h +++ b/vcl/inc/unx/x11_cursors/mirror_mask.h diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h index a1ece2d925e9..a1ece2d925e9 100644 --- a/vcl/unx/source/inc/movebezierweight_curs.h +++ b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h index 27e0d8c703db..27e0d8c703db 100644 --- a/vcl/unx/source/inc/movebezierweight_mask.h +++ b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/inc/unx/x11_cursors/movedata_curs.h index b79412bc3f41..b79412bc3f41 100644 --- a/vcl/unx/source/dtrans/movedata_curs.h +++ b/vcl/inc/unx/x11_cursors/movedata_curs.h diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/inc/unx/x11_cursors/movedata_mask.h index e25d0837d8dc..e25d0837d8dc 100644 --- a/vcl/unx/source/dtrans/movedata_mask.h +++ b/vcl/inc/unx/x11_cursors/movedata_mask.h diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/inc/unx/x11_cursors/movedlnk_curs.h index 56608b8153a6..56608b8153a6 100644 --- a/vcl/unx/source/inc/movedlnk_curs.h +++ b/vcl/inc/unx/x11_cursors/movedlnk_curs.h diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/inc/unx/x11_cursors/movedlnk_mask.h index 2aa3eb4b277d..2aa3eb4b277d 100644 --- a/vcl/unx/source/inc/movedlnk_mask.h +++ b/vcl/inc/unx/x11_cursors/movedlnk_mask.h diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/inc/unx/x11_cursors/movefile_curs.h index ed3a11e7f49d..ed3a11e7f49d 100644 --- a/vcl/unx/source/inc/movefile_curs.h +++ b/vcl/inc/unx/x11_cursors/movefile_curs.h diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/inc/unx/x11_cursors/movefile_mask.h index 668d8d7e8015..668d8d7e8015 100644 --- a/vcl/unx/source/inc/movefile_mask.h +++ b/vcl/inc/unx/x11_cursors/movefile_mask.h diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/inc/unx/x11_cursors/movefiles_curs.h index 148fe2e72a5e..148fe2e72a5e 100644 --- a/vcl/unx/source/inc/movefiles_curs.h +++ b/vcl/inc/unx/x11_cursors/movefiles_curs.h diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/inc/unx/x11_cursors/movefiles_mask.h index dc990dc5cb61..dc990dc5cb61 100644 --- a/vcl/unx/source/inc/movefiles_mask.h +++ b/vcl/inc/unx/x11_cursors/movefiles_mask.h diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/inc/unx/x11_cursors/moveflnk_curs.h index 7f48bc4506fc..7f48bc4506fc 100644 --- a/vcl/unx/source/inc/moveflnk_curs.h +++ b/vcl/inc/unx/x11_cursors/moveflnk_curs.h diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/inc/unx/x11_cursors/moveflnk_mask.h index a25b7ee18960..a25b7ee18960 100644 --- a/vcl/unx/source/inc/moveflnk_mask.h +++ b/vcl/inc/unx/x11_cursors/moveflnk_mask.h diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/inc/unx/x11_cursors/movepoint_curs.h index e3b20bd8edf9..e3b20bd8edf9 100644 --- a/vcl/unx/source/inc/movepoint_curs.h +++ b/vcl/inc/unx/x11_cursors/movepoint_curs.h diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/inc/unx/x11_cursors/movepoint_mask.h index e4fae36c023c..e4fae36c023c 100644 --- a/vcl/unx/source/inc/movepoint_mask.h +++ b/vcl/inc/unx/x11_cursors/movepoint_mask.h diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/inc/unx/x11_cursors/nodrop_curs.h index 8e208e32f293..8e208e32f293 100644 --- a/vcl/unx/source/dtrans/nodrop_curs.h +++ b/vcl/inc/unx/x11_cursors/nodrop_curs.h diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/inc/unx/x11_cursors/nodrop_mask.h index 7cbecef2c60f..7cbecef2c60f 100644 --- a/vcl/unx/source/dtrans/nodrop_mask.h +++ b/vcl/inc/unx/x11_cursors/nodrop_mask.h diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/inc/unx/x11_cursors/null_curs.h index 19d4130d4b5d..19d4130d4b5d 100644 --- a/vcl/unx/source/inc/null_curs.h +++ b/vcl/inc/unx/x11_cursors/null_curs.h diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/inc/unx/x11_cursors/null_mask.h index a657cfa54af4..a657cfa54af4 100644 --- a/vcl/unx/source/inc/null_mask.h +++ b/vcl/inc/unx/x11_cursors/null_mask.h diff --git a/vcl/unx/source/inc/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h index 5dfd18a539a6..5dfd18a539a6 100644 --- a/vcl/unx/source/inc/paintbrush_curs.h +++ b/vcl/inc/unx/x11_cursors/paintbrush_curs.h diff --git a/vcl/unx/source/inc/paintbrush_mask.h b/vcl/inc/unx/x11_cursors/paintbrush_mask.h index a5b5617b820f..a5b5617b820f 100644 --- a/vcl/unx/source/inc/paintbrush_mask.h +++ b/vcl/inc/unx/x11_cursors/paintbrush_mask.h diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/inc/unx/x11_cursors/pivotcol_curs.h index 22873985daf0..22873985daf0 100644 --- a/vcl/unx/source/inc/pivotcol_curs.h +++ b/vcl/inc/unx/x11_cursors/pivotcol_curs.h diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/inc/unx/x11_cursors/pivotcol_mask.h index 911eede87ed4..911eede87ed4 100644 --- a/vcl/unx/source/inc/pivotcol_mask.h +++ b/vcl/inc/unx/x11_cursors/pivotcol_mask.h diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/inc/unx/x11_cursors/pivotdel_curs.h index e0dcbc14a6d6..e0dcbc14a6d6 100644 --- a/vcl/unx/source/inc/pivotdel_curs.h +++ b/vcl/inc/unx/x11_cursors/pivotdel_curs.h diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/inc/unx/x11_cursors/pivotdel_mask.h index 147bc2da410d..147bc2da410d 100644 --- a/vcl/unx/source/inc/pivotdel_mask.h +++ b/vcl/inc/unx/x11_cursors/pivotdel_mask.h diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/inc/unx/x11_cursors/pivotfld_curs.h index 1daf4f553275..1daf4f553275 100644 --- a/vcl/unx/source/inc/pivotfld_curs.h +++ b/vcl/inc/unx/x11_cursors/pivotfld_curs.h diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/inc/unx/x11_cursors/pivotfld_mask.h index 6d62d8bbda46..6d62d8bbda46 100644 --- a/vcl/unx/source/inc/pivotfld_mask.h +++ b/vcl/inc/unx/x11_cursors/pivotfld_mask.h diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/inc/unx/x11_cursors/pivotrow_curs.h index 75f4965f2582..75f4965f2582 100644 --- a/vcl/unx/source/inc/pivotrow_curs.h +++ b/vcl/inc/unx/x11_cursors/pivotrow_curs.h diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/inc/unx/x11_cursors/pivotrow_mask.h index a8896d0975f9..a8896d0975f9 100644 --- a/vcl/unx/source/inc/pivotrow_mask.h +++ b/vcl/inc/unx/x11_cursors/pivotrow_mask.h diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/inc/unx/x11_cursors/rotate_curs.h index f9c57674dfb2..f9c57674dfb2 100644 --- a/vcl/unx/source/inc/rotate_curs.h +++ b/vcl/inc/unx/x11_cursors/rotate_curs.h diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/inc/unx/x11_cursors/rotate_mask.h index 9fcff18925f0..9fcff18925f0 100644 --- a/vcl/unx/source/inc/rotate_mask.h +++ b/vcl/inc/unx/x11_cursors/rotate_mask.h diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h new file mode 100644 index 000000000000..e0d34e122336 --- /dev/null +++ b/vcl/inc/unx/x11_cursors/salcursors.h @@ -0,0 +1,162 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "unx/x11_cursors/nodrop_curs.h" +#include "unx/x11_cursors/nodrop_mask.h" +#include "unx/x11_cursors/magnify_curs.h" +#include "unx/x11_cursors/magnify_mask.h" +#include "unx/x11_cursors/rotate_curs.h" +#include "unx/x11_cursors/rotate_mask.h" +#include "unx/x11_cursors/hshear_curs.h" +#include "unx/x11_cursors/hshear_mask.h" +#include "unx/x11_cursors/vshear_curs.h" +#include "unx/x11_cursors/vshear_mask.h" +#include "unx/x11_cursors/drawline_curs.h" +#include "unx/x11_cursors/drawline_mask.h" +#include "unx/x11_cursors/drawrect_curs.h" +#include "unx/x11_cursors/drawrect_mask.h" +#include "unx/x11_cursors/drawpolygon_curs.h" +#include "unx/x11_cursors/drawpolygon_mask.h" +#include "unx/x11_cursors/drawbezier_curs.h" +#include "unx/x11_cursors/drawbezier_mask.h" +#include "unx/x11_cursors/drawarc_curs.h" +#include "unx/x11_cursors/drawarc_mask.h" +#include "unx/x11_cursors/drawpie_curs.h" +#include "unx/x11_cursors/drawpie_mask.h" +#include "unx/x11_cursors/drawcirclecut_curs.h" +#include "unx/x11_cursors/drawcirclecut_mask.h" +#include "unx/x11_cursors/drawellipse_curs.h" +#include "unx/x11_cursors/drawellipse_mask.h" +#include "unx/x11_cursors/drawconnect_curs.h" +#include "unx/x11_cursors/drawconnect_mask.h" +#include "unx/x11_cursors/drawtext_curs.h" +#include "unx/x11_cursors/drawtext_mask.h" +#include "unx/x11_cursors/mirror_curs.h" +#include "unx/x11_cursors/mirror_mask.h" +#include "unx/x11_cursors/crook_curs.h" +#include "unx/x11_cursors/crook_mask.h" +#include "unx/x11_cursors/crop_curs.h" +#include "unx/x11_cursors/crop_mask.h" +#include "unx/x11_cursors/movepoint_curs.h" +#include "unx/x11_cursors/movepoint_mask.h" +#include "unx/x11_cursors/movebezierweight_curs.h" +#include "unx/x11_cursors/movebezierweight_mask.h" +#include "unx/x11_cursors/drawfreehand_curs.h" +#include "unx/x11_cursors/drawfreehand_mask.h" +#include "unx/x11_cursors/drawcaption_curs.h" +#include "unx/x11_cursors/drawcaption_mask.h" +#include "unx/x11_cursors/movedata_curs.h" +#include "unx/x11_cursors/movedata_mask.h" +#include "unx/x11_cursors/copydata_curs.h" +#include "unx/x11_cursors/copydata_mask.h" +#include "unx/x11_cursors/linkdata_curs.h" +#include "unx/x11_cursors/linkdata_mask.h" +#include "unx/x11_cursors/movedlnk_curs.h" +#include "unx/x11_cursors/movedlnk_mask.h" +#include "unx/x11_cursors/copydlnk_curs.h" +#include "unx/x11_cursors/copydlnk_mask.h" +#include "unx/x11_cursors/movefile_curs.h" +#include "unx/x11_cursors/movefile_mask.h" +#include "unx/x11_cursors/copyfile_curs.h" +#include "unx/x11_cursors/copyfile_mask.h" +#include "unx/x11_cursors/linkfile_curs.h" +#include "unx/x11_cursors/linkfile_mask.h" +#include "unx/x11_cursors/moveflnk_curs.h" +#include "unx/x11_cursors/moveflnk_mask.h" +#include "unx/x11_cursors/copyflnk_curs.h" +#include "unx/x11_cursors/copyflnk_mask.h" +#include "unx/x11_cursors/movefiles_curs.h" +#include "unx/x11_cursors/movefiles_mask.h" +#include "unx/x11_cursors/copyfiles_curs.h" +#include "unx/x11_cursors/copyfiles_mask.h" + +#include "unx/x11_cursors/chart_curs.h" +#include "unx/x11_cursors/chart_mask.h" +#include "unx/x11_cursors/detective_curs.h" +#include "unx/x11_cursors/detective_mask.h" +#include "unx/x11_cursors/pivotcol_curs.h" +#include "unx/x11_cursors/pivotcol_mask.h" +#include "unx/x11_cursors/pivotfld_curs.h" +#include "unx/x11_cursors/pivotfld_mask.h" +#include "unx/x11_cursors/pivotrow_curs.h" +#include "unx/x11_cursors/pivotrow_mask.h" +#include "unx/x11_cursors/pivotdel_curs.h" +#include "unx/x11_cursors/pivotdel_mask.h" + +#include "unx/x11_cursors/chain_curs.h" +#include "unx/x11_cursors/chain_mask.h" +#include "unx/x11_cursors/chainnot_curs.h" +#include "unx/x11_cursors/chainnot_mask.h" + +#include "unx/x11_cursors/timemove_curs.h" +#include "unx/x11_cursors/timemove_mask.h" +#include "unx/x11_cursors/timesize_curs.h" +#include "unx/x11_cursors/timesize_mask.h" + +#include "unx/x11_cursors/ase_curs.h" +#include "unx/x11_cursors/ase_mask.h" +#include "unx/x11_cursors/asn_curs.h" +#include "unx/x11_cursors/asn_mask.h" +#include "unx/x11_cursors/asne_curs.h" +#include "unx/x11_cursors/asne_mask.h" +#include "unx/x11_cursors/asns_curs.h" +#include "unx/x11_cursors/asns_mask.h" +#include "unx/x11_cursors/asnswe_curs.h" +#include "unx/x11_cursors/asnswe_mask.h" +#include "unx/x11_cursors/asnw_curs.h" +#include "unx/x11_cursors/asnw_mask.h" +#include "unx/x11_cursors/ass_curs.h" +#include "unx/x11_cursors/ass_mask.h" +#include "unx/x11_cursors/asse_curs.h" +#include "unx/x11_cursors/asse_mask.h" +#include "unx/x11_cursors/assw_curs.h" +#include "unx/x11_cursors/assw_mask.h" +#include "unx/x11_cursors/asw_curs.h" +#include "unx/x11_cursors/asw_mask.h" +#include "unx/x11_cursors/aswe_curs.h" +#include "unx/x11_cursors/aswe_mask.h" +#include "unx/x11_cursors/null_curs.h" +#include "unx/x11_cursors/null_mask.h" + +#include "unx/x11_cursors/airbrush_curs.h" +#include "unx/x11_cursors/airbrush_mask.h" +#include "unx/x11_cursors/fill_curs.h" +#include "unx/x11_cursors/fill_mask.h" +#include "unx/x11_cursors/vertcurs_curs.h" +#include "unx/x11_cursors/vertcurs_mask.h" +#include "unx/x11_cursors/tblsele_curs.h" +#include "unx/x11_cursors/tblsele_mask.h" +#include "unx/x11_cursors/tblsels_curs.h" +#include "unx/x11_cursors/tblsels_mask.h" +#include "unx/x11_cursors/tblselse_curs.h" +#include "unx/x11_cursors/tblselse_mask.h" +#include "unx/x11_cursors/tblselw_curs.h" +#include "unx/x11_cursors/tblselw_mask.h" +#include "unx/x11_cursors/tblselsw_curs.h" +#include "unx/x11_cursors/tblselsw_mask.h" +#include "unx/x11_cursors/paintbrush_curs.h" +#include "unx/x11_cursors/paintbrush_mask.h" diff --git a/vcl/unx/source/inc/tblsele_curs.h b/vcl/inc/unx/x11_cursors/tblsele_curs.h index 7ad1314d1957..7ad1314d1957 100644 --- a/vcl/unx/source/inc/tblsele_curs.h +++ b/vcl/inc/unx/x11_cursors/tblsele_curs.h diff --git a/vcl/unx/source/inc/tblsele_mask.h b/vcl/inc/unx/x11_cursors/tblsele_mask.h index bb35c22c97cb..bb35c22c97cb 100644 --- a/vcl/unx/source/inc/tblsele_mask.h +++ b/vcl/inc/unx/x11_cursors/tblsele_mask.h diff --git a/vcl/unx/source/inc/tblsels_curs.h b/vcl/inc/unx/x11_cursors/tblsels_curs.h index 0bf38d4b3fdb..0bf38d4b3fdb 100644 --- a/vcl/unx/source/inc/tblsels_curs.h +++ b/vcl/inc/unx/x11_cursors/tblsels_curs.h diff --git a/vcl/unx/source/inc/tblsels_mask.h b/vcl/inc/unx/x11_cursors/tblsels_mask.h index 9ba3b51d8d76..9ba3b51d8d76 100644 --- a/vcl/unx/source/inc/tblsels_mask.h +++ b/vcl/inc/unx/x11_cursors/tblsels_mask.h diff --git a/vcl/unx/source/inc/tblselse_curs.h b/vcl/inc/unx/x11_cursors/tblselse_curs.h index 208c7c59dc2d..208c7c59dc2d 100644 --- a/vcl/unx/source/inc/tblselse_curs.h +++ b/vcl/inc/unx/x11_cursors/tblselse_curs.h diff --git a/vcl/unx/source/inc/tblselse_mask.h b/vcl/inc/unx/x11_cursors/tblselse_mask.h index 4c4c97ad4ccf..4c4c97ad4ccf 100644 --- a/vcl/unx/source/inc/tblselse_mask.h +++ b/vcl/inc/unx/x11_cursors/tblselse_mask.h diff --git a/vcl/unx/source/inc/tblselsw_curs.h b/vcl/inc/unx/x11_cursors/tblselsw_curs.h index a3166a27ca52..a3166a27ca52 100644 --- a/vcl/unx/source/inc/tblselsw_curs.h +++ b/vcl/inc/unx/x11_cursors/tblselsw_curs.h diff --git a/vcl/unx/source/inc/tblselsw_mask.h b/vcl/inc/unx/x11_cursors/tblselsw_mask.h index 3981cbaa884d..3981cbaa884d 100644 --- a/vcl/unx/source/inc/tblselsw_mask.h +++ b/vcl/inc/unx/x11_cursors/tblselsw_mask.h diff --git a/vcl/unx/source/inc/tblselw_curs.h b/vcl/inc/unx/x11_cursors/tblselw_curs.h index 9d802d094ef8..9d802d094ef8 100644 --- a/vcl/unx/source/inc/tblselw_curs.h +++ b/vcl/inc/unx/x11_cursors/tblselw_curs.h diff --git a/vcl/unx/source/inc/tblselw_mask.h b/vcl/inc/unx/x11_cursors/tblselw_mask.h index 940668e3db7f..940668e3db7f 100644 --- a/vcl/unx/source/inc/tblselw_mask.h +++ b/vcl/inc/unx/x11_cursors/tblselw_mask.h diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/inc/unx/x11_cursors/timemove_curs.h index 252a702caf77..252a702caf77 100644 --- a/vcl/unx/source/inc/timemove_curs.h +++ b/vcl/inc/unx/x11_cursors/timemove_curs.h diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/inc/unx/x11_cursors/timemove_mask.h index b7a9542a64c6..b7a9542a64c6 100644 --- a/vcl/unx/source/inc/timemove_mask.h +++ b/vcl/inc/unx/x11_cursors/timemove_mask.h diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/inc/unx/x11_cursors/timesize_curs.h index 61e53971290e..61e53971290e 100644 --- a/vcl/unx/source/inc/timesize_curs.h +++ b/vcl/inc/unx/x11_cursors/timesize_curs.h diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/inc/unx/x11_cursors/timesize_mask.h index 3c4333c5e7b8..3c4333c5e7b8 100644 --- a/vcl/unx/source/inc/timesize_mask.h +++ b/vcl/inc/unx/x11_cursors/timesize_mask.h diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/inc/unx/x11_cursors/vertcurs_curs.h index d67251a1743d..d67251a1743d 100644 --- a/vcl/unx/source/inc/vertcurs_curs.h +++ b/vcl/inc/unx/x11_cursors/vertcurs_curs.h diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/inc/unx/x11_cursors/vertcurs_mask.h index 769d6966571f..769d6966571f 100644 --- a/vcl/unx/source/inc/vertcurs_mask.h +++ b/vcl/inc/unx/x11_cursors/vertcurs_mask.h diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/inc/unx/x11_cursors/vshear_curs.h index 87357c0a5027..87357c0a5027 100644 --- a/vcl/unx/source/inc/vshear_curs.h +++ b/vcl/inc/unx/x11_cursors/vshear_curs.h diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/inc/unx/x11_cursors/vshear_mask.h index be77728c13f9..be77728c13f9 100644 --- a/vcl/unx/source/inc/vshear_mask.h +++ b/vcl/inc/unx/x11_cursors/vshear_mask.h diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx index c143e49002fa..11f00145c466 100644 --- a/vcl/inc/vcl/cursor.hxx +++ b/vcl/inc/vcl/cursor.hxx @@ -69,7 +69,7 @@ public: SAL_DLLPRIVATE void ImplRestore(); DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* ); SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true, bool bRestore = false ); - SAL_DLLPRIVATE bool ImplHide(); + SAL_DLLPRIVATE bool ImplHide( bool bStopTimer ); SAL_DLLPRIVATE void ImplNew(); public: diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index a83920b6674c..b69e5a847066 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -68,6 +68,15 @@ class Gradient; #define MTF_MIRROR_HORZ 0x00000001UL #define MTF_MIRROR_VERT 0x00000002UL +// ----------------------------- +// - Write flags for streaming - +// ----------------------------- + +#define GDIMETAFILE_WRITE_DEFAULT 0x00000000 +#define GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC 0x00000001 + +typedef sal_uInt32 GDIMetaFileWriteFlags; + // --------- // - Enums - // --------- @@ -237,7 +246,7 @@ public: // Methoden zum Lesen und Schreiben des neuen Formats; // die Read-Methode kann auch das alte Format lesen SvStream& Read( SvStream& rIStm ); - SvStream& Write( SvStream& rOStm ); + SvStream& Write( SvStream& rOStm, GDIMetaFileWriteFlags = GDIMETAFILE_WRITE_DEFAULT ); // Stream-Operatoren schreiben das alte Format (noch) // und lesen sowohl das alte wie auch das neue Format @@ -248,4 +257,3 @@ public: }; #endif // _SV_GDIMTF_HXX - diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index ce2cec67e1f4..29668f0dfa58 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -109,11 +109,12 @@ enum GfxLinkType GFX_LINK_TYPE_NATIVE_WMF = 6, // Don't forget to update the following defines GFX_LINK_TYPE_NATIVE_MET = 7, // Don't forget to update the following defines GFX_LINK_TYPE_NATIVE_PCT = 8, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_SVG = 9, // Don't forget to update the following defines GFX_LINK_TYPE_USER = 0xffff }; #define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF -#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_PCT +#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_SVG // ----------- // - GfxLink - diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 61ec67ce8a79..31c7b20b9c77 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -35,6 +35,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/rendergraphic.hxx> #include <vcl/graph.h> #include <vcl/gfxlink.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -119,9 +120,12 @@ public: void SetDefaultType(); sal_Bool IsSupportedGraphic() const; - sal_Bool IsTransparent() const; - sal_Bool IsAlpha() const; - sal_Bool IsAnimated() const; + sal_Bool IsTransparent() const; + sal_Bool IsAlpha() const; + sal_Bool IsAnimated() const; + sal_Bool IsEPS() const; + sal_Bool IsRenderGraphic() const; + sal_Bool HasRenderGraphic() const; // #i102089# Access of Bitmap potentially will have to rasterconvert the Graphic // if it is a MetaFile. To be able to control this conversion it is necessary to @@ -131,8 +135,9 @@ public: Bitmap GetBitmap(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const; BitmapEx GetBitmapEx(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const; - Animation GetAnimation() const; - const GDIMetaFile& GetGDIMetaFile() const; + Animation GetAnimation() const; + const GDIMetaFile& GetGDIMetaFile() const; + ::vcl::RenderGraphic GetRenderGraphic() const; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; @@ -219,4 +224,3 @@ public: }; #endif // _SV_GRAPH_HXX - 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/metaact.hxx b/vcl/inc/vcl/metaact.hxx index 33120b288a98..b1bd5d91d20e 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -42,6 +42,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/rendergraphic.hxx> class SvStream; @@ -102,6 +103,7 @@ class SvStream; #define META_LAYOUTMODE_ACTION (149) #define META_TEXTLANGUAGE_ACTION (150) #define META_OVERLINECOLOR_ACTION (151) +#define META_RENDERGRAPHIC_ACTION (152) #define META_COMMENT_ACTION (512) @@ -110,6 +112,11 @@ class SvStream; struct ImplMetaReadData { rtl_TextEncoding meActualCharSet; + + ImplMetaReadData() : + meActualCharSet( RTL_TEXTENCODING_ASCII_US ) + { + } }; // ------------------------------------------------------------------------ @@ -117,6 +124,13 @@ struct ImplMetaReadData struct ImplMetaWriteData { rtl_TextEncoding meActualCharSet; + GDIMetaFileWriteFlags mnWriteFlags; + + ImplMetaWriteData() : + meActualCharSet( RTL_TEXTENCODING_ASCII_US ), + mnWriteFlags( GDIMETAFILE_WRITE_DEFAULT ) + { + } }; // ------------------------------------------------------------------------ @@ -1543,4 +1557,41 @@ public: LanguageType GetTextLanguage() const { return meTextLanguage; } }; +// --------------------------- +// - MetaRenderGraphicAction - +// --------------------------- + +class VCL_DLLPUBLIC MetaRenderGraphicAction : public MetaAction +{ +private: + + ::vcl::RenderGraphic maRenderGraphic; + Point maPoint; + Size maSize; + double mfRotateAngle; + double mfShearAngleX; + double mfShearAngleY; + + virtual sal_Bool Compare( const MetaAction& ) const; + +public: + DECL_META_ACTION( RenderGraphic, META_RENDERGRAPHIC_ACTION ) + + MetaRenderGraphicAction( const Point& rPoint, const Size& rSize, + const vcl::RenderGraphic& rRenderData, + double fRotateAngle = 0.0, + double fShearAngleX = 0.0, + double fShearAngleY = 0.0 ); + + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); + + const ::vcl::RenderGraphic& GetRenderGraphic() const { return maRenderGraphic; } + const Point& GetPoint() const { return maPoint; } + const Size& GetSize() const { return maSize; } + double GetRotateAngle() const { return mfRotateAngle; } + double GetShearAngleX() const { return mfShearAngleX; } + double GetShearAngleY() const { return mfShearAngleY; } +}; + #endif // _SV_METAACT_HXX diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 1130db5bd4a2..601670592194 100755..100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -108,6 +108,7 @@ namespace vcl class PDFWriterImpl; class ExtOutDevData; class ITextLayout; + class RenderGraphic; } #define OUTDEV_BUFFER_SIZE 128 @@ -808,7 +809,19 @@ public: void DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency); - void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ); + void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, + const Gradient& rTransparenceGradient ); + + /** Added return value to see if EPS could be painted directly. + Theoreticaly, handing over a matrix would be needed to handle + painting rotated EPS files (e.g. contained in Metafiles). This + would then need to be supported for Mac and PS printers, but + that's too much for now, wrote #i107046# for this */ + bool DrawEPS( const Point& rPt, const Size& rSz, + const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL ); + + void DrawRenderGraphic( const Point& rPt, const Size& rSz, + const ::vcl::RenderGraphic& rRenderGraphic ); Color GetPixel( const Point& rPt ) const; Color* GetPixel( const Polygon& rPts ) const; @@ -1117,14 +1130,6 @@ public: */ sal_Bool HasAlpha(); - /** Added return value to see if EPS could be painted directly. - Theoreticaly, handing over a matrix would be needed to handle - painting rotated EPS files (e.g. contained in Metafiles). This - would then need to be supported for Mac and PS printers, but - that's too much for now, wrote #i107046# for this */ - bool DrawEPS( const Point& rPt, const Size& rSz, - const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL ); - /// request XCanvas render interface for this OutputDevice ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > GetCanvas() const; diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index f1e203a84431..bf2a09c1dd42 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -52,8 +52,24 @@ namespace vcl */ struct PDFExtOutDevBookmarkEntry { + /** ID of the link pointing to the bookmark, or -1 if the entry denotes a destination instead of a link. + */ sal_Int32 nLinkId; + + /** ID of the named destination denoted by the bookmark, or -1 if the entry denotes a link instead of a named destination. + */ + sal_Int32 nDestId; + + /** link target name, respectively destination name + */ rtl::OUString aBookmark; + + PDFExtOutDevBookmarkEntry() + :nLinkId( -1 ) + ,nDestId( -1 ) + ,aBookmark() + { + } }; /* @@ -195,6 +211,24 @@ public : -1 if page id does not exist */ sal_Int32 CreateNamedDest( const String& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + + /** registers a destination for which a destinatin ID needs to be known immediately, instead of later on setting it via + SetLinkDest. + + This is used in contexts where a destination is referenced by means other than a link. + + Later in the export process, a call to DescribeRegisteredDest must be made, providing the information about + the destination. + + @return + the unique Id of the destination + */ + sal_Int32 RegisterDest(); + + /** provides detailed information about a destination range which previously has been registered using RegisterDest. + */ + void DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + //<---i56629 /** Create a new destination to be used in a link diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 4e792ef40f57..09a8a08d5aca 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -939,6 +939,29 @@ The following structure describes the permissions used in PDF security -1 if page id does not exist */ sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 ); + + /** creates a destination which is not intended to be referred to by a link, but by a public destination Id. + + Form widgets, for instance, might refer to a destination, without ever actually creating a source link to + point to this destination. In such cases, a public destination Id will be assigned to the form widget, + and later on, the concrete destination data for this public Id will be registered using RegisterDestReference. + + @param rRect + target rectangle on page to be displayed if dest is jumped to + + @param nPageNr + number of page the dest is on (as returned by NewPage) + or -1 in which case the current page is used + + @param eType + what dest type to use + + @returns + the internal destination Id. + */ + sal_Int32 RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); + + /** Set the destination for a link <p>will change a URL type link to a dest link if necessary</p> diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx deleted file mode 100644 index de9f62184483..000000000000 --- a/vcl/inc/vcl/polyscan.hxx +++ /dev/null @@ -1,155 +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. - * - ************************************************************************/ - -#ifndef _SV_POLYSCAN_HXX -#define _SV_POLYSCAN_HXX - -#include <tools/gen.hxx> - -// ----------------- -// - ScanlinePoint - -// ----------------- - -struct ScanlinePoint -{ - long mnX; - ScanlinePoint* mpNext; - - ScanlinePoint() : mnX( 0L ), mpNext( NULL ) {}; - ScanlinePoint( long nX, ScanlinePoint* pNext ) : mnX( nX ), mpNext( pNext ) {}; - ~ScanlinePoint() {}; - - void Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; } -}; - -// ------------------- -// - PolyScanSegment - -// ------------------- - -struct PolyScanSegment -{ - long mnStart; - long mnEnd; - - PolyScanSegment() : mnStart( 0L ), mnEnd( 0L ) {}; - PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {}; - ~PolyScanSegment() {}; -}; - -// ---------------- -// - PolyScanline - -// ---------------- - -struct ScanlinePoint; -class Polygon; -class PolyPolygon; - -class PolyScanline -{ -private: - - ScanlinePoint* mpFirst; - ScanlinePoint* mpLast; - ScanlinePoint* mpAct; - long mnLeft; - long mnRight; - - void ImplDelete(); - -public: - - PolyScanline(); - ~PolyScanline(); - - void Insert( long nX ); - void Set( long nStart, long nEnd ); - void Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); } - - inline sal_Bool GetFirstX( long& rX ); - inline sal_Bool GetNextX( long& rX ); - - sal_Bool GetFirstSegment( PolyScanSegment& rSegment ); - sal_Bool GetNextSegment( PolyScanSegment& rSegment ); -}; - -// ------------------------------------------------------------------------ - -inline sal_Bool PolyScanline::GetFirstX( long& rX ) -{ - mpAct = mpFirst; - return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False ); -} - -// ------------------------------------------------------------------------ - -inline sal_Bool PolyScanline::GetNextX( long& rX ) -{ - return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False ); -} - -// --------------- -// - PolyScanner - -// --------------- - -class PolyScanner -{ -private: - - PolyScanline* mpArray; - long mnLeft; - long mnTop; - long mnRight; - long mnBottom; - - PolyScanner() {}; - -protected: - - void InsertLine( const Point& rStart, const Point& rEnd ); - -public: - - PolyScanner( const Rectangle& rRect ); - PolyScanner( const Polygon& rPoly ); - PolyScanner( const PolyPolygon& rPolyPoly ); - ~PolyScanner(); - - long Left() const { return mnLeft; } - long Top() const { return mnTop; } - long Right() const { return mnRight; } - long Bottom() const { return mnBottom; } - - long Width() const { return( mnRight - mnLeft + 1L ); } - long Height() const { return( mnBottom - mnTop + 1L ); } - - Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); } - - sal_uLong Count() const { return Height(); } - PolyScanline* operator[]( sal_uLong nPos ) const; -}; - -#endif // _SV_POLYSCAN_HXX diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index 01cbcbb5fc81..ab777c392836 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/vcl/rendergraphic.hxx b/vcl/inc/vcl/rendergraphic.hxx new file mode 100644 index 000000000000..0a0f475decd6 --- /dev/null +++ b/vcl/inc/vcl/rendergraphic.hxx @@ -0,0 +1,124 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_RENDERGRAPHIC_HXX +#define _SV_RENDERGRAPHIC_HXX + +#include <vcl/dllapi.h> +#include <rtl/ustring.hxx> +#include <boost/shared_array.hpp> +#include <memory> + +class SvStream; +class MapMode; +class Size; +class BitmapEx; + +namespace vcl +{ + // ----------------- + // - RenderGraphic - + // ----------------- + class VCL_DLLPUBLIC RenderGraphic + { + public: + + typedef boost::shared_array< sal_uInt8 > GraphicData; + + friend VCL_DLLPUBLIC ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ); + friend VCL_DLLPUBLIC ::SvStream& operator<<( ::SvStream& rOStm, const RenderGraphic& rRenderGraphic ); + + public: + + RenderGraphic( ); + + RenderGraphic( const RenderGraphic& rRenderGraphic ); + + RenderGraphic( const GraphicData& rGraphicData, + sal_uInt32 nGraphicDataLength, + const rtl::OUString& rGraphicDataMimeType ); + + RenderGraphic( const rtl::OUString& rGraphicDataMimeType, + sal_uInt32 nGraphicDataLength, + const sal_uInt8* pGraphicData = NULL ); + + virtual ~RenderGraphic(); + + RenderGraphic& operator=(const RenderGraphic& rRenderGraphic ); + + bool operator==(const RenderGraphic& rRenderGraphic ) const; + + inline bool operator!=(const RenderGraphic& rRenderGraphic ) const + { + return( !( rRenderGraphic == *this ) ); + } + + bool IsEqual( const RenderGraphic& rRenderGraphic ) const; + + bool operator!() const; + + inline bool IsEmpty( ) const + { + return( !( *this ) ); + } + + inline const GraphicData& GetGraphicData( ) const + { + return( maGraphicData ); + } + + inline sal_uInt32 GetGraphicDataLength( ) const + { + return( mnGraphicDataLength ); + } + + inline const rtl::OUString& GetGraphicDataMimeType( ) const + { + return( maGraphicDataMimeType ); + } + + const MapMode& GetPrefMapMode() const; + const Size& GetPrefSize() const; + + BitmapEx GetReplacement() const; + + private: + + void ImplCheckData(); + void ImplGetDefaults() const; + + private: + + GraphicData maGraphicData; + sal_uInt32 mnGraphicDataLength; + rtl::OUString maGraphicDataMimeType; + mutable ::std::auto_ptr< MapMode > mapPrefMapMode; + mutable ::std::auto_ptr< Size > mapPrefSize; + }; +} + +#endif // _SV_RENDERHRAPHIC_HXX diff --git a/vcl/inc/vcl/rendergraphicrasterizer.hxx b/vcl/inc/vcl/rendergraphicrasterizer.hxx new file mode 100644 index 000000000000..f2166b03ffb3 --- /dev/null +++ b/vcl/inc/vcl/rendergraphicrasterizer.hxx @@ -0,0 +1,111 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_RENDERGRAPHICRASTERIZER_HXX +#define _SV_RENDERGRAPHICRASTERIZER_HXX + +#include <vcl/rendergraphic.hxx> +#include <vcl/bitmapex.hxx> + +#include <com/sun/star/graphic/XGraphicRasterizer.hpp> + +#include <memory> +#include <deque> + +#define VCL_RASTERIZER_UNLIMITED_EXTENT 0x00000000 +#define VCL_RASTERIZER_DEFAULT_EXTENT 0xffffffff + +namespace vcl +{ + // --------------------------- + // - RenderGraphicRasterizer - + // --------------------------- + + class VCL_DLLPUBLIC RenderGraphicRasterizer + { + public: + + RenderGraphicRasterizer( const RenderGraphic& rData ); + + + RenderGraphicRasterizer( const RenderGraphicRasterizer& rRenderGraphicRasterizer ); + + virtual ~RenderGraphicRasterizer(); + + RenderGraphicRasterizer& operator=( const RenderGraphicRasterizer& rRenderGraphicRasterizer ); + + inline const RenderGraphic& GetRenderGraphic() const + { + return( maRenderGraphic ); + } + + const Size& GetDefaultSizePixel() const; + + BitmapEx GetReplacement() const; + + virtual Size GetPrefSize() const; + + virtual MapMode GetPrefMapMode() const; + + virtual const BitmapEx& Rasterize( const Size& rSizePixel_UnrotatedUnsheared, + double fRotateAngle = 0.0, + double fShearAngleX = 0.0, + double fShearAngleY = 0.0, + sal_uInt32 nMaxExtent = VCL_RASTERIZER_DEFAULT_EXTENT ) const; + + protected: + + RenderGraphic maRenderGraphic; + mutable com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicRasterizer > mxRasterizer; + + virtual void InitializeRasterizer(); + + private: + + RenderGraphicRasterizer(); + + mutable BitmapEx maBitmapEx; + mutable Size maDefaultSizePixel; + mutable double mfRotateAngle; + mutable double mfShearAngleX; + mutable double mfShearAngleY; + + private: + + typedef ::std::deque< RenderGraphicRasterizer > RenderGraphicRasterizerCache; + + static RenderGraphicRasterizerCache& ImplGetCache(); + + static bool ImplInitializeFromCache( RenderGraphicRasterizer& rRasterizer ); + static bool ImplRasterizeFromCache( RenderGraphicRasterizer& rRasterizer, + const Size& rSizePixel, double fRotateAngle, + double fShearAngleX, double fShearAngleY ); + static void ImplUpdateCache( const RenderGraphicRasterizer& rRasterizer ); +}; +} + +#endif // _SV_RENDERGRAPHICRASTERIZER_HXX diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx index aa7741c69034..1894143f78be 100644 --- a/vcl/inc/vcl/salctype.hxx +++ b/vcl/inc/vcl/salctype.hxx @@ -48,6 +48,7 @@ #define CVT_TIF (0x00000008UL) #define CVT_WMF (0x00000009UL) #define CVT_EMF (0x0000000aUL) +#define CVT_SVG (0x0000000bUL) // --------------- // - ConvertData - diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svgread.hxx index dce884cdf776..ea4388767d02 100644 --- a/vcl/inc/vcl/svcompat.hxx +++ b/vcl/inc/vcl/svgread.hxx @@ -25,46 +25,56 @@ * ************************************************************************/ -#ifndef _SV_SVCOMPAT_HXX -#define _SV_SVCOMPAT_HXX +#ifndef _SV_SVGREAD_HXX +#define _SV_SVGREAD_HXX -#include <sv.h> +#include <vcl/dllapi.h> +#include <memory> -// ----------- -// - Defines - -// ----------- +// ------------- +// - SVGReader - +// ------------- -#define COMPAT_FORMAT( char1, char2, char3, char4 ) \ - ((sal_uLong)((((sal_uLong)(char)(char1)))| \ - (((sal_uLong)(char)(char2))<<8UL)| \ - (((sal_uLong)(char)(char3))<<16UL)| \ - ((sal_uLong)(char)(char4))<<24UL)) +class SvStream; +class GDIMetaFile; +namespace vcl +{ + class SVGReaderImpl; -class SvStream; + class VCL_DLLPUBLIC SVGReader + { + public: -// -------------- -// - ImplCompat - -// -------------- + SVGReader( SvStream& rStm ); + ~SVGReader(); -class ImplCompat -{ - SvStream* mpRWStm; - sal_uInt32 mnCompatPos; - sal_uInt32 mnTotalSize; - sal_uInt16 mnStmMode; - sal_uInt16 mnVersion; + /* rSVGMtf is an output parameter, that is also returned + by the method as well. + + In case of a failure, the GDIMetaFile will not contain + any actions at all and thus GDIMetaFile::GetActionCount + will return 0. + + In case of success, the GDIMetaFile will contain a + META_RENDERGRAPHIC_ACTION, containing the SVG raw data. The + data can be rendered by using the standard ways to output a + GDIMetaFile, e.g. calling GDIMetaFile::Play + + */ + GDIMetaFile& Read( GDIMetaFile& rSVGMtf ); + + private: + + SVGReader(); + SVGReader( const SVGReader& rReader ); - ImplCompat() {} - ImplCompat( const ImplCompat& rCompat ) {} - ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; } - sal_Bool operator==( const ImplCompat& rCompat ) { return sal_False; } + inline SVGReader& operator=( const SVGReader& /* rReader */ ) { return( *this ); } -public: - ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 ); - ~ImplCompat(); + private: - sal_uInt16 GetVersion() const { return mnVersion; } -}; + std::auto_ptr< SVGReaderImpl > mapImpl; + }; +} -#endif // _SV_SVCOMPAT_HXX +#endif // _SV_SVGREAD_HXX diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vclpluginapi.h index af616e80351a..3fe781a7bb97 100644 --- a/vcl/inc/vcl/unobrok.hxx +++ b/vcl/inc/vclpluginapi.h @@ -25,15 +25,46 @@ * ************************************************************************/ -#ifndef _UNOBROK_HXX -#define _UNOBROK_HXX +#ifndef _VCLPLUGINAPI_H +#define _VCLPLUGINAPI_H -#include <vcl/svdata.hxx> -#include <vos/thread.hxx> +#include "sal/config.h" +#include "sal/types.h" -namespace vcl_accept -{ - sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr); -} +#if defined VCLPLUG_GEN_IMPLEMENTATION +#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_IMPORT +#endif -#endif // _UNOBROK_HXX +#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/inc/vcl/wall2.hxx b/vcl/inc/wall2.hxx index 12ef95e017d7..12ef95e017d7 100644 --- a/vcl/inc/vcl/wall2.hxx +++ b/vcl/inc/wall2.hxx diff --git a/vcl/win/inc/salbmp.h b/vcl/inc/win/salbmp.h index 07655d6b7a65..8ef8e9fd9f6e 100644..100755 --- a/vcl/win/inc/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -28,10 +28,9 @@ #ifndef _SV_SALBMP_H #define _SV_SALBMP_H -#include <wincomp.hxx> #include <tools/gen.hxx> -#include <vcl/sv.h> -#include <vcl/salbmp.hxx> +#include <win/wincomp.hxx> +#include <salbmp.hxx> // -------------- // - SalBitmap - diff --git a/vcl/win/inc/saldata.hxx b/vcl/inc/win/saldata.hxx index b86b4cc29ed4..6c040993c76e 100755 --- a/vcl/win/inc/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -28,13 +28,13 @@ #ifndef _SV_SALDATA_HXX #define _SV_SALDATA_HXX -#include <vcl/sv.h> -#include <vcl/svdata.hxx> -#include <vcl/salwtype.hxx> -#include <wincomp.hxx> - #include "osl/module.h" +#include <svdata.hxx> +#include <salwtype.hxx> + +#include <win/wincomp.hxx> + #include <set> // for hMenu validation #include <map> diff --git a/vcl/win/inc/salframe.h b/vcl/inc/win/salframe.h index cfb26847db02..71786924d097 100644..100755 --- a/vcl/win/inc/salframe.h +++ b/vcl/inc/win/salframe.h @@ -28,9 +28,8 @@ #ifndef _SV_SALFRAME_H #define _SV_SALFRAME_H -#include <vcl/sv.h> #include <vcl/sysdata.hxx> -#include <vcl/salframe.hxx> +#include <salframe.hxx> class WinSalGraphics; diff --git a/vcl/win/inc/salgdi.h b/vcl/inc/win/salgdi.h index 70734846f445..52ac23b45a48 100755 --- a/vcl/win/inc/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -28,11 +28,10 @@ #ifndef _SV_SALGDI_H #define _SV_SALGDI_H -#include <vcl/sv.h> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/outfont.hxx> -#include <vcl/impfont.hxx> +#include <sallayout.hxx> +#include <salgdi.hxx> +#include <outfont.hxx> +#include <impfont.hxx> #include "boost/scoped_ptr.hpp" #include <hash_set> diff --git a/vcl/win/inc/salids.hrc b/vcl/inc/win/salids.hrc index 3049f11b551b..3049f11b551b 100644 --- a/vcl/win/inc/salids.hrc +++ b/vcl/inc/win/salids.hrc diff --git a/vcl/win/inc/salinst.h b/vcl/inc/win/salinst.h index f08f99898915..0c3580509654 100755 --- a/vcl/win/inc/salinst.h +++ b/vcl/inc/win/salinst.h @@ -28,8 +28,7 @@ #ifndef _SV_SALINST_H #define _SV_SALINST_H -#include <vcl/sv.h> -#include <vcl/salinst.hxx> +#include <salinst.hxx> namespace vos { class OMutex; } diff --git a/vcl/win/inc/salmenu.h b/vcl/inc/win/salmenu.h index c9442ced8936..686c6c406aeb 100644..100755 --- a/vcl/win/inc/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -28,10 +28,8 @@ #ifndef _SV_SALMENU_H #define _SV_SALMENU_H -#include <vcl/sv.h> #include <vcl/bitmap.hxx> -#include <vcl/salmenu.hxx> - +#include <salmenu.hxx> class WinSalMenu : public SalMenu { diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/inc/win/salnativewidgets.h index fceee1076595..772e0cc5b036 100644..100755 --- a/vcl/win/inc/salnativewidgets.h +++ b/vcl/inc/win/salnativewidgets.h @@ -31,8 +31,6 @@ #ifdef __cplusplus -#include <vcl/sv.h> - /* SalControlHandleData: * * Holds platform specific theming data. diff --git a/vcl/win/inc/salobj.h b/vcl/inc/win/salobj.h index e262fd9bc10d..57ed83ee8e6b 100644..100755 --- a/vcl/win/inc/salobj.h +++ b/vcl/inc/win/salobj.h @@ -28,8 +28,7 @@ #ifndef _SV_SALOBJ_H #define _SV_SALOBJ_H -#include <vcl/sv.h> -#include <vcl/salobj.hxx> +#include <salobj.hxx> // ----------------- // - SalObjectData - diff --git a/vcl/win/inc/salprn.h b/vcl/inc/win/salprn.h index 14141b6e7e6b..538fc8ea18e3 100644..100755 --- a/vcl/win/inc/salprn.h +++ b/vcl/inc/win/salprn.h @@ -28,8 +28,7 @@ #ifndef _SV_SALPRN_H #define _SV_SALPRN_H -#include <vcl/sv.h> -#include <vcl/salprn.hxx> +#include <salprn.hxx> // ----------------- // - SalDriverData - diff --git a/vcl/win/inc/salsys.h b/vcl/inc/win/salsys.h index 51a8c0443b58..af0019c47615 100644..100755 --- a/vcl/win/inc/salsys.h +++ b/vcl/inc/win/salsys.h @@ -28,7 +28,7 @@ #ifndef _SV_SALSYS_H #define _SV_SALSYS_H -#include <vcl/salsys.hxx> +#include <salsys.hxx> #include <vector> #include <map> diff --git a/vcl/win/inc/saltimer.h b/vcl/inc/win/saltimer.h index 38f861fad441..f04c9bf3104a 100644..100755 --- a/vcl/win/inc/saltimer.h +++ b/vcl/inc/win/saltimer.h @@ -28,7 +28,7 @@ #ifndef _SV_SALTIMER_H #define _SV_SALTIMER_H -#include <vcl/saltimer.hxx> +#include <saltimer.hxx> class WinSalTimer : public SalTimer { diff --git a/vcl/win/inc/salvd.h b/vcl/inc/win/salvd.h index 24aa8b99ba01..14632bccf649 100644..100755 --- a/vcl/win/inc/salvd.h +++ b/vcl/inc/win/salvd.h @@ -28,8 +28,7 @@ #ifndef _SV_SALVD_H #define _SV_SALVD_H -#include <vcl/sv.h> -#include <vcl/salvd.hxx> +#include <salvd.hxx> class WinSalGraphics; diff --git a/vcl/win/inc/svsys.h b/vcl/inc/win/svsys.h index 7b0e87304d59..7b0e87304d59 100644 --- a/vcl/win/inc/svsys.h +++ b/vcl/inc/win/svsys.h diff --git a/vcl/win/inc/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 141ea4106238..2eabc23c8f48 100644..100755 --- a/vcl/win/inc/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -31,7 +31,6 @@ #ifndef _STRING_H #include <string.h> #endif -#include <vcl/sv.h> // ---------- // - Strict - diff --git a/vcl/inc/vcl/window.h b/vcl/inc/window.h index 4011584890cf..4011584890cf 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/window.h diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/xconnection.hxx index d43e02941cb3..d43e02941cb3 100644 --- a/vcl/inc/vcl/xconnection.hxx +++ b/vcl/inc/xconnection.hxx diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst index d8426a092093..352528d87d29 100644 --- a/vcl/prj/build.lst +++ b/vcl/prj/build.lst @@ -1,57 +1,4 @@ vc vcl : L10N: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\source\plugadapt nmake - u vc__plug vc_inc NULL -vc vcl\unx\source\desktopdetect nmake - u vc__desk vc_inc NULL -vc vcl\unx\source\app nmake - u vc__appu vc_inc NULL -vc vcl\unx\source\dtrans nmake - u vc__dtru vc_inc NULL -vc vcl\unx\source\fontmanager nmake - u vc__ftmu vc_inc NULL -vc vcl\unx\source\gdi nmake - u vc__gdiu vc_inc NULL -vc vcl\unx\source\printer nmake - u vc__prnu vc_inc NULL -vc vcl\unx\source\printergfx nmake - u vc__prgu vc_inc NULL -vc vcl\unx\source\window nmake - u vc__winu vc_inc NULL -vc vcl\unx\gtk\a11y nmake - u vc__gtky vc_inc NULL -vc vcl\unx\gtk\app nmake - u vc__gtka vc_inc NULL -vc vcl\unx\gtk\window nmake - u vc__gtkw vc_inc NULL -vc vcl\unx\gtk\gdi nmake - u vc__gtkg vc_inc NULL -vc vcl\unx\headless nmake - u vc__hl vc_inc NULL -vc vcl\unx\kde nmake - u vc__kde vc_inc NULL -vc vcl\unx\kde4 nmake - u vc__kde4 vc_inc NULL -vc vcl\aqua\source\a11y nmake - u vc__aquy vc_inc NULL -vc vcl\aqua\source\app nmake - u vc__appa vc_inc NULL -vc vcl\aqua\source\dtrans nmake - u vc__dtra vc_inc NULL -vc vcl\aqua\source\gdi nmake - u vc__gdia vc_inc NULL -vc vcl\aqua\source\res nmake - u vc__resa NULL -vc vcl\aqua\source\window nmake - u vc__wina vc_inc NULL -vc vcl\mac\source\app nmake - m vc__appm vc_inc NULL -vc vcl\mac\source\gdi nmake - m vc__gdim vc_inc NULL -vc vcl\mac\source\window nmake - m vc__winm vc_inc NULL -vc vcl\mac\source\src nmake - m vc__srcm vc_inc NULL -vc vcl\util nmake - all vc_util vc__plug.u vc__desk.u vc__aquy.u vc__appa.u vc__dtra.u vc__appm.m vc__appu.u vc__dtru.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc__ftmu.u vc__prgu.u vc__prnu.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_fts vc_components NULL -vc vcl\util\linksvp nmake - u vc_lsvp vc_util NULL -vc vcl\workben nmake - all vc_wrkb vc_util vc_salmain NULL - -# memCheck works only within unix -# memCheck is not right yet -# vc vcl\qa\complex\memCheck nmake - u vc_qa_complex vc_util NULL -# GPF -# vc vcl\qa\complex\persistent_window_states nmake - all vc_qa_complex vc_util NULL +vc vcl\prj nmake - all vc_prj NULL diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 5a7dd7d9ef91..8b137891791f 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -1,159 +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%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj -..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o -..\%__SRC%\lib\libvclmain.a %_DEST%\lib%_EXT%\libvclmain.a -..\%__SRC%\lib\vclmain.lib %_DEST%\lib%_EXT%\vclmain.lib - -..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx -..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx -..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx -..\inc\vcl\apptypes.hxx %_DEST%\inc%_EXT%\vcl\apptypes.hxx -..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx -..\inc\vcl\bitmap.hxx %_DEST%\inc%_EXT%\vcl\bitmap.hxx -..\inc\vcl\bitmapex.hxx %_DEST%\inc%_EXT%\vcl\bitmapex.hxx -..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx -..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx -..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx -..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h -..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx -..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h -..\inc\vcl\combobox.hxx %_DEST%\inc%_EXT%\vcl\combobox.hxx -..\inc\vcl\ctrl.hxx %_DEST%\inc%_EXT%\vcl\ctrl.hxx -..\inc\vcl\cursor.hxx %_DEST%\inc%_EXT%\vcl\cursor.hxx -..\inc\vcl\cvtgrf.hxx %_DEST%\inc%_EXT%\vcl\cvtgrf.hxx -..\inc\vcl\cvtsvm.hxx %_DEST%\inc%_EXT%\vcl\cvtsvm.hxx -..\inc\vcl\decoview.hxx %_DEST%\inc%_EXT%\vcl\decoview.hxx -..\inc\vcl\dialog.hxx %_DEST%\inc%_EXT%\vcl\dialog.hxx -..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx -..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx -..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h -..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx -..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx -..\inc\vcl\field.hxx %_DEST%\inc%_EXT%\vcl\field.hxx -..\inc\vcl\fixbrd.hxx %_DEST%\inc%_EXT%\vcl\fixbrd.hxx -..\inc\vcl\fixed.hxx %_DEST%\inc%_EXT%\vcl\fixed.hxx -..\inc\vcl\floatwin.hxx %_DEST%\inc%_EXT%\vcl\floatwin.hxx -..\inc\vcl\fntstyle.hxx %_DEST%\inc%_EXT%\vcl\fntstyle.hxx -..\inc\vcl\font.hxx %_DEST%\inc%_EXT%\vcl\font.hxx -..\inc\vcl\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx -..\inc\vcl\gdimtf.hxx %_DEST%\inc%_EXT%\vcl\gdimtf.hxx -..\inc\vcl\gfxlink.hxx %_DEST%\inc%_EXT%\vcl\gfxlink.hxx -..\inc\vcl\gradient.hxx %_DEST%\inc%_EXT%\vcl\gradient.hxx -..\inc\vcl\graph.h %_DEST%\inc%_EXT%\vcl\graph.h -..\inc\vcl\graph.hxx %_DEST%\inc%_EXT%\vcl\graph.hxx -..\inc\vcl\group.hxx %_DEST%\inc%_EXT%\vcl\group.hxx -..\inc\vcl\hatch.hxx %_DEST%\inc%_EXT%\vcl\hatch.hxx -..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx -..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx -..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx -..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx -..\inc\vcl\throbber.hxx %_DEST%\inc%_EXT%\vcl\throbber.hxx -..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx -..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx -..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx -..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx -..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h -..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx -..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx -..\inc\vcl\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx -..\inc\vcl\longcurr.hxx %_DEST%\inc%_EXT%\vcl\longcurr.hxx -..\inc\vcl\lstbox.h %_DEST%\inc%_EXT%\vcl\lstbox.h -..\inc\vcl\lstbox.hxx %_DEST%\inc%_EXT%\vcl\lstbox.hxx -..\inc\vcl\mapmod.hxx %_DEST%\inc%_EXT%\vcl\mapmod.hxx -..\inc\vcl\menu.hxx %_DEST%\inc%_EXT%\vcl\menu.hxx -..\inc\vcl\menubtn.hxx %_DEST%\inc%_EXT%\vcl\menubtn.hxx -..\inc\vcl\metaact.hxx %_DEST%\inc%_EXT%\vcl\metaact.hxx -..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx -..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx -..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx -..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx -..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx -..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx -..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx -..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx -..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx -..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx -..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx -..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx -..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx -..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx -..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx -..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx -..\inc\vcl\region.hxx %_DEST%\inc%_EXT%\vcl\region.hxx -..\inc\vcl\salbtype.hxx %_DEST%\inc%_EXT%\vcl\salbtype.hxx -..\inc\vcl\salctype.hxx %_DEST%\inc%_EXT%\vcl\salctype.hxx -..\inc\vcl\salgtype.hxx %_DEST%\inc%_EXT%\vcl\salgtype.hxx -..\inc\vcl\salstype.hxx %_DEST%\inc%_EXT%\vcl\salstype.hxx -..\inc\vcl\salnativewidgets.hxx %_DEST%\inc%_EXT%\vcl\salnativewidgets.hxx -..\inc\vcl\scrbar.hxx %_DEST%\inc%_EXT%\vcl\scrbar.hxx -..\inc\vcl\seleng.hxx %_DEST%\inc%_EXT%\vcl\seleng.hxx -..\inc\vcl\settings.hxx %_DEST%\inc%_EXT%\vcl\settings.hxx -..\inc\vcl\slider.hxx %_DEST%\inc%_EXT%\vcl\slider.hxx -..\inc\vcl\sndstyle.hxx %_DEST%\inc%_EXT%\vcl\sndstyle.hxx -..\inc\vcl\sound.hxx %_DEST%\inc%_EXT%\vcl\sound.hxx -..\inc\vcl\spin.h %_DEST%\inc%_EXT%\vcl\spin.h -..\inc\vcl\spin.hxx %_DEST%\inc%_EXT%\vcl\spin.hxx -..\inc\vcl\spinfld.hxx %_DEST%\inc%_EXT%\vcl\spinfld.hxx -..\inc\vcl\split.hxx %_DEST%\inc%_EXT%\vcl\split.hxx -..\inc\vcl\splitwin.hxx %_DEST%\inc%_EXT%\vcl\splitwin.hxx -..\inc\vcl\status.hxx %_DEST%\inc%_EXT%\vcl\status.hxx -..\inc\vcl\stdtext.hxx %_DEST%\inc%_EXT%\vcl\stdtext.hxx -..\inc\vcl\sv.h %_DEST%\inc%_EXT%\vcl\sv.h -..\inc\vcl\svapp.hxx %_DEST%\inc%_EXT%\vcl\svapp.hxx -..\inc\vcl\symbol.hxx %_DEST%\inc%_EXT%\vcl\symbol.hxx -..\inc\vcl\syschild.hxx %_DEST%\inc%_EXT%\vcl\syschild.hxx -..\inc\vcl\sysdata.hxx %_DEST%\inc%_EXT%\vcl\sysdata.hxx -..\inc\vcl\syswin.hxx %_DEST%\inc%_EXT%\vcl\syswin.hxx -..\inc\vcl\tabctrl.hxx %_DEST%\inc%_EXT%\vcl\tabctrl.hxx -..\inc\vcl\tabdlg.hxx %_DEST%\inc%_EXT%\vcl\tabdlg.hxx -..\inc\vcl\tabpage.hxx %_DEST%\inc%_EXT%\vcl\tabpage.hxx -..\inc\vcl\taskpanelist.hxx %_DEST%\inc%_EXT%\vcl\taskpanelist.hxx -..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx -..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx -..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.hxx -..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx -..\inc\vcl\vclenum.hxx %_DEST%\inc%_EXT%\vcl\vclenum.hxx -..\inc\vcl\vclevent.hxx %_DEST%\inc%_EXT%\vcl\vclevent.hxx -..\inc\vcl\virdev.hxx %_DEST%\inc%_EXT%\vcl\virdev.hxx -..\inc\vcl\waitobj.hxx %_DEST%\inc%_EXT%\vcl\waitobj.hxx -..\inc\vcl\wall.hxx %_DEST%\inc%_EXT%\vcl\wall.hxx -..\inc\vcl\window.hxx %_DEST%\inc%_EXT%\vcl\window.hxx -..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx -..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx -..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx -..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx -..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx -..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx -..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx -..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx -..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx -..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx -..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx -..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx -..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx -..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx -..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx -..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx -..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx -..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx -..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx -..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx -..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx -..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx -..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx -..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx -..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx -..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx -..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component diff --git a/vcl/util/makefile.pmk b/vcl/prj/makefile.mk index 884eb499b532..c73a3d944bbf 100644 --- a/vcl/util/makefile.pmk +++ b/vcl/prj/makefile.mk @@ -25,10 +25,16 @@ # #************************************************************************* -.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua" -USE_BUILTIN_RASTERIZER=true -.ENDIF +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk -.IF "$(USE_BUILTIN_RASTERIZER)" != "" -ADDCDEFS += -DUSE_BUILTIN_RASTERIZER +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s .ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 6649f19e0030..94ebbf3ad9d8 100644..100755 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -37,14 +37,10 @@ #include <cmath> #include <limits.h> -#include "vcl/svdata.hxx" -#include "svsys.h" - -#ifdef WNT -#undef min -#endif #include "tools/debug.hxx" -#include "vcl/svdata.hxx" + +#include "vos/mutex.hxx" + #include "vcl/svapp.hxx" #include "vcl/event.hxx" #include "vcl/lstbox.hxx" @@ -57,13 +53,18 @@ #include "vcl/wrkwin.hxx" #include "vcl/sound.hxx" #include "vcl/threadex.hxx" -#include "vcl/dbggui.hxx" -#include "com/sun/star/i18n/XCharacterClassification.hpp" + +#include "svdata.hxx" +#include "dbggui.hxx" #include "vcl/unohelp.hxx" #include "vcl/unohelp2.hxx" -#include "vos/mutex.hxx" -#include "vcl/salinst.hxx" + +#include "salinst.hxx" +#include "svdata.hxx" +#include "svsys.h" + +#include "com/sun/star/i18n/XCharacterClassification.hpp" #include <map> #include <algorithm> @@ -626,10 +627,9 @@ sal_Bool DbgWindow::Close() // remember window position ByteString aState( GetWindowState() ); DbgData* pData = DbgGetData(); - strncpy( pData->aDbgWinState, - aState.GetBuffer(), - std::min( sizeof( pData->aDbgWinState ), - size_t(aState.Len() + 1U )) ); + size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.Len() + 1U )) + ? sizeof( pData->aDbgWinState ) : size_t(aState.Len() + 1U ); + strncpy( pData->aDbgWinState, aState.GetBuffer(), nCopy ); pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0; // and save for next session DbgSaveData( *pData ); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 13fb2d3c0893..ce582916ea62 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -28,16 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vcl/svdata.hxx" +#include "tools/debug.hxx" +#include "tools/diagnose_ex.h" +#include "tools/time.hxx" + #include "vcl/window.hxx" #include "vcl/event.hxx" #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" #include "vcl/help.hxx" -#include "vcl/helpwin.hxx" -#include "tools/debug.hxx" -#include "tools/diagnose_ex.h" -#include "tools/time.hxx" + +#include "helpwin.hxx" +#include "svdata.hxx" // ======================================================================= diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 5b2f302adaa7..b7ae51615c08 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -28,16 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vcl/i18nhelp.hxx" - -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/i18n/TransliterationModules.hpp" #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" + #include "i18npool/mslangid.hxx" #include "rtl/ustrbuf.hxx" +#include "vcl/i18nhelp.hxx" + +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/i18n/TransliterationModules.hpp" + using namespace ::com::sun::star; vcl::I18nHelper::I18nHelper( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, const ::com::sun::star::lang::Locale& rLocale ) diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 42e4cf09fdb0..de1c2b985f4a 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> -#include <vcl/idlemgr.hxx> + #include <vcl/svapp.hxx> +#include <idlemgr.hxx> + // ======================================================================= struct ImplIdleData diff --git a/vcl/source/app/makefile.mk b/vcl/source/app/makefile.mk deleted file mode 100644 index 5d14f0032b4a..000000000000 --- a/vcl/source/app/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=app -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -CDEFS+=-DDLLPOSTFIX=$(DLLPOSTFIX) - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/dbggui.obj \ - $(SLO)$/help.obj \ - $(SLO)$/idlemgr.obj \ - $(SLO)$/settings.obj \ - $(SLO)$/sound.obj \ - $(SLO)$/stdtext.obj \ - $(SLO)$/svapp.obj \ - $(SLO)$/svdata.obj \ - $(SLO)$/svmain.obj \ - $(SLO)$/svmainhook.obj \ - $(SLO)$/timer.obj \ - $(SLO)$/dndhelp.obj \ - $(SLO)$/unohelp.obj \ - $(SLO)$/unohelp2.obj \ - $(SLO)$/vclevent.obj \ - $(SLO)$/i18nhelp.obj \ - $(SLO)$/salvtables.obj \ - $(SLO)$/session.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 8ee732acf981..3bb06c03ebdb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -28,16 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/salframe.hxx> -#include <vcl/salinst.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> -#include <vcl/saltimer.hxx> -#include <vcl/salimestatus.hxx> -#include <vcl/salsys.hxx> -#include <vcl/salbmp.hxx> -#include <vcl/salobj.hxx> -#include <vcl/salmenu.hxx> +#include <salframe.hxx> +#include <salinst.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <saltimer.hxx> +#include <salimestatus.hxx> +#include <salsys.hxx> +#include <salbmp.hxx> +#include <salobj.hxx> +#include <salmenu.hxx> // this file contains the virtual destructors of the sal interface // compilers ususally put their vtables where the destructor is diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index c8d55d109134..780d91c4e41a 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -27,12 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> -#include <vcl/salinst.hxx> -#include <vcl/salsession.hxx> + #include <cppuhelper/compbase1.hxx> + #include <tools/debug.hxx> + +#include <vcl/svapp.hxx> + +#include <svdata.hxx> +#include <salinst.hxx> +#include <salsession.hxx> + #include <com/sun/star/frame/XSessionManagerClient.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XSessionManagerListener2.hpp> diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 480817f26b37..55974b57815c 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -27,24 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include "tools/debug.hxx" + #include "i18npool/mslangid.hxx" + #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" #include "vcl/event.hxx" #include "vcl/settings.hxx" #include "vcl/i18nhelp.hxx" -#include "unotools/fontcfg.hxx" #include "vcl/configsettings.hxx" #include "vcl/gradient.hxx" #include "vcl/unohelp.hxx" #include "vcl/bitmapex.hxx" -#include "vcl/impimagetree.hxx" + +#include "unotools/fontcfg.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/collatorwrapper.hxx" #include "unotools/configmgr.hxx" #include "unotools/confignode.hxx" -#include <unotools/syslocaleoptions.hxx> +#include "unotools/syslocaleoptions.hxx" #ifdef WNT #include "tools/prewin.h" @@ -52,6 +54,9 @@ #include "tools/postwin.h" #endif +#include "svdata.hxx" +#include "impimagetree.hxx" + using namespace rtl; // ======================================================================= diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index d180f2647135..9c9caa81da49 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -27,22 +27,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/urlobj.hxx> +#include <tools/debug.hxx> + #include <unotools/localfilehelper.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> -#include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/salbtype.hxx> #include <vcl/sound.hxx> -#include <vcl/salinst.hxx> + +#include <salframe.hxx> +#include <svdata.hxx> +#include <salinst.hxx> void Sound::Beep( SoundType eType, Window* pWindow ) { diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 7411baaf470e..bbe09eb1b411 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -28,13 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> +#include <svids.hrc> +#include <svdata.hxx> // ======================================================================= diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index c61ddc0af6ae..da70672b7b2d 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -28,52 +28,58 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/salinst.hxx" -#include "vcl/salframe.hxx" -#include "vcl/salsys.hxx" +//#include "svsys.h" + +#include "comphelper/processfactory.hxx" + +#include "osl/module.h" +#include "osl/file.hxx" +#include "osl/thread.h" + +#include "rtl/tencinfo.h" +#include "rtl/instance.hxx" + #include "vos/process.hxx" #include "vos/mutex.hxx" + #include "tools/tools.h" #include "tools/debug.hxx" #include "tools/time.hxx" + #include "i18npool/mslangid.hxx" -#include "vcl/svdata.hxx" + +#include "unotools/syslocaleoptions.hxx" + #include "vcl/settings.hxx" -#include "vcl/accmgr.hxx" #include "vcl/keycod.hxx" #include "vcl/event.hxx" #include "vcl/vclevent.hxx" #include "vcl/virdev.hxx" -#include "vcl/window.h" #include "vcl/wrkwin.hxx" -#include "vcl/idlemgr.hxx" #include "vcl/svapp.hxx" #include "vcl/cvtgrf.hxx" #include "vcl/unowrap.hxx" -#include "vcl/xconnection.hxx" -#include "vcl/svids.hrc" #include "vcl/timer.hxx" - #include "vcl/unohelp.hxx" +#include "vcl/lazydelete.hxx" + +#include "salinst.hxx" +#include "salframe.hxx" +#include "salsys.hxx" +#include "svdata.hxx" +#include "salimestatus.hxx" +#include "xconnection.hxx" +#include "window.h" +#include "accmgr.hxx" +#include "idlemgr.hxx" +#include "svids.hrc" #include "com/sun/star/uno/Reference.h" #include "com/sun/star/awt/XToolkit.hpp" #include "com/sun/star/uno/XNamingService.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "comphelper/processfactory.hxx" - -#include "osl/module.h" -#include "osl/file.hxx" - -#include "osl/thread.h" -#include "rtl/tencinfo.h" -#include "rtl/instance.hxx" -#include "vcl/salimestatus.hxx" #include <utility> -#include <vcl/lazydelete.hxx> -#include <unotools/syslocaleoptions.hxx> using namespace ::com::sun::star::uno; diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b749fa78ea59..51bbbef353a8 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -31,36 +31,36 @@ #include <string.h> #include "rtl/instance.hxx" + #include "osl/process.h" #include "osl/file.hxx" -#include "svsys.h" - #include "tools/debug.hxx" #include "tools/resary.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salframe.hxx" +#include "unotools/fontcfg.hxx" + +#include "vos/mutex.hxx" + +#include "cppuhelper/implbase1.hxx" + +#include "uno/current_context.hxx" + #include "vcl/configsettings.hxx" -#include "vcl/svdata.hxx" -#include "vcl/window.h" #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" #include "vcl/msgbox.hxx" #include "vcl/unohelp.hxx" #include "vcl/button.hxx" // for Button::GetStandardText #include "vcl/dockwin.hxx" // for DockingManager -#include "vcl/salimestatus.hxx" -#include "vcl/salsys.hxx" -#include "vcl/svids.hrc" -#include "vcl/xconnection.hxx" - -#include "unotools/fontcfg.hxx" -#include "vos/mutex.hxx" - -#include "cppuhelper/implbase1.hxx" -#include "uno/current_context.hxx" +#include "salinst.hxx" +#include "salframe.hxx" +#include "svdata.hxx" +#include "window.h" +#include "salimestatus.hxx" +#include "salsys.hxx" +#include "svids.hrc" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XComponent.hpp" diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index c075e1b108f3..d819b52f7944 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -28,6 +28,32 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "rtl/logfile.hxx" + +#include "osl/file.hxx" + +#include "vos/signal.hxx" +#include "vos/process.hxx" + +#include "tools/tools.h" +#include "tools/debug.hxx" +#include "tools/unqid.hxx" +#include "tools/resmgr.hxx" + +#include "comphelper/processfactory.hxx" + +#include "unotools/syslocaleoptions.hxx" +#include "unotools/fontcfg.hxx" + +#include "vcl/svapp.hxx" +#include "vcl/wrkwin.hxx" +#include "vcl/cvtgrf.hxx" +#include "vcl/image.hxx" +#include "vcl/settings.hxx" +#include "vcl/unowrap.hxx" +#include "vcl/configsettings.hxx" +#include "vcl/lazydelete.hxx" + #ifdef WNT #include <tools/prewin.h> #include <process.h> // for _beginthreadex @@ -40,46 +66,28 @@ // building X11 graphics layers. #if defined UNX && ! defined QUARTZ -#include "svunx.h" +//#include "svunx.h" #endif -#include "svsys.h" -#include "vcl/salinst.hxx" -#include "vcl/salwtype.hxx" -#include "vos/signal.hxx" -#include "tools/tools.h" -#include "tools/debug.hxx" -#include "tools/unqid.hxx" -#include "vcl/svdata.hxx" -#include "vcl/dbggui.hxx" -#include "vcl/svapp.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/image.hxx" -#include "tools/resmgr.hxx" -#include "vcl/accmgr.hxx" -#include "vcl/idlemgr.hxx" -#include "vcl/outdev.h" -#include "vcl/outfont.hxx" -#include "vcl/print.h" -#include "vcl/settings.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/salsys.hxx" -#include "vcl/saltimer.hxx" -#include "vcl/salimestatus.hxx" -#include "vcl/impimagetree.hxx" -#include "vcl/xconnection.hxx" +//#include "svsys.h" + +#include "salinst.hxx" +#include "salwtype.hxx" +#include "svdata.hxx" +#include "dbggui.hxx" +#include "accmgr.hxx" +#include "idlemgr.hxx" +#include "outdev.h" +#include "outfont.hxx" +#include "print.h" +#include "salsys.hxx" +#include "saltimer.hxx" +#include "salimestatus.hxx" +#include "impimagetree.hxx" +#include "xconnection.hxx" -#include "vos/process.hxx" -#include "osl/file.hxx" -#include "comphelper/processfactory.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XComponent.hpp" -#include "rtl/logfile.hxx" -#include <unotools/syslocaleoptions.hxx> -#include "unotools/fontcfg.hxx" -#include "vcl/configsettings.hxx" -#include "vcl/lazydelete.hxx" #include "cppuhelper/implbase1.hxx" #include "uno/current_context.hxx" @@ -370,7 +378,9 @@ void DeInitVCL() aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) ); aBuf.append( "\" type = \"" ); aBuf.append( typeid(*pWin).name() ); - aBuf.append( "\"\n" ); + aBuf.append( "\", ptr = 0x" ); + aBuf.append( sal_Int64( pWin ), 16 ); + aBuf.append( "\n" ); } } DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() ); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index f31779f759c6..ec421651637e 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -28,17 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/saltimer.hxx> #include <tools/time.hxx> -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> -#include <vcl/salinst.hxx> #include <tools/debug.hxx> + +#include <vcl/svapp.hxx> #include <vcl/timer.hxx> +#include <saltimer.hxx> +#include <svdata.hxx> +#include <salinst.hxx> // ======================================================================= diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 711f9fb06ae1..c67abda51f60 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -28,35 +28,29 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <tools/tempfile.hxx> +#include <osl/file.hxx> +#include <cppuhelper/servicefactory.hxx> + +#include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> + +#include <svdata.hxx> + #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif #include <com/sun/star/i18n/XCharacterClassification.hpp> - -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif #include <com/sun/star/awt/XExtendedToolkit.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> - - #include <com/sun/star/registry/XImplementationRegistration.hpp> -#include <cppuhelper/servicefactory.hxx> - -#include <tools/tempfile.hxx> -#include <osl/file.hxx> - -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::rtl; diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 1ae5f7537ca6..33f22a3a50d5 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -29,7 +29,8 @@ #include "precompiled_vcl.hxx" #include "vcl/vclevent.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 9c88deccec23..f988c58f953e 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -28,6 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "vos/mutex.hxx" + +#include "osl/mutex.hxx" + +#include "vcl/svapp.hxx" + +#include "svdata.hxx" +#include "salinst.hxx" + #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/lang/XSingleServiceFactory.hpp" #include "com/sun/star/lang/XInitialization.hpp" @@ -41,12 +50,6 @@ #include "com/sun/star/datatransfer/dnd/XDropTarget.hpp" #include "com/sun/star/datatransfer/dnd/DNDConstants.hpp" -#include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" -#include "vos/mutex.hxx" -#include "osl/mutex.hxx" - #include "cppuhelper/compbase1.hxx" #include "cppuhelper/compbase2.hxx" #include "cppuhelper/compbase3.hxx" diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 7cfdecbfdb00..48fb3aac653a 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -45,9 +45,7 @@ using ::rtl::OUStringBuffer; using namespace com::sun::star::uno; using namespace com::sun::star::lang; - // service implementation - extern Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames(); extern OUString SAL_CALL vcl_session_getImplementationName(); extern Reference< XInterface > SAL_CALL vcl_session_createInstance( const Reference< XMultiServiceFactory > & ); @@ -77,6 +75,13 @@ extern Reference< XInterface > SAL_CALL DragSource_createInstance( const Referen extern Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames(); extern OUString SAL_CALL DropTarget_getImplementationName(); extern Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory > & ); + +namespace rsvg +{ + extern Sequence< OUString > SAL_CALL Rasterizer_getSupportedServiceNames(); + extern OUString SAL_CALL Rasterizer_getImplementationName(); + extern Reference< XInterface > SAL_CALL Rasterizer_createInstance( const Reference< XMultiServiceFactory > & ); +} } extern "C" { @@ -142,6 +147,12 @@ extern "C" { xMgr, vcl::DropTarget_getImplementationName(), vcl::DropTarget_createInstance, vcl::DropTarget_getSupportedServiceNames() ); } + else if( vcl::rsvg::Rasterizer_getImplementationName().equalsAscii( pImplementationName ) ) + { + xFactory = ::cppu::createSingleFactory( + xMgr, vcl::rsvg::Rasterizer_getImplementationName(), vcl::rsvg::Rasterizer_createInstance, + vcl::rsvg::Rasterizer_getSupportedServiceNames() ); + } if( xFactory.is() ) { xFactory->acquire(); diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index ad309e4f2560..2cbea1628f4e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -28,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <tools/debug.hxx> + +#include "vcl/svapp.hxx" +#include "vcl/font.hxx" + +#include "svdata.hxx" + #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -38,15 +45,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/font.hxx" - #include <cppuhelper/implbase3.hxx> -#include <tools/debug.hxx> - - using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/source/components/makefile.mk b/vcl/source/components/makefile.mk index 982687104c01..41f21bfa3749 100644 --- a/vcl/source/components/makefile.mk +++ b/vcl/source/components/makefile.mk @@ -33,20 +33,23 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk +.INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile2.pmk # --- Files -------------------------------------------------------- -SLOFILES= $(SLO)$/display.obj \ - $(SLO)$/dtranscomp.obj \ - $(SLO)$/fontident.obj \ - $(SLO)$/stringmirror.obj \ +SLOFILES= $(SLO)$/display.obj \ + $(SLO)$/dtranscomp.obj \ + $(SLO)$/fontident.obj \ + $(SLO)$/stringmirror.obj \ + $(SLO)$/rasterizer_rsvg.obj \ $(SLO)$/factory.obj -# --- Targets ------------------------------------------------------ +EXCEPTIONSFILES= $(SLO)$/rasterizer_rsvg.obj + -.INCLUDE : target.mk -.INCLUDE : $(PRJ)$/util$/target.pmk +# --- Targets ------------------------------------------------------ +.INCLUDE : target.mk +.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx new file mode 100644 index 000000000000..5547b179d227 --- /dev/null +++ b/vcl/source/components/rasterizer_rsvg.cxx @@ -0,0 +1,640 @@ +/************************************************************************* + * + * 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 <vcl/graph.hxx> +#include <vcl/bmpacc.hxx> +#include <vcl/alpha.hxx> +#include <com/sun/star/graphic/XGraphicRasterizer.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <cppuhelper/implbase2.hxx> +#include <osl/module.h> + +#include <vector> + +#if defined MACOSX + #define VCL_RSVG_GOBJECT_LIBNAME "libgobject-2.0.0.dylib" + #define VCL_RSVG_CAIRO_LIBNAME "libcairo.2.dylib" + #define VCL_RSVG_LIBRSVG_LIBNAME "librsvg-2.2.dylib" +#elif defined UNX + #define VCL_RSVG_GOBJECT_LIBNAME "libgobject-2.0.so" + #define VCL_RSVG_CAIRO_LIBNAME "libcairo.so" + #define VCL_RSVG_LIBRSVG_LIBNAME "librsvg-2.so" +#elif defined WNT + #define VCL_RSVG_GOBJECT_LIBNAME "libgobject-2.0-0.dll" + #define VCL_RSVG_CAIRO_LIBNAME "cairo.dll" + #define VCL_RSVG_LIBRSVG_LIBNAME "librsvg-2-2.dll" +#else + #define VCL_RSVG_GOBJECT_LIBNAME "nogobjectlib" + #define VCL_RSVG_CAIRO_LIBNAME "nocairolib" + #define VCL_RSVG_LIBRSVG_LIBNAME "nolibrsvglib" +#endif + +#define VCL_RSVG_DEFAULT_DPI 72 + +using namespace ::com::sun::star; + +// ----------------------------------------------------- +// - external stuff for dynamic library function calls - +// ----------------------------------------------------- + +typedef int gboolean; +typedef unsigned char guint8; +typedef sal_Size gsize; +typedef void* gpointer; + +struct GError; + +enum cairo_format_t { CAIRO_FORMAT_ARGB32 = 0 }; +enum cairo_status_t { CAIRO_STATUS_SUCCESS = 0 }; + +struct cairo_surface_t; +struct cairo_t; +struct cairo_matrix_t +{ + double xx; double yx; + double xy; double yy; + double x0; double y0; +}; + +struct RsvgHandle; +struct RsvgDimensionData +{ + int width; + int height; + double em; + double ex; +}; + +namespace vcl +{ +namespace rsvg +{ +// ----------------- +// - Uno functions - +// ---------------- + +uno::Sequence< ::rtl::OUString > Rasterizer_getSupportedServiceNames() +{ + static ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRasterizer_RSVG" ) ); + static uno::Sequence< ::rtl::OUString > aServiceNames( &aServiceName, 1 ); + + return( aServiceNames ); +} + +// ----------------------------------------------------------------------------- + +::rtl::OUString Rasterizer_getImplementationName() +{ + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::rsvg::Rasterizer" ) ); +} + +// ------------------ +// - LibraryWrapper - +// ------------------ + +class LibraryWrapper +{ +public: + + static LibraryWrapper& get(); + + bool isValid() const { return( ( mpGObjectLib != NULL ) && ( mpCairoLib != NULL ) && ( mpRSVGLib != NULL ) ); } + + // G-Object + gpointer g_object_unref( gpointer pointer ) { return( (*mp_g_object_unref)( pointer ) ); }; + + // LibRSVG + + // Cairo + cairo_surface_t* image_surface_create( cairo_format_t format, int width, int height ) { return( (*mp_image_surface_create)( format, width, height ) ); } + void surface_destroy( cairo_surface_t* surface ) { (*mp_surface_destroy)( surface ); } + cairo_status_t surface_status( cairo_surface_t* surface ) { return( (*mp_surface_status)( surface ) ); } + cairo_t* create( cairo_surface_t* surface ) { return( (*mp_create)( surface ) ); } + void destroy( cairo_t* cairo ) { (*mp_destroy )( cairo ); } + void matrix_init_identity( cairo_matrix_t* matrix ){ (*mp_matrix_init_identity)( matrix ); } + void matrix_translate( cairo_matrix_t* matrix, double nx, double ny ) { (*mp_matrix_translate)( matrix, nx, ny ); } + void matrix_scale( cairo_matrix_t* matrix, double sx, double sy ) {( *mp_matrix_scale )( matrix, sx, sy ); } + void matrix_rotate( cairo_matrix_t* matrix, double radians ) { ( *mp_matrix_rotate )( matrix, radians ); } + void transform( cairo_t* cairo, cairo_matrix_t *matrix ) { (*mp_transform)( cairo, matrix ); } + unsigned char* image_surface_get_data(cairo_surface_t* surface) { return( (*mp_image_surface_get_data)( surface ) ); } + int image_surface_get_width(cairo_surface_t* surface) { return( (*mp_image_surface_get_width)( surface ) ); } + int image_surface_get_height(cairo_surface_t* surface) { return( (*mp_image_surface_get_height)( surface ) ); } + int image_surface_get_stride(cairo_surface_t* surface) { return( (*mp_image_surface_get_stride)( surface ) ); } + + // LibRSVG + void rsvg_init() { (*mp_rsvg_init)(); } + RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) ); } + gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return( (*mp_rsvg_handle_close)( handle, error ) ); } + void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy ) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); } + void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); } + gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); } + +private: + + LibraryWrapper(); + +private: + + oslModule mpGObjectLib; + oslModule mpCairoLib; + oslModule mpRSVGLib; + + // GObject + gpointer (*mp_g_object_unref)( gpointer ); + + // Cairo + cairo_surface_t* (*mp_image_surface_create)(cairo_format_t,int,int); + void (*mp_surface_destroy )(cairo_surface_t*); + cairo_status_t (*mp_surface_status)(cairo_surface_t*); + cairo_t* (*mp_create)(cairo_surface_t*); + void (*mp_destroy)(cairo_t*); + void (*mp_matrix_init_identity)(cairo_matrix_t*); + void (*mp_matrix_translate)( cairo_matrix_t*, double, double); + void (*mp_matrix_scale )( cairo_matrix_t*, double, double); + void (*mp_matrix_rotate)( cairo_matrix_t*, double); + void (*mp_transform)( cairo_t*, cairo_matrix_t*); + unsigned char* (*mp_image_surface_get_data)( cairo_surface_t* ); + int (*mp_image_surface_get_width)(cairo_surface_t* surface); + int (*mp_image_surface_get_height)(cairo_surface_t* surface); + int (*mp_image_surface_get_stride)(cairo_surface_t* surface); + + // LibRSVG + void (*mp_rsvg_init)( void ); + RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, GError** ); + gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** ); + void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double ); + void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* ); + gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* ); +}; + +// ----------------------------------------------------------------------------- + +LibraryWrapper& LibraryWrapper::get() +{ + static LibraryWrapper* pLibraryInstance = NULL; + + if( !pLibraryInstance ) + pLibraryInstance = new LibraryWrapper; + + return( *pLibraryInstance ); +} + +// ----------------------------------------------------------------------------- + +LibraryWrapper::LibraryWrapper() : + mpGObjectLib( NULL ), + mpCairoLib( NULL ), + mpRSVGLib( NULL ) +{ + const ::rtl::OUString aGObjectLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_GOBJECT_LIBNAME ) ); + const ::rtl::OUString aCairoLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_CAIRO_LIBNAME ) ); + const ::rtl::OUString aRSVGLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_LIBRSVG_LIBNAME ) ); + bool bCont = true; + + // GObject + if( bCont && ( NULL != ( mpGObjectLib = osl_loadModule( aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) ) || + NULL != ( mpGObjectLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get, + aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) ) + + ) ) + { + mp_g_object_unref = ( gpointer (*)( gpointer ) ) osl_getAsciiFunctionSymbol( mpGObjectLib, "g_object_unref" ); + + if( !( mp_g_object_unref ) ) + { + OSL_TRACE( "not all needed symbols were found in g-object library" ); + bCont = false; + } + } + + // Cairo + if( bCont && ( NULL != ( mpCairoLib = osl_loadModule( aCairoLibName.pData, SAL_LOADMODULE_DEFAULT ) ) || + NULL != ( mpCairoLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get, + aCairoLibName.pData, SAL_LOADMODULE_DEFAULT ) ) + ) ) + { + mp_image_surface_create = ( cairo_surface_t* (*)( cairo_format_t, int, int ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_create" ); + mp_surface_destroy = ( void (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" ); + mp_surface_status = ( cairo_status_t (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_status" ); + mp_create = ( cairo_t* (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" ); + mp_destroy = ( void (*)( cairo_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" ); + mp_matrix_init_identity = ( void (*)( cairo_matrix_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_init_identity" ); + mp_matrix_translate = ( void (*)( cairo_matrix_t*, double, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_translate" ); + mp_matrix_scale = ( void (*)( cairo_matrix_t*, double, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_scale" ); + mp_matrix_rotate = ( void (*)( cairo_matrix_t*, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_rotate" ); + mp_transform = ( void (*)( cairo_t*, cairo_matrix_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_transform" ); + mp_image_surface_get_data = ( unsigned char* (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_data" ); + mp_image_surface_get_width = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_width" ); + mp_image_surface_get_height = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_height" ); + mp_image_surface_get_stride = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_stride" ); + + if( !( mp_image_surface_create && + mp_surface_destroy && + mp_surface_status && + mp_create && + mp_destroy && + mp_matrix_init_identity && + mp_matrix_translate && + mp_matrix_scale && + mp_matrix_rotate && + mp_transform && + mp_image_surface_get_data && + mp_image_surface_get_width && + mp_image_surface_get_height && + mp_image_surface_get_stride ) ) + { + OSL_TRACE( "not all needed symbols were found in cairo library" ); + bCont = false; + } + } + + // LibRSVG + if( bCont && ( NULL != ( mpRSVGLib = osl_loadModule( aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) ) || + NULL != ( mpRSVGLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get, + aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) ) + ) ) + { + mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_init" ); + mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_new_from_data" ); + mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_close" ); + mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" ); + mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_get_dimensions" ); + mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" ); + + if( !( mp_rsvg_init && + mp_rsvg_handle_new_from_data && + mp_rsvg_handle_close && + mp_rsvg_handle_set_dpi_x_y && + mp_rsvg_handle_get_dimensions && + mp_rsvg_handle_render_cairo ) ) + { + OSL_TRACE( "not all needed symbols were found in librsvg library" ); + bCont = false; + } + } + + OSL_ENSURE( mpGObjectLib, "g-object library could not be loaded" ); + OSL_ENSURE( mpCairoLib, "cairo library could not be loaded" ); + OSL_ENSURE( mpRSVGLib, "librsvg library could not be loaded" ); + + bCont = bCont && mpGObjectLib != NULL && mpCairoLib != NULL && mpRSVGLib != NULL; + + // unload all libraries in case of failure + if( !bCont ) + { + if( mpRSVGLib ) + { + osl_unloadModule( mpRSVGLib ); + mpRSVGLib = NULL; + } + + if( mpCairoLib ) + { + osl_unloadModule( mpCairoLib ); + mpCairoLib = NULL; + } + + if( mpGObjectLib ) + { + osl_unloadModule( mpGObjectLib ); + mpGObjectLib = NULL; + } + } + else + rsvg_init(); +} + +// --------------------------- +// - ::vcl::rsvg::Rasterizer - +// --------------------------- + +class Rasterizer : public ::cppu::WeakAggImplHelper2< graphic::XGraphicRasterizer, lang::XServiceInfo > +{ +public: + Rasterizer(); + virtual ~Rasterizer(); + + // XGraphicRasterizer + virtual ::sal_Bool SAL_CALL initializeData( const uno::Reference< io::XInputStream >& DataStream, + ::sal_uInt32 DPI_X, ::sal_uInt32 DPI_Y, + awt::Size& DefaultSizePixel ) + throw ( uno::RuntimeException ); + + virtual uno::Reference< graphic::XGraphic > SAL_CALL rasterize( ::sal_uInt32 Width, + ::sal_uInt32 Height, + double RotateAngle, + double ShearAngle_X, + double ShearAngle_Y, + const uno::Sequence< beans::PropertyValue >& RasterizeProperties ) + throw (uno::RuntimeException); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName() + throw( uno::RuntimeException); + + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ) + throw( uno::RuntimeException ); + + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + throw( uno::RuntimeException ); + +protected: + + void implFreeRsvgHandle(); + + uno::Reference< graphic::XGraphic > implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const; + +private: + + Rasterizer( const Rasterizer& ); + Rasterizer& operator=( const Rasterizer& ); + +private: + + RsvgHandle* mpRsvgHandle; + sal_Int32 mnDefaultWidth; + sal_Int32 mnDefaultHeight; + bool mbLibInit; +}; + +// ----------------------------------------------------------------------------- + +Rasterizer::Rasterizer() : + mpRsvgHandle( NULL ), + mnDefaultWidth( 0 ), + mnDefaultHeight( 0 ), + mbLibInit( true ) +{ + try + { + LibraryWrapper& rLib = LibraryWrapper::get(); + mbLibInit = rLib.isValid(); + } + catch( ... ) + { + mbLibInit = false; + } +} + +// ----------------------------------------------------------------------------- + +Rasterizer::~Rasterizer() +{ + implFreeRsvgHandle(); +} + +// ----------------------------------------------------------------------------- + +void Rasterizer::implFreeRsvgHandle() +{ + if( mpRsvgHandle ) + { + LibraryWrapper::get().g_object_unref( static_cast< gpointer >( mpRsvgHandle ) ); + mpRsvgHandle = NULL; + } +} + +// ----------------------------------------------------------------------------- + +uno::Reference< graphic::XGraphic > Rasterizer::implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const +{ + LibraryWrapper& rLib = LibraryWrapper::get(); + unsigned char* pData = rLib.image_surface_get_data( pSurface ); + const sal_Int32 nWidth = rLib.image_surface_get_width( pSurface ); + const sal_Int32 nHeight =rLib.image_surface_get_height( pSurface ); + const sal_Int32 nStride = rLib.image_surface_get_stride( pSurface ); + + uno::Reference< graphic::XGraphic > xRet; + + if( pData && nWidth && nHeight && nStride ) + { + Size aSize( nWidth, nHeight ); + Bitmap aBmp( aSize, 24 ); + AlphaMask aAlphaMask( aSize ); + BitmapWriteAccess* pBmpAcc = aBmp.AcquireWriteAccess(); + BitmapWriteAccess* pAlpAcc = aAlphaMask.AcquireWriteAccess(); + + if( pBmpAcc && pAlpAcc ) + { + BitmapColor aPixel, aWhitePixel( 255, 255, 255 ), aAlpha( 0 ), aFullAlpha( 255 ); + sal_uInt32* pRow = reinterpret_cast< sal_uInt32* >( pData ); + + for( sal_Int32 nY = 0; nY < nHeight; ++nY, pRow = reinterpret_cast< sal_uInt32* >( pData += nStride ) ) + { + for( sal_Int32 nX = 0; nX < nWidth; ++nX ) + { + const register sal_uInt32 nPixel = *pRow++; + const register sal_uInt32 nAlpha = nPixel >> 24; + + if( !nAlpha ) + { + pBmpAcc->SetPixel( nY, nX, aWhitePixel ); + pAlpAcc->SetPixel( nY, nX, aFullAlpha ); + } + else + { + aPixel.SetRed( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x00ff0000 ) >> 16 ) * 255 ) / nAlpha ) ); + aPixel.SetGreen( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x0000ff00 ) >> 8 ) * 255 ) / nAlpha ) ); + aPixel.SetBlue( static_cast< sal_uInt8 >( ( ( nPixel & 0x000000ff ) * 255 ) / nAlpha ) ); + pBmpAcc->SetPixel( nY, nX, aPixel ); + + aAlpha.SetIndex( static_cast< sal_uInt8 >( 255 - nAlpha ) ); + pAlpAcc->SetPixel( nY, nX, aAlpha ); + } + } + } + + aBmp.ReleaseAccess( pBmpAcc ); + aAlphaMask.ReleaseAccess( pAlpAcc ); + + const Graphic aGraphic( BitmapEx( aBmp, aAlphaMask ) ); + xRet.set( aGraphic.GetXGraphic(), uno::UNO_QUERY ); + } + else + { + aBmp.ReleaseAccess( pBmpAcc ); + aAlphaMask.ReleaseAccess( pAlpAcc ); + } + } + + return( xRet ); +} + +// ----------------------------------------------------------------------------- + +::sal_Bool SAL_CALL Rasterizer::initializeData( const uno::Reference< io::XInputStream >& rDataStream, + ::sal_uInt32 nDPI_X, ::sal_uInt32 nDPI_Y, + awt::Size& rDefaultSizePixel ) + throw ( uno::RuntimeException ) +{ + LibraryWrapper& rLib = LibraryWrapper::get(); + + implFreeRsvgHandle(); + + if( mbLibInit && rDataStream.is() ) + { + ::std::vector< sal_Int8 > aDataBuffer; + uno::Reference< io::XSeekable > xSeekable( rDataStream, uno::UNO_QUERY ); + sal_Int32 nReadSize, nBlockSize = ( xSeekable.is() ? xSeekable->getLength() : 65536 ); + uno::Sequence< sal_Int8 > aStmBuffer( nBlockSize ); + + do + { + nReadSize = rDataStream->readBytes( aStmBuffer, nBlockSize ); + + if( nReadSize > 0 ) + { + const sal_Int8* pArray = aStmBuffer.getArray(); + aDataBuffer.insert( aDataBuffer.end(), pArray, pArray + nReadSize ); + } + } + while( nReadSize == nBlockSize ); + + if( aDataBuffer.size() && + ( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ), + aDataBuffer.size(), NULL ) ) ) && + !rLib.rsvg_handle_close( mpRsvgHandle, NULL ) ) + { + implFreeRsvgHandle(); + } + } + + // get default dimensions of image + mnDefaultWidth = mnDefaultHeight = 0; + + if( mpRsvgHandle ) + { + RsvgDimensionData aDefaultDimension = { 0, 0, 0.0, 0.0 }; + + rLib.rsvg_handle_set_dpi_x_y( mpRsvgHandle, nDPI_X ? nDPI_X: 72, nDPI_Y ? nDPI_Y : 72 ); + rLib.rsvg_handle_get_dimensions( mpRsvgHandle, &aDefaultDimension ); + + mnDefaultWidth = aDefaultDimension.width; + mnDefaultHeight = aDefaultDimension.height; + } + + rDefaultSizePixel.Width = mnDefaultWidth; + rDefaultSizePixel.Height = mnDefaultHeight; + + return( mpRsvgHandle != NULL ); +} + +// ----------------------------------------------------------------------------- + +uno::Reference< graphic::XGraphic > SAL_CALL Rasterizer::rasterize( ::sal_uInt32 nWidth, + ::sal_uInt32 nHeight, + double /*fRotateAngle*/, + double /*fShearAngle_X*/, + double /*ShearAngle_Y*/, + const uno::Sequence< beans::PropertyValue >& + /*rRasterizeProperties*/ ) + throw ( uno::RuntimeException ) +{ + LibraryWrapper& rLib = LibraryWrapper::get(); + uno::Reference< graphic::XGraphic > xRet; + + if( mpRsvgHandle && rLib.isValid() && nWidth && nHeight && mnDefaultWidth && mnDefaultHeight ) + { + cairo_surface_t* pSurface = rLib.image_surface_create( CAIRO_FORMAT_ARGB32, nWidth, nHeight ); + + if( pSurface && ( CAIRO_STATUS_SUCCESS == rLib.surface_status( pSurface ) ) ) + { + cairo_t* pCr = rLib.create( pSurface ); + + if( pCr ) + { + cairo_matrix_t aMatrix; + + rLib.matrix_init_identity( &aMatrix ); + rLib.matrix_scale( &aMatrix, + static_cast< double >( nWidth ) / mnDefaultWidth, + static_cast< double >( nHeight ) / mnDefaultHeight ); + rLib.transform( pCr, &aMatrix ); + + if( rLib.rsvg_handle_render_cairo( mpRsvgHandle, pCr ) ) + { + xRet = implGetXGraphicFromSurface( pSurface ); + } + + rLib.destroy( pCr ); + } + + rLib.surface_destroy( pSurface ); + OSL_ENSURE( xRet.is(), "SVG *not* rendered successfully" ); + } + } + + return( xRet ); +} + +// ----------------------------------------------------------------------------- + +::rtl::OUString SAL_CALL Rasterizer::getImplementationName() + throw( uno::RuntimeException ) +{ + return( Rasterizer_getImplementationName() ); +} + +// ----------------------------------------------------------------------------- + +sal_Bool SAL_CALL Rasterizer::supportsService( const ::rtl::OUString& rServiceName ) + throw( uno::RuntimeException ) +{ + const uno::Sequence< ::rtl::OUString > aServices( Rasterizer_getSupportedServiceNames() ); + + for( sal_Int32 nService = 0; nService < aServices.getLength(); ++nService ) + { + if( rServiceName == aServices[ nService ] ) + return sal_True; + } + + return sal_False; +} + +// ----------------------------------------------------------------------------- + +uno::Sequence< ::rtl::OUString > SAL_CALL Rasterizer::getSupportedServiceNames() + throw( uno::RuntimeException ) +{ + return( Rasterizer_getSupportedServiceNames() ); +} + +// ------------------------------ +// - Uno instantiation function - +// ------------------------------ + +uno::Reference< uno::XInterface > SAL_CALL Rasterizer_createInstance( const uno::Reference< lang::XMultiServiceFactory >& ) +{ + return static_cast< ::cppu::OWeakObject* >( new rsvg::Rasterizer ); +} + +} // namespace rsvg +} // namespace vcl diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5ffe94212d20..1a6439a0502e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -29,14 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> +#include <tools/poly.hxx> +#include <tools/rc.h> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_IAMGE_HXX #include <vcl/image.hxx> -#endif #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/decoview.hxx> @@ -44,20 +40,14 @@ #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#include <tools/poly.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> -#include <vcl/controldata.hxx> -#ifndef _SV_NATIVEWIDGET_HXX #include <vcl/salnativewidgets.hxx> -#endif #include <vcl/edit.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - - +#include <svids.hrc> +#include <svdata.hxx> +#include <window.h> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 2fd0ade0f65d..2d6cb76b0512 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -27,23 +27,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/table.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/decoview.hxx> -#include <vcl/ilstbox.hxx> #include <vcl/lstbox.h> #include <vcl/button.hxx> -#include <vcl/subedit.hxx> #include <vcl/event.hxx> #include <vcl/combobox.hxx> -#include <vcl/controldata.hxx> - +#include <svdata.hxx> +#include <subedit.hxx> +#include <ilstbox.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 6bbe5bb32c38..26ef9b076d8c 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H +#include <comphelper/processfactory.hxx> + +#include <tools/diagnose_ex.h> #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/ctrl.hxx> #include <vcl/decoview.hxx> -#include <vcl/controldata.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/textlayout.hxx> -#include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <textlayout.hxx> +#include <svdata.hxx> +#include <controldata.hxx> + using namespace vcl; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 769614a9259b..cd8d64516919 100755 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -28,25 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/menu.hxx> #include <vcl/cmdevt.h> -#include <vcl/subedit.hxx> #include <vcl/edit.hxx> #include <vcl/svapp.hxx> -#include <vcl/controldata.hxx> #include <vcl/msgbox.hxx> -#include <vcl/window.h> + +#include <window.h> +#include <svdata.hxx> +#include <svids.hrc> +#include <subedit.hxx> +#include <controldata.hxx> #include <vos/mutex.hxx> diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4a42abd3ea79..fd69457c8026 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -37,12 +37,15 @@ #include "tools/rc.h" #include "tools/resary.hxx" -#include "vcl/svids.hrc" + #include "vcl/field.hxx" #include "vcl/event.hxx" #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" #include "vcl/unohelp.hxx" + +#include "svids.hrc" +#include "svdata.hxx" + #include "i18nutil/unicode.hxx" #include "rtl/math.hxx" diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 4b14a5a4b199..9aac58e1a30a 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,21 +29,18 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> -#ifndef _SV_EVENT_HXX -#include <vcl/field.hxx> -#endif + #include <vcl/svapp.hxx> #include <vcl/sound.hxx> #include <vcl/event.hxx> #include <vcl/field.hxx> -#include <i18npool/mslangid.hxx> - #include <vcl/unohelp.hxx> +#include <svdata.hxx> + +#include <i18npool/mslangid.hxx> + #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index db92cd0b09af..5455f9410f54 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + +#include "tools/rc.h" + #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/fixed.hxx" -#include "vcl/controldata.hxx" -#include "vcl/window.h" -#include "tools/rc.h" +#include "controldata.hxx" +#include "window.h" // ======================================================================= diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 5b09bf6bb3b5..6bf4d519a64b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -27,15 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/event.hxx> -#include <vcl/group.hxx> -#include <vcl/controldata.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <vcl/event.hxx> +#include <vcl/group.hxx> +#include <controldata.hxx> // ======================================================================= diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 793d12a0e93e..016facae8e2c 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -27,29 +27,25 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/event.hxx> #include <vcl/scrbar.hxx> #include <vcl/help.hxx> #include <vcl/lstbox.h> -#include <vcl/ilstbox.hxx> -#include <vcl/i18nhelp.hxx> -#include <vcl/controldata.hxx> #include <vcl/unohelp.hxx> -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ -#include <com/sun/star/i18n/XCollator.hpp> -#endif +#include <vcl/i18nhelp.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ -#include <com/sun/star/accessibility/XAccessible.hpp> -#endif +#include <ilstbox.hxx> +#include <controldata.hxx> +#include <svdata.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ +#include <com/sun/star/i18n/XCollator.hpp> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #define MULTILINE_ENTRY_DRAW_FLAGS ( TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_VCENTER ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index aae78baa3fb7..40b897bbb35c 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -34,15 +34,13 @@ #include <tools/debug.hxx> #include <tools/bigint.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/longcurr.hxx> +#include <svdata.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 594b76684a1a..94d865f79bc1 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -29,22 +29,23 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" +#include "tools/debug.hxx" + -#include "vcl/svdata.hxx" #include "vcl/decoview.hxx" #include "vcl/event.hxx" #include "vcl/scrbar.hxx" #include "vcl/button.hxx" #include "vcl/edit.hxx" -#include "vcl/subedit.hxx" -#include "vcl/ilstbox.hxx" #include "vcl/lstbox.hxx" #include "vcl/combobox.hxx" -#include "vcl/controldata.hxx" -#include "tools/debug.hxx" +#include "svdata.hxx" +#include "controldata.hxx" +#include "subedit.hxx" +#include "ilstbox.hxx" +#include "dndevdis.hxx" -#include <vcl/dndevdis.hxx> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> // ======================================================================= @@ -290,8 +291,15 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) Image aImage = mpImplLB->GetEntryList()->GetEntryImage( nChanged ); mpImplWin->SetImage( aImage ); } - mpImplWin->Invalidate(); } + else + { + mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND ); + mpImplWin->SetString( ImplGetSVEmptyStr() ); + Image aImage; + mpImplWin->SetImage( aImage ); + } + mpImplWin->Invalidate(); } return 1; } diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk deleted file mode 100644 index de2613b1084f..000000000000 --- a/vcl/source/control/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=ctrl - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -.IF "$(COM)"=="ICC" -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -.ENDIF - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/button.obj \ - $(SLO)$/ctrl.obj \ - $(SLO)$/edit.obj \ - $(SLO)$/field2.obj \ - $(SLO)$/ilstbox.obj \ - $(SLO)$/tabctrl.obj \ - $(SLO)$/throbber.obj - -SLOFILES= $(EXCEPTIONSFILES) \ - $(SLO)$/combobox.obj \ - $(SLO)$/field.obj \ - $(SLO)$/fixbrd.obj \ - $(SLO)$/fixed.obj \ - $(SLO)$/group.obj \ - $(SLO)$/imgctrl.obj \ - $(SLO)$/longcurr.obj \ - $(SLO)$/lstbox.obj \ - $(SLO)$/morebtn.obj \ - $(SLO)$/menubtn.obj \ - $(SLO)$/scrbar.obj \ - $(SLO)$/slider.obj \ - $(SLO)$/spinfld.obj \ - $(SLO)$/spinbtn.obj \ - $(SLO)$/quickselectionengine.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 9bc71f1a55e3..17ecbd4a6ce8 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -33,7 +33,8 @@ #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" #include "vcl/timer.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "rtl/string.hxx" #include "tools/rc.h" diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index d7501a6f99b6..ed0bb4374c53 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -29,12 +29,14 @@ #include "precompiled_vcl.hxx" #include "tools/rc.h" + #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/spin.h" #include "vcl/spinfld.hxx" -#include "vcl/controldata.hxx" -#include "vcl/svdata.hxx" + +#include "controldata.hxx" +#include "svdata.hxx" // ======================================================================= diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3140d100aa86..6cc07e85ffb7 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -27,10 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/debug.hxx" +#include "tools/debug.hxx" #include "tools/rc.h" -#include "vcl/svdata.hxx" + #include "vcl/svapp.hxx" #include "vcl/help.hxx" #include "vcl/event.hxx" @@ -39,11 +39,12 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" -#include "vcl/controldata.hxx" #include "vcl/sound.hxx" #include "vcl/lstbox.hxx" -#include "vcl/window.h" +#include "controldata.hxx" +#include "svdata.hxx" +#include "window.h" #include <hash_map> #include <vector> diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index cb565122ea63..45172002bff6 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -32,7 +32,8 @@ #include <cstring> #include <assert.h> -#include <vcl/fontsubset.hxx> +#include <fontsubset.hxx> + #include <vcl/strhelper.hxx> //#define IGNORE_HINTS diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 64cf243c6a9d..26382e245996 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/fontsubset.hxx> -#include <sft.hxx> #include <tools/debug.hxx> +#include <fontsubset.hxx> +#include <sft.hxx> + // ==================================================================== FontSubsetInfo::FontSubsetInfo() diff --git a/vcl/source/fontsubset/makefile.mk b/vcl/source/fontsubset/makefile.mk deleted file mode 100644 index 25dde00af521..000000000000 --- a/vcl/source/fontsubset/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=fontsubset - -# --- Settings ----------------------------------------------------- -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/list.obj \ - $(SLO)$/sft.obj \ - $(SLO)$/cff.obj \ - $(SLO)$/fontsubset.obj \ - $(SLO)$/xlat.obj \ - $(SLO)$/ttcr.obj \ - $(SLO)$/gsub.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 8d831961f8af..bcf141a8e005 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -27,22 +27,23 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <rtl/crc.h> -#include <vcl/salbtype.hxx> #include <tools/stream.hxx> -#include <vcl/bmpacc.hxx> #include <tools/poly.hxx> -#include <vcl/outdev.hxx> -#include <vcl/impbmp.hxx> -#include <vcl/salbmp.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif + +#include <vcl/salbtype.hxx> +#include <vcl/bmpacc.hxx> +#include <vcl/outdev.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> +#include <impbmp.hxx> +#include <salbmp.hxx> + // ---------- // - Bitmap - // ---------- diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 4905646d3563..d39b0f7169d0 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -29,13 +29,15 @@ #include "precompiled_vcl.hxx" #include <stdlib.h> + #include <vcl/bmpacc.hxx> -#include <vcl/impoct.hxx> #include <vcl/octree.hxx> -#include <impvect.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bitmap.hxx> +#include <impoct.hxx> +#include <impvect.hxx> + // ----------- // - Defines - // ----------- diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index abee1ed9bf67..743326df04d5 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -27,25 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <ctype.h> + #include <rtl/crc.h> -#include <vcl/salbtype.hxx> + #include <tools/stream.hxx> #include <tools/debug.hxx> +#include <tools/rc.h> + +#include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <vcl/alpha.hxx> -#include <vcl/image.h> #include <vcl/bitmapex.hxx> #include <vcl/pngread.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include <vcl/impimagetree.hxx> -#endif -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif #include <vcl/svapp.hxx> #include <vcl/bmpacc.hxx> +#include <image.h> +#include <impimagetree.hxx> + // ------------ // - BitmapEx - // ------------ diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 1c7b41b51de6..ed0dc6225a0f 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/salbtype.hxx> -#include <vcl/impbmp.hxx> #include <vcl/bitmap.hxx> #include <vcl/bmpacc.hxx> + +#include <impbmp.hxx> + #include <string.h> // -------------------- diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index ac2e09df832f..fc3e031f260e 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -27,12 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + +#include <tools/poly.hxx> + #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> -#include <tools/poly.hxx> #include <vcl/region.hxx> #include <vcl/bmpacc.hxx> -#include <vcl/bmpfast.hxx> + +#include <bmpfast.hxx> // --------------------- // - BitmapWriteAccess - diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index ac3a80612fe5..a3b729e69244 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/bmpfast.hxx> +#include <bmpfast.hxx> #ifndef NO_OPTIMIZED_BITMAP_ACCESS diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index b11b9ab822f4..ce39c70e243f 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -29,7 +29,9 @@ #include "precompiled_vcl.hxx" #include <vcl/configsettings.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> + #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 3f95f56315f6..61a08df4ddc0 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -28,14 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <vcl/metaact.hxx> -#include <vcl/salinst.hxx> -#include <vcl/svdata.hxx> #include <vcl/cvtgrf.hxx> +#include <salinst.hxx> +#include <svdata.hxx> + // -------------- // - Callback - // -------------- diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 4a3a2f265374..4f1aad4d36cb 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -28,15 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "sft.hxx" +#include "unotools/fontcfg.hxx" #include "tools/stream.hxx" #include "tools/vcompat.hxx" #include "tools/debug.hxx" + #include "vcl/font.hxx" -#include "vcl/impfont.hxx" -#include "vcl/outfont.hxx" -#include "unotools/fontcfg.hxx" + +#include "impfont.hxx" +#include "outfont.hxx" +#include "sft.hxx" + #include <algorithm> @@ -874,9 +877,6 @@ namespace bool identifyTrueTypeFont( const void* i_pBuffer, sal_uInt32 i_nSize, Font& o_rResult ) { bool bResult = false; -// FIXME: This is HACK. We do not build psprint's part on aqua... -// How to solve this? -#ifndef QUARTZ TrueTypeFont* pTTF = NULL; if( OpenTTFontBuffer( const_cast<void*>(i_pBuffer), i_nSize, 0, &pTTF ) == SF_OK ) { @@ -950,7 +950,6 @@ namespace // success bResult = true; } -#endif return bResult; } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 23da138d23a2..1e99c5c3c04f 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1449,6 +1449,15 @@ void GDIMetaFile::Rotate( long nAngle10 ) } break; + case( META_RENDERGRAPHIC_ACTION ): + { + OSL_TRACE( "Rotate not supported for RenderGraphic MetaActions yet" ); + + pAction->Duplicate(); + aMtf.AddAction( pAction ); + } + break; + default: { pAction->Execute( &aMapVDev ); @@ -1513,363 +1522,371 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference ) switch( nActionType ) { case( META_PIXEL_ACTION ): - { - MetaPixelAction* pAct = (MetaPixelAction*) pAction; - ImplActionBounds( aBound, - Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), - aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), - aClipStack ); - } - break; + { + MetaPixelAction* pAct = (MetaPixelAction*) pAction; + ImplActionBounds( aBound, + Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), + aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), + aClipStack ); + } + break; case( META_POINT_ACTION ): - { - MetaPointAction* pAct = (MetaPointAction*) pAction; - ImplActionBounds( aBound, - Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), - aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), - aClipStack ); - } - break; + { + MetaPointAction* pAct = (MetaPointAction*) pAction; + ImplActionBounds( aBound, + Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ), + aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ), + aClipStack ); + } + break; case( META_LINE_ACTION ): - { - MetaLineAction* pAct = (MetaLineAction*) pAction; - Point aP1( pAct->GetStartPoint() ), aP2( pAct->GetEndPoint() ); - Rectangle aRect( aP1, aP2 ); - aRect.Justify(); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaLineAction* pAct = (MetaLineAction*) pAction; + Point aP1( pAct->GetStartPoint() ), aP2( pAct->GetEndPoint() ); + Rectangle aRect( aP1, aP2 ); + aRect.Justify(); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_RECT_ACTION ): - { - MetaRectAction* pAct = (MetaRectAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaRectAction* pAct = (MetaRectAction*) pAction; + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_ROUNDRECT_ACTION ): - { - MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction; + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_ELLIPSE_ACTION ): - { - MetaEllipseAction* pAct = (MetaEllipseAction*) pAction; - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaEllipseAction* pAct = (MetaEllipseAction*) pAction; + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_ARC_ACTION ): - { - MetaArcAction* pAct = (MetaArcAction*) pAction; - // FIXME: this is imprecise - // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaArcAction* pAct = (MetaArcAction*) pAction; + // FIXME: this is imprecise + // e.g. for small arcs the whole rectangle is WAY too large + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_PIE_ACTION ): - { - MetaPieAction* pAct = (MetaPieAction*) pAction; - // FIXME: this is imprecise - // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaPieAction* pAct = (MetaPieAction*) pAction; + // FIXME: this is imprecise + // e.g. for small arcs the whole rectangle is WAY too large + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_CHORD_ACTION ): - { - MetaChordAction* pAct = (MetaChordAction*) pAction; - // FIXME: this is imprecise - // e.g. for small arcs the whole rectangle is WAY too large - ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaChordAction* pAct = (MetaChordAction*) pAction; + // FIXME: this is imprecise + // e.g. for small arcs the whole rectangle is WAY too large + ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_POLYLINE_ACTION ): - { - MetaPolyLineAction* pAct = (MetaPolyLineAction*) pAction; - Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaPolyLineAction* pAct = (MetaPolyLineAction*) pAction; + Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_POLYGON_ACTION ): - { - MetaPolygonAction* pAct = (MetaPolygonAction*) pAction; - Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaPolygonAction* pAct = (MetaPolygonAction*) pAction; + Rectangle aRect( pAct->GetPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_POLYPOLYGON_ACTION ): - { - MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction; - Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction; + Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_TEXT_ACTION ): - { - MetaTextAction* pAct = (MetaTextAction*) pAction; - Rectangle aRect; - // hdu said base = index - aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() ); - Point aPt( pAct->GetPoint() ); - aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaTextAction* pAct = (MetaTextAction*) pAction; + Rectangle aRect; + // hdu said base = index + aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() ); + Point aPt( pAct->GetPoint() ); + aRect.Move( aPt.X(), aPt.Y() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_TEXTARRAY_ACTION ): - { - MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction; - Rectangle aRect; - // hdu said base = index - aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(), - 0, pAct->GetDXArray() ); - Point aPt( pAct->GetPoint() ); - aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction; + Rectangle aRect; + // hdu said base = index + aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(), + 0, pAct->GetDXArray() ); + Point aPt( pAct->GetPoint() ); + aRect.Move( aPt.X(), aPt.Y() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_STRETCHTEXT_ACTION ): - { - MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; - Rectangle aRect; - // hdu said base = index - aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(), - pAct->GetWidth(), NULL ); - Point aPt( pAct->GetPoint() ); - aRect.Move( aPt.X(), aPt.Y() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; + Rectangle aRect; + // hdu said base = index + aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(), + pAct->GetWidth(), NULL ); + Point aPt( pAct->GetPoint() ); + aRect.Move( aPt.X(), aPt.Y() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_TEXTLINE_ACTION ): - { - MetaTextLineAction* pAct = (MetaTextLineAction*) pAction; - // measure a test string to get ascend and descent right - static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 }; - String aStr( pStr ); - - Rectangle aRect; - aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.Len(), 0, NULL ); - Point aPt( pAct->GetStartPoint() ); - aRect.Move( aPt.X(), aPt.Y() ); - aRect.Right() = aRect.Left() + pAct->GetWidth(); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaTextLineAction* pAct = (MetaTextLineAction*) pAction; + // measure a test string to get ascend and descent right + static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 }; + String aStr( pStr ); + + Rectangle aRect; + aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.Len(), 0, NULL ); + Point aPt( pAct->GetStartPoint() ); + aRect.Move( aPt.X(), aPt.Y() ); + aRect.Right() = aRect.Left() + pAct->GetWidth(); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_BMPSCALE_ACTION ): - { - MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; - Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; + Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_BMPSCALEPART_ACTION ): - { - MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; - Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; + Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_BMPEXSCALE_ACTION ): - { - MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; - Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; + Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_BMPEXSCALEPART_ACTION ): - { - MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; - Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; + Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_GRADIENT_ACTION ): - { - MetaGradientAction* pAct = (MetaGradientAction*) pAction; - Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaGradientAction* pAct = (MetaGradientAction*) pAction; + Rectangle aRect( pAct->GetRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_GRADIENTEX_ACTION ): - { - MetaGradientExAction* pAct = (MetaGradientExAction*) pAction; - Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaGradientExAction* pAct = (MetaGradientExAction*) pAction; + Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_COMMENT_ACTION ): - { - // nothing to do - }; - break; + { + // nothing to do + }; + break; case( META_HATCH_ACTION ): - { - MetaHatchAction* pAct = (MetaHatchAction*) pAction; - Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaHatchAction* pAct = (MetaHatchAction*) pAction; + Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_TRANSPARENT_ACTION ): - { - MetaTransparentAction* pAct = (MetaTransparentAction*) pAction; - Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaTransparentAction* pAct = (MetaTransparentAction*) pAction; + Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_FLOATTRANSPARENT_ACTION ): - { - MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction; - GDIMetaFile aTransMtf( pAct->GetGDIMetaFile() ); - // get the bound rect of the contained metafile - Rectangle aRect( aTransMtf.GetBoundRect( i_rReference ) ); - // scale the rect now on the assumption that the correct top left of the metafile - // (not its bounds !) is (0,0) - Size aPSize( aTransMtf.GetPrefSize() ); - aPSize = aMapVDev.LogicToLogic( aPSize, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() ); - Size aActSize( pAct->GetSize() ); - double fX = double(aActSize.Width())/double(aPSize.Width()); - double fY = double(aActSize.Height())/double(aPSize.Height()); - aRect.Left() = long(double(aRect.Left())*fX); - aRect.Right() = long(double(aRect.Right())*fX); - aRect.Top() = long(double(aRect.Top())*fY); - aRect.Bottom() = long(double(aRect.Bottom())*fY); - - // transform the rect to current VDev state - aRect = aMapVDev.LogicToLogic( aRect, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() ); - - ImplActionBounds( aBound, aRect, aClipStack ); - } - break; + { + MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction; + GDIMetaFile aTransMtf( pAct->GetGDIMetaFile() ); + // get the bound rect of the contained metafile + Rectangle aRect( aTransMtf.GetBoundRect( i_rReference ) ); + // scale the rect now on the assumption that the correct top left of the metafile + // (not its bounds !) is (0,0) + Size aPSize( aTransMtf.GetPrefSize() ); + aPSize = aMapVDev.LogicToLogic( aPSize, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() ); + Size aActSize( pAct->GetSize() ); + double fX = double(aActSize.Width())/double(aPSize.Width()); + double fY = double(aActSize.Height())/double(aPSize.Height()); + aRect.Left() = long(double(aRect.Left())*fX); + aRect.Right() = long(double(aRect.Right())*fX); + aRect.Top() = long(double(aRect.Top())*fY); + aRect.Bottom() = long(double(aRect.Bottom())*fY); + + // transform the rect to current VDev state + aRect = aMapVDev.LogicToLogic( aRect, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() ); + + ImplActionBounds( aBound, aRect, aClipStack ); + } + break; case( META_EPS_ACTION ): - { - MetaEPSAction* pAct = (MetaEPSAction*) pAction; - Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaEPSAction* pAct = (MetaEPSAction*) pAction; + Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_CLIPREGION_ACTION ): - { - MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction; - if( pAct->IsClipping() ) - aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ); - else - aClipStack.back() = Rectangle(); - } - break; + { + MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction; + if( pAct->IsClipping() ) + aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ); + else + aClipStack.back() = Rectangle(); + } + break; case( META_ISECTRECTCLIPREGION_ACTION ): - { - MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction; - Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); - if( aClipStack.back().IsEmpty() ) - aClipStack.back() = aRect; - else - aClipStack.back().Intersection( aRect ); - } - break; + { + MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction; + Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); + if( aClipStack.back().IsEmpty() ) + aClipStack.back() = aRect; + else + aClipStack.back().Intersection( aRect ); + } + break; case( META_ISECTREGIONCLIPREGION_ACTION ): - { - MetaISectRegionClipRegionAction* pAct = (MetaISectRegionClipRegionAction*) pAction; - Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); - if( aClipStack.back().IsEmpty() ) - aClipStack.back() = aRect; - else - aClipStack.back().Intersection( aRect ); - } - break; + { + MetaISectRegionClipRegionAction* pAct = (MetaISectRegionClipRegionAction*) pAction; + Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) ); + if( aClipStack.back().IsEmpty() ) + aClipStack.back() = aRect; + else + aClipStack.back().Intersection( aRect ); + } + break; case( META_BMP_ACTION ): - { - MetaBmpAction* pAct = (MetaBmpAction*) pAction; - Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpAction* pAct = (MetaBmpAction*) pAction; + Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_BMPEX_ACTION ): - { - MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; - Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; + Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_MASK_ACTION ): - { - MetaMaskAction* pAct = (MetaMaskAction*) pAction; - Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaMaskAction* pAct = (MetaMaskAction*) pAction; + Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_MASKSCALE_ACTION ): - { - MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; - Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; + Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_MASKSCALEPART_ACTION ): - { - MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; - Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction; + Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_WALLPAPER_ACTION ): - { - MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction; - Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction; + Rectangle aRect( pAct->GetRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_TEXTRECT_ACTION ): - { - MetaTextRectAction* pAct = (MetaTextRectAction*) pAction; - Rectangle aRect( pAct->GetRect() ); - ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); - } - break; + { + MetaTextRectAction* pAct = (MetaTextRectAction*) pAction; + Rectangle aRect( pAct->GetRect() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; case( META_MOVECLIPREGION_ACTION ): + { + MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction; + if( ! aClipStack.back().IsEmpty() ) { - MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction; - if( ! aClipStack.back().IsEmpty() ) - { - Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() ); - aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() ); - aClipStack.back().Move( aDelta.Width(), aDelta.Width() ); - } + Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() ); + aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() ); + aClipStack.back().Move( aDelta.Width(), aDelta.Width() ); } - break; + } + break; + + case( META_RENDERGRAPHIC_ACTION ): + { + MetaRenderGraphicAction* pAct = (MetaRenderGraphicAction*) pAction; + Rectangle aRect( pAct->GetPoint(), pAct->GetSize() ); + ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack ); + } + break; default: { @@ -2269,6 +2286,15 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol } break; + case( META_RENDERGRAPHIC_ACTION ): + { + OSL_TRACE( "ExchangeColors not supported for RenderGraphic MetaActions yet" ); + + pAction->Duplicate(); + aMtf.Insert( pAction, LIST_APPEND ); + } + break; + default: { pAction->Duplicate(); @@ -2454,11 +2480,13 @@ sal_uLong GDIMetaFile::GetChecksum() const { GDIMetaFile aMtf; SvMemoryStream aMemStm( 65535, 65535 ); - ImplMetaWriteData aWriteData; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet(); + ImplMetaWriteData aWriteData; SVBT16 aBT16; SVBT32 aBT32; sal_uLong nCrc = 0; + aWriteData.meActualCharSet = aMemStm.GetStreamCharSet(); + for( sal_uLong i = 0, nObjCount = GetActionCount(); i < nObjCount; i++ ) { MetaAction* pAction = GetAction( i ); @@ -2715,6 +2743,30 @@ sal_uLong GDIMetaFile::GetChecksum() const } break; + case( META_RENDERGRAPHIC_ACTION ): + { + MetaRenderGraphicAction* pAct = (MetaRenderGraphicAction*) pAction; + const ::vcl::RenderGraphic& rRenderGraphic = pAct->GetRenderGraphic(); + + ShortToSVBT16( pAct->GetType(), aBT16 ); + nCrc = rtl_crc32( nCrc, aBT16, 2 ); + + nCrc = rtl_crc32( nCrc, rRenderGraphic.GetGraphicData().get(), rRenderGraphic.GetGraphicDataLength() ); + + UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 ); + nCrc = rtl_crc32( nCrc, aBT32, 4 ); + + UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 ); + nCrc = rtl_crc32( nCrc, aBT32, 4 ); + + UInt32ToSVBT32( pAct->GetSize().Width(), aBT32 ); + nCrc = rtl_crc32( nCrc, aBT32, 4 ); + + UInt32ToSVBT32( pAct->GetSize().Height(), aBT32 ); + nCrc = rtl_crc32( nCrc, aBT32, 4 ); + } + break; + default: { pAction->Write( aMemStm, &aWriteData ); @@ -2781,8 +2833,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const } break; - default: - break; + case( META_RENDERGRAPHIC_ACTION ): nSizeBytes += ( ( (MetaRenderGraphicAction*) pAction )->GetRenderGraphic() ).GetGraphicDataLength(); break; } } @@ -2810,27 +2861,63 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) // new format VersionCompat* pCompat; MetaAction* pAction; - sal_uInt32 nStmCompressMode = 0; - sal_uInt32 nCount = 0; + sal_uInt32 nStmCompressMode = 0; + sal_uInt32 nCount = 0; + sal_uInt8 bRenderGraphicReplacements = 0; pCompat = new VersionCompat( rIStm, STREAM_READ ); + { + // version 1 + rIStm >> nStmCompressMode; + rIStm >> rGDIMetaFile.aPrefMapMode; + rIStm >> rGDIMetaFile.aPrefSize; + rIStm >> nCount; - rIStm >> nStmCompressMode; - rIStm >> rGDIMetaFile.aPrefMapMode; - rIStm >> rGDIMetaFile.aPrefSize; - rIStm >> nCount; + if( pCompat->GetVersion() >= 2 ) + { + // version 2 + // ========= + // contains an additional flag to indicate that RenderGraphic + // actions are immediately followed by a replacement image, that + // needs to be skipped in case the flag is set (KA 01/2011) + rIStm >> bRenderGraphicReplacements; + } + } delete pCompat; ImplMetaReadData aReadData; aReadData.meActualCharSet = rIStm.GetStreamCharSet(); - for( sal_uInt32 nAction = 0UL; ( nAction < nCount ) && !rIStm.IsEof(); nAction++ ) + for( sal_uInt32 nAction = 0UL; ( nAction < nCount ) && !rIStm.IsEof(); ++nAction ) { pAction = MetaAction::ReadMetaAction( rIStm, &aReadData ); if( pAction ) + { rGDIMetaFile.AddAction( pAction ); + + // if the MetaFile was written in RenderGraphics replacement mode + // and we just read a RenderGraphic action, skip the following + // META_BMPEXSCALE_ACTION, since this is the replacement image, + // just needed for old implementations; don't forget to increment + // the action read counter! (KA 01/2011) + if( bRenderGraphicReplacements && + ( META_RENDERGRAPHIC_ACTION == pAction->GetType() ) && + ( ++nAction < nCount ) && !rIStm.IsEof() ) + { + sal_uInt16 nFollowingType; + + // dummy read of the next following META_BMPEXSCALE_ACTION + // RenderGraphic replacement action (KA 01/2011) + rIStm >> nFollowingType; + delete ( new VersionCompat( rIStm, STREAM_READ ) ); + + OSL_ENSURE( META_BMPEXSCALE_ACTION == nFollowingType, \ +"META_RENDERGRAPHIC_ACTION read in RenderGraphic replacement mode \ +without following META_BMPEXSCALE_ACTION replacement" ); + } + } } } else @@ -2859,10 +2946,27 @@ SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ) { if( !rOStm.GetError() ) { - if( rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50 ) - ((GDIMetaFile&) rGDIMetaFile ).Write( rOStm ); + static const char* pEnableSVM1 = getenv( "SAL_ENABLE_SVM1" ); + static const bool bNoSVM1 = (NULL == pEnableSVM1 ) || ( '0' == *pEnableSVM1 ); + + if( bNoSVM1 || rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50 ) + { + const_cast< GDIMetaFile& >( rGDIMetaFile ).Write( rOStm ); + } else - delete( new SVMConverter( rOStm, (GDIMetaFile&) rGDIMetaFile, CONVERT_TO_SVM1 ) ); + { + delete( new SVMConverter( rOStm, const_cast< GDIMetaFile& >( rGDIMetaFile ), CONVERT_TO_SVM1 ) ); + } + +#ifdef DEBUG + if( !bNoSVM1 && rOStm.GetVersion() < SOFFICE_FILEFORMAT_50 ) + { +OSL_TRACE( \ +"GDIMetaFile would normally be written in old SVM1 format by this call. \ +The current implementation always writes in VCLMTF format. \ +Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" ); + } +#endif // DEBUG } return rOStm; @@ -2880,32 +2984,90 @@ SvStream& GDIMetaFile::Read( SvStream& rIStm ) // ------------------------------------------------------------------------ -SvStream& GDIMetaFile::Write( SvStream& rOStm ) +SvStream& GDIMetaFile::Write( SvStream& rOStm, GDIMetaFileWriteFlags nWriteFlags ) { VersionCompat* pCompat; const sal_uInt32 nStmCompressMode = rOStm.GetCompressMode(); sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); + const sal_uInt8 bRenderGraphicReplacements = + ( ( ( GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC & nWriteFlags ) != 0 ) ? 1 : 0 ); + + // With the introduction of the META_RENDERGRAPHIC_ACTION, it is neccessary + // to provide some kind of document backward compatibility: + // + // If the flag GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC is set in + // parameter nWriteFlags, each META_RENDERGRAPHIC_ACTION is followed by + // an additional META_BMPEXSCALE_ACTION, that contains a replacement + // image for the new RenderGraphic action. + // + // Old implementations, not knowing anything about META_RENDERGRAPHIC_ACTION, + // will skip this new action and read the META_BMPEXSCALE_ACTION instead + // + // Since the current implementation is able to handle the new action, the + // then following image replacement action needs to be skipped by this + // implementation, if the metafile was written in the RenderGraphic + // replacement mode. + // + // To be able to detect this compatibility mode, the header needs to + // be extended by a corresponding flag, resulting in version 2 of + // the header. The surrounding VersionCompat of the header + // allows to add such new data without any problems (KA 01/2011) rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rOStm.Write( "VCLMTF", 6 ); - pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 ); + pCompat = new VersionCompat( rOStm, STREAM_WRITE, 2 ); - rOStm << nStmCompressMode; - rOStm << aPrefMapMode; - rOStm << aPrefSize; - rOStm << (sal_uInt32) GetActionCount(); + { + // version 1 + sal_uInt32 nActionCount = 0; + + // calculate correct action count and watch for + // additional RenderGraphic replacement actions, if the + // GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC is set + // and META_RENDERGRAPHIC_ACTION are encountered (KA 01/2011) + for( MetaAction* pAct = static_cast< MetaAction* >( First() ); pAct; pAct = static_cast< MetaAction* >( Next() ) ) + { + nActionCount += ( bRenderGraphicReplacements && ( META_RENDERGRAPHIC_ACTION == pAct->GetType() ) ? 2 : 1 ); + } + + rOStm << nStmCompressMode << aPrefMapMode << aPrefSize << nActionCount; + + { + // version 2 + // ========= + // since version 2, a GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC flag + // is written, to indicate that each META_BMPEXSCALE_ACTION following + // a META_RENDERGRAPHIC_ACTION needs to be skipped, in case the flag is + // set (KA 01/2011) + rOStm << bRenderGraphicReplacements; + } + } delete pCompat; ImplMetaWriteData aWriteData; + aWriteData.meActualCharSet = rOStm.GetStreamCharSet(); + aWriteData.mnWriteFlags = nWriteFlags; - MetaAction* pAct = (MetaAction*)First(); - while ( pAct ) + for( MetaAction* pAct = static_cast< MetaAction* >( First() ); pAct; pAct = static_cast< MetaAction* >( Next() ) ) { pAct->Write( rOStm, &aWriteData ); - pAct = (MetaAction*)Next(); + + // write the RenderGraphic replacement image, if the + // GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC flag is set + // and if a META_RENDERGRAPHIC_ACTION is encountered (KA 01/2011) + if( bRenderGraphicReplacements && ( META_RENDERGRAPHIC_ACTION == pAct->GetType() ) ) + { + MetaRenderGraphicAction* pRenderAction = static_cast< MetaRenderGraphicAction* >( pAct ); + MetaBmpExScaleAction* pBmpExScaleAction = new MetaBmpExScaleAction( + pRenderAction->GetPoint(), pRenderAction->GetSize(), + pRenderAction->GetRenderGraphic().GetReplacement() ); + + pBmpExScaleAction->Write( rOStm, &aWriteData ); + pBmpExScaleAction->Delete(); + } } rOStm.SetNumberFormatInt( nOldFormat ); diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 1a476f1b5420..c9c997b568e2 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -258,6 +258,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic ) case( GFX_LINK_TYPE_NATIVE_WMF ): nCvtType = CVT_WMF; break; case( GFX_LINK_TYPE_NATIVE_MET ): nCvtType = CVT_MET; break; case( GFX_LINK_TYPE_NATIVE_PCT ): nCvtType = CVT_PCT; break; + case( GFX_LINK_TYPE_NATIVE_SVG ): nCvtType = CVT_SVG; break; default: nCvtType = CVT_UNKNOWN; break; } diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 1a8201706212..65555a441a1a 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -27,11 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/impgraph.hxx> + #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/graph.hxx> + +#include <impgraph.hxx> + #include <comphelper/processfactory.hxx> + #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -427,6 +431,27 @@ sal_Bool Graphic::IsAnimated() const // ------------------------------------------------------------------------ +sal_Bool Graphic::IsEPS() const +{ + return mpImpGraphic->ImplIsEPS(); +} + +// ------------------------------------------------------------------------ + +sal_Bool Graphic::IsRenderGraphic() const +{ + return mpImpGraphic->ImplIsRenderGraphic(); +} + +// ------------------------------------------------------------------------ + +sal_Bool Graphic::HasRenderGraphic() const +{ + return mpImpGraphic->ImplHasRenderGraphic(); +} + +// ------------------------------------------------------------------------ + Bitmap Graphic::GetBitmap(const GraphicConversionParameters& rParameters) const { return mpImpGraphic->ImplGetBitmap(rParameters); @@ -455,6 +480,13 @@ const GDIMetaFile& Graphic::GetGDIMetaFile() const // ------------------------------------------------------------------------ +::vcl::RenderGraphic Graphic::GetRenderGraphic() const +{ + return mpImpGraphic->ImplGetRenderGraphic(); +} + +// ------------------------------------------------------------------------ + uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const { uno::Reference< graphic::XGraphic > xRet; diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index ee6060b7d8f3..d33709787d2d 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -31,25 +31,22 @@ #include <boost/scoped_array.hpp> #include <rtl/logfile.hxx> + #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <tools/rc.hxx> -#ifndef _SV_RESMGR_HXX #include <tools/resmgr.hxx> -#endif + #include <vcl/settings.hxx> #include <vcl/outdev.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include <vcl/impimagetree.hxx> -#endif -#include <vcl/image.h> #include <vcl/image.hxx> +#include <impimagetree.hxx> +#include <image.h> + #if OSL_DEBUG_LEVEL > 0 #include <rtl/strbuf.hxx> #endif diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index d97999311751..0118acc13146 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -27,12 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H -#include "vcl/impimagetree.hxx" -#endif + +#include "impimagetree.hxx" //........................................................................ namespace vcl diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index af39ed615874..f8d71112d3a1 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -28,15 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> #include <tools/debug.hxx> -#include <vcl/impbmp.hxx> + #include <vcl/bitmap.hxx> -#include <vcl/svdata.hxx> -#include <vcl/salinst.hxx> + +#include <svdata.hxx> +#include <salinst.hxx> +#include <salbmp.hxx> +#include <impbmp.hxx> // -------------- // - ImpBitmap - diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 500ba9549b9e..62b1976015ce 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -27,24 +27,27 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/vcompat.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> +#include <tools/stream.hxx> + #include <ucbhelper/content.hxx> + #include <unotools/ucbstreamhelper.hxx> -#ifndef _UNTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif + #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> -#include <tools/debug.hxx> -#include <tools/stream.hxx> -#include <vcl/impgraph.hxx> #include <vcl/gfxlink.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/salbtype.hxx> #include <vcl/graph.hxx> #include <vcl/metaact.hxx> + +#include <impgraph.hxx> + #include <com/sun/star/ucb/CommandAbortedException.hpp> // ----------- @@ -480,6 +483,48 @@ sal_Bool ImpGraphic::ImplIsAnimated() const // ------------------------------------------------------------------------ +sal_Bool ImpGraphic::ImplIsEPS() const +{ + return( ( meType == GRAPHIC_GDIMETAFILE ) && + ( maMetaFile.GetActionCount() > 0 ) && + ( maMetaFile.GetAction( 0 )->GetType() == META_EPS_ACTION ) ); +} + +// ------------------------------------------------------------------------ + +sal_Bool ImpGraphic::ImplIsRenderGraphic() const +{ + return( ( GRAPHIC_GDIMETAFILE == meType ) && + ( 1 == maMetaFile.GetActionCount() ) && + ( META_RENDERGRAPHIC_ACTION == maMetaFile.GetAction( 0 )->GetType() ) ); +} + +// ------------------------------------------------------------------------ + +sal_Bool ImpGraphic::ImplHasRenderGraphic() const +{ + sal_Bool bRet = sal_False; + + if( GRAPHIC_GDIMETAFILE == meType ) + { + GDIMetaFile& rMtf = const_cast< ImpGraphic* >( this )->maMetaFile; + + for( MetaAction* pAct = rMtf.FirstAction(); pAct && !bRet; pAct = rMtf.NextAction() ) + { + if( META_RENDERGRAPHIC_ACTION == pAct->GetType() ) + { + bRet = sal_True; + } + } + + rMtf.WindStart(); + } + + return( bRet ); +} + +// ------------------------------------------------------------------------ + Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) const { Bitmap aRetBmp; @@ -592,6 +637,18 @@ Animation ImpGraphic::ImplGetAnimation() const // ------------------------------------------------------------------------ +::vcl::RenderGraphic ImpGraphic::ImplGetRenderGraphic() const +{ + ::vcl::RenderGraphic aRet; + + if( ImplIsRenderGraphic() ) + aRet = static_cast< MetaRenderGraphicAction* >( maMetaFile.GetAction( 0 ) )->GetRenderGraphic(); + + return( aRet ); +} + +// ------------------------------------------------------------------------ + const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const { return maMetaFile; diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 0d0af3365c00..735f912f0782 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -27,15 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/outdev.hxx> #include <vcl/bitmapex.hxx> #include <vcl/alpha.hxx> #include <vcl/window.hxx> #include <vcl/bmpacc.hxx> #include <vcl/virdev.hxx> -#include <vcl/image.h> #include <vcl/image.hxx> +#include <image.h> + // ----------- // - Defines - // ----------- diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 03e4c1dbbb2a..19947679567c 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -26,13 +26,13 @@ ***********************************************************************/ #include "precompiled_vcl.hxx" + #include "sal/config.h" #include <list> #include <memory> #include <utility> #include <vector> - #include <hash_map> #include "com/sun/star/container/XNameAccess.hpp" @@ -43,24 +43,31 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" + #include "comphelper/processfactory.hxx" + #include "osl/file.hxx" #include "osl/diagnose.h" + #include "rtl/bootstrap.hxx" #include "rtl/string.h" #include "rtl/textenc.h" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" + #include "sal/types.h" + #include "tools/stream.hxx" #include "tools/urlobj.hxx" + #include "vcl/bitmapex.hxx" -#include "vcl/impimagetree.hxx" #include "vcl/pngread.hxx" #include "vcl/settings.hxx" #include "vcl/svapp.hxx" +#include "impimagetree.hxx" + namespace { namespace css = com::sun::star; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 8321e56443f3..b44a99b2789d 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -27,13 +27,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _RTL_ALLOC_H + #include <rtl/alloc.h> -#endif + #include <vcl/jobset.hxx> -#include <vcl/jobset.h> + +#include <jobset.h> // ======================================================================= diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk index ac2e586a41cb..ec664cf648a6 100755 --- a/vcl/source/gdi/makefile.mk +++ b/vcl/source/gdi/makefile.mk @@ -47,75 +47,77 @@ CDEFS+=-DENABLE_GRAPHITE # --- Files -------------------------------------------------------- -EXCEPTIONSFILES= $(SLO)$/salmisc.obj \ - $(SLO)$/outdev.obj \ - $(SLO)$/outdev3.obj \ - $(SLO)$/outdevnative.obj \ - $(SLO)$/gfxlink.obj \ - $(SLO)$/print.obj \ - $(SLO)$/print2.obj \ - $(SLO)$/print3.obj \ - $(SLO)$/oldprintadaptor.obj \ - $(SLO)$/configsettings.obj \ - $(SLO)$/sallayout.obj \ - $(SLO)$/image.obj \ - $(SLO)$/impimage.obj \ - $(SLO)$/impgraph.obj \ - $(SLO)$/metric.obj \ - $(SLO)$/pdfwriter_impl.obj \ - $(SLO)$/pdfwriter_impl2.obj \ - $(SLO)$/pdffontcache.obj\ - $(SLO)$/bmpconv.obj \ - $(SLO)$/pdfextoutdevdata.obj \ - $(SLO)$/jobset.obj \ - $(SLO)$/impimagetree.obj \ - $(SLO)$/pngread.obj \ - $(SLO)$/pngwrite.obj \ - $(SLO)$/virdev.obj \ - $(SLO)$/gdimtf.obj \ - $(SLO)$/graphictools.obj \ - $(SLO)$/textlayout.obj \ - $(SLO)$/lineinfo.obj +EXCEPTIONSFILES= $(SLO)$/salmisc.obj \ + $(SLO)$/outdev.obj \ + $(SLO)$/outdev3.obj \ + $(SLO)$/outdevnative.obj \ + $(SLO)$/gfxlink.obj \ + $(SLO)$/print.obj \ + $(SLO)$/print2.obj \ + $(SLO)$/print3.obj \ + $(SLO)$/oldprintadaptor.obj \ + $(SLO)$/configsettings.obj \ + $(SLO)$/sallayout.obj \ + $(SLO)$/image.obj \ + $(SLO)$/impimage.obj \ + $(SLO)$/impgraph.obj \ + $(SLO)$/metric.obj \ + $(SLO)$/pdfwriter_impl.obj \ + $(SLO)$/pdfwriter_impl2.obj \ + $(SLO)$/pdffontcache.obj \ + $(SLO)$/bmpconv.obj \ + $(SLO)$/pdfextoutdevdata.obj \ + $(SLO)$/jobset.obj \ + $(SLO)$/impimagetree.obj \ + $(SLO)$/pngread.obj \ + $(SLO)$/pngwrite.obj \ + $(SLO)$/virdev.obj \ + $(SLO)$/gdimtf.obj \ + $(SLO)$/graphictools.obj \ + $(SLO)$/textlayout.obj \ + $(SLO)$/lineinfo.obj \ + $(SLO)$/svgread.obj \ + $(SLO)$/rendergraphic.obj \ + $(SLO)$/rendergraphicrasterizer.obj -SLOFILES= $(EXCEPTIONSFILES) \ +SLOFILES= $(EXCEPTIONSFILES) \ $(SLO)$/animate.obj \ $(SLO)$/impanmvw.obj \ - $(SLO)$/bitmap.obj \ + $(SLO)$/bitmap.obj \ $(SLO)$/bitmap2.obj \ $(SLO)$/bitmap3.obj \ $(SLO)$/bitmap4.obj \ - $(SLO)$/alpha.obj \ + $(SLO)$/alpha.obj \ $(SLO)$/bitmapex.obj \ $(SLO)$/bmpacc.obj \ $(SLO)$/bmpacc2.obj \ $(SLO)$/bmpacc3.obj \ $(SLO)$/bmpfast.obj \ - $(SLO)$/cvtsvm.obj \ - $(SLO)$/cvtgrf.obj \ - $(SLO)$/font.obj \ + $(SLO)$/cvtsvm.obj \ + $(SLO)$/cvtgrf.obj \ + $(SLO)$/font.obj \ $(SLO)$/gradient.obj \ - $(SLO)$/hatch.obj \ - $(SLO)$/graph.obj \ - $(SLO)$/impbmp.obj \ + $(SLO)$/hatch.obj \ + $(SLO)$/graph.obj \ + $(SLO)$/impbmp.obj \ $(SLO)$/imagerepository.obj \ $(SLO)$/impvect.obj \ - $(SLO)$/mapmod.obj \ + $(SLO)$/mapmod.obj \ $(SLO)$/metaact.obj \ - $(SLO)$/octree.obj \ - $(SLO)$/outmap.obj \ + $(SLO)$/octree.obj \ + $(SLO)$/outmap.obj \ $(SLO)$/outdev2.obj \ $(SLO)$/outdev4.obj \ $(SLO)$/outdev5.obj \ $(SLO)$/outdev6.obj \ $(SLO)$/regband.obj \ - $(SLO)$/region.obj \ - $(SLO)$/wall.obj \ - $(SLO)$/base14.obj \ + $(SLO)$/region.obj \ + $(SLO)$/wall.obj \ + $(SLO)$/base14.obj \ $(SLO)$/pdfwriter.obj \ $(SLO)$/salgdilayout.obj \ $(SLO)$/extoutdevdata.obj \ - $(SLO)$/salnativewidgets-none.obj - + $(SLO)$/salnativewidgets-none.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index eab6af8444e5..ad0c9c9d5f95 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -38,6 +38,7 @@ #include <vcl/salbtype.hxx> #include <vcl/metaact.hxx> #include <vcl/graphictools.hxx> +#include <vcl/rendergraphicrasterizer.hxx> // ======================================================================== @@ -235,6 +236,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData case( META_COMMENT_ACTION ): pAction = new MetaCommentAction; break; case( META_LAYOUTMODE_ACTION ): pAction = new MetaLayoutModeAction; break; case( META_TEXTLANGUAGE_ACTION ): pAction = new MetaTextLanguageAction; break; + case( META_RENDERGRAPHIC_ACTION ): pAction = new MetaRenderGraphicAction; break; default: { @@ -2565,7 +2567,10 @@ MetaGradientExAction::~MetaGradientExAction() void MetaGradientExAction::Execute( OutputDevice* pOut ) { if( pOut->GetConnectMetaFile() ) - pOut->GetConnectMetaFile()->AddAction( Clone() ); + { + Duplicate(); + pOut->GetConnectMetaFile()->AddAction( this ); + } } // ------------------------------------------------------------------------ @@ -4059,7 +4064,10 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 void MetaCommentAction::Execute( OutputDevice* pOut ) { if ( pOut->GetConnectMetaFile() ) - pOut->GetConnectMetaFile()->AddAction( Clone() ); + { + Duplicate(); + pOut->GetConnectMetaFile()->AddAction( this ); + } } // ------------------------------------------------------------------------ @@ -4294,3 +4302,81 @@ void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* ) } // ======================================================================== + +IMPL_META_ACTION( RenderGraphic, META_RENDERGRAPHIC_ACTION ) + +// ------------------------------------------------------------------------ + +MetaRenderGraphicAction::MetaRenderGraphicAction( const Point& rPoint, const Size& rSize, + const vcl::RenderGraphic& rRenderGraphic, + double fRotateAngle, double fShearAngleX, double fShearAngleY ) : + MetaAction( META_RENDERGRAPHIC_ACTION ), + maRenderGraphic( rRenderGraphic ), + maPoint( rPoint ), + maSize( rSize ), + mfRotateAngle( fRotateAngle ), + mfShearAngleX( fShearAngleX ), + mfShearAngleY( fShearAngleY ) +{ +} + +// ------------------------------------------------------------------------ + +void MetaRenderGraphicAction::Execute( OutputDevice* pOut ) +{ + pOut->DrawRenderGraphic( maPoint, maSize, maRenderGraphic ); +} + +// ------------------------------------------------------------------------ + +MetaAction* MetaRenderGraphicAction::Clone() +{ + MetaAction* pClone = (MetaAction*) new MetaRenderGraphicAction( *this ); + pClone->ResetRefCount(); + return pClone; +} + +// ------------------------------------------------------------------------ + +void MetaRenderGraphicAction::Move( long nHorzMove, long nVertMove ) +{ + maPoint.Move( nHorzMove, nVertMove ); +} + +// ------------------------------------------------------------------------ + +void MetaRenderGraphicAction::Scale( double fScaleX, double fScaleY ) +{ + Rectangle aRectangle( maPoint, maSize ); + ImplScaleRect( aRectangle, fScaleX, fScaleY ); + maPoint = aRectangle.TopLeft(); + maSize = aRectangle.GetSize(); +} + +// ------------------------------------------------------------------------ + +sal_Bool MetaRenderGraphicAction::Compare( const MetaAction& rMetaAction ) const +{ + return ( maRenderGraphic.IsEqual( ( (MetaRenderGraphicAction&) rMetaAction).maRenderGraphic ) && + ( maPoint == ( (MetaRenderGraphicAction&) rMetaAction).maPoint ) && + ( maSize == ( (MetaRenderGraphicAction&) rMetaAction).maSize ) && + ( mfRotateAngle == ( (MetaRenderGraphicAction&) rMetaAction).mfRotateAngle ) && + ( mfShearAngleX == ( (MetaRenderGraphicAction&) rMetaAction).mfShearAngleX ) && + ( mfShearAngleY == ( (MetaRenderGraphicAction&) rMetaAction).mfShearAngleY ) ); +} + +// ------------------------------------------------------------------------ + +void MetaRenderGraphicAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) +{ + WRITE_BASE_COMPAT( rOStm, 1, pData ); + rOStm << maRenderGraphic << maPoint << maSize << mfRotateAngle << mfShearAngleX << mfShearAngleY; +} + +// ------------------------------------------------------------------------ + +void MetaRenderGraphicAction::Read( SvStream& rIStm, ImplMetaReadData* ) +{ + COMPAT( rIStm ); + rIStm >> maRenderGraphic >> maPoint >> maSize >> mfRotateAngle >> mfShearAngleX >> mfShearAngleY; +} diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 01f88e9d8860..b05ae27a8f5f 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/impfont.hxx> +#include <impfont.hxx> #include <vcl/metric.hxx> #include <vector> diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 658856dbe100..be69d34bff7e 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <limits.h> + #include <vcl/bmpacc.hxx> -#include <vcl/impoct.hxx> #include <vcl/octree.hxx> +#include <impoct.hxx> + // --------- // - pMask - // --------- diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index b5ecb0761949..dcad34c363ad 100755..100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -29,35 +29,34 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/sallayout.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/poly.hxx> + #include <vcl/svapp.hxx> #include <vcl/ctrl.hxx> -#ifndef _POLY_HXX -#include <tools/poly.hxx> -#endif #include <vcl/region.hxx> -#include <vcl/region.h> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> #include <vcl/print.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> +// declare system types in sysdata.hxx +#include <svsys.h> #include <vcl/sysdata.hxx> +#include <salgdi.hxx> +#include <sallayout.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <window.h> +#include <outdev.h> +#include <region.h> +#include <outdata.hxx> + #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 6d98f79dcaaa..46b0d81c348d 100755 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -28,30 +28,29 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/impbmp.hxx> #include <tools/debug.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/virdev.hxx> -#include <vcl/outdata.hxx> -#include <vcl/outdev.h> #include <vcl/bmpacc.hxx> -#include <vcl/region.h> #include <vcl/outdev.hxx> #include <vcl/window.hxx> -#include <vcl/window.h> -#include <vcl/sallayout.hxx> -#include <vcl/image.h> #include <vcl/image.hxx> -#include <vcl/bmpfast.hxx> + +#include <bmpfast.hxx> +#include <salbmp.hxx> +#include <salgdi.hxx> +#include <impbmp.hxx> +#include <sallayout.hxx> +#include <image.h> +#include <outdev.h> +#include <window.h> +#include <region.h> +#include <outdata.hxx> #define BAND_MAX_SIZE 512000 diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 10f618d6e7c1..1681e1eeec7c 100644..100755 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -30,49 +30,57 @@ #include "i18npool/mslangid.hxx" -#include "svsys.h" -#include "vcl/salgdi.hxx" -#include "vcl/sallayout.hxx" #include "rtl/tencinfo.h" +#include "rtl/logfile.hxx" + #include "tools/debug.hxx" -#include "vcl/svdata.hxx" -#include "vcl/metric.hxx" -#include "vcl/impfont.hxx" -#include "vcl/metaact.hxx" -#include "vcl/gdimtf.hxx" -#include "vcl/outdata.hxx" -#include "vcl/outfont.hxx" +#include "tools/poly.hxx" + #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolypolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include "tools/poly.hxx" -#include "vcl/outdev.h" + +#include "vcl/metric.hxx" +#include "vcl/metaact.hxx" +#include "vcl/gdimtf.hxx" #include "vcl/virdev.hxx" #include "vcl/print.hxx" #include "vcl/event.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/svapp.hxx" #include "vcl/bmpacc.hxx" -#include "unotools/fontcvt.hxx" #include "vcl/outdev.hxx" #include "vcl/edit.hxx" -#include "unotools/fontcfg.hxx" +// declare system types in sysdata.hxx +#include <svsys.h> #include "vcl/sysdata.hxx" -#include "vcl/textlayout.hxx" -#include "vcl/svids.hrc" +#include "vcl/unohelp.hxx" +#include "vcl/controllayout.hxx" + +#include "salgdi.hxx" +#include "sallayout.hxx" +#include "svdata.hxx" +#include "impfont.hxx" +#include "outdata.hxx" +#include "outfont.hxx" +#include "outdev.h" +#include "textlayout.hxx" +#include "svids.hrc" +#include "window.h" + +#include "unotools/fontcvt.hxx" +#include "unotools/fontcfg.hxx" + #include "osl/file.h" + #ifdef ENABLE_GRAPHITE -#include "vcl/graphite_features.hxx" +#include "graphite_features.hxx" #endif #ifdef USE_BUILTIN_RASTERIZER -#include "vcl/glyphcache.hxx" +#include "glyphcache.hxx" #endif -#include "vcl/unohelp.hxx" #include "pdfwriter_impl.hxx" -#include "vcl/controllayout.hxx" -#include "rtl/logfile.hxx" #include "com/sun/star/beans/PropertyValues.hpp" #include "com/sun/star/i18n/XBreakIterator.hpp" diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index a18b7ff48413..84fc4fd7c524 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -28,25 +28,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svsys.h> -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/line.hxx> +#include <tools/poly.hxx> + #include <vcl/gradient.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> -#include <tools/poly.hxx> #include <vcl/salbtype.hxx> -#include <tools/line.hxx> #include <vcl/hatch.hxx> #include <vcl/window.hxx> #include <vcl/virdev.hxx> #include <vcl/outdev.hxx> #include "pdfwriter_impl.hxx" -#include "vcl/window.h" -#include "vcl/salframe.hxx" + +#include "window.h" +#include "salframe.hxx" +#include "salgdi.hxx" +#include "svdata.hxx" +#include "outdata.hxx" #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 627f75e88282..0a28203dbdfd 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -29,20 +29,19 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> #include <tools/poly.hxx> + #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> +#include <salgdi.hxx> +#include <svdata.hxx> +#include <outdata.hxx> +#include <outdev.h> + // ======================================================================= DBG_NAMEEX( OutputDevice ) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index eb4b76fb4b41..4e02681841d2 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -28,12 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> #include <tools/debug.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> @@ -42,16 +37,22 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> -#include <vcl/wall2.hxx> +#include <vcl/rendergraphicrasterizer.hxx> + +#include <wall2.hxx> +#include <salgdi.hxx> +#include <window.h> +#include <svdata.hxx> +#include <outdev.h> + #include <com/sun/star/uno/Sequence.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> + #include <math.h> -#include <vcl/window.h> -#include <vcl/svdata.hxx> // ======================================================================== @@ -1143,6 +1144,7 @@ void OutputDevice::Erase() return; sal_Bool bNativeOK = sal_False; + if( meOutDevType == OUTDEV_WINDOW ) { Window* pWindow = static_cast<Window*>(this); @@ -1193,6 +1195,8 @@ void OutputDevice::ImplDraw2ColorFrame( const Rectangle& rRect, bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, GDIMetaFile* pSubst ) { + DBG_TRACE( "OutputDevice::DrawEPS()" ); + bool bDrawn(true); if ( mpMetaFile ) @@ -1211,7 +1215,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, if( mbOutputClipped ) return bDrawn; - Rectangle aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) ); + Rectangle aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) ); if( !aRect.IsEmpty() ) { @@ -1245,3 +1249,26 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, return bDrawn; } + +// ------------------------------------------------------------------ + +void OutputDevice::DrawRenderGraphic( const Point& rPoint, const Size& rSize, + const ::vcl::RenderGraphic& rRenderGraphic ) +{ + DBG_TRACE( "OutputDevice::DrawRenderGraphic()" ); + + if( mpMetaFile ) + mpMetaFile->AddAction( new MetaRenderGraphicAction( rPoint, rSize, rRenderGraphic ) ); + + if( !rRenderGraphic.IsEmpty() ) + { + ::vcl::RenderGraphicRasterizer aRasterizer( rRenderGraphic ); + BitmapEx aBmpEx; + const Size aSizePixel( LogicToPixel( rSize ) ); + GDIMetaFile* pOldMetaFile = mpMetaFile; + + mpMetaFile = NULL; + DrawBitmapEx( rPoint, rSize, aRasterizer.Rasterize( aSizePixel ) ); + mpMetaFile = pOldMetaFile; + } +} diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index cb472762338b..c31188fc357e 100755 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -30,10 +30,11 @@ #include "vcl/outdev.hxx" #include "vcl/window.hxx" -#include "vcl/salgdi.hxx" #include "vcl/salnativewidgets.hxx" #include "vcl/pdfextoutdevdata.hxx" +#include "salgdi.hxx" + // ----------------------------------------------------------------------- static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 1bdd86e13ecb..72bcd2cc8a14 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -30,25 +30,25 @@ #include <limits.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/bigint.hxx> #include <tools/debug.hxx> -#include <vcl/virdev.hxx> -#include <vcl/svdata.hxx> #include <tools/poly.hxx> + +#include <vcl/virdev.hxx> #include <vcl/region.hxx> -#include <vcl/region.h> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/cursor.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> #include <vcl/lineinfo.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdev.h> -#include <vcl/salgdi.hxx> + +#include <svdata.hxx> +#include <region.h> +#include <window.h> +#include <outdev.h> +#include <salgdi.hxx> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 77458d2b26fd..c47b034e1011 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -31,22 +31,25 @@ #include "vcl/graph.hxx" #include "vcl/outdev.hxx" #include "vcl/gfxlink.hxx" +#include "vcl/dllapi.h" #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" #include <boost/shared_ptr.hpp> #include <set> +#include <map> namespace vcl { -struct PDFExtOutDevDataSync +struct SAL_DLLPRIVATE PDFExtOutDevDataSync { enum Action{ CreateNamedDest, CreateDest, CreateLink, SetLinkDest, SetLinkURL, + RegisterDest, CreateOutlineItem, SetOutlineItemParent, SetOutlineItemText, @@ -73,7 +76,15 @@ struct PDFExtOutDevDataSync Action eAct; }; -struct GlobalSyncData +struct SAL_DLLPRIVATE PDFLinkDestination +{ + Rectangle mRect; + MapMode mMapMode; + sal_Int32 mPageNr; + PDFWriter::DestAreaType mAreaType; +}; + +struct SAL_DLLPRIVATE GlobalSyncData { std::deque< PDFExtOutDevDataSync::Action > mActions; std::deque< MapMode > mParaMapModes; @@ -84,6 +95,7 @@ struct GlobalSyncData std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes; std::deque< PDFNote > mParaPDFNotes; std::deque< PDFWriter::PageTransition > mParaPageTransitions; + ::std::map< sal_Int32, PDFLinkDestination > mFutureDestinations; sal_Int32 GetMappedId(); sal_Int32 GetMappedStructId( sal_Int32 ); @@ -145,7 +157,7 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter ) { switch( *aIter ) { - case PDFExtOutDevDataSync::CreateNamedDest : //i56629 + case PDFExtOutDevDataSync::CreateNamedDest : //i56629 { rWriter.Push( PUSH_MAPMODE ); rWriter.SetMapMode( mParaMapModes.front() ); @@ -197,6 +209,21 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter ) mParaOUStrings.pop_front(); } break; + case PDFExtOutDevDataSync::RegisterDest : + { + const sal_Int32 nDestId = mParaInts.front(); + mParaInts.pop_front(); + OSL_ENSURE( mFutureDestinations.find( nDestId ) != mFutureDestinations.end(), + "GlobalSyncData::PlayGlobalActions: DescribeRegisteredRequest has not been called for that destination!" ); + + PDFLinkDestination& rDest = mFutureDestinations[ nDestId ]; + + rWriter.Push( PUSH_MAPMODE ); + rWriter.SetMapMode( rDest.mMapMode ); + mParaIds.push_back( rWriter.RegisterDestReference( nDestId, rDest.mRect, rDest.mPageNr, rDest.mAreaType ) ); + rWriter.Pop(); + } + break; case PDFExtOutDevDataSync::CreateOutlineItem : { sal_Int32 nParent = GetMappedId(); @@ -459,6 +486,7 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM case PDFExtOutDevDataSync::CreateLink: case PDFExtOutDevDataSync::SetLinkDest: case PDFExtOutDevDataSync::SetLinkURL: + case PDFExtOutDevDataSync::RegisterDest: case PDFExtOutDevDataSync::CreateOutlineItem: case PDFExtOutDevDataSync::SetOutlineItemParent: case PDFExtOutDevDataSync::SetOutlineItemText: @@ -617,9 +645,28 @@ sal_Int32 PDFExtOutDevData::CreateNamedDest(const String& sDestName, const Rect mpGlobalSyncData->mParaMapModes.push_back( mrOutDev.GetMapMode() ); mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr ); mpGlobalSyncData->mParaDestAreaTypes.push_back( eType ); + return mpGlobalSyncData->mCurId++; } //<---i56629 +sal_Int32 PDFExtOutDevData::RegisterDest() +{ + const sal_Int32 nLinkDestID = mpGlobalSyncData->mCurId++; + mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::RegisterDest ); + mpGlobalSyncData->mParaInts.push_back( nLinkDestID ); + + return nLinkDestID; +} +void PDFExtOutDevData::DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +{ + OSL_PRECOND( nDestId != -1, "PDFExtOutDevData::DescribeRegisteredDest: invalid destination Id!" ); + PDFLinkDestination aLinkDestination; + aLinkDestination.mRect = rRect; + aLinkDestination.mMapMode = mrOutDev.GetMapMode(); + aLinkDestination.mPageNr = nPageNr == -1 ? mnPage : nPageNr; + aLinkDestination.mAreaType = eType; + mpGlobalSyncData->mFutureDestinations[ nDestId ] = aLinkDestination; +} sal_Int32 PDFExtOutDevData::CreateDest( const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateDest ); diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx index 507ede81ef24..f0842c6bc1ba 100644 --- a/vcl/source/gdi/pdffontcache.cxx +++ b/vcl/source/gdi/pdffontcache.cxx @@ -28,9 +28,9 @@ #include "precompiled_vcl.hxx" #include "pdffontcache.hxx" -#include <vcl/salgdi.hxx> -#include <vcl/outfont.hxx> -#include <vcl/sallayout.hxx> +#include <salgdi.hxx> +#include <outfont.hxx> +#include <sallayout.hxx> using namespace vcl; diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx index 06ffff86b070..b9997c1e6fc9 100644 --- a/vcl/source/gdi/pdffontcache.hxx +++ b/vcl/source/gdi/pdffontcache.hxx @@ -30,8 +30,8 @@ #include <sal/types.h> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> +#include <sallayout.hxx> +#include <salgdi.hxx> namespace vcl { diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 445365e83dd4..d6c5aed6b52a 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -420,6 +420,10 @@ sal_Int32 PDFWriter::CreateLink( const Rectangle& rRect, sal_Int32 nPageNr ) { return ((PDFWriterImpl*)pImplementation)->createLink( rRect, nPageNr ); } +sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType ) +{ + return ((PDFWriterImpl*)pImplementation)->registerDestReference( nDestId, rRect, nPageNr, eType ); +} //--->i56629 sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 4a37d3a5d601..11e4367eae95 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -33,42 +33,53 @@ #include <algorithm> #include <tools/urlobj.hxx> + #include <pdfwriter_impl.hxx> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> + +#include <osl/thread.h> +#include <osl/file.h> + +#include <rtl/crc.h> +#include <rtl/digest.h> #include <rtl/ustrbuf.hxx> + #include <tools/debug.hxx> #include <tools/zcodec.hxx> #include <tools/stream.hxx> + #include <i18npool/mslangid.hxx> + #include <vcl/virdev.hxx> #include <vcl/bmpacc.hxx> #include <vcl/bitmapex.hxx> #include <vcl/image.hxx> -#include <vcl/outdev.h> -#include <vcl/sallayout.hxx> #include <vcl/metric.hxx> -#include <vcl/fontsubset.hxx> -#include <vcl/textlayout.hxx> -#include <vcl/cvtgrf.hxx> -#include <svsys.h> -#include <vcl/salgdi.hxx> #include <vcl/svapp.hxx> -#include <osl/thread.h> -#include <osl/file.h> -#include <rtl/crc.h> -#include <rtl/digest.h> +#include <vcl/lineinfo.hxx> +#include "vcl/cvtgrf.hxx" +#include "vcl/strhelper.hxx" + +#include <fontsubset.hxx> +#include <outdev.h> +#include <sallayout.hxx> +#include <textlayout.hxx> +#include <salgdi.hxx> + +#include <icc/sRGB-IEC61966-2.1.hxx> + #include <comphelper/processfactory.hxx> + #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> + #include "cppuhelper/implbase1.hxx" -#include <icc/sRGB-IEC61966-2.1.hxx> -#include <vcl/lineinfo.hxx> -#include "vcl/strhelper.hxx" using namespace vcl; using namespace rtl; @@ -5613,7 +5624,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() if(!m_bIsPDF_A1) { OStringBuffer aDest; - if( rWidget.m_nDest != -1 && appendDest( rWidget.m_nDest, aDest ) ) + if( rWidget.m_nDest != -1 && appendDest( m_aDestinationIdTranslation[ rWidget.m_nDest ], aDest ) ) { aLine.append( "/AA<</D<</Type/Action/S/GoTo/D " ); aLine.append( aDest.makeStringAndClear() ); @@ -10839,6 +10850,11 @@ sal_Int32 PDFWriterImpl::createDest( const Rectangle& rRect, sal_Int32 nPageNr, return nRet; } +sal_Int32 PDFWriterImpl::registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +{ + return m_aDestinationIdTranslation[ nDestId ] = createDest( rRect, nPageNr, eType ); +} + sal_Int32 PDFWriterImpl::setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) { if( nLinkId < 0 || nLinkId >= (sal_Int32)m_aLinks.size() ) diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index c73be7c037e5..845e95d29270 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -37,14 +37,14 @@ #include "vcl/gradient.hxx" #include "vcl/hatch.hxx" #include "vcl/wall.hxx" -#include "vcl/outdata.hxx" +#include "outdata.hxx" #include "rtl/strbuf.hxx" #include "rtl/cipher.h" #include "rtl/digest.h" #include "com/sun/star/util/XURLTransformer.hpp" #include "com/sun/star/lang/Locale.hpp" -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #include "pdffontcache.hxx" #include <vector> @@ -613,6 +613,9 @@ private: dest id is always the dest's position in this vector */ std::vector<PDFDest> m_aDests; + /** contains destinations accessible via a public Id, instead of being linked to by an ordinary link + */ + ::std::map< sal_Int32, sal_Int32 > m_aDestinationIdTranslation; /* contains all links ever set during PDF creation, link id is always the link's position in this vector */ @@ -1279,6 +1282,7 @@ public: // links sal_Int32 createLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 ); sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); sal_Int32 setLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 143c55a83ab1..b957c57205e8 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -35,9 +35,13 @@ #include "vcl/metaact.hxx" #include "vcl/bmpacc.hxx" #include "vcl/graph.hxx" -#include "vcl/svdata.hxx" +#include "vcl/rendergraphicrasterizer.hxx" + +#include "svdata.hxx" + #include "unotools/streamwrap.hxx" #include "unotools/processfactory.hxx" + #include "comphelper/processfactory.hxx" #include "com/sun/star/beans/PropertyValue.hpp" @@ -1044,6 +1048,17 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; + case( META_RENDERGRAPHIC_ACTION ): + { + const MetaRenderGraphicAction* pA = static_cast< const MetaRenderGraphicAction* >( pAction ); + const ::vcl::RenderGraphicRasterizer aRasterizer( pA->GetRenderGraphic() ); + + implWriteBitmapEx( pA->GetPoint(), pA->GetSize(), + aRasterizer.Rasterize( pDummyVDev->LogicToPixel( pA->GetSize() ) ), + pDummyVDev, i_rContext ); + } + break; + default: // #i24604# Made assertion fire only once per // metafile. The asserted actions here are all diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx deleted file mode 100644 index 7c69f79d50e6..000000000000 --- a/vcl/source/gdi/polyscan.cxx +++ /dev/null @@ -1,358 +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 <string.h> -#include <tools/new.hxx> -#include <vcl/salbtype.hxx> -#include "polyscan.hxx" -#include <tools/poly.hxx> - -// ---------------- -// - PolyScanline - -// ---------------- - -PolyScanline::PolyScanline() : - mpFirst ( NULL ), - mpLast ( NULL ), - mpAct ( NULL ), - mnLeft ( 0L ), - mnRight ( 0L ) -{ -} - -// ------------------------------------------------------------------------ - -PolyScanline::~PolyScanline() -{ - ImplDelete(); -} - -// ------------------------------------------------------------------------ - -void PolyScanline::ImplDelete() -{ - ScanlinePoint* pAct = mpFirst; - - while( pAct ) - { - ScanlinePoint* pNext = pAct->mpNext; - delete pAct; - pAct = pNext; - } - - mnLeft = mnRight = 0L; - mpFirst = mpAct = mpLast = NULL; -} - -// ------------------------------------------------------------------------ - -void PolyScanline::Insert( long nX ) -{ - // first point to insert? - if( !mpFirst ) - mpLast = mpFirst = new ScanlinePoint( mnLeft = mnRight = nX, NULL ); - else - { - // insert at the beginning of the scanline - if( nX <= mpFirst->mnX ) - mpFirst = new ScanlinePoint( mnLeft = nX, mpFirst ); - else if( nX >= mnRight ) - mpLast = mpLast->mpNext = new ScanlinePoint( mnRight = nX, NULL ); - else - { - ScanlinePoint* pLast = mpFirst; - ScanlinePoint* pAct = mpFirst->mpNext; - - while( pAct ) - { - // insert in the midlle of the scanline? - if( nX <= pAct->mnX ) - { - pLast->mpNext = new ScanlinePoint( nX, pAct ); - break; - } - - pLast = pAct; - pAct = pAct->mpNext; - } - } - } -} - -// ------------------------------------------------------------------------ - -void PolyScanline::Set( long nStart, long nEnd ) -{ - if( mpFirst ) - ImplDelete(); - - if( nStart <= nEnd ) - mpFirst = new ScanlinePoint( mnLeft = nStart, mpLast = new ScanlinePoint( mnRight = nEnd, NULL ) ); - else - mpFirst = new ScanlinePoint( mnLeft = nEnd, mpLast = new ScanlinePoint( mnRight = nStart, NULL ) ); -} - -// ------------------------------------------------------------------------ - -sal_Bool PolyScanline::GetFirstSegment( PolyScanSegment& rSegment ) -{ - sal_Bool bRet = GetFirstX( rSegment.mnStart ); - - if( bRet && !GetNextX( rSegment.mnEnd ) ) - rSegment.mnEnd = rSegment.mnStart; - - return bRet; -} - -// ------------------------------------------------------------------------ - -sal_Bool PolyScanline::GetNextSegment( PolyScanSegment& rSegment ) -{ - sal_Bool bRet = GetNextX( rSegment.mnStart ); - - if( bRet && !GetNextX( rSegment.mnEnd ) ) - rSegment.mnEnd = rSegment.mnStart; - - return bRet; -} - -// --------------- -// - PolyScanner - -// --------------- - -PolyScanner::PolyScanner( const Rectangle& rRect ) -{ - if( !rRect.IsEmpty() ) - { - Rectangle aRect( rRect ); - sal_uLong nHeight; - - aRect.Justify(); - mnLeft = aRect.Left(); - mnTop = aRect.Top(); - mnRight = aRect.Right(); - mnBottom = aRect.Bottom(); - mpArray = new PolyScanline[ nHeight = Height() ]; - - for( sal_uLong i = 0UL; i < nHeight; i++ ) - mpArray[ i ].Set( mnLeft, mnRight ); - } - else - { - mnLeft = mnTop = mnRight = mnBottom = 0L; - mpArray = NULL; - } -} - -// ------------------------------------------------------------------------ - -PolyScanner::PolyScanner( const Polygon& rPoly ) -{ - const long nCount = rPoly.GetSize(); - - if( nCount ) - { - long nLast = nCount - 1; - Point aFirst( rPoly[ 0 ] ); - Point aLast( rPoly[ (sal_uInt16) nLast ] ); - - while( nLast && ( aLast == aFirst ) ) - aLast = rPoly[ (sal_uInt16) --nLast ]; - - if( !nLast ) - { - aLast = rPoly[ 0 ]; - mnLeft = mnRight = aLast.X(); - mnTop = mnBottom = aLast.Y(); - mpArray = new PolyScanline[ 1UL ]; - mpArray[ 0 ].Set( mnLeft, mnRight ); - } - else - { - const Rectangle aRect( rPoly.GetBoundRect() ); - sal_uLong nHeight; - - mnLeft = aRect.Left(); - mnTop = aRect.Top(); - mnRight = aRect.Right(); - mnBottom = aRect.Bottom(); - aLast = aFirst; - mpArray = new PolyScanline[ nHeight = Height() ]; - - for( long i = 1L; i <= nLast; i++ ) - { - const Point& rPt = rPoly[ (sal_uInt16) i ]; - - if( rPt != aLast ) - { - InsertLine( aLast, rPt ); - aLast = rPt; - } - } - - InsertLine( aLast, aFirst ); - } - } - else - mpArray = NULL; -} - -// ------------------------------------------------------------------------ - -PolyScanner::PolyScanner( const PolyPolygon& rPolyPoly ) -{ - mpArray = NULL; -} - -// ------------------------------------------------------------------------ - -PolyScanner::~PolyScanner() -{ - delete[] mpArray; -} - -// ------------------------------------------------------------------------ - -PolyScanline* PolyScanner::operator[]( sal_uLong nPos ) const -{ - DBG_ASSERT( nPos < Count(), "nPos out of range!" ); - return( mpArray ? ( mpArray + nPos ) : NULL ); -} - -// ------------------------------------------------------------------------ - -void PolyScanner::InsertLine( const Point& rStart, const Point& rEnd ) -{ - long nX, nY; - - if( rStart.Y() == rEnd.Y() ) - mpArray[ rStart.Y() - mnTop ].Insert( rStart.X() ); - else if( rStart.X() == rEnd.X() ) - { - // vertical line - const long nEndY = rEnd.Y(); - - nX = rStart.X(); - nY = rStart.Y(); - - if( nEndY > nY ) - while( nY < nEndY ) - mpArray[ nY++ - mnTop ].Insert( nX ); - else - while( nY > nEndY ) - mpArray[ nY-- - mnTop ].Insert( nX ); - } - else - { - const long nDX = labs( rEnd.X() - rStart.X() ); - const long nDY = labs( rEnd.Y() - rStart.Y() ); - const long nStartX = rStart.X(); - const long nStartY = rStart.Y(); - const long nEndX = rEnd.X(); - const long nEndY = rEnd.Y(); - const long nXInc = ( nStartX < nEndX ) ? 1L : -1L; - const long nYInc = ( nStartY < nEndY ) ? 1L : -1L; - long nLastX = nStartX; - long nLastY = nStartY; - sal_Bool bLast = sal_False; - - mpArray[ nStartY - mnTop ].Insert( nStartX ); - - if( nDX >= nDY ) - { - const long nDYX = ( nDY - nDX ) << 1; - const long nDY2 = nDY << 1; - long nD = nDY2 - nDX; - - for( nX = nStartX, nY = nLastY = nStartY; nX != nEndX; ) - { - if( nY != nLastY ) - { - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - - mpArray[ nY - mnTop ].Insert( nX ); - bLast = sal_False; - } - else - bLast = sal_True; - - nLastX = nX; - nLastY = nY; - - if( nD < 0L ) - nD += nDY2; - else - { - nD += nDYX; - nY += nYInc; - } - - nX += nXInc; - } - } - else - { - const long nDYX = ( nDX - nDY ) << 1; - const long nDY2 = nDX << 1; - long nD = nDY2 - nDY; - - for( nX = nStartX, nY = nStartY; nY != nEndY; ) - { - if( nY != nLastY ) - { - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - - mpArray[ nY - mnTop ].Insert( nX ); - bLast = sal_False; - } - else - bLast = sal_True; - - nLastX = nX; - nLastY = nY; - - if( nD < 0L ) - nD += nDY2; - else - { - nD += nDYX; - nX += nXInc; - } - - nY += nYInc; - } - } - - if( bLast ) - mpArray[ nLastY - mnTop ].Insert( nLastX ); - } -} diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index e5e19dff3771..9d8bee00ef24 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -31,31 +31,29 @@ #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <list> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salptype.hxx> -#include <vcl/salprn.hxx> - -#include <vcl/unohelp.hxx> #include <tools/debug.hxx> #include <tools/resary.hxx> #include <tools/stream.hxx> #include <tools/vcompat.hxx> -#include <vcl/svdata.hxx> + +#include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/jobset.h> -#include <vcl/outdev.h> #include <vcl/virdev.hxx> #include <vcl/window.hxx> -#include <vcl/print.h> #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> #include <vcl/print.hxx> -#include <vcl/svids.hrc> + +#include <salinst.hxx> +#include <salgdi.hxx> +#include <salptype.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <svids.hrc> +#include <jobset.h> +#include <outdev.h> +#include <print.h> #include <comphelper/processfactory.hxx> diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index d86df6e2816b..59b79c64a13c 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -33,18 +33,22 @@ #include <utility> #include <list> #include <vector> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> + #include <tools/debug.hxx> + #include <vcl/virdev.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/print.h> #include <vcl/salbtype.hxx> #include <vcl/print.hxx> #include <vcl/svapp.hxx> -#include <vcl/sallayout.hxx> #include <vcl/bmpacc.hxx> +#include <vcl/rendergraphicrasterizer.hxx> + +#include <print.h> #include "pdfwriter_impl.hxx" @@ -111,6 +115,9 @@ static bool ImplIsActionSpecial( const MetaAction& rAct ) case META_BMPEXSCALEPART_ACTION: return static_cast<const MetaBmpExScalePartAction&>(rAct).GetBitmapEx().IsTransparent(); + case META_RENDERGRAPHIC_ACTION: + return true; + default: return false; } @@ -198,6 +205,16 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, aBmpEx = static_cast<const MetaBmpExScaleAction&>(rAct).GetBitmapEx(); break; + case META_RENDERGRAPHIC_ACTION: + { + const ::vcl::RenderGraphicRasterizer aRasterizer( static_cast<const MetaRenderGraphicAction&>(rAct). + GetRenderGraphic() ); + + aBmpEx = aRasterizer.Rasterize( rStateOutDev.LogicToPixel( + static_cast<const MetaRenderGraphicAction&>(rAct).GetSize() ) ); + break; + } + case META_TRANSPARENT_ACTION: default: @@ -265,6 +282,11 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcSize(), aBmp )); break; + case META_RENDERGRAPHIC_ACTION: + o_rMtf.AddAction( new MetaBmpScaleAction( + static_cast<const MetaRenderGraphicAction&>(rAct).GetPoint(), + static_cast<const MetaRenderGraphicAction&>(rAct).GetSize(), + aBmp )); default: DBG_ERROR("Unexpected case"); break; @@ -377,6 +399,7 @@ static bool ImplIsNotTransparent( const MetaAction& rAct, const OutputDevice& rO case META_TEXTRECT_ACTION: case META_STRETCHTEXT_ACTION: case META_TEXTLINE_ACTION: + case META_RENDERGRAPHIC_ACTION: // all other actions: generate non-transparent output bRet = true; break; @@ -629,7 +652,14 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic case META_TEXTLINE_ACTION: DBG_ERROR("META_TEXTLINE_ACTION not supported"); - break; + break; + + case( META_RENDERGRAPHIC_ACTION ): + { + const MetaRenderGraphicAction& rRenderAct = static_cast<const MetaRenderGraphicAction&>(rAct); + aActionBounds = Rectangle( rRenderAct.GetPoint(), rRenderAct.GetSize() ); + } + break; default: break; @@ -656,6 +686,7 @@ static bool ImplIsActionHandlingTransparency( const MetaAction& rAct ) case META_BMPEX_ACTION: case META_BMPEXSCALE_ACTION: case META_BMPEXSCALEPART_ACTION: + case META_RENDERGRAPHIC_ACTION: return true; default: diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 3873cdc6cb14..3bc47e6cf8fb 100755 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -28,16 +28,17 @@ #include "precompiled_vcl.hxx" #include "vcl/print.hxx" -#include "vcl/prndlg.hxx" #include "vcl/svapp.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salprn.hxx" -#include "vcl/svids.hrc" #include "vcl/metaact.hxx" #include "vcl/msgbox.hxx" #include "vcl/configsettings.hxx" +#include "printdlg.hxx" +#include "svdata.hxx" +#include "salinst.hxx" +#include "salprn.hxx" +#include "svids.hrc" + #include "tools/urlobj.hxx" #include "com/sun/star/ui/dialogs/XFilePicker.hpp" diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 96e67aaabffa..fe2e0f763e08 100755..100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -29,19 +29,16 @@ #include "precompiled_vcl.hxx" #include <limits.h> + #include <tools/vcompat.hxx> -#include <vcl/salbtype.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> -#ifndef _REGION_H -#include <vcl/region.h> -#endif -#ifndef _REGION_HXX + #include <vcl/region.hxx> -#endif -#ifndef _REGBAND_HXX #include <vcl/regband.hxx> -#endif +#include <vcl/salbtype.hxx> + +#include <region.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx new file mode 100644 index 000000000000..10b6064cc57c --- /dev/null +++ b/vcl/source/gdi/rendergraphic.cxx @@ -0,0 +1,240 @@ +/************************************************************************* + * + * 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/rendergraphic.hxx> +#include <vcl/rendergraphicrasterizer.hxx> +#include <vcl/mapmod.hxx> +#include <tools/stream.hxx> +#include <tools/vcompat.hxx> + +#include <cstring> +#include <cstdio> + +namespace vcl +{ + +// ----------------- +// - RenderGraphic - +// ----------------- +RenderGraphic::RenderGraphic( ) : + mnGraphicDataLength( 0 ) +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphic::RenderGraphic( const RenderGraphic& rRenderGraphic ) : + maGraphicData( rRenderGraphic.maGraphicData ), + mnGraphicDataLength( rRenderGraphic.mnGraphicDataLength ), + maGraphicDataMimeType( rRenderGraphic.maGraphicDataMimeType ), + mapPrefMapMode( rRenderGraphic.mapPrefMapMode.get() ? new MapMode( *rRenderGraphic.mapPrefMapMode ) : NULL ), + mapPrefSize( rRenderGraphic.mapPrefSize.get() ? new Size( *rRenderGraphic.mapPrefSize ) : NULL ) +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphic::RenderGraphic( const GraphicData& rGraphicData, + sal_uInt32 nGraphicDataLength, + const rtl::OUString& rGraphicDataMimeType ) : + maGraphicData( rGraphicData ), + mnGraphicDataLength( nGraphicDataLength ), + maGraphicDataMimeType( rGraphicDataMimeType ) +{ + ImplCheckData( ); +} + +// ------------------------------------------------------------------------- + +RenderGraphic::RenderGraphic( const rtl::OUString& rGraphicDataMimeType, + sal_uInt32 nGraphicDataLength, + const sal_uInt8* pGraphicData ) : + maGraphicData(), + mnGraphicDataLength( nGraphicDataLength ), + maGraphicDataMimeType( rGraphicDataMimeType ) +{ + if( rGraphicDataMimeType.getLength( ) && nGraphicDataLength ) + { + maGraphicData.reset( new sal_uInt8[ nGraphicDataLength ] ); + + if( pGraphicData ) + { + memcpy( maGraphicData.get(), pGraphicData, nGraphicDataLength ); + } + } + else + { + ImplCheckData( ); + } +} + +// ------------------------------------------------------------------------- + +RenderGraphic::~RenderGraphic( ) +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphic& RenderGraphic::operator=(const RenderGraphic& rRenderGraphic ) +{ + maGraphicData = rRenderGraphic.maGraphicData; + mnGraphicDataLength = rRenderGraphic.mnGraphicDataLength; + maGraphicDataMimeType = rRenderGraphic.maGraphicDataMimeType; + mapPrefMapMode.reset( rRenderGraphic.mapPrefMapMode.get() ? new MapMode( *rRenderGraphic.mapPrefMapMode ) : NULL ); + mapPrefSize.reset( rRenderGraphic.mapPrefSize.get() ? new Size( *rRenderGraphic.mapPrefSize ) : NULL ); + + return( *this ); +} + +// ------------------------------------------------------------------------- + +bool RenderGraphic::operator==(const RenderGraphic& rRenderGraphic ) const +{ + return( ( rRenderGraphic.mnGraphicDataLength == mnGraphicDataLength ) && + ( rRenderGraphic.maGraphicData == maGraphicData ) && + ( rRenderGraphic.maGraphicDataMimeType.equalsIgnoreAsciiCase( maGraphicDataMimeType ) ) ); +} + +// ------------------------------------------------------------------------- + +bool RenderGraphic::operator!() const +{ + return( ( 0 == maGraphicDataMimeType.getLength( ) ) || + ( 0 == mnGraphicDataLength ) || + !maGraphicData.get( ) ); +} + +// ------------------------------------------------------------------------- + +bool RenderGraphic::IsEqual( const RenderGraphic& rRenderGraphic ) const +{ + bool bRet = ( rRenderGraphic.mnGraphicDataLength == mnGraphicDataLength ) && + ( rRenderGraphic.maGraphicDataMimeType.equalsIgnoreAsciiCase( maGraphicDataMimeType ) ); + + if( bRet && mnGraphicDataLength && ( rRenderGraphic.maGraphicData != maGraphicData ) ) + { + bRet = ( 0 == memcmp( rRenderGraphic.maGraphicData.get( ), + maGraphicData.get( ), + mnGraphicDataLength ) ); + } + + return( bRet ); +} + +// ------------------------------------------------------------------------- + +const MapMode& RenderGraphic::GetPrefMapMode() const +{ + ImplGetDefaults(); + return( *mapPrefMapMode ); +} + +// ------------------------------------------------------------------------- + +const Size& RenderGraphic::GetPrefSize() const +{ + ImplGetDefaults(); + return( *mapPrefSize ); +} + +// ------------------------------------------------------------------------- + +BitmapEx RenderGraphic::GetReplacement() const +{ + const RenderGraphicRasterizer aRasterizer( *this ); + + return( aRasterizer.GetReplacement() ); +} + +// ------------------------------------------------------------------------- + +void RenderGraphic::ImplCheckData( ) +{ + if( !( *this ) ) + { + maGraphicData.reset( ); + mnGraphicDataLength = 0; + maGraphicDataMimeType = ::rtl::OUString(); + mapPrefMapMode.reset(); + mapPrefSize.reset(); + } +} + +// ------------------------------------------------------------------------- + +void RenderGraphic::ImplGetDefaults() const +{ + if( !mapPrefMapMode.get() || !mapPrefSize.get() ) + { + const RenderGraphicRasterizer aRasterizer( *this ); + + mapPrefMapMode.reset( new MapMode( aRasterizer.GetPrefMapMode() ) ); + mapPrefSize.reset( new Size( aRasterizer.GetPrefSize() ) ); + } +} + +// ------------------------------------------------------------------------- + +::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ) +{ + ::VersionCompat aVCompat( rIStm, STREAM_READ ); + String aGraphicDataMimeType; + sal_uInt32 nGraphicDataLength = 0; + + rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US ); + rIStm >> nGraphicDataLength; + + rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); + + if( !rRenderGraphic.IsEmpty() ) + { + rIStm.Read( rRenderGraphic.GetGraphicData().get(), nGraphicDataLength ); + } + + return rIStm; +} + +// ------------------------------------------------------------------ + +::SvStream& operator<<( ::SvStream& rOStm, const RenderGraphic& rRenderGraphic ) +{ + ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); + const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); + + rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US ); + rOStm << nGraphicDataLength; + + if( nGraphicDataLength ) + { + rOStm.Write( rRenderGraphic.GetGraphicData().get(), nGraphicDataLength ); + } + + return rOStm; +} + +} // VCL diff --git a/vcl/source/gdi/rendergraphicrasterizer.cxx b/vcl/source/gdi/rendergraphicrasterizer.cxx new file mode 100644 index 000000000000..29c9863335b3 --- /dev/null +++ b/vcl/source/gdi/rendergraphicrasterizer.cxx @@ -0,0 +1,400 @@ +/************************************************************************* + * + * 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/rendergraphicrasterizer.hxx> +#include <vcl/svapp.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/virdev.hxx> +#include <vcl/unohelp.hxx> +#include <vcl/bmpacc.hxx> +#include <vcl/graph.hxx> +#include <tools/stream.hxx> +#include <comphelper/processfactory.hxx> +#include <unotools/streamwrap.hxx> + +#include <com/sun/star/lang/XMultiServiceFactory.hpp> + +#define VCL_SERVICENAME_RASTERIZER_SVG "com.sun.star.graphic.GraphicRasterizer_RSVG" + +using namespace com::sun::star; + +namespace vcl +{ +// --------------------------------------------------------- +// - maximum extent in pixel for graphics to be rasterized - +// --------------------------------------------------------- + +static const sal_uInt32 nRasterizerDefaultExtent = 4096; + +// --------------------------- +// - RenderGraphicRasterizer - +// --------------------------- + +RenderGraphicRasterizer::RenderGraphicRasterizer( const RenderGraphic& rRenderGraphic ) : + maRenderGraphic( rRenderGraphic ), + mfRotateAngle( 0.0 ), + mfShearAngleX( 0.0 ), + mfShearAngleY( 0.0 ) +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphicRasterizer::RenderGraphicRasterizer( const RenderGraphicRasterizer& rRenderGraphicRasterizer ) : + maRenderGraphic( rRenderGraphicRasterizer.maRenderGraphic ), + mxRasterizer( rRenderGraphicRasterizer.mxRasterizer ), + maBitmapEx( rRenderGraphicRasterizer.maBitmapEx ), + maDefaultSizePixel( rRenderGraphicRasterizer.maDefaultSizePixel ), + mfRotateAngle( rRenderGraphicRasterizer.mfRotateAngle ), + mfShearAngleX( rRenderGraphicRasterizer.mfShearAngleX ), + mfShearAngleY( rRenderGraphicRasterizer.mfShearAngleY ) +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphicRasterizer::~RenderGraphicRasterizer() +{ +} + +// ------------------------------------------------------------------------- + +RenderGraphicRasterizer& RenderGraphicRasterizer::operator=( + const RenderGraphicRasterizer& rRenderGraphicRasterizer ) +{ + maRenderGraphic = rRenderGraphicRasterizer.maRenderGraphic; + maBitmapEx = rRenderGraphicRasterizer.maBitmapEx; + maDefaultSizePixel = rRenderGraphicRasterizer.maDefaultSizePixel; + mfRotateAngle = rRenderGraphicRasterizer.mfRotateAngle; + mfShearAngleX = rRenderGraphicRasterizer.mfShearAngleX; + mfShearAngleY = rRenderGraphicRasterizer.mfShearAngleY; + mxRasterizer = rRenderGraphicRasterizer.mxRasterizer; + + return( *this ); +} + +// ------------------------------------------------------------------------- + +const Size& RenderGraphicRasterizer::GetDefaultSizePixel() const +{ + const_cast< RenderGraphicRasterizer* >( this )->InitializeRasterizer(); + + return( maDefaultSizePixel ); +} + +// ------------------------------------------------------------------------- + +BitmapEx RenderGraphicRasterizer::GetReplacement() const +{ + BitmapEx aRet( Rasterize( GetDefaultSizePixel() ) ); + + aRet.SetPrefSize( GetPrefSize() ); + aRet.SetPrefMapMode( GetPrefMapMode() ); + + return( aRet ); +} + +// ------------------------------------------------------------------------- + +Size RenderGraphicRasterizer::GetPrefSize() const +{ + const Size aSizePixel( GetDefaultSizePixel() ); + std::auto_ptr< VirtualDevice > apCompVDev; + OutputDevice* pCompDev = NULL; + +#ifndef NO_GETAPPWINDOW + pCompDev = Application::GetAppWindow(); +#endif + + if( !pCompDev ) + { + apCompVDev.reset( new VirtualDevice ); + pCompDev = apCompVDev.get(); + } + + return( pCompDev->PixelToLogic( aSizePixel, GetPrefMapMode() ) ); +} + +// ------------------------------------------------------------------------- + +MapMode RenderGraphicRasterizer::GetPrefMapMode() const +{ + return( MapMode( MAP_100TH_MM ) ); +} + +// ------------------------------------------------------------------------- + +const BitmapEx& RenderGraphicRasterizer::Rasterize( const Size& rSizePixel, + double fRotateAngle, + double fShearAngleX, + double fShearAngleY, + sal_uInt32 nMaxExtent ) const +{ + const bool bRasterize = !maRenderGraphic.IsEmpty() && + rSizePixel.Width() && rSizePixel.Height() && + ( maBitmapEx.IsEmpty() || + ( rSizePixel != maBitmapEx.GetSizePixel() ) || + ( fRotateAngle != mfRotateAngle ) || + ( fShearAngleX != mfShearAngleX ) || + ( fShearAngleY != mfShearAngleY ) ); + + if( bRasterize ) + { + const_cast< RenderGraphicRasterizer* >( this )->InitializeRasterizer(); + + if( mxRasterizer.is() ) + { + sal_uInt32 nWidth = labs( rSizePixel.Width() ); + sal_uInt32 nHeight = labs( rSizePixel.Height() ); + + // limiting the extent of the rastered bitmap + if( VCL_RASTERIZER_UNLIMITED_EXTENT != nMaxExtent ) + { + if( VCL_RASTERIZER_DEFAULT_EXTENT == nMaxExtent ) + { + nMaxExtent = nRasterizerDefaultExtent; + } + + if( ( nWidth > nMaxExtent ) || ( nHeight > nMaxExtent ) ) + { + const double fScale = static_cast< double >( nMaxExtent ) / ::std::max( nWidth, nHeight ); + + nWidth = FRound( nWidth * fScale ); + nHeight = FRound( nHeight * fScale ); + } + } + + if( !ImplRasterizeFromCache( const_cast< RenderGraphicRasterizer& >( *this ), + Size( nWidth, nHeight ), fRotateAngle, fShearAngleX, fShearAngleY ) ) + { + try + { + const uno::Sequence< beans::PropertyValue > aPropertySeq; + const Graphic aRasteredGraphic( mxRasterizer->rasterize( nWidth, + nHeight, + fRotateAngle, + fShearAngleX, + fShearAngleY, + aPropertySeq ) ); + + maBitmapEx = aRasteredGraphic.GetBitmapEx(); + mfRotateAngle = fRotateAngle; + mfShearAngleX = fShearAngleX; + mfShearAngleY = fShearAngleY; + + ImplUpdateCache( *this ); + +// OSL_TRACE( "Wanted: %d x %d / Got: %d x %d", rSizePixel.Width(), rSizePixel.Height(), maBitmapEx.GetSizePixel().Width(), maBitmapEx.GetSizePixel().Height() ); + } + catch( ... ) + { + OSL_TRACE( "caught exception during rasterization" ); + } + } + } + } + + return( maBitmapEx ); +} + +// ------------------------------------------------------------------------- + +void RenderGraphicRasterizer::InitializeRasterizer() +{ + if( !mxRasterizer.is() && !ImplInitializeFromCache( *this ) ) + { + uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); + + maDefaultSizePixel.Width() = maDefaultSizePixel.Height() = 0; + + if( !maRenderGraphic.IsEmpty() ) + { + rtl::OUString aServiceName; + + if( 0 == maRenderGraphic.GetGraphicDataMimeType().compareToAscii( "image/svg+xml" ) ) + { + aServiceName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VCL_SERVICENAME_RASTERIZER_SVG ) ); + } + + if( aServiceName.getLength() ) + { + mxRasterizer.set( xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); + + if( mxRasterizer.is() ) + { + std::auto_ptr< VirtualDevice > apCompVDev; + OutputDevice* pCompDev = NULL; + +#ifndef NO_GETAPPWINDOW + pCompDev = Application::GetAppWindow(); +#endif + + if( !pCompDev ) + { + apCompVDev.reset( new VirtualDevice ); + pCompDev = apCompVDev.get(); + } + + const Size aDPI( pCompDev->LogicToPixel( Size( 1, 1 ), MAP_INCH ) ); + awt::Size aSizePixel; + SvMemoryStream aMemStm( maRenderGraphic.GetGraphicData().get(), + maRenderGraphic.GetGraphicDataLength(), + STREAM_READ ); + + uno::Reference< io::XInputStream > xIStm( new utl::OSeekableInputStreamWrapper( aMemStm ) ); + + try + { + if( !xIStm.is() || !mxRasterizer->initializeData( xIStm, aDPI.Width(), aDPI.Height(), aSizePixel ) ) + { + mxRasterizer.clear(); + } + else + { + maDefaultSizePixel.Width() = aSizePixel.Width; + maDefaultSizePixel.Height() = aSizePixel.Height; + } + } + catch( ... ) + { + OSL_TRACE( "caught exception during initialization of SVG rasterizer component" ); + mxRasterizer.clear(); + } + } + } + } + } +} + +// ------------------------------------------------------------------------------ + +RenderGraphicRasterizer::RenderGraphicRasterizerCache& RenderGraphicRasterizer::ImplGetCache() +{ + static RenderGraphicRasterizerCache* pCache = NULL; + + if( !pCache ) + { + pCache = new RenderGraphicRasterizerCache; + } + + return( *pCache ); +} + +// ------------------------------------------------------------------------------ + +bool RenderGraphicRasterizer::ImplInitializeFromCache( RenderGraphicRasterizer& rRasterizer ) +{ + RenderGraphicRasterizerCache& rCache = ImplGetCache(); + bool bRet = false; + + for( sal_uInt32 i = 0; i < rCache.size(); ++i ) + { + const RenderGraphicRasterizer* pCheck = &rCache[ i ]; + + if( pCheck && pCheck->mxRasterizer.is() && ( pCheck->maRenderGraphic == rRasterizer.maRenderGraphic ) ) + { +// OSL_TRACE( "Hit RenderGraphicRasterizer cache for initialization" ); + + rRasterizer.mxRasterizer = pCheck->mxRasterizer; + rRasterizer.maDefaultSizePixel = pCheck->maDefaultSizePixel; + + // put found Rasterizer at begin of deque + const RenderGraphicRasterizer aFound( rCache[ i ] ); + + rCache.erase( rCache.begin() + i ); + rCache.push_front( aFound ); + + + bRet = true; + } + } + + return( bRet ); +} + +// ------------------------------------------------------------------------------ + +bool RenderGraphicRasterizer::ImplRasterizeFromCache( RenderGraphicRasterizer& rRasterizer, + const Size& rSizePixel, + double fRotateAngle, + double fShearAngleX, + double fShearAngleY ) +{ + RenderGraphicRasterizerCache& rCache = ImplGetCache(); + bool bRet = false; + + for( sal_uInt32 i = 0; i < rCache.size(); ++i ) + { + const RenderGraphicRasterizer& rCheck = rCache[ i ]; + + if( rCheck.mxRasterizer.is() && rRasterizer.mxRasterizer.is() && + ( ( rCheck.mxRasterizer == rRasterizer.mxRasterizer ) || + ( rRasterizer.maRenderGraphic == rCheck.maRenderGraphic ) ) && + ( rCheck.maBitmapEx.GetSizePixel() == rSizePixel ) && + ( rCheck.mfRotateAngle == fRotateAngle ) && + ( rCheck.mfShearAngleX == fShearAngleX ) && + ( rCheck.mfShearAngleY == fShearAngleY ) ) + { +// OSL_TRACE( "Hit RenderGraphicRasterizer cache for rasterizing" ); + + rRasterizer.maBitmapEx = rCheck.maBitmapEx; + rRasterizer.mfRotateAngle = fRotateAngle; + rRasterizer.mfShearAngleX = fShearAngleX; + rRasterizer.mfShearAngleY = fShearAngleY; + + // put found Rasterizer at begin of deque + const RenderGraphicRasterizer aFound( rCache[ i ] ); + + rCache.erase( rCache.begin() + i ); + rCache.push_front( aFound ); + + bRet = true; + } + } + + return( bRet ); +} + +// ------------------------------------------------------------------------------ + +void RenderGraphicRasterizer::ImplUpdateCache( const RenderGraphicRasterizer& rRasterizer ) +{ + RenderGraphicRasterizerCache& rCache = ImplGetCache(); + const sal_uInt32 nMaxCacheSize = 8; + + if( rCache.size() < nMaxCacheSize ) + { + rCache.push_front( rRasterizer ); + } + else + { + rCache.pop_back(); + rCache.push_front( rRasterizer ); + } +} + +} // VCL diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 9f2ee0924555..0b6677b2426f 100755 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -29,30 +29,31 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> -#include <vcl/salprn.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/svapp.hxx> #include <tools/poly.hxx> + +#include <vcl/svapp.hxx> #include <vcl/region.hxx> -#include <vcl/region.h> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/metaact.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/outdata.hxx> #include <vcl/print.hxx> -#include <vcl/outdev.h> #include <vcl/outdev.hxx> #include <vcl/unowrap.hxx> -#include <vcl/sallayout.hxx> + +#include <window.h> +#include <region.h> +#include <outdev.h> +#include <sallayout.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <salprn.hxx> +#include <svdata.hxx> +#include <outdata.hxx> + + #include "basegfx/polygon/b2dpolygon.hxx" // ---------------------------------------------------------------------------- diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 5e187944c706..3a2251da5d84 100755 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -34,19 +34,16 @@ #include <math.h> #include <sal/alloca.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salgdi.hxx> -#include <vcl/sallayout.hxx> +#include <salgdi.hxx> +#include <sallayout.hxx> + #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> + #include <i18npool/lang.h> -#ifndef _TL_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <limits.h> diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index f77ce914fd4d..d1cf56f6a044 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -30,7 +30,7 @@ #include <rtl/memory.h> #include <vcl/bmpacc.hxx> #include <vcl/salbtype.hxx> -#include <vcl/bmpfast.hxx> +#include <bmpfast.hxx> // ----------- // - Defines - diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index 4cbce4c5298a..50048831f3b3 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> using namespace rtl; diff --git a/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx deleted file mode 100644 index be0c9cd7dcc9..000000000000 --- a/vcl/source/gdi/svcompat.cxx +++ /dev/null @@ -1,78 +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 <tools/stream.hxx> -#include <svcompat.hxx> - -// -------------- -// - ImplCompat - -// -------------- - -ImplCompat::ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion ) : - mpRWStm ( &rStm ), - mnStmMode ( nStreamMode ), - mnVersion ( nVersion ) -{ - if( !mpRWStm->GetError() ) - { - if( STREAM_WRITE == mnStmMode ) - { - *mpRWStm << mnVersion; - mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL; - mpRWStm->SeekRel( 4L ); - } - else - { - *mpRWStm >> mnVersion; - *mpRWStm >> mnTotalSize; - mnCompatPos = mpRWStm->Tell(); - } - } -} - -// ------------------------------------------------------------------------ - -ImplCompat::~ImplCompat() -{ - if( STREAM_WRITE == mnStmMode ) - { - const sal_uInt32 nEndPos = mpRWStm->Tell(); - - mpRWStm->Seek( mnCompatPos ); - *mpRWStm << ( nEndPos - mnTotalSize ); - mpRWStm->Seek( nEndPos ); - } - else - { - const sal_uInt32 nReadSize = mpRWStm->Tell() - mnCompatPos; - - if( mnTotalSize > nReadSize ) - mpRWStm->SeekRel( mnTotalSize - nReadSize ); - } -} diff --git a/vcl/source/gdi/svgread.cxx b/vcl/source/gdi/svgread.cxx new file mode 100644 index 000000000000..47ef39c37f20 --- /dev/null +++ b/vcl/source/gdi/svgread.cxx @@ -0,0 +1,131 @@ +/************************************************************************* + * + * 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 <tools/stream.hxx> +#include <vcl/svgread.hxx> +#include <vcl/gdimtf.hxx> +#include <vcl/metaact.hxx> +#include <vcl/rendergraphicrasterizer.hxx> + +// ----------- +// - Defines - +// ----------- + +namespace vcl +{ + // ----------------- + // - SVGReaderImpl - + // ----------------- + + class SVGReaderImpl + { + public: + + SVGReaderImpl( SvStream& rStm ); + ~SVGReaderImpl(); + + GDIMetaFile& ImplRead( GDIMetaFile& rSVGMtf ); + + private: + + SvStream& mrStm; + }; + + // ------------------------------------------------------------------------------ + + SVGReaderImpl::SVGReaderImpl( SvStream& rStm ) : + mrStm( rStm ) + { + } + + // ------------------------------------------------------------------------ + + SVGReaderImpl::~SVGReaderImpl() + { + } + + // ------------------------------------------------------------------------ + + GDIMetaFile& SVGReaderImpl::ImplRead( GDIMetaFile& rSVGMtf ) + { + const sal_uInt32 nStmPos = mrStm.Tell(); + const sal_uInt32 nStmLen = mrStm.Seek( STREAM_SEEK_TO_END ) - nStmPos; + + if( nStmLen ) + { + const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString::createFromAscii( "image/svg+xml" ), nStmLen ); + + mrStm.Seek( nStmPos ); + mrStm.Read( aSVGGraphic.GetGraphicData().get(), nStmLen ); + + if( !mrStm.GetError() ) + { + const vcl::RenderGraphicRasterizer aRasterizer( aSVGGraphic ); + const Size aDefaultSizePixel( aRasterizer.GetDefaultSizePixel() ); + + if( aDefaultSizePixel.Width() && aDefaultSizePixel.Height() ) + { + const Point aPos; + const Size aPrefSize( aRasterizer.GetPrefSize() ); + + rSVGMtf.SetPrefMapMode( aRasterizer.GetPrefMapMode() ); + rSVGMtf.SetPrefSize( aPrefSize ); + rSVGMtf.AddAction( new MetaRenderGraphicAction( aPos, aPrefSize, aSVGGraphic ) ); + rSVGMtf.WindStart(); + } + } + } + + return( rSVGMtf ); + } + + // ------------- + // - SVGReader - + // ------------- + + SVGReader::SVGReader( SvStream& rIStm ) : + mapImpl( new ::vcl::SVGReaderImpl( rIStm ) ) + { + } + + // ------------------------------------------------------------------------ + + SVGReader::~SVGReader() + { + } + + // ------------------------------------------------------------------------ + + GDIMetaFile& SVGReader::Read( GDIMetaFile& rSVGMtf ) + { + rSVGMtf = GDIMetaFile(); + + return( mapImpl.get() ? mapImpl->ImplRead( rSVGMtf ) : rSVGMtf ); + } + +} // namespace vcl diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 6d69bc67b982..fa674d1a712b 100755 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -30,8 +30,9 @@ #include "vcl/ctrl.hxx" #include "vcl/outdev.hxx" -#include "vcl/outfont.hxx" -#include "vcl/textlayout.hxx" + +#include "outfont.hxx" +#include "textlayout.hxx" #include <com/sun/star/i18n/ScriptDirection.hpp> diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index e6e100072679..cfea7205ee34 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -28,21 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> -#include <vcl/salvd.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/outdev.h> #include <vcl/virdev.hxx> +#include <salinst.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <salvd.hxx> +#include <outdev.h> +#include <svdata.hxx> + using namespace ::com::sun::star::uno; // ======================================================================= diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 5b865038bb2b..aa7c421dbc65 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -27,17 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <tools/debug.hxx> + #include <vcl/bitmapex.hxx> #include <vcl/gradient.hxx> #include <vcl/wall.hxx> -#include <vcl/wall2.hxx> #include <vcl/svapp.hxx> +#include <wall2.hxx> + -DBG_NAME( Wallpaper ); +DBG_NAME( Wallpaper ) // ----------------------------------------------------------------------- diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 4e94df4810da..fc23dba23bfb 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -36,12 +36,13 @@ #include "gcach_ftyp.hxx" #include "vcl/svapp.hxx" -#include "vcl/outfont.hxx" -#include "vcl/impfont.hxx" + +#include "outfont.hxx" +#include "impfont.hxx" #include "tools/poly.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "basegfx/matrix/b2dhommatrixtools.hxx" #include "basegfx/polygon/b2dpolypolygon.hxx" #include "osl/file.hxx" diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx index e607af2a90a8..747219451b64 100644 --- a/vcl/source/glyphs/gcach_ftyp.hxx +++ b/vcl/source/glyphs/gcach_ftyp.hxx @@ -28,7 +28,7 @@ #ifndef _SV_GCACHFTYP_HXX #define _SV_GCACHFTYP_HXX -#include <vcl/glyphcache.hxx> +#include <glyphcache.hxx> #include <rtl/textcvt.h> #include <ft2build.h> diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx index 84f1eef2e477..3fb0a21bd13c 100755 --- a/vcl/source/glyphs/gcach_layout.cxx +++ b/vcl/source/glyphs/gcach_layout.cxx @@ -30,8 +30,8 @@ #define ENABLE_ICU_LAYOUT #include <gcach_ftyp.hxx> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> +#include <sallayout.hxx> +#include <salgdi.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx index f5e259d8852c..34d0d4104590 100755 --- a/vcl/source/glyphs/gcach_rbmp.cxx +++ b/vcl/source/glyphs/gcach_rbmp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/glyphcache.hxx> +#include <glyphcache.hxx> #include <string.h> //------------------------------------------------------------------------ diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx deleted file mode 100644 index b2ed9e891516..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 = sal_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, sal_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; -} - -// ----------------------------------------------------------------------- - -sal_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 ); - - sal_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 ( sal_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 4e7d36a69f80..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 sal_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/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index 3b4b77cb5358..5dbec89e9619 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -31,15 +31,17 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <vcl/salbtype.hxx> + #include <gcach_ftyp.hxx> #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> -#include <vcl/outfont.hxx> +#include <vcl/salbtype.hxx> + +#include <outfont.hxx> #ifdef ENABLE_GRAPHITE -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> #endif #include <rtl/ustring.hxx> // used only for string=>hashvalue diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index 8507e55065f2..27c9eb02da64 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -45,17 +45,17 @@ #include <i18npool/mslangid.hxx> // Platform #ifndef WNT -#include <saldisp.hxx> +#include <unx/saldisp.hxx> -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> #include <freetype/ftsynth.h> // Module #include "gcach_ftyp.hxx" -#include <vcl/graphite_features.hxx> -#include <vcl/graphite_adaptors.hxx> +#include <graphite_features.hxx> +#include <graphite_adaptors.hxx> // Module private type definitions and forward declarations. // diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx index 7682cdb6c8ba..a19f5c5a2c9d 100644 --- a/vcl/source/glyphs/graphite_cache.cxx +++ b/vcl/source/glyphs/graphite_cache.cxx @@ -34,7 +34,7 @@ #endif #include <tools/debug.hxx> -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> #include <preextstl.h> #include <graphite/GrClient.h> @@ -42,8 +42,8 @@ #include <postextstl.h> #include <rtl/ustring.hxx> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> +#include <graphite_layout.hxx> +#include <graphite_cache.hxx> #include "graphite_textsrc.hxx" diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 1cb25306c4ee..4aba41c4b6d3 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -40,7 +40,7 @@ #include <svsys.h> #endif -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> using namespace grutils; // These mustn't conflict with font name lists which use ; and , diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 8a011606ab41..267454d825c5 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -57,10 +57,10 @@ #endif #ifdef UNX -#include <vcl/graphite_adaptors.hxx> +#include <graphite_adaptors.hxx> #endif -#include <vcl/salgdi.hxx> +#include <salgdi.hxx> #include <unicode/uchar.h> #include <unicode/ubidi.h> @@ -75,8 +75,8 @@ #include <graphite/SegmentPainter.h> #include <postextstl.h> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_features.hxx> +#include <graphite_layout.hxx> +#include <graphite_features.hxx> #include "graphite_textsrc.hxx" @@ -102,7 +102,7 @@ FILE * grLog() #endif #ifdef GRCACHE -#include <vcl/graphite_cache.hxx> +#include <graphite_cache.hxx> #endif diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx index eda97f509f03..ceba4dd4f6c8 100644 --- a/vcl/source/glyphs/graphite_serverfont.cxx +++ b/vcl/source/glyphs/graphite_serverfont.cxx @@ -35,12 +35,12 @@ // // Platform -#include <vcl/sallayout.hxx> +#include <sallayout.hxx> // Module #include "gcach_ftyp.hxx" -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> #include "graphite_textsrc.hxx" -#include <vcl/graphite_serverfont.hxx> +#include <graphite_serverfont.hxx> #ifndef WNT diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx index 5764ba9454c9..ac5fd0c558af 100644 --- a/vcl/source/glyphs/graphite_textsrc.cxx +++ b/vcl/source/glyphs/graphite_textsrc.cxx @@ -37,7 +37,7 @@ #include <string> #include <cassert> #include "graphite_textsrc.hxx" -#include <vcl/graphite_features.hxx> +#include <graphite_features.hxx> // class TextSourceAdaptor implementation. // diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index 388f8a631b49..ece01cc1a532 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -43,17 +43,9 @@ #include <tools/svwin.h> #endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif - -#ifndef _SV_SALGDI_HXX -#include <vcl/salgdi.hxx> -#endif - -#ifndef _SV_SALLAYOUT_HXX -#include <vcl/sallayout.hxx> -#endif +#include <salgdi.hxx> +#include <sallayout.hxx> // Module #include "vcl/dllapi.h" diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk deleted file mode 100644 index 74811aba6204..000000000000 --- a/vcl/source/glyphs/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=glyphs - -ENABLE_EXCEPTIONS=true -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -CFLAGS+= $(FREETYPE_CFLAGS) - -# --- Files -------------------------------------------------------- - -.IF "$(USE_BUILTIN_RASTERIZER)" != "" -# GlyphCache + FreeType support (only on UNX platforms currently) -SLOFILES=\ - $(SLO)$/glyphcache.obj \ - $(SLO)$/gcach_rbmp.obj \ - $(SLO)$/gcach_layout.obj \ - $(SLO)$/gcach_ftyp.obj - -.IF "$(ENABLE_GRAPHITE)" != "" -# Graphite support using the glyphcache infrastructure -CFLAGS+=-DENABLE_GRAPHITE -SLOFILES+= $(SLO)$/graphite_adaptors.obj \ - $(SLO)$/graphite_features.obj \ - $(SLO)$/graphite_cache.obj \ - $(SLO)$/graphite_textsrc.obj \ - $(SLO)$/graphite_serverfont.obj \ - $(SLO)$/graphite_layout.obj -.ENDIF - -.ELSE - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -# Graphite support on non-UNX platforms -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE -SLOFILES=\ - $(SLO)$/graphite_textsrc.obj \ - $(SLO)$/graphite_cache.obj \ - $(SLO)$/graphite_features.obj \ - $(SLO)$/graphite_layout.obj -.ENDIF -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 711a985b6fe5..f541ad92b552 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -37,7 +37,7 @@ #include <vos/mutex.hxx> #include <tools/diagnose_ex.h> -#include <vcl/canvasbitmap.hxx> +#include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> #include <vcl/bmpacc.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 36fdd514efe9..1ab4f9a619d0 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -69,7 +69,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/canvasbitmap.hxx> +#include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> #include <hash_map> diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index f5ecd02f39ae..b8ede1b5220a 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -33,7 +33,7 @@ #include "vcl/window.hxx" #include "vcl/menu.hxx" #include "vcl/lazydelete.hxx" -#include "vcl/svdata.hxx" +#include "svdata.hxx" namespace vcl { diff --git a/vcl/source/helper/makefile.mk b/vcl/source/helper/makefile.mk deleted file mode 100644 index 1a417417dbe4..000000000000 --- a/vcl/source/helper/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -ENABLE_EXCEPTIONS=TRUE -PRJNAME=vcl -TARGET=helper -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/strhelper.obj \ - $(SLO)$/evntpost.obj \ - $(SLO)$/canvasbitmap.obj \ - $(SLO)$/canvastools.obj \ - $(SLO)$/xconnection.obj \ - $(SLO)$/threadex.obj \ - $(SLO)$/lazydelete.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index a0cc8c35e5e2..d8bd96cfd0cf 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -28,13 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "rtl/ref.hxx" -#include "vcl/xconnection.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" #include "vcl/svapp.hxx" +#include "xconnection.hxx" +#include "svdata.hxx" +#include "salinst.hxx" + namespace { namespace css = com::sun::star; diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index c2e3af01635a..56f197966276 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -32,7 +32,8 @@ #include "sal/main.h" #include "tools/extendapplicationenvironment.hxx" -#include "vcl/salinst.hxx" + +#include "salinst.hxx" SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index b786184fa2f3..a8962044b47d 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -27,9 +27,7 @@ #define _SV_BTNTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_BUTTONTEXT_OK { diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src index a42a9531d9ee..f66683bfd5dc 100644 --- a/vcl/source/src/helptext.src +++ b/vcl/source/src/helptext.src @@ -27,9 +27,7 @@ #define _SV_HELPTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_HELPTEXT_CLOSE { diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 000d7215d80d..987ee29277c7 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -27,9 +27,7 @@ #define _SV_IMAGES_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> // ======================================================================= diff --git a/vcl/source/src/makefile.mk b/vcl/source/src/makefile.mk deleted file mode 100644 index 161d821573b9..000000000000 --- a/vcl/source/src/makefile.mk +++ /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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=svsrc -RESTARGET=vcl - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES= images.src \ - menu.src \ - stdtext.src \ - helptext.src \ - units.src \ - btntext.src \ - print.src \ - throbber.src \ - -RESLIB1NAME= $(RESTARGET) -RESLIB1IMAGES= $(PRJ)$/source/src -RESLIB1SRSFILES= $(SRS)$/svsrc.srs - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src index 1833093adfac..cead04b9f6ec 100644 --- a/vcl/source/src/menu.src +++ b/vcl/source/src/menu.src @@ -25,9 +25,8 @@ * ************************************************************************/ #define _SV_MENU_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif + +#include <svids.hrc> String SV_RESID_STRING_NOSELECTIONPOSSIBLE { diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index f41e65f4939f..82b0c00c2e15 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "vcl/svids.hrc" +#include "svids.hrc" ModalDialog SV_DLG_PRINT { diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src index 1b95f7bb1d72..9fd1487ce522 100644 --- a/vcl/source/src/stdtext.src +++ b/vcl/source/src/stdtext.src @@ -27,9 +27,7 @@ #define _SV_STDTEXT_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> String SV_STDTEXT_SERVICENOTAVAILABLE { diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src index 16b40b3f41a3..ea5f6ecad2ce 100644 --- a/vcl/source/src/units.src +++ b/vcl/source/src/units.src @@ -26,9 +26,7 @@ ************************************************************************/ #define _SV_UNITS_SRC -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif +#include <svids.hrc> StringArray SV_FUNIT_STRINGS { 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/source/window/accel.cxx b/vcl/source/window/accel.cxx index be71aa3e02e6..29f6cc16a176 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -28,16 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" #include <tools/list.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/debug.hxx> +#include <tools/rc.h> + #include <vcl/svapp.hxx> -#include <vcl/accel.h> +#include <accel.h> #include <vcl/accel.hxx> -#ifndef _RC_H -#include <tools/rc.h> -#endif diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 6b30dd3a3c23..0781b50eb37b 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -29,9 +29,10 @@ #include "precompiled_vcl.hxx" #include <tools/list.hxx> #include <tools/debug.hxx> -#include <vcl/accel.h> + +#include <accel.h> #include <vcl/accel.hxx> -#include <vcl/accmgr.hxx> +#include <accmgr.hxx> diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index f016ef2c053b..90f8bc9a4c1e 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -27,9 +27,10 @@ #include "precompiled_vcl.hxx" +#include "svdata.hxx" + #include "vcl/arrange.hxx" #include "vcl/edit.hxx" -#include "vcl/svdata.hxx" #include "vcl/svapp.hxx" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 79454d8b1fe5..3a00b522952e 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -27,10 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/syswin.hxx> @@ -42,9 +44,8 @@ #include <vcl/virdev.hxx> #include <vcl/help.hxx> #include <vcl/edit.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/metric.hxx> + #include <tools/debug.hxx> using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 4ce3c34d65e4..08132496dc36 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -30,14 +30,13 @@ #include <tools/ref.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svdata.hxx> + #include <vcl/button.hxx> #include <vcl/btndlg.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index c59978077412..03648a078193 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <vcl/settings.hxx> #include <vcl/window.hxx> -#include <vcl/window.h> -#include <tools/poly.hxx> #include <vcl/cursor.hxx> +#include <window.h> + +#include <tools/poly.hxx> + // ======================================================================= @@ -216,7 +219,7 @@ void Cursor::ImplShow( bool bDrawDirect, bool bRestore ) // ----------------------------------------------------------------------- -bool Cursor::ImplHide() +bool Cursor::ImplHide( bool i_bStopTimer ) { bool bWasCurVisible = false; if ( mpData && mpData->mpWindow ) @@ -225,6 +228,13 @@ bool Cursor::ImplHide() if ( mpData->mbCurVisible ) ImplRestore(); } + + if( mpData && i_bStopTimer ) + { + mpData->maTimer.Stop(); + mpData->mpWindow = NULL; + } + return bWasCurVisible; } @@ -328,13 +338,7 @@ void Cursor::Hide() if ( mbVisible ) { mbVisible = sal_False; - ImplHide(); - - if( mpData ) - { - mpData->maTimer.Stop(); - mpData->mpWindow = NULL; - } + ImplHide( true ); } } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 73a3bc7eb981..031e947cbf13 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -29,14 +29,14 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> + #include <vcl/svapp.hxx> -#include <vcl/window.h> #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/wrkwin.hxx> #include <vcl/button.hxx> #include <vcl/mnemonic.hxx> diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 32fc4755a62d..cf49dad4173a 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -27,15 +27,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> +#include <window.h> + #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabdlg.hxx> #include <vcl/button.hxx> -#include <vcl/window.h> #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index e4d5a8c4c0eb..70453d6c4f9a 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -28,13 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndevdis.hxx> -#include <vcl/dndlcon.hxx> -#include <vcl/window.h> +#include <dndevdis.hxx> +#include <dndlcon.hxx> +#include <window.h> +#include <svdata.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> + using namespace ::osl; using namespace ::vos; using namespace ::cppu; diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index 07819e76f957..9d768ad49ac9 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/dndlcon.hxx> +#include <dndlcon.hxx> using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 6c8519b68a1e..4d1c77ab09b5 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/debug.hxx> + #include <vcl/dockingarea.hxx> #include <vcl/syswin.hxx> #include <vcl/menu.hxx> -#include <vcl/svdata.hxx> + +#include <svdata.hxx> #include <map> diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index c59cb4da5dc8..314aa67597b2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -28,25 +28,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> #ifndef _SV_RC_H #include <tools/rc.h> #endif + +#include <brdwin.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <window.h> + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> #include <vcl/lineinfo.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> // ======================================================================= diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index eb16832e5c00..a3caabce0c5c 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -28,23 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <tools/time.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif + #include <vcl/event.hxx> -#include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dockwin.hxx> #include <vcl/svapp.hxx> -#include <vcl/svdata.hxx> #include <vcl/timer.hxx> -#include <vcl/window.h> #include <vcl/unowrap.hxx> -#include <vcl/salframe.hxx> + +#include <svdata.hxx> +#include <window.h> +#include <brdwin.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 170fcbd65cee..f8bf9a97d6dd 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -28,21 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/svdata.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> +#include <salframe.hxx> + #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/floatwin.hxx> -#include <vcl/window.h> -#ifndef _SV_RC_H + #include <tools/rc.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 03f88adc3566..4ed808852336 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -28,18 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/wrkwin.hxx> +#include <vcl/wrkwin.hxx> #include <vcl/bitmap.hxx> -#include <vcl/impbmp.hxx> #include <vcl/introwin.hxx> +#include <impbmp.hxx> +#include <svdata.hxx> +#include <salframe.hxx> diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 968c72abd383..44c0a8b79d0b 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -28,21 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> +#include <salinst.hxx> +#include <salframe.hxx> +#include <svdata.hxx> + #include <vcl/window.hxx> -#ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> -#endif -#ifndef _RC_H #include <tools/rc.h> -#endif - // ======================================================================= diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk deleted file mode 100644 index 1c63376dfda5..000000000000 --- a/vcl/source/window/makefile.mk +++ /dev/null @@ -1,106 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=win -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/arrange.obj \ - $(SLO)$/abstdlg.obj \ - $(SLO)$/accel.obj \ - $(SLO)$/accmgr.obj \ - $(SLO)$/brdwin.obj \ - $(SLO)$/btndlg.obj \ - $(SLO)$/cmdevt.obj \ - $(SLO)$/cursor.obj \ - $(SLO)$/decoview.obj \ - $(SLO)$/dialog.obj \ - $(SLO)$/dlgctrl.obj \ - $(SLO)$/dndevdis.obj \ - $(SLO)$/dndlcon.obj \ - $(SLO)$/dockingarea.obj \ - $(SLO)$/dockmgr.obj \ - $(SLO)$/dockwin.obj \ - $(SLO)$/floatwin.obj \ - $(SLO)$/introwin.obj \ - $(SLO)$/keycod.obj \ - $(SLO)$/keyevent.obj \ - $(SLO)$/mouseevent.obj \ - $(SLO)$/menu.obj \ - $(SLO)$/mnemonic.obj \ - $(SLO)$/mnemonicengine.obj \ - $(SLO)$/msgbox.obj \ - $(SLO)$/popupmenuwindow.obj \ - $(SLO)$/scrwnd.obj \ - $(SLO)$/printdlg.obj \ - $(SLO)$/seleng.obj \ - $(SLO)$/split.obj \ - $(SLO)$/splitwin.obj \ - $(SLO)$/status.obj \ - $(SLO)$/syschild.obj \ - $(SLO)$/javachild.obj \ - $(SLO)$/syswin.obj \ - $(SLO)$/tabdlg.obj \ - $(SLO)$/tabpage.obj \ - $(SLO)$/taskpanelist.obj \ - $(SLO)$/toolbox.obj \ - $(SLO)$/toolbox2.obj \ - $(SLO)$/window.obj \ - $(SLO)$/winproc.obj \ - $(SLO)$/window2.obj \ - $(SLO)$/window3.obj \ - $(SLO)$/window4.obj \ - $(SLO)$/wpropset.obj \ - $(SLO)$/wrkwin.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - -$(INCCOM)$/cuilib.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - @$(RM) $@ - @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@ -.ENDIF - -$(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index dda796ba41e4..72715139f699 100755 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -28,38 +28,39 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svsys.h" -#include "vcl/salinst.hxx" #include "tools/list.hxx" #include "tools/debug.hxx" #include "tools/diagnose_ex.h" -#include "vcl/svdata.hxx" +#include "tools/rc.h" +#include "tools/stream.hxx" + #include "vcl/svapp.hxx" #include "vcl/mnemonic.hxx" #include "vcl/image.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" -#include "vcl/svids.hrc" #include "vcl/floatwin.hxx" #include "vcl/wrkwin.hxx" #include "vcl/timer.hxx" #include "vcl/sound.hxx" #include "vcl/decoview.hxx" #include "vcl/bitmap.hxx" -#include "tools/rc.h" #include "vcl/menu.hxx" #include "vcl/button.hxx" #include "vcl/gradient.hxx" #include "vcl/i18nhelp.hxx" #include "vcl/taskpanelist.hxx" -#include "vcl/window.h" #include "vcl/controllayout.hxx" #include "vcl/toolbox.hxx" -#include "tools/stream.hxx" -#include "vcl/salmenu.hxx" -#include "vcl/salframe.hxx" #include "vcl/dockingarea.hxx" +#include "salinst.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "window.h" +#include "salmenu.hxx" +#include "salframe.hxx" + #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 6e0c109a564d..9f36b9ed5109 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -28,23 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> +#include <tools/rc.h> + +#include <svids.hrc> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> + #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/fixed.hxx> #include <vcl/sound.hxx> -#include <vcl/brdwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/button.hxx> -#ifndef _SV_RC_H -#include <tools/rc.h> -#endif #include <vcl/mnemonic.hxx> -#include <vcl/window.h> diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d38128e04f1e..094567c7f15c 100755 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -27,14 +27,15 @@ #include "precompiled_vcl.hxx" +#include "printdlg.hxx" +#include "svdata.hxx" +#include "svids.hrc" +#include "jobset.h" + #include "vcl/print.hxx" -#include "vcl/prndlg.hxx" #include "vcl/dialog.hxx" #include "vcl/button.hxx" -#include "vcl/svdata.hxx" -#include "vcl/svids.hrc" #include "vcl/wall.hxx" -#include "vcl/jobset.h" #include "vcl/status.hxx" #include "vcl/decoview.hxx" #include "vcl/arrange.hxx" diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 31740214532b..178692ff45c2 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -33,19 +33,12 @@ #include <tools/time.hxx> #include <tools/debug.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif -#include <vcl/svdata.hxx> -#ifndef _VCL_TIMER_HXX +#include <svids.hrc> +#include <svdata.hxx> +#include <scrwnd.hxx> + #include <vcl/timer.hxx> -#endif -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif -#ifndef _VCL_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <math.h> #include <limits.h> diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 9d7727493490..c92d9dd4130a 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -200,11 +200,7 @@ void SelectionEngine::CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ) sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_CMDEVT); - if ( !pFunctionSet || !pWin ) - return sal_False; - const bool bRightClickCursorPositioning = - rMEvt.IsRight() && rMEvt.GetClicks() == 1 && !IsInSelection(); - if ( (rMEvt.GetClicks() > 1 || rMEvt.IsRight()) && !bRightClickCursorPositioning ) + if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) return sal_False; sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods; diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index face35a179d8..976c56cfea56 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -28,19 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/gradient.hxx> -#include <tools/poly.hxx> #include <vcl/lineinfo.hxx> + #include <rtl/instance.hxx> -#include <vcl/window.h> + +#include <window.h> namespace { diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 3a66ead3944c..1d701752389c 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -29,22 +29,22 @@ #include "precompiled_vcl.hxx" #include <string.h> + #include <tools/list.hxx> #include <tools/debug.hxx> #include <tools/rcid.h> + #include <vcl/event.hxx> #include <vcl/wall.hxx> #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> #include <vcl/symbol.hxx> -#ifndef _SV_SVIDS_HRC -#include <vcl/svids.hrc> -#endif #include <vcl/image.hxx> -#include <vcl/svdata.hxx> #include <vcl/help.hxx> #include <vcl/splitwin.hxx> +#include <svdata.hxx> +#include <svids.hrc> // ======================================================================= diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index a261b6bd96a7..ee673e87c4b5 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -27,20 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/status.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> // ======================================================================= diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 9e7a30e983cb..25e693ae72a2 100644..100755 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -28,21 +28,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svsys.h> #include <rtl/process.h> #include <rtl/ref.hxx> + #include <tools/rc.h> -#include <vcl/window.h> -#include <vcl/salinst.hxx> -#include <vcl/salframe.hxx> + +// declare system types in sysdata.hxx +#include <svsys.h> + #include <vcl/window.hxx> -#include <vcl/salobj.hxx> -#include <vcl/svdata.hxx> #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> #include <vcl/syschild.hxx> #include <vcl/unohelp.hxx> +#include <window.h> +#include <salinst.hxx> +#include <salframe.hxx> +#include <salobj.hxx> +#include <svdata.hxx> + #ifdef SOLAR_JAVA #include <jni.h> #endif @@ -53,8 +58,6 @@ #include <com/sun/star/java/XJavaThreadRegister_11.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/syschild.hxx> - using namespace ::com::sun::star; // ======================================================================= @@ -240,6 +243,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) { sal_IntPtr nRet = 0; + (void)bUseJava; #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined QUARTZ diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 48c7629c2026..3313402dfef6 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -29,16 +29,8 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> -#include <vcl/brdwin.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> @@ -46,6 +38,10 @@ #include <vcl/taskpanelist.hxx> #include <vcl/unowrap.hxx> +#include <salframe.hxx> +#include <svdata.hxx> +#include <brdwin.hxx> +#include <window.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index dcb95b9b52a2..459e07f97042 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -29,20 +29,17 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/event.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/bitmapex.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> - +#include <svdata.hxx> +#include <com/sun/star/accessibility/XAccessible.hpp> // ======================================================================= diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 71a8f2ec2a30..f4f40f6722bf 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -27,11 +27,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <vcl/svdata.hxx> + #include <tools/rcid.h> -#include <vcl/dockwin.hxx> +#include <vcl/dockwin.hxx> #include <vcl/taskpanelist.hxx> + +#include <svdata.hxx> + #include <functional> #include <algorithm> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 105cf18bb43a..682c65e47a6f 100644..100755 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif #include <rtl/logfile.hxx> + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> +#include <tools/poly.hxx> + #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/accel.hxx> @@ -48,14 +44,18 @@ #include <vcl/virdev.hxx> #include <vcl/spin.h> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/bitmap.hxx> -#include <tools/poly.hxx> -#include <vcl/salframe.hxx> #include <vcl/mnemonic.hxx> #include <vcl/gradient.hxx> #include <vcl/menu.hxx> -#include <vcl/window.h> + +#include <svdata.hxx> +#include <window.h> +#include <toolbox.h> +#include <salframe.hxx> +#if defined WNT +#include <svsys.h> +#endif #include <string.h> #include <vector> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c993c9143a2c..fd6fb5dffb6b 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -27,26 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/list.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/bitmap.hxx> #include <vcl/toolbox.hxx> -#include <vcl/toolbox.h> #include <vcl/mnemonic.hxx> #include <vcl/menu.hxx> -#include <vcl/brdwin.hxx> - #include <vcl/unohelp.hxx> +#include <vcl/ImageListProvider.hxx> + +#include <svdata.hxx> +#include <brdwin.hxx> +#include <toolbox.h> + #include <unotools/confignode.hxx> -#include <vcl/ImageListProvider.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace vcl; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 96e787928772..ac7101f079c0 100644..100755 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -27,48 +27,58 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include "svsys.h" -#endif -#include "vcl/salframe.hxx" -#include "vcl/salobj.hxx" -#include "vcl/salinst.hxx" -#include "vcl/salgtype.hxx" -#include "vcl/salgdi.hxx" -#include "vcl/unohelp.hxx" #include "tools/time.hxx" #include "tools/debug.hxx" -#ifndef _SV_RC_H #include "tools/rc.h" -#endif -#include "vcl/svdata.hxx" -#include "vcl/dbggui.hxx" -#include "vcl/outfont.hxx" -#include "vcl/outdev.h" -#include "vcl/region.h" + +#include "unotools/fontcfg.hxx" +#include "unotools/confignode.hxx" + +#include "vcl/unohelp.hxx" +#include "vcl/salgtype.hxx" #include "vcl/event.hxx" #include "vcl/help.hxx" #include "vcl/cursor.hxx" #include "vcl/svapp.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/syswin.hxx" #include "vcl/syschild.hxx" -#include "vcl/brdwin.hxx" -#include "vcl/helpwin.hxx" #include "vcl/dockwin.hxx" #include "vcl/menu.hxx" #include "vcl/wrkwin.hxx" #include "vcl/wall.hxx" #include "vcl/gradient.hxx" -#include "vcl/toolbox.h" -#include "unotools/fontcfg.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" #include "vcl/salctype.hxx" -#include "vcl/button.hxx" // Button::GetStandardText +#include "vcl/button.hxx" #include "vcl/taskpanelist.hxx" +#include "vcl/dialog.hxx" +#include "vcl/unowrap.hxx" +#include "vcl/gdimtf.hxx" +#include "vcl/pdfextoutdevdata.hxx" +#include "vcl/lazydelete.hxx" + +// declare system types in sysdata.hxx +#include "svsys.h" +#include "vcl/sysdata.hxx" + +#include "salframe.hxx" +#include "salobj.hxx" +#include "salinst.hxx" +#include "salgdi.hxx" +#include "svdata.hxx" +#include "dbggui.hxx" +#include "outfont.hxx" +#include "window.h" +#include "toolbox.h" +#include "outdev.h" +#include "region.h" +#include "brdwin.hxx" +#include "helpwin.hxx" +#include "sallayout.hxx" +#include "dndlcon.hxx" +#include "dndevdis.hxx" + #include "com/sun/star/awt/XWindowPeer.hpp" #include "com/sun/star/rendering/XCanvas.hpp" #include "com/sun/star/rendering/XSpriteCanvas.hpp" @@ -85,16 +95,6 @@ #include "com/sun/star/accessibility/XAccessible.hpp" #include "com/sun/star/accessibility/AccessibleRole.hpp" -#include "vcl/dialog.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/dndlcon.hxx" -#include "vcl/dndevdis.hxx" -#include "unotools/confignode.hxx" -#include "vcl/gdimtf.hxx" - -#include "vcl/pdfextoutdevdata.hxx" -#include "vcl/lazydelete.hxx" - #include <set> #include <typeinfo> @@ -2407,7 +2407,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { bool bRestoreCursor = false; if ( mpWindowImpl->mpCursor ) - bRestoreCursor = mpWindowImpl->mpCursor->ImplHide(); + bRestoreCursor = mpWindowImpl->mpCursor->ImplHide( false ); mbInitClipRegion = sal_True; mpWindowImpl->mbInPaint = sal_True; @@ -2896,7 +2896,7 @@ void Window::ImplScroll( const Rectangle& rRect, ImplInvalidateAllOverlapBackgrounds(); if ( mpWindowImpl->mpCursor ) - mpWindowImpl->mpCursor->ImplHide(); + mpWindowImpl->mpCursor->ImplHide( false ); sal_uInt16 nOrgFlags = nFlags; if ( !(nFlags & (SCROLL_CHILDREN | SCROLL_NOCHILDREN)) ) @@ -4073,7 +4073,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) { // Cursor hiden if ( pOldFocusWindow->mpWindowImpl->mpCursor ) - pOldFocusWindow->mpWindowImpl->mpCursor->ImplHide(); + pOldFocusWindow->mpWindowImpl->mpCursor->ImplHide( true ); } // !!!!! Wegen altem SV-Office Activate/Deavtivate Handling @@ -8054,7 +8054,7 @@ void Window::SetCursor( Cursor* pCursor ) if ( mpWindowImpl->mpCursor != pCursor ) { if ( mpWindowImpl->mpCursor ) - mpWindowImpl->mpCursor->ImplHide(); + mpWindowImpl->mpCursor->ImplHide( true ); mpWindowImpl->mpCursor = pCursor; if ( pCursor ) pCursor->ImplShow(); @@ -9703,7 +9703,7 @@ sal_Bool Window::IsNativeWidgetEnabled() const } #ifdef WNT // see #140456# -#include <salframe.h> +#include <win/salframe.h> #endif uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize, diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 669fce05a791..2513170a4d25 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -29,31 +29,28 @@ #include "precompiled_vcl.hxx" #include <limits.h> -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salbmp.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/salframe.hxx> + #include <tools/debug.hxx> -#include <vcl/svdata.hxx> -#include <vcl/impbmp.hxx> +#include <tools/poly.hxx> + #include <vcl/bitmap.hxx> #include <vcl/event.hxx> #include <vcl/timer.hxx> #include <vcl/metric.hxx> -#include <vcl/outfont.hxx> -#include <vcl/outdev.h> -#include <tools/poly.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/scrbar.hxx> -#ifndef _SV_SCRWND_HXX -#include <scrwnd.hxx> -#endif #include <vcl/dockwin.hxx> +#include <window.h> +#include <outfont.hxx> +#include <outdev.h> +#include <svdata.hxx> +#include <impbmp.hxx> +#include <salbmp.hxx> +#include <salgdi.hxx> +#include <salframe.hxx> +#include <scrwnd.hxx> // ======================================================================= diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index 577a573c2015..775249c450ee 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -28,10 +28,11 @@ #include "precompiled_vcl.hxx" #include "vcl/window.hxx" -#include "vcl/window.h" -#include "vcl/svdata.hxx" #include "vcl/arrange.hxx" +#include "window.h" +#include "svdata.hxx" + #include "com/sun/star/beans/PropertyValue.hpp" #include <map> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 9cb38756e770..6522856bb05d 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -28,40 +28,37 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salwtype.hxx> -#include <vcl/salframe.hxx> #include <tools/debug.hxx> -#ifndef _INTN_HXX -//#include <tools/intn.hxx> -#endif + +#include <unotools/localedatawrapper.hxx> + #include <vcl/i18nhelp.hxx> #include <vcl/unohelp.hxx> -#include <unotools/localedatawrapper.hxx> -#include <vcl/svdata.hxx> -#include <vcl/dbggui.hxx> #include <vcl/timer.hxx> #include <vcl/event.hxx> #include <vcl/sound.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/cursor.hxx> -#include <vcl/accmgr.hxx> -#include <vcl/print.h> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> #include <vcl/floatwin.hxx> #include <vcl/dialog.hxx> #include <vcl/help.hxx> -#include <vcl/helpwin.hxx> -#include <vcl/brdwin.hxx> #include <vcl/dockwin.hxx> -#include <vcl/salgdi.hxx> #include <vcl/menu.hxx> -#include <vcl/dndlcon.hxx> +#include <svdata.hxx> +#include <dbggui.hxx> +#include <salwtype.hxx> +#include <salframe.hxx> +#include <accmgr.hxx> +#include <print.h> +#include <window.h> +#include <helpwin.hxx> +#include <brdwin.hxx> +#include <salgdi.hxx> +#include <dndlcon.hxx> + #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> @@ -1646,7 +1643,13 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) // #i42750# presentation wants to be informed about resize // as early as possible WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow); - if( pWorkWindow && pWorkWindow->IsPresentationMode() ) + if( ! pWorkWindow || pWorkWindow->IsPresentationMode() ) + bStartTimer = false; + } + else + { + WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow); + if( ! pWorkWindow || pWorkWindow->IsPresentationMode() ) bStartTimer = false; } } @@ -1793,7 +1796,7 @@ IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG ) pSVData->maWinData.mpFocusWin = NULL; if ( pFocusWin->ImplGetWindowImpl()->mpCursor ) - pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); + pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); // Deaktivate rufen Window* pOldFocusWindow = pFocusWin; @@ -1900,7 +1903,7 @@ static void ImplHandleLoseFocus( Window* pWindow ) Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor ) - pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); + pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); if( bCallDirect ) pWindow->ImplAsyncFocusHdl( NULL ); } diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx index fcb0c560291e..10e3e8fa5e2f 100644 --- a/vcl/source/window/wpropset.cxx +++ b/vcl/source/window/wpropset.cxx @@ -30,7 +30,8 @@ #include "vcl/wpropset.hxx" #include "vcl/window.hxx" #include "vcl/vclevent.hxx" -#include "vcl/svdata.hxx" + +#include "svdata.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/beans/PropertyValue.hpp" diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 81c2b36345eb..0e667de73067 100644..100755 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -28,22 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#include <vcl/salframe.hxx> #include <tools/debug.hxx> - -#ifndef _SV_RC_H #include <tools/rc.h> -#endif -#include <vcl/svdata.hxx> + #include <vcl/svapp.hxx> -#include <vcl/brdwin.hxx> -#include <vcl/window.h> #include <vcl/wrkwin.hxx> +// declare system types in sysdata.hxx +#include <svsys.h> #include <vcl/sysdata.hxx> +#include <svdata.hxx> +#include <salframe.hxx> +#include <brdwin.hxx> +#include <window.h> + // ======================================================================= #define WORKWIN_WINDOWSTATE_FULLSCREEN ((sal_uLong)0x00010000) diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 9756c728250d..341c1263ac9e 100644 --- a/vcl/unx/source/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -30,22 +30,22 @@ #include <stdio.h> #include <string.h> + #include <sal/alloca.h> +#include <osl/thread.h> + #include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> #include <tools/postx.h> -#include <salunx.h> -#include <XIM.h> -#include <i18n_cb.hxx> -#include <i18n_status.hxx> -#include "i18n_ic.hxx" -#include "i18n_im.hxx" -#ifndef _OSL_THREAD_H -#include <osl/thread.h> -#endif -#include <vcl/salframe.hxx> +#include "unx/salunx.h" +#include "unx/XIM.h" +#include "unx/i18n_cb.hxx" +#include "unx/i18n_status.hxx" +#include "unx/i18n_ic.hxx" +#include "unx/i18n_im.hxx" +#include "salframe.hxx" // ------------------------------------------------------------------------- // diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 46471d553dda..73de37538d61 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -29,29 +29,24 @@ #include "precompiled_vcl.hxx" #include <stdio.h> + #include <sal/alloca.h> +#include <osl/thread.h> #include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> #include <tools/postx.h> -#include <salunx.h> +#include <unx/salunx.h> +#include <unx/XIM.h> +#include <unx/i18n_ic.hxx> +#include <unx/i18n_im.hxx> +#include <unx/i18n_status.hxx> -#include <XIM.h> -#include <i18n_ic.hxx> -#include <i18n_im.hxx> -#include <i18n_status.hxx> - -#ifndef _SV_SALFRAME_HXX -#include <salframe.h> -#endif -#include <saldata.hxx> -#include <saldisp.hxx> - -#ifndef _OSL_THREAD_H -#include <osl/thread.h> -#endif +#include <unx/salframe.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> using namespace vcl; diff --git a/vcl/unx/source/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index c797da34e76c..176212f681d5 100644 --- a/vcl/unx/source/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -30,6 +30,7 @@ #include <stdio.h> #include <string.h> + #ifdef LINUX # ifndef __USE_XOPEN # define __USE_XOPEN @@ -40,19 +41,19 @@ #include <tools/prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> -#include <XIM.h> +#include <unx/XIM.h> #include <tools/postx.h> -#include <salunx.h> -#include <saldisp.hxx> -#include "i18n_im.hxx" -#include <i18n_status.hxx> +#include "unx/salunx.h" +#include "unx/saldisp.hxx" +#include "unx/i18n_im.hxx" +#include "unx/i18n_status.hxx" #include <osl/thread.h> #include <osl/process.h> using namespace vcl; -#include "i18n_cb.hxx" +#include "unx/i18n_cb.hxx" #if defined(SOLARIS) || defined(LINUX) extern "C" char * XSetIMValues(XIM im, ...); #endif diff --git a/vcl/unx/source/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx index 812e54aae937..122a88517baf 100644 --- a/vcl/unx/source/app/i18n_keysym.cxx +++ b/vcl/unx/generic/app/i18n_keysym.cxx @@ -31,7 +31,7 @@ #include <X11/X.h> #include <sal/types.h> -#include <i18n_keysym.hxx> +#include <unx/i18n_keysym.hxx> // convert keysyms to unicode // for all keysyms with byte1 and byte2 equal zero, and of course only for diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 844775779935..04ffe8bd8d71 100644 --- a/vcl/unx/source/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -35,25 +35,25 @@ #include <tools/prex.h> #include <X11/Xlib.h> -#include <XIM.h> +#include <unx/XIM.h> #include <tools/postx.h> -#include <salunx.h> - -#include <i18n_status.hxx> -#include <i18n_ic.hxx> +#include <unx/salunx.h> +#include <unx/i18n_status.hxx> +#include <unx/i18n_ic.hxx> +#include <unx/saldisp.hxx> +#include <unx/salframe.h> +#include <unx/saldata.hxx> #include <vcl/wrkwin.hxx> #include <vcl/fixed.hxx> #include <vcl/menubtn.hxx> #include <vcl/menu.hxx> -#include <vcl/svdata.hxx> #include <vcl/svapp.hxx> -#include <saldisp.hxx> -#include <salframe.h> -#include <saldata.hxx> #include <vcl/sysdata.hxx> +#include <svdata.hxx> + using namespace vcl; using namespace rtl; diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/generic/app/i18n_wrp.cxx index eb48962a24d0..ff56f0ed0647 100644 --- a/vcl/unx/source/app/i18n_wrp.cxx +++ b/vcl/unx/generic/app/i18n_wrp.cxx @@ -43,9 +43,10 @@ struct XIMArg #include <string.h> #include <dlfcn.h> + #include <X11/Xlib.h> #include <X11/Xlibint.h> -#include "XIM.h" +#include "unx/XIM.h" #define XIIIMP_LIB "xiiimp.so.2" diff --git a/vcl/unx/source/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index e9a787eda667..5587bbf02339 100644 --- a/vcl/unx/source/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -31,9 +31,9 @@ #include <stdio.h> -#include "saldisp.hxx" -#include "saldata.hxx" -#include "i18n_xkb.hxx" +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" +#include "unx/i18n_xkb.hxx" SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* #if __XKeyboardExtension__ diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index b48f0e629bd9..73d4b2a2e7eb 100644 --- a/vcl/unx/source/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -34,7 +34,7 @@ #include <tools/postx.h> #endif -#include <saldisp.hxx> +#include <unx/saldisp.hxx> #include <X11/keysym.h> #if !defined (SunXK_Undo) diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index 27f9b1d1b77c..e7f37c00e2ca 100644 --- a/vcl/unx/source/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -282,8 +282,8 @@ void RandRWrapper::releaseWrapper() #endif -#include "saldisp.hxx" -#include "salframe.h" +#include "unx/saldisp.hxx" +#include "unx/salframe.h" #if OSL_DEBUG_LEVEL > 1 #include <cstdio> #endif diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index b14c11ac783e..ec8db9509bf6 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -56,29 +56,27 @@ #include <sys/time.h> #include <unistd.h> #endif + #include <vos/process.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif -#include "Xproto.h" -#include <saldisp.hxx> -#include <saldata.hxx> -#include <vcl/salinst.hxx> -#include <salframe.h> +#include "unx/Xproto.h" +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" +#include "unx/salframe.h" +#include "unx/sm.hxx" +#include "unx/i18n_im.hxx" +#include "unx/i18n_xkb.hxx" +#include "salinst.hxx" + #include <osl/signal.h> #include <osl/thread.h> #include <osl/process.h> #include <rtl/strbuf.hxx> -#ifndef _RTL_BOOTSTRAP_HXX #include <rtl/bootstrap.hxx> -#endif #include <tools/debug.hxx> -#include <sm.hxx> #include <vcl/svapp.hxx> -#include "i18n_im.hxx" -#include "i18n_xkb.hxx" // -=-= <signal.h> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #ifndef UNX diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 39d2803720c8..5a228676e722 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -48,8 +48,8 @@ #include <tools/prex.h> #include <X11/cursorfont.h> -#include "salcursors.h" -#include "invert50.h" +#include "unx/x11_cursors/salcursors.h" +#include "unx/x11_cursors/invert50.h" #ifdef SOLARIS #define XK_KOREAN #endif @@ -75,25 +75,25 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #include <tools/postx.h> -#include <salunx.h> +#include <unx/salunx.h> #include <sal/types.h> -#include "i18n_im.hxx" -#include "i18n_xkb.hxx" -#include <saldisp.hxx> -#include <saldata.hxx> -#include <vcl/salinst.hxx> -#include <salgdi.h> -#include <salframe.h> +#include "unx/i18n_im.hxx" +#include "unx/i18n_xkb.hxx" +#include <unx/saldisp.hxx> +#include <unx/saldata.hxx> +#include <salinst.hxx> +#include <unx/salgdi.h> +#include <unx/salframe.h> #include <vcl/keycodes.hxx> #include <vcl/salbtype.hxx> -#include <salbmp.h> +#include <unx/salbmp.h> #ifndef _OSL_THREADMUTEX_H_ #include <osl/mutex.h> #endif -#include <salobj.h> -#include <sm.hxx> -#include <wmadaptor.hxx> -#include <dtint.hxx> +#include <unx/salobj.h> +#include <unx/sm.hxx> +#include <unx/wmadaptor.hxx> +#include <unx/dtint.hxx> #include <osl/socket.h> #include <poll.h> diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 8814e6c65f89..3b57544ebad0 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -32,23 +32,24 @@ #include <stdio.h> #include <stdlib.h> -#include <osl/module.hxx> +#include "osl/module.hxx" +#include "tools/solarmutex.hxx" +#include "vos/mutex.hxx" -#include "salunx.h" -#include "saldata.hxx" -#include "saldisp.hxx" -#include "salinst.h" -#include "salframe.h" -#include "dtint.hxx" -#include "salprn.h" -#include "sm.hxx" +#include "unx/salunx.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/salinst.h" +#include "unx/salframe.h" +#include "unx/dtint.hxx" +#include "unx/salprn.h" +#include "unx/sm.hxx" -#include "vcl/salwtype.hxx" #include "vcl/apptypes.hxx" #include "vcl/helper.hxx" -#include <tools/solarmutex.hxx> -#include "vos/mutex.hxx" + +#include "salwtype.hxx" // ------------------------------------------------------------------------- // @@ -101,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/source/app/salsys.cxx b/vcl/unx/generic/app/salsys.cxx index 5e2b870f559f..672b3e53e672 100644 --- a/vcl/unx/source/app/salsys.cxx +++ b/vcl/unx/generic/app/salsys.cxx @@ -28,16 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <salunx.h> -#include <vcl/salsys.hxx> -#include <dtint.hxx> +#include <unx/salunx.h> +#include <unx/dtint.hxx> +#include <unx/saldata.hxx> +#include <unx/salinst.h> +#include <unx/saldisp.hxx> +#include <unx/salsys.h> + #include <vcl/msgbox.hxx> #include <vcl/button.hxx> -#include <vcl/svdata.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <saldisp.hxx> -#include <salsys.h> + +#include <svdata.hxx> #include <rtl/ustrbuf.hxx> #include <osl/thread.h> diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index 1085967f74a2..af8b2df4124b 100644 --- a/vcl/unx/source/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -34,11 +34,11 @@ #include <time.h> #include <unistd.h> -#include <salunx.h> -#include <saldata.hxx> -#include <saldisp.hxx> -#include <saltimer.h> -#include <salinst.h> +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/saltimer.h> +#include <unx/salinst.h> // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 21d9b8df60f3..c8090270d611 100644 --- a/vcl/unx/source/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -36,19 +36,20 @@ #include <osl/process.h> #include <osl/security.h> +#include <osl/conditn.h> #include <tools/prex.h> #include <X11/Xatom.h> #include <tools/postx.h> -#include <sm.hxx> -#include <saldata.hxx> -#include <saldisp.hxx> -#include <salframe.h> + +#include <unx/sm.hxx> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/salframe.h> +#include <unx/salinst.h> + #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <salinst.h> - -#include <osl/conditn.h> #define USE_SM_EXTENSION diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/generic/app/soicon.cxx index ddb14e9ecc39..bb41299c376d 100644 --- a/vcl/unx/source/app/soicon.cxx +++ b/vcl/unx/generic/app/soicon.cxx @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <salunx.h> -#include <saldisp.hxx> -#include <vcl/salbmp.hxx> +#include <unx/salunx.h> +#include <unx/saldisp.hxx> +#include <unx/salbmp.h> +#include <unx/soicon.hxx> + #include <vcl/salbtype.hxx> -#include <vcl/impbmp.hxx> #include <vcl/bitmap.hxx> -#ifndef _SV_BITMAP_HXX #include <vcl/bitmapex.hxx> -#endif #include <vcl/graph.hxx> -#include <soicon.hxx> -#include <vcl/svdata.hxx> -#include <salbmp.h> -#include <vcl/svids.hrc> + +#include <svdata.hxx> +#include <svids.hrc> +#include <salbmp.hxx> +#include <impbmp.hxx> + sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask) diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index f816c5d1426e..90b2e5426bdf 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -31,17 +31,22 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> + #include "sal/alloca.h" -#include "wmadaptor.hxx" -#include "saldisp.hxx" -#include "saldata.hxx" -#include "salframe.h" -#include "vcl/salgdi.hxx" -#include "osl/thread.h" #include "rtl/locale.h" + +#include "osl/thread.h" #include "osl/process.h" + #include "vcl/configsettings.hxx" +#include "unx/wmadaptor.hxx" +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" +#include "unx/salframe.h" + +#include "salgdi.hxx" + #include "tools/prex.h" #include <X11/X.h> #include <X11/Xatom.h> diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 74ab2e2c3ea2..777e5aa921d3 100644 --- a/vcl/unx/source/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -28,18 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svunx.h> +#include <unx/svunx.h> #include <tools/prex.h> #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/source/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index a08a9481b8e8..a08a9481b8e8 100644 --- a/vcl/unx/source/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 2c0ee2d95c0d..2c0ee2d95c0d 100644 --- a/vcl/unx/source/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx diff --git a/vcl/unx/source/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index e6fc3dd8a532..e6fc3dd8a532 100644 --- a/vcl/unx/source/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx diff --git a/vcl/unx/source/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index d8ef87444a7a..d8ef87444a7a 100644 --- a/vcl/unx/source/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index 5db23329abd8..5db23329abd8 100644 --- a/vcl/unx/source/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 8188f2b1164a..e7b0e754e395 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saldisp.hxx" -#include "saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" #include <unistd.h> #include <stdio.h> diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 34a50819bfed..34a50819bfed 100644 --- a/vcl/unx/source/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index d15518c0b9ab..fa7fc6a65589 100644 --- a/vcl/unx/source/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "unx/salinst.h" #include <X11_clipboard.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 16518f0b2864..16518f0b2864 100644 --- a/vcl/unx/source/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index 65f7d1fdc475..65f7d1fdc475 100644 --- a/vcl/unx/source/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx diff --git a/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index 1ccd04eba725..1ccd04eba725 100644 --- a/vcl/unx/source/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx diff --git a/vcl/unx/source/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx index b59b4417ca69..b59b4417ca69 100644 --- a/vcl/unx/source/dtrans/bmp.hxx +++ b/vcl/unx/generic/dtrans/bmp.hxx diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 001da3900bb7..001da3900bb7 100644 --- a/vcl/unx/source/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx diff --git a/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/generic/dtrans/copydata_curs.h index e3d0e3e76530..e3d0e3e76530 100644 --- a/vcl/unx/source/inc/copydata_curs.h +++ b/vcl/unx/generic/dtrans/copydata_curs.h diff --git a/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/generic/dtrans/copydata_mask.h index f25b0863d807..f25b0863d807 100644 --- a/vcl/unx/source/inc/copydata_mask.h +++ b/vcl/unx/generic/dtrans/copydata_mask.h diff --git a/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/generic/dtrans/linkdata_curs.h index c60edc3b99d0..c60edc3b99d0 100644 --- a/vcl/unx/source/inc/linkdata_curs.h +++ b/vcl/unx/generic/dtrans/linkdata_curs.h diff --git a/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/generic/dtrans/linkdata_mask.h index cf0f89f63b1b..cf0f89f63b1b 100644 --- a/vcl/unx/source/inc/linkdata_mask.h +++ b/vcl/unx/generic/dtrans/linkdata_mask.h diff --git a/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/generic/dtrans/movedata_curs.h index b79412bc3f41..b79412bc3f41 100644 --- a/vcl/unx/source/inc/movedata_curs.h +++ b/vcl/unx/generic/dtrans/movedata_curs.h diff --git a/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/generic/dtrans/movedata_mask.h index e25d0837d8dc..e25d0837d8dc 100644 --- a/vcl/unx/source/inc/movedata_mask.h +++ b/vcl/unx/generic/dtrans/movedata_mask.h diff --git a/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/generic/dtrans/nodrop_curs.h index 8e208e32f293..8e208e32f293 100644 --- a/vcl/unx/source/inc/nodrop_curs.h +++ b/vcl/unx/generic/dtrans/nodrop_curs.h diff --git a/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/generic/dtrans/nodrop_mask.h index 7cbecef2c60f..7cbecef2c60f 100644 --- a/vcl/unx/source/inc/nodrop_mask.h +++ b/vcl/unx/generic/dtrans/nodrop_mask.h diff --git a/vcl/unx/source/fontmanager/adobeenc.tab b/vcl/unx/generic/fontmanager/adobeenc.tab index 492e92f3fcf2..492e92f3fcf2 100644 --- a/vcl/unx/source/fontmanager/adobeenc.tab +++ b/vcl/unx/generic/fontmanager/adobeenc.tab diff --git a/vcl/unx/source/fontmanager/afm_hash.cpp b/vcl/unx/generic/fontmanager/afm_hash.cpp index de01d8cd0434..de01d8cd0434 100755 --- a/vcl/unx/source/fontmanager/afm_hash.cpp +++ b/vcl/unx/generic/fontmanager/afm_hash.cpp diff --git a/vcl/unx/source/fontmanager/afm_keyword_list b/vcl/unx/generic/fontmanager/afm_keyword_list index 263d76bca4d3..263d76bca4d3 100755 --- a/vcl/unx/source/fontmanager/afm_keyword_list +++ b/vcl/unx/generic/fontmanager/afm_keyword_list diff --git a/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx index 0c43373bfa8e..639e394f0edd 100644 --- a/vcl/unx/source/fontmanager/fontcache.cxx +++ b/vcl/unx/generic/fontmanager/fontcache.cxx @@ -31,7 +31,7 @@ #include <cstdlib> #include <cstring> -#include "vcl/fontcache.hxx" +#include "fontcache.hxx" #include "osl/thread.h" diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 434263db352e..be7904c55959 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "fontcache.hxx" +#include "impfont.hxx" #include "vcl/fontmanager.hxx" -#include "vcl/fontcache.hxx" -#include "vcl/impfont.hxx" using namespace psp; diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index d72692b86a65..8b9ba153e7e3 100644 --- a/vcl/unx/source/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -36,15 +36,14 @@ #include "unotools/atom.hxx" +#include "fontcache.hxx" +#include "fontsubset.hxx" +#include "impfont.hxx" +#include "svdata.hxx" +#include "salinst.hxx" #include "vcl/fontmanager.hxx" -#include "vcl/fontcache.hxx" -#include "vcl/fontcache.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/impfont.hxx" #include "vcl/strhelper.hxx" #include "vcl/ppdparser.hxx" -#include "vcl/svdata.hxx" -#include "vcl/salinst.hxx" #include "tools/urlobj.hxx" #include "tools/stream.hxx" diff --git a/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index 05213a52597c..05213a52597c 100644 --- a/vcl/unx/source/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx diff --git a/vcl/unx/source/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx index e1a33b4d1b5d..e1a33b4d1b5d 100644 --- a/vcl/unx/source/fontmanager/parseAFM.cxx +++ b/vcl/unx/generic/fontmanager/parseAFM.cxx diff --git a/vcl/unx/source/fontmanager/parseAFM.hxx b/vcl/unx/generic/fontmanager/parseAFM.hxx index cfebde696c14..cfebde696c14 100644 --- a/vcl/unx/source/fontmanager/parseAFM.hxx +++ b/vcl/unx/generic/fontmanager/parseAFM.hxx diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/generic/gdi/cdeint.cxx index ee0054814761..af635f38e9bc 100644 --- a/vcl/unx/source/gdi/cdeint.cxx +++ b/vcl/unx/generic/gdi/cdeint.cxx @@ -27,17 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <stdlib.h> #include <ctype.h> #include <unistd.h> -#include <salunx.h> -#include <saldisp.hxx> -#include <cdeint.hxx> -#include <vcl/settings.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> +#include <vcl/settings.hxx> + +#include <unx/salunx.h> +#include <unx/saldisp.hxx> +#include <unx/cdeint.hxx> + CDEIntegrator::CDEIntegrator() { meType = DtCDE; diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/generic/gdi/dtint.cxx index 5f0dbd50ea17..d14389cd0438 100644 --- a/vcl/unx/source/gdi/dtint.cxx +++ b/vcl/unx/generic/gdi/dtint.cxx @@ -34,23 +34,23 @@ #include <fcntl.h> #include <dlfcn.h> -#include <salunx.h> -#include <X11/Xatom.h> +#include "osl/file.h" +#include "osl/process.h" +#include "osl/security.h" + +#include "vcl/svapp.hxx" +#include "unx/salunx.h" +#include <X11/Xatom.h> #ifdef USE_CDE -#include <cdeint.hxx> +#include "unx/cdeint.hxx" #endif -#include <dtint.hxx> -#include <saldisp.hxx> -#include <saldata.hxx> -#include <wmadaptor.hxx> - -#include <vcl/svapp.hxx> -#include <dtsetenum.hxx> +#include "unx/dtint.hxx" +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" +#include "unx/wmadaptor.hxx" -#include <osl/file.h> -#include <osl/process.h> -#include <osl/security.h> +#include "dtsetenum.hxx" #include <set> #include <stdio.h> diff --git a/vcl/unx/source/gdi/dtsetenum.hxx b/vcl/unx/generic/gdi/dtsetenum.hxx index 5406ac870a43..5406ac870a43 100644 --- a/vcl/unx/source/gdi/dtsetenum.hxx +++ b/vcl/unx/generic/gdi/dtsetenum.hxx diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 9b876eb329b8..3cd828c24065 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -28,15 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <rtl/ustring.hxx> -#include <osl/module.h> -#include <osl/thread.h> - -#include <gcach_xpeer.hxx> -#include <xrender_peer.hxx> -#include <saldisp.hxx> -#include <saldata.hxx> -#include <salgdi.h> +#include "rtl/ustring.hxx" +#include "osl/module.h" +#include "osl/thread.h" + +#include "unx/saldisp.hxx" +#include "unx/saldata.hxx" +#include "unx/salgdi.h" + +#include "gcach_xpeer.hxx" +#include "xrender_peer.hxx" // =========================================================================== diff --git a/vcl/unx/source/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx index 13277fa975de..a65c75174858 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.hxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx @@ -28,13 +28,11 @@ #ifndef _SV_GCACH_XPEER_HXX #define _SV_GCACH_XPEER_HXX -#include <vcl/glyphcache.hxx> - #include <tools/prex.h> #include <X11/extensions/Xrender.h> #include <tools/postx.h> -#include <vcl/dllapi.h> +#include <glyphcache.hxx> class SalDisplay; struct MultiScreenGlyph; diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/generic/gdi/pspgraphics.cxx index f9a156c841fc..e68568a81aa9 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/generic/gdi/pspgraphics.cxx @@ -28,21 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "pspgraphics.h" -#include "vcl/jobdata.hxx" -#include "vcl/printergfx.hxx" -#include "vcl/printerinfomanager.hxx" -#include "vcl/bmpacc.hxx" -#include "vcl/salbmp.hxx" -#include "vcl/glyphcache.hxx" -#include "vcl/impfont.hxx" -#include "vcl/outfont.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/svapp.hxx" -#include "vcl/salprn.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/region.h" - #include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -50,9 +35,26 @@ #include <sys/stat.h> #include <sys/types.h> +#include "unx/pspgraphics.h" + +#include "vcl/jobdata.hxx" +#include "vcl/printerinfomanager.hxx" +#include "vcl/bmpacc.hxx" +#include "vcl/svapp.hxx" +#include "vcl/sysdata.hxx" + +#include "printergfx.hxx" +#include "salbmp.hxx" +#include "glyphcache.hxx" +#include "impfont.hxx" +#include "outfont.hxx" +#include "fontsubset.hxx" +#include "salprn.hxx" +#include "region.h" + #ifdef ENABLE_GRAPHITE -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_serverfont.hxx> +#include <graphite_layout.hxx> +#include <graphite_serverfont.hxx> #endif using namespace psp; diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 42d657b431bd..732ae465df52 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -34,19 +34,22 @@ #ifdef FREEBSD #include <sys/types.h> #endif -#include <tools/prex.h> -#include "Xproto.h" -#include <tools/postx.h> -#include <salunx.h> + #include <osl/endian.h> #include <rtl/memory.h> -#include <vcl/salbtype.hxx> -#include <saldata.hxx> -#include <saldisp.hxx> -#include <salgdi.h> -#include <salbmp.h> -#include <salinst.h> + #include <vcl/bitmap.hxx> +#include <vcl/salbtype.hxx> + +#include <tools/prex.h> +#include "unx/Xproto.h" +#include <tools/postx.h> +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/salgdi.h> +#include <unx/salbmp.h> +#include <unx/salinst.h> // ----------- // - Defines - diff --git a/vcl/unx/source/gdi/salcvt.cxx b/vcl/unx/generic/gdi/salcvt.cxx index c699cdb12335..c699cdb12335 100644 --- a/vcl/unx/source/gdi/salcvt.cxx +++ b/vcl/unx/generic/gdi/salcvt.cxx diff --git a/vcl/unx/source/gdi/salcvt.hxx b/vcl/unx/generic/gdi/salcvt.hxx index c142c76fe5d0..6d0e3bf9650c 100644 --- a/vcl/unx/source/gdi/salcvt.hxx +++ b/vcl/unx/generic/gdi/salcvt.hxx @@ -27,10 +27,11 @@ #ifndef SAL_CONVERTER_CACHE_HXX_ #define SAL_CONVERTER_CACHE_HXX_ -#include <salunx.h> #include <rtl/tencinfo.h> #include <rtl/textcvt.h> +#include <unx/salunx.h> + #include <map> extern "C" const char* diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index df23220ea6d5..39205ab2e321 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -28,20 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "Xproto.h" - -#include "salunx.h" -#include "saldata.hxx" -#include "saldisp.hxx" -#include "salgdi.h" -#include "salframe.h" -#include "salvd.h" -#include "xrender_peer.hxx" - -#include "vcl/printergfx.hxx" -#include "vcl/jobdata.hxx" -#include "vcl/region.h" - #include "tools/debug.hxx" #include "basegfx/polygon/b2dpolygon.hxx" @@ -55,6 +41,20 @@ #include "basegfx/polygon/b2dpolypolygoncutter.hxx" #include "basegfx/polygon/b2dtrapezoid.hxx" +#include "vcl/jobdata.hxx" + +#include "unx/Xproto.h" +#include "unx/salunx.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/salgdi.h" +#include "unx/salframe.h" +#include "unx/salvd.h" + +#include "printergfx.hxx" +#include "xrender_peer.hxx" +#include "region.h" + #include <vector> #include <queue> #include <set> diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 624360b21d29..314797946ecf 100644 --- a/vcl/unx/source/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -31,17 +31,19 @@ #include <stdio.h> #include <poll.h> -#include "salunx.h" -#include "saldata.hxx" -#include "saldisp.hxx" -#include "salbmp.h" -#include "salgdi.h" -#include "salframe.h" -#include "salvd.h" +#include "vcl/salbtype.hxx" + +#include "unx/salunx.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/salbmp.h" +#include "unx/salgdi.h" +#include "unx/salframe.h" +#include "unx/salvd.h" #include "xrender_peer.hxx" -#include "vcl/salbtype.hxx" -#include "vcl/printergfx.hxx" +#include "printergfx.hxx" + #include "vcl/bmpacc.hxx" #undef SALGDI2_TESTTRANS diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 6684b5664887..fc278dd250eb 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -38,26 +38,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include "gcach_xpeer.hxx" -#include "xrender_peer.hxx" -#include "salunx.h" -#include "saldata.hxx" -#include "saldisp.hxx" -#include "salgdi.h" -#include "pspgraphics.h" -#include "salvd.h" -#include <vcl/sysdata.hxx> -#include "salcvt.hxx" - -#include "vcl/printergfx.hxx" -#include "vcl/fontmanager.hxx" -#include "vcl/jobdata.hxx" -#include "vcl/printerinfomanager.hxx" -#include "vcl/svapp.hxx" -#include "vcl/impfont.hxx" -#include "vcl/salframe.hxx" -#include "vcl/outdev.h" - #include "sal/alloca.h" #include "sal/types.h" @@ -73,11 +53,33 @@ #include "i18npool/mslangid.hxx" +#include <vcl/sysdata.hxx> +#include "printergfx.hxx" +#include "vcl/fontmanager.hxx" +#include "vcl/jobdata.hxx" +#include "vcl/printerinfomanager.hxx" +#include "vcl/svapp.hxx" + +#include "unx/salunx.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/salgdi.h" +#include "unx/pspgraphics.h" +#include "unx/salvd.h" + +#include "salcvt.hxx" +#include "gcach_xpeer.hxx" +#include "xrender_peer.hxx" +#include "impfont.hxx" +#include "salframe.hxx" +#include "outdev.h" + + #include <hash_set> #ifdef ENABLE_GRAPHITE -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_serverfont.hxx> +#include <graphite_layout.hxx> +#include <graphite_serverfont.hxx> #endif struct cairo_surface_t; diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/generic/gdi/salprnpsp.cxx index 65a0802e9fe2..0a278cab971f 100644 --- a/vcl/unx/source/gdi/salprnpsp.cxx +++ b/vcl/unx/generic/gdi/salprnpsp.cxx @@ -40,28 +40,30 @@ printer job functions. */ -#include <salunx.h> #include <unistd.h> #include <sys/wait.h> #include <sys/stat.h> -#include "saldisp.hxx" -#include "salinst.h" -#include "salprn.h" -#include "salframe.h" -#include "pspgraphics.h" -#include "saldata.hxx" +#include "rtl/ustring.hxx" + +#include "osl/module.h" + #include "vcl/svapp.hxx" -#include "vcl/jobset.h" -#include "vcl/print.h" #include "vcl/print.hxx" #include "vcl/pdfwriter.hxx" -#include "vcl/salptype.hxx" #include "vcl/printerinfomanager.hxx" -#include "rtl/ustring.hxx" +#include <unx/salunx.h> +#include "unx/saldisp.hxx" +#include "unx/salinst.h" +#include "unx/salprn.h" +#include "unx/salframe.h" +#include "unx/pspgraphics.h" +#include "unx/saldata.hxx" -#include "osl/module.h" +#include "jobset.h" +#include "print.h" +#include "salptype.hxx" using namespace psp; using namespace rtl; @@ -71,8 +73,6 @@ using namespace com::sun::star; * static helpers */ -#include "rtsname.hxx" - static oslModule driverLib = NULL; extern "C" { diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 675deef90ffe..9f18ba6388ea 100644 --- a/vcl/unx/source/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -28,17 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <vcl/sysdata.hxx> + #include <tools/prex.h> #include <X11/extensions/Xrender.h> #include <tools/postx.h> -#include <salunx.h> -#include <saldata.hxx> -#include <saldisp.hxx> -#include <vcl/salinst.hxx> -#include <salgdi.h> -#include <salvd.h> -#include <vcl/sysdata.hxx> +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/salgdi.h> +#include <unx/salvd.h> + +#include <salinst.hxx> // -=-= SalInstance =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index 8d24e4098df4..32e656bcbf5f 100644 --- a/vcl/unx/source/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -29,16 +29,17 @@ #include "precompiled_vcl.hxx" #include <stdio.h> + #include <rtl/ustring.hxx> #include <osl/module.h> -//#include <osl/thread.h> -using namespace rtl; + +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> #include <xrender_peer.hxx> -#include <salunx.h> -#include <saldata.hxx> -#include <saldisp.hxx> +using namespace rtl; // --------------------------------------------------------------------------- diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 89dccfcef40b..89dccfcef40b 100644 --- a/vcl/unx/source/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index fd49ee34f543..00058bf24461 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -33,9 +33,8 @@ #include "rtl/ustrbuf.hxx" - -#include "vcl/salinst.hxx" -#include "saldata.hxx" +#include "salinst.hxx" +#include "unx/saldata.hxx" #include "vcl/printerinfomanager.hxx" #include <cstdio> @@ -68,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/source/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index caf3249b5f46..97fe10f4d7ce 100644 --- a/vcl/unx/source/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/source/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index 811f93bcb826..811f93bcb826 100644 --- a/vcl/unx/source/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 9a85d02db894..9a85d02db894 100644 --- a/vcl/unx/source/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 421ce74b98d8..7108d7fb2a5c 100644 --- a/vcl/unx/source/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -35,7 +35,8 @@ #include "cupsmgr.hxx" #include "vcl/fontmanager.hxx" #include "vcl/strhelper.hxx" -#include "saldata.hxx" + +#include "unx/saldata.hxx" #include "tools/urlobj.hxx" #include "tools/stream.hxx" diff --git a/vcl/unx/source/printergfx/bitmap_gfx.cxx b/vcl/unx/generic/printergfx/bitmap_gfx.cxx index 1421fb7433f7..9275db1e469f 100644 --- a/vcl/unx/source/printergfx/bitmap_gfx.cxx +++ b/vcl/unx/generic/printergfx/bitmap_gfx.cxx @@ -30,7 +30,7 @@ #include "psputil.hxx" -#include "vcl/printergfx.hxx" +#include "printergfx.hxx" #include "vcl/strhelper.hxx" namespace psp { diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/generic/printergfx/common_gfx.cxx index fa032c46a74b..6ebf79cfac73 100644 --- a/vcl/unx/source/printergfx/common_gfx.cxx +++ b/vcl/unx/generic/printergfx/common_gfx.cxx @@ -31,8 +31,8 @@ #include "psputil.hxx" #include "glyphset.hxx" -#include "vcl/printergfx.hxx" -#include "vcl/printerjob.hxx" +#include "printergfx.hxx" +#include "printerjob.hxx" #include "vcl/fontmanager.hxx" #include "vcl/strhelper.hxx" #include "vcl/printerinfomanager.hxx" diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/generic/printergfx/glyphset.cxx index 8885a6b42c1e..9b0f5fb99c43 100644 --- a/vcl/unx/source/printergfx/glyphset.cxx +++ b/vcl/unx/generic/printergfx/glyphset.cxx @@ -33,9 +33,9 @@ #include "sft.hxx" -#include "vcl/printergfx.hxx" +#include "printergfx.hxx" +#include "fontsubset.hxx" #include "vcl/fontmanager.hxx" -#include "vcl/fontsubset.hxx" #include "osl/thread.h" diff --git a/vcl/unx/source/printergfx/glyphset.hxx b/vcl/unx/generic/printergfx/glyphset.hxx index 320e8e071955..320e8e071955 100644 --- a/vcl/unx/source/printergfx/glyphset.hxx +++ b/vcl/unx/generic/printergfx/glyphset.hxx diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/generic/printergfx/printerjob.cxx index 947eb290ec60..351d1af9b41d 100644 --- a/vcl/unx/source/printergfx/printerjob.cxx +++ b/vcl/unx/generic/printergfx/printerjob.cxx @@ -38,11 +38,11 @@ #include "psputil.hxx" #include "glyphset.hxx" -#include "vcl/printerjob.hxx" +#include "printerjob.hxx" +#include "printergfx.hxx" #include "vcl/ppdparser.hxx" #include "vcl/strhelper.hxx" #include "vcl/printerinfomanager.hxx" -#include "vcl/printergfx.hxx" #include "rtl/ustring.hxx" #include "rtl/strbuf.hxx" diff --git a/vcl/unx/source/printergfx/psheader.ps b/vcl/unx/generic/printergfx/psheader.ps index 6a0e350d9ddc..6a0e350d9ddc 100644 --- a/vcl/unx/source/printergfx/psheader.ps +++ b/vcl/unx/generic/printergfx/psheader.ps diff --git a/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/generic/printergfx/psputil.cxx index 370114be47cb..370114be47cb 100644 --- a/vcl/unx/source/printergfx/psputil.cxx +++ b/vcl/unx/generic/printergfx/psputil.cxx diff --git a/vcl/unx/source/printergfx/psputil.hxx b/vcl/unx/generic/printergfx/psputil.hxx index d4af41bb95ed..d4af41bb95ed 100644 --- a/vcl/unx/source/printergfx/psputil.hxx +++ b/vcl/unx/generic/printergfx/psputil.hxx diff --git a/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/generic/printergfx/text_gfx.cxx index 1901aa0d004a..7934821d4d70 100644 --- a/vcl/unx/source/printergfx/text_gfx.cxx +++ b/vcl/unx/generic/printergfx/text_gfx.cxx @@ -33,7 +33,7 @@ #include "psputil.hxx" #include "glyphset.hxx" -#include "vcl/printergfx.hxx" +#include "printergfx.hxx" #include "vcl/fontmanager.hxx" #include "vcl/helper.hxx" diff --git a/vcl/unx/source/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index 4683864fd116..4683864fd116 100644 --- a/vcl/unx/source/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx diff --git a/vcl/unx/source/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx index a687870ede4a..a687870ede4a 100644 --- a/vcl/unx/source/window/FWS.hxx +++ b/vcl/unx/generic/window/FWS.hxx diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 5ad3a9d94375..c0348beb6a34 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -33,6 +33,16 @@ #include <stdlib.h> #include <unistd.h> +#include "tools/debug.hxx" + +#include "sal/alloca.h" + +#include "vcl/floatwin.hxx" +#include "vcl/svapp.hxx" +#include "vcl/keycodes.hxx" +#include "vcl/printerinfomanager.hxx" +#include "vcl/settings.hxx" + #include <tools/prex.h> #include <X11/Xatom.h> #include <X11/keysym.h> @@ -43,32 +53,24 @@ #endif #include <tools/postx.h> -#include "salunx.h" -#include "saldata.hxx" -#include "saldisp.hxx" -#include "salgdi.h" -#include "salframe.h" -#include "soicon.hxx" -#include "dtint.hxx" -#include "sm.hxx" -#include "wmadaptor.hxx" -#include "salprn.h" -#include "salbmp.h" -#include "i18n_ic.hxx" -#include "i18n_keysym.hxx" -#include "i18n_status.hxx" - -#include "vcl/salinst.hxx" -#include "vcl/floatwin.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" -#include "vcl/keycodes.hxx" -#include "vcl/printerinfomanager.hxx" -#include "vcl/settings.hxx" - -#include "tools/debug.hxx" +#include "unx/salunx.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" +#include "unx/salgdi.h" +#include "unx/salframe.h" +#include "unx/soicon.hxx" +#include "unx/dtint.hxx" +#include "unx/sm.hxx" +#include "unx/wmadaptor.hxx" +#include "unx/salprn.h" +#include "unx/salbmp.h" +#include "unx/i18n_ic.hxx" +#include "unx/i18n_keysym.hxx" +#include "unx/i18n_status.hxx" + +#include "salinst.hxx" +#include "sallayout.hxx" -#include "sal/alloca.h" #include <com/sun/star/uno/Exception.hpp> #include <algorithm> diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 93aeeba66ee8..49225e2c99ce 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -28,29 +28,28 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#if OSL_DEBUG_LEVEL > 1 +#include <stdio.h> +#endif +#include <tools/debug.hxx> + +#include <vcl/keycodes.hxx> + #include <tools/prex.h> #include <X11/Xlib.h> #include <X11/extensions/shape.h> #include <tools/postx.h> -#include <salunx.h> -#include <salstd.hxx> -#include <saldata.hxx> -#ifndef _SV_SALINST_HXX -#include <salinst.h> -#endif -#include <saldisp.hxx> -#ifndef _SV_SALFRAME_HXX -#include <salframe.h> -#endif -#include <salobj.h> -#include <vcl/salwtype.hxx> -#include <vcl/keycodes.hxx> +#include <unx/salunx.h> +#include <unx/salstd.hxx> +#include <unx/saldata.hxx> +#include <unx/salinst.h> +#include <unx/saldisp.hxx> +#include <unx/salframe.h> +#include <unx/salobj.h> + +#include <salwtype.hxx> -#include <tools/debug.hxx> -#if OSL_DEBUG_LEVEL > 1 -#include <stdio.h> -#endif // ======================================================================= // SalInstance member to create and destroy a SalObject diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index 25add8e0dd18..71c05bd16626 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <plugins/gtk/atkbridge.hxx> -#include <plugins/gtk/gtkframe.hxx> +#include <unx/gtk/atkbridge.hxx> +#include <unx/gtk/gtkframe.hxx> #include "atkfactory.hxx" #include "atkutil.hxx" diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index d2574f616539..9588123f4032 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <plugins/gtk/gtkframe.hxx> +#include <unx/gtk/gtkframe.hxx> #include <vcl/window.hxx> #include "atkwrapper.hxx" #include "atkfactory.hxx" diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index c4fdc54e9064..b1e4bde84756 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <plugins/gtk/gtkframe.hxx> +#include <unx/gtk/gtkframe.hxx> #include <vcl/window.hxx> #include "vcl/popupmenuwindow.hxx" diff --git a/vcl/unx/gtk/a11y/makefile.mk b/vcl/unx/gtk/a11y/makefile.mk deleted file mode 100644 index 14d3014ddf11..000000000000 --- a/vcl/unx/gtk/a11y/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=gtka11y -ENABLE_EXCEPTIONS=TRUE - -# workaround for makedepend hang -MKDEPENDSOLVER= -NO_DEFAULT_STL=YES - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_GTK)" != "" - -PKGCONFIG_MODULES=gtk+-2.0 -.INCLUDE : pkg_config.mk - -CFLAGS+=-DVERSION=$(EMQ)"$(UPD)$(LAST_MINOR)$(EMQ)" - -ATKVERSION:=$(shell @$(PKG_CONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk) - -.IF "$(ATKVERSION)" >= "000100070000" -CFLAGS+=-DHAS_ATKRECTANGLE -.ENDIF - -SLOFILES=\ - $(SLO)$/atkaction.obj \ - $(SLO)$/atkbridge.obj \ - $(SLO)$/atkcomponent.obj \ - $(SLO)$/atkeditabletext.obj \ - $(SLO)$/atkfactory.obj \ - $(SLO)$/atkhypertext.obj \ - $(SLO)$/atkimage.obj \ - $(SLO)$/atklistener.obj \ - $(SLO)$/atkregistry.obj \ - $(SLO)$/atkselection.obj \ - $(SLO)$/atktable.obj \ - $(SLO)$/atktext.obj \ - $(SLO)$/atktextattributes.obj \ - $(SLO)$/atkutil.obj \ - $(SLO)$/atkvalue.obj \ - $(SLO)$/atkwindow.obj \ - $(SLO)$/atkwrapper.obj - -.ELSE # "$(ENABLE_GTK)" != "" - -dummy: - @echo GTK disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 329e6867206b..ffa61bc52c10 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -46,19 +46,19 @@ #include <sys/time.h> #include <unistd.h> #endif -#include <plugins/gtk/gtkdata.hxx> -#include <plugins/gtk/gtkinst.hxx> -#include <plugins/gtk/gtkframe.hxx> -#include <salobj.h> +#include <unx/gtk/gtkdata.hxx> +#include <unx/gtk/gtkinst.hxx> +#include <unx/gtk/gtkframe.hxx> +#include <unx/salobj.h> #include <osl/thread.h> #include <osl/process.h> #include <tools/debug.hxx> -#include "i18n_im.hxx" -#include "i18n_xkb.hxx" -#include <wmadaptor.hxx> +#include "unx/i18n_im.hxx" +#include "unx/i18n_xkb.hxx" +#include <unx/wmadaptor.hxx> -#include "../../unx/source/inc/salcursors.h" +#include "unx/x11_cursors/salcursors.h" #include <vcl/svapp.hxx> diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 2b0e90dc9bc0..888e2ed883b9 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -29,13 +29,12 @@ #include "precompiled_vcl.hxx" #include <osl/module.h> -#include <plugins/gtk/gtkdata.hxx> -#include <plugins/gtk/gtkinst.hxx> -#include <salframe.h> -#include <salobj.h> -#include <plugins/gtk/gtkframe.hxx> -#include <plugins/gtk/gtkobject.hxx> -#include <plugins/gtk/atkbridge.hxx> +#include <unx/gtk/gtkdata.hxx> +#include <unx/gtk/gtkinst.hxx> +#include <unx/salobj.h> +#include <unx/gtk/gtkframe.hxx> +#include <unx/gtk/gtkobject.hxx> +#include <unx/gtk/atkbridge.hxx> #include <rtl/strbuf.hxx> @@ -131,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/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index 272af20d0886..daaf4b27bc5c 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <svunx.h> -#include <vcl/svdata.hxx> +#include <unx/svunx.h> +#include <svdata.hxx> #include <vcl/window.hxx> -#include <plugins/gtk/gtkinst.hxx> +#include <unx/gtk/gtkinst.hxx> #include <cstdio> #include <gdk/gdk.h> #include <gtk/gtk.h> diff --git a/vcl/unx/gtk/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk deleted file mode 100644 index 3e8cd750bf7a..000000000000 --- a/vcl/unx/gtk/app/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=gtkapp -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# workaround for makedepend hang -MKDEPENDSOLVER= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_GTK)" != "" - -PKGCONFIG_MODULES=gtk+-2.0 -.INCLUDE : pkg_config.mk - -SLOFILES=\ - $(SLO)$/gtkdata.obj \ - $(SLO)$/gtkinst.obj \ - $(SLO)$/gtksys.obj - -EXCEPTIONSFILES=\ - $(SLO)$/gtkdata.obj\ - $(SLO)$/gtkinst.obj - -.ELSE # "$(ENABLE_GTK)" != "" - -dummy: - @echo GTK disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/gtk/gdi/makefile.mk b/vcl/unx/gtk/gdi/makefile.mk deleted file mode 100644 index ec6b4e1d205e..000000000000 --- a/vcl/unx/gtk/gdi/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=gtkgdi -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_GTK)" != "" - -PKGCONFIG_MODULES=gtk+-2.0 -.INCLUDE : pkg_config.mk - -SLOFILES=$(SLO)$/salnativewidgets-gtk.obj -EXCEPTIONSFILES=$(SLO)$/salnativewidgets-gtk.obj - -.ELSE # "$(ENABLE_GTK)" != "" -dummy: - @echo GTK disabled - nothing to build -.ENDIF - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index def25a0bac9d..3657e3a0d770 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -28,12 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "plugins/gtk/gtkframe.hxx" -#include "plugins/gtk/gtkdata.hxx" -#include "plugins/gtk/gtkinst.hxx" -#include "plugins/gtk/gtkgdi.hxx" +#include "vcl/svapp.hxx" + +#include "unx/gtk/gtkframe.hxx" +#include "unx/gtk/gtkdata.hxx" +#include "unx/gtk/gtkinst.hxx" +#include "unx/gtk/gtkgdi.hxx" -#include "pspgraphics.h" +#include "unx/pspgraphics.h" +#include "unx/saldata.hxx" +#include "unx/saldisp.hxx" #include <cstdio> #include <cmath> @@ -41,10 +45,6 @@ #include <algorithm> #include <hash_map> -#include "saldata.hxx" -#include "saldisp.hxx" -#include "vcl/svapp.hxx" - typedef struct _cairo_font_options cairo_font_options_t; // initialize statics diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index aa5926702731..5f4a2bda25f8 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -28,17 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <plugins/gtk/gtkframe.hxx> -#include <plugins/gtk/gtkdata.hxx> -#include <plugins/gtk/gtkinst.hxx> -#include <plugins/gtk/gtkgdi.hxx> +#include <unx/gtk/gtkframe.hxx> +#include <unx/gtk/gtkdata.hxx> +#include <unx/gtk/gtkinst.hxx> +#include <unx/gtk/gtkgdi.hxx> #include <vcl/keycodes.hxx> -#include <wmadaptor.hxx> -#include <sm.hxx> -#include <salbmp.h> -#include <salprn.h> +#include <unx/wmadaptor.hxx> +#include <unx/sm.hxx> +#include <unx/salbmp.h> +#include <unx/salprn.h> #include <vcl/floatwin.hxx> -#include <salprn.h> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -49,8 +48,8 @@ #include <dlfcn.h> #include <vcl/salbtype.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/impbmp.hxx> -#include <vcl/svids.hrc> +#include <impbmp.hxx> +#include <svids.hrc> #include <algorithm> diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f7ef753dc628..68c8f1f1286d 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <plugins/gtk/gtkobject.hxx> -#include <plugins/gtk/gtkframe.hxx> -#include <plugins/gtk/gtkdata.hxx> -#include <plugins/gtk/gtkinst.hxx> +#include <unx/gtk/gtkobject.hxx> +#include <unx/gtk/gtkframe.hxx> +#include <unx/gtk/gtkdata.hxx> +#include <unx/gtk/gtkinst.hxx> GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow ) : m_pSocket( NULL ), diff --git a/vcl/unx/gtk/window/makefile.mk b/vcl/unx/gtk/window/makefile.mk deleted file mode 100644 index ac23e9363eef..000000000000 --- a/vcl/unx/gtk/window/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=gtkwin -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# workaround for makedepend hang -MKDEPENDSOLVER= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_GTK)" != "" - -PKGCONFIG_MODULES=gtk+-2.0 -.IF "$(ENABLE_DBUS)" != "" -CDEFS+=-DENABLE_DBUS -PKGCONFIG_MODULES+= dbus-glib-1 -.ENDIF -.INCLUDE : pkg_config.mk - -.IF "$(COM)" == "C52" -NOOPTFILES=$(SLO)$/gtkframe.obj -.ENDIF - -SLOFILES=\ - $(SLO)$/gtkframe.obj \ - $(SLO)$/gtkobject.obj -EXCEPTIONSFILES=$(SLO)$/gtkframe.obj -.ELSE # "$(ENABLE_GTK)" != "" - -dummy: - @echo GTK disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/headless/makefile.mk b/vcl/unx/headless/makefile.mk deleted file mode 100644 index a32f02838080..000000000000 --- a/vcl/unx/headless/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - - -ENABLE_EXCEPTIONS=true - -PRJNAME=vcl -TARGET=svpplug - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(listening)"!="" || "$(LISTENING)"!="" -CDEFS+= -DWITH_SVP_LISTENING -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)" == "unx" - -SLOFILES=\ - $(SLO)$/svpinst.obj\ - $(SLO)$/svpdummies.obj\ - $(SLO)$/svpframe.obj\ - $(SLO)$/svpgdi.obj\ - $(SLO)$/svptext.obj\ - $(SLO)$/svpprn.obj\ - $(SLO)$/svppspgraphics.obj\ - $(SLO)$/svpvd.obj\ - $(SLO)$/svpbmp.obj\ - $(SLO)$/svpelement.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx index e62f24a171e2..e5a40320bc4c 100644 --- a/vcl/unx/headless/svpbmp.hxx +++ b/vcl/unx/headless/svpbmp.hxx @@ -28,7 +28,7 @@ #ifndef SVP_SVBMP_HXX #define SVP_SVBMP_HXX -#include <vcl/salbmp.hxx> +#include <salbmp.hxx> #include "svpelement.hxx" class SvpSalBitmap : public SalBitmap, public SvpElement diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx index a72ba11e5c12..cec6540adc79 100644 --- a/vcl/unx/headless/svpdummies.hxx +++ b/vcl/unx/headless/svpdummies.hxx @@ -27,10 +27,11 @@ #ifndef _SVP_SVPDUMMIES_HXX -#include <vcl/salobj.hxx> #include <vcl/sysdata.hxx> -#include <vcl/salimestatus.hxx> -#include <vcl/salsys.hxx> + +#include <salobj.hxx> +#include <salimestatus.hxx> +#include <salsys.hxx> class SalGraphics; diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx index af40fb66fb7f..0e9a78a4562e 100644 --- a/vcl/unx/headless/svpframe.hxx +++ b/vcl/unx/headless/svpframe.hxx @@ -27,9 +27,9 @@ #ifndef _SVP_SVPFRAME_HXX -#include <vcl/salframe.hxx> #include <vcl/sysdata.hxx> +#include <salframe.hxx> #include "svpelement.hxx" #include <list> diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index a460bb271198..3a72e126e4d2 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -29,7 +29,6 @@ #include "svpbmp.hxx" #include <vcl/sysdata.hxx> -#include <vcl/region.h> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -47,6 +46,7 @@ #endif #include <svppspgraphics.hxx> +#include <region.h> using namespace basegfx; using namespace basebmp; diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 9e4971528033..217d50940b11 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -27,11 +27,12 @@ #ifndef _SVP_SVPGDI_HXX -#include <vcl/salgdi.hxx> -#include <vcl/sallayout.hxx> #include <basebmp/bitmapdevice.hxx> #include <basebmp/color.hxx> +#include <salgdi.hxx> +#include <sallayout.hxx> + class ServerFont; class SvpSalGraphics : public SalGraphics diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index bce609b95035..ebd0ee457bd5 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -30,17 +30,19 @@ #include <sys/time.h> #include <sys/poll.h> +#include <sal/types.h> + +#include <vcl/apptypes.hxx> + #include "svpinst.hxx" #include "svpframe.hxx" #include "svpdummies.hxx" #include "svpvd.hxx" #include "svpbmp.hxx" -#include <vcl/salframe.hxx> -#include <vcl/svdata.hxx> -#include <vcl/apptypes.hxx> -#include <vcl/saldatabasic.hxx> -#include <sal/types.h> +#include <salframe.hxx> +#include <svdata.hxx> +#include <saldatabasic.hxx> // plugin factory function extern "C" diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 736916bbaced..cf6def7f3d8a 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -28,12 +28,13 @@ #ifndef _SVP_SALINST_HXX #define _SVP_SALINST_HXX -#include <vcl/salinst.hxx> -#include <vcl/salwtype.hxx> -#include <vcl/saltimer.hxx> #include <vos/mutex.hxx> #include <vos/thread.hxx> +#include <salinst.hxx> +#include <salwtype.hxx> +#include <saltimer.hxx> + #include <list> #include <time.h> // timeval diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx index 0c8a119806af..0a5eb0ad0e7b 100644 --- a/vcl/unx/headless/svpprn.cxx +++ b/vcl/unx/headless/svpprn.cxx @@ -28,21 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include <unistd.h> +#include <sys/stat.h> +#include <sys/wait.h> + #include "vcl/svapp.hxx" -#include "vcl/jobset.h" -#include "vcl/print.h" -#include "vcl/salptype.hxx" #include "vcl/timer.hxx" #include "vcl/printerinfomanager.hxx" +#include "jobset.h" +#include "print.h" +#include "salptype.hxx" + #include "svpprn.hxx" #include "svppspgraphics.hxx" #include "svpinst.hxx" -#include <unistd.h> -#include <sys/stat.h> -#include <sys/wait.h> - using namespace psp; using namespace rtl; diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx index 84dbf8277054..d7064522e2b3 100644 --- a/vcl/unx/headless/svpprn.hxx +++ b/vcl/unx/headless/svpprn.hxx @@ -29,9 +29,12 @@ #define _SVP_SVPPRN_HXX #include "vcl/jobdata.hxx" -#include "vcl/printergfx.hxx" -#include "vcl/printerjob.hxx" -#include "vcl/salprn.hxx" + +#include "printergfx.hxx" +#include "printerjob.hxx" +#include "salprn.hxx" + +#include "vclpluginapi.h" class PspGraphics; @@ -101,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/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 13c5469ed028..cdd664c7b76a 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -28,33 +28,34 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "svppspgraphics.hxx" -#include "svpbmp.hxx" +#include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "basegfx/vector/b2ivector.hxx" +#include "basegfx/point/b2ipoint.hxx" + +#include "basebmp/color.hxx" #include "vcl/jobdata.hxx" -#include "vcl/printergfx.hxx" #include "vcl/printerinfomanager.hxx" #include "vcl/bmpacc.hxx" -#include "vcl/salbmp.hxx" -#include "vcl/glyphcache.hxx" -#include "vcl/impfont.hxx" -#include "vcl/outfont.hxx" -#include "vcl/fontsubset.hxx" #include "vcl/svapp.hxx" -#include "vcl/salprn.hxx" #include "vcl/sysdata.hxx" -#include "vcl/region.h" -#include "basegfx/vector/b2ivector.hxx" -#include "basegfx/point/b2ipoint.hxx" -#include "basebmp/color.hxx" - -#include <stdlib.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <sys/stat.h> -#include <sys/types.h> +#include "salprn.hxx" +#include "salbmp.hxx" +#include "glyphcache.hxx" +#include "impfont.hxx" +#include "outfont.hxx" +#include "fontsubset.hxx" +#include "printergfx.hxx" +#include "svppspgraphics.hxx" +#include "svpbmp.hxx" +#include "region.h" using namespace psp; using namespace rtl; diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index 729116fcc1d2..74f2f097a1af 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -30,8 +30,9 @@ #include "vcl/fontmanager.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/salgdi.hxx" + +#include "sallayout.hxx" +#include "salgdi.hxx" namespace psp { struct JobData; class PrinterGfx; } diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index fba7fe4bf31d..243e2b6ec422 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -25,12 +25,10 @@ * ************************************************************************/ -#include "svpgdi.hxx" -#include "svpbmp.hxx" - #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> + #include <basebmp/scanlineformats.hxx> #include <tools/debug.hxx> @@ -39,10 +37,12 @@ #include <basebmp/debug.hxx> #endif -#include <vcl/outfont.hxx> -#include <vcl/glyphcache.hxx> -#include <vcl/impfont.hxx> +#include <outfont.hxx> +#include <glyphcache.hxx> +#include <impfont.hxx> +#include "svpgdi.hxx" +#include "svpbmp.hxx" #include "svppspgraphics.hxx" using namespace basegfx; diff --git a/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx index 784a2ad6f664..d66a31905c04 100644 --- a/vcl/unx/headless/svpvd.hxx +++ b/vcl/unx/headless/svpvd.hxx @@ -28,7 +28,7 @@ #ifndef _SVP_SVPVD_HXX #define _SVP_SVPVD_HXX -#include <vcl/salvd.hxx> +#include <salvd.hxx> #include "svpelement.hxx" #include <list> diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index ae3938b4fbb9..a6badfbea23e 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -45,18 +45,21 @@ #include <sys/time.h> #include <unistd.h> #endif -#include <plugins/kde/kdedata.hxx> + #include <osl/thread.h> #include <osl/process.h> #include <osl/module.h> #include <tools/debug.hxx> -#include "i18n_im.hxx" -#include "i18n_xkb.hxx" + #include <vos/process.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif + +#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/kde/makefile.mk b/vcl/unx/kde/makefile.mk deleted file mode 100644 index e4e056ee6435..000000000000 --- a/vcl/unx/kde/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=kdeplug -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# workaround for makedepend hang -MKDEPENDSOLVER= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_KDE)" != "" - -CFLAGS+=$(KDE_CFLAGS) - -.IF "$(ENABLE_RANDR)" != "" -CDEFS+=-DUSE_RANDR -.ENDIF - -SLOFILES=\ - $(SLO)$/kdedata.obj \ - $(SLO)$/salnativewidgets-kde.obj - -.ELSE # "$(ENABLE_KDE)" != "" - -dummy: - @echo KDE disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 30cbb0cea365..c9f35b295511 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -31,23 +31,16 @@ #define _SV_SALNATIVEWIDGETS_KDE_CXX #include <shell/kde_headers.h> -#include <salunx.h> -#include <saldata.hxx> -#include <saldisp.hxx> +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/salgdi.h> +#include <unx/pspgraphics.h> +#include <unx/kde/kdedata.hxx> -#ifndef _SV_SALGDI_HXX -#include <salgdi.h> -#endif - -#ifndef _SV_SALGDI_HXX -#include <salframe.h> -#endif #include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> -#include <plugins/kde/kdedata.hxx> -#include <iostream> -#include <pspgraphics.h> using namespace ::rtl; diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx index 6daa0c81a4fb..753deb697e95 100644 --- a/vcl/unx/kde4/KDEData.hxx +++ b/vcl/unx/kde4/KDEData.hxx @@ -27,8 +27,8 @@ #pragma once -#include <saldisp.hxx> -#include <saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/saldata.hxx> class KDEData : public X11SalData { diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx index 1ab966b1847b..8287bbfb9bda 100644 --- a/vcl/unx/kde4/KDESalDisplay.hxx +++ b/vcl/unx/kde4/KDESalDisplay.hxx @@ -27,7 +27,7 @@ #pragma once -#include <saldisp.hxx> +#include <unx/saldisp.hxx> class SalKDEDisplay : public SalX11Display { @@ -35,3 +35,4 @@ class SalKDEDisplay : public SalX11Display SalKDEDisplay( Display* pDisp ); virtual ~SalKDEDisplay(); }; + diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index abd1dc993f9e..1e96c3e2f7a4 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -44,13 +44,14 @@ #include "KDEXLib.hxx" #include "KDESalGraphics.hxx" +#include <tools/color.hxx> + #include <vcl/settings.hxx> #include <vcl/font.hxx> -#include <tools/color.hxx> -#include <vcl/svdata.hxx> +#include <svdata.hxx> -#include <pspgraphics.h> +#include <unx/pspgraphics.h> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx index 6ea6f6ef283e..c5071ce85ffa 100644 --- a/vcl/unx/kde4/KDESalFrame.hxx +++ b/vcl/unx/kde4/KDESalFrame.hxx @@ -27,8 +27,8 @@ #pragma once -#include <saldisp.hxx> -#include <salframe.h> +#include <unx/saldisp.hxx> +#include <unx/salframe.h> class KDESalFrame : public X11SalFrame { diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 92b9a6b676a0..ea1deebfc35c 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -28,8 +28,8 @@ #pragma once #include <rtl/string.hxx> -#include <saldisp.hxx> -#include <salgdi.h> +#include <unx/saldisp.hxx> +#include <unx/salgdi.h> #define Region QtXRegion #include <QImage> diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx index 91907e586b0c..32f51c4e8c0e 100644 --- a/vcl/unx/kde4/KDESalInstance.hxx +++ b/vcl/unx/kde4/KDESalInstance.hxx @@ -27,7 +27,7 @@ #pragma once -#include <salinst.h> +#include <unx/salinst.h> class SalYieldMutex; class SalFrame; diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 3fb2bcaf487d..427c9e7576a8 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -25,6 +25,8 @@ * ************************************************************************/ +#include <vos/process.hxx> + #include "VCLKDEApplication.hxx" #define Region QtXRegion @@ -39,11 +41,10 @@ #include "KDEXLib.hxx" -#include <i18n_im.hxx> -#include <i18n_xkb.hxx> +#include <unx/i18n_im.hxx> +#include <unx/i18n_xkb.hxx> -#include <saldata.hxx> -#include <vos/process.hxx> +#include <unx/saldata.hxx> #include "KDESalDisplay.hxx" diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx index 985e0c3c6717..561f6ee73a78 100644 --- a/vcl/unx/kde4/KDEXLib.hxx +++ b/vcl/unx/kde4/KDEXLib.hxx @@ -27,7 +27,7 @@ #pragma once -#include <saldisp.hxx> +#include <unx/saldisp.hxx> class KDEXLib : public SalXLib { @@ -46,3 +46,4 @@ class KDEXLib : public SalXLib void doStartup(); }; + 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 */ diff --git a/vcl/unx/kde4/makefile.mk b/vcl/unx/kde4/makefile.mk deleted file mode 100644 index fd1e9ca59236..000000000000 --- a/vcl/unx/kde4/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=kde4plug -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# workaround for makedepend hang -MKDEPENDSOLVER= - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -.IF "$(ENABLE_KDE4)" != "" - -CFLAGS+=$(KDE4_CFLAGS) - -.IF "$(ENABLE_RANDR)" != "" -CDEFS+=-DUSE_RANDR -.ENDIF - -SLOFILES=\ - $(SLO)$/main.obj \ - $(SLO)$/VCLKDEApplication.obj \ - $(SLO)$/KDEXLib.obj \ - $(SLO)$/KDESalDisplay.obj \ - $(SLO)$/KDESalFrame.obj \ - $(SLO)$/KDESalGraphics.obj \ - $(SLO)$/KDESalInstance.obj \ - $(SLO)$/KDEData.obj - - -.ELSE # "$(ENABLE_KDE4)" != "" - -dummy: - @echo KDE disabled - nothing to build -.ENDIF -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk deleted file mode 100644 index bd7549945c7c..000000000000 --- a/vcl/unx/source/app/makefile.mk +++ /dev/null @@ -1,110 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salapp -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -SLOFILES=\ - $(SLO)$/i18n_cb.obj \ - $(SLO)$/i18n_ic.obj \ - $(SLO)$/i18n_im.obj \ - $(SLO)$/i18n_xkb.obj \ - $(SLO)$/i18n_wrp.obj \ - $(SLO)$/i18n_status.obj \ - $(SLO)$/i18n_keysym.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/saldisp.obj \ - $(SLO)$/randrwrapper.obj \ - $(SLO)$/salinst.obj \ - $(SLO)$/salsys.obj \ - $(SLO)$/soicon.obj \ - $(SLO)$/sm.obj \ - $(SLO)$/keysymnames.obj \ - $(SLO)$/wmadaptor.obj - -EXCEPTIONSFILES=\ - $(SLO)$/wmadaptor.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/salinst.obj \ - $(SLO)$/saldisp.obj \ - $(SLO)$/i18n_status.obj \ - $(SLO)$/i18n_cb.obj \ - $(SLO)$/i18n_ic.obj \ - $(SLO)$/salsys.obj - - -.IF "$(ENABLE_RANDR)" != "" -CDEFS+=-DUSE_RANDR -.IF "$(XRANDR_DLOPEN)" == "FALSE" -CDEFS+=$(XRANDR_CFLAGS) -.ELSE -CDEFS+=-DXRANDR_DLOPEN -.ENDIF -.ENDIF - -.IF "$(USE_XINERAMA)" != "NO" -CDEFS+=-DUSE_XINERAMA -.IF "$(USE_XINERAMA_VERSION)" == "Xorg" -CDEFS+=-DUSE_XINERAMA_XORG -.ELIF "$(USE_XINERAMA_VERSION)" == "Xsun" -CDEFS+=-DUSE_XINERAMA_XSUN -.ELSE -# provide sensible default -.IF "$(OS)" != "SOLARIS" -CDEFS+=-DUSE_XINERAMA_XORG -.ELSE -CDEFS+=-DUSE_XINERAMA_XSUN -.ENDIF -.ENDIF -.ENDIF - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/unx/source/desktopdetect/makefile.mk b/vcl/unx/source/desktopdetect/makefile.mk deleted file mode 100644 index 83d5d29f4b71..000000000000 --- a/vcl/unx/source/desktopdetect/makefile.mk +++ /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. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=dtdetect - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -SLOFILES=$(SLO)$/desktopdetector.obj - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/source/dtrans/makefile.mk b/vcl/unx/source/dtrans/makefile.mk deleted file mode 100644 index 6f5caccfd734..000000000000 --- a/vcl/unx/source/dtrans/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=dtransX11 -TARGETTYPE=GUI - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for Mac OS X" - -.ELSE # "$(GUIBASE)"=="aqua" - -.IF "$(COM)$(CPU)" == "C50I" || "$(COM)$(CPU)" == "C52I" -NOOPTFILES=\ - $(SLO)$/X11_selection.obj -.ENDIF - -SLOFILES=\ - $(SLO)$/X11_dndcontext.obj \ - $(SLO)$/X11_transferable.obj \ - $(SLO)$/X11_clipboard.obj \ - $(SLO)$/X11_selection.obj \ - $(SLO)$/X11_droptarget.obj \ - $(SLO)$/X11_service.obj \ - $(SLO)$/bmp.obj \ - $(SLO)$/config.obj - -.ENDIF # "$(OS)"=="MACOSX" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk deleted file mode 100644 index c6a23b88f35b..000000000000 --- a/vcl/unx/source/fontmanager/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -ENABLE_EXCEPTIONS=TRUE -PRJNAME=vcl -TARGET=fontman - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+= -I..$/fontsubset -INCDEPN+= -I..$/fontsubset - -.IF "$(ENABLE_FONTCONFIG)" != "" -CDEFS += -DENABLE_FONTCONFIG -.ENDIF - -CFLAGS+=$(FREETYPE_CFLAGS) - - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"=="aqua" - -SLOFILES=\ - $(SLO)$/fontmanager.obj \ - $(SLO)$/fontcache.obj \ - $(SLO)$/fontconfig.obj \ - $(SLO)$/helper.obj \ - $(SLO)$/parseAFM.obj - -.IF "$(OS)$(CPU)"=="SOLARISI" -NOOPTFILES=$(SLO)$/fontmanager.obj -.ENDIF - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk deleted file mode 100644 index 123fcbcf9131..000000000000 --- a/vcl/unx/source/gdi/makefile.mk +++ /dev/null @@ -1,101 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salgdi - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -SLOFILES= \ - $(SLO)$/salgdi2.obj \ - $(SLO)$/salbmp.obj \ - $(SLO)$/salgdi.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/dtint.obj \ - $(SLO)$/salcvt.obj \ - $(SLO)$/salgdi3.obj \ - $(SLO)$/gcach_xpeer.obj \ - $(SLO)$/xrender_peer.obj \ - $(SLO)$/pspgraphics.obj - -EXCEPTIONSFILES=\ - $(SLO)$/salgdi.obj \ - $(SLO)$/salbmp.obj \ - $(SLO)$/salgdi3.obj \ - $(SLO)$/salcvt.obj - -SLOFILES+=$(SLO)$/salprnpsp.obj -EXCEPTIONSFILES+=$(SLO)$/salprnpsp.obj - -.IF "$(OS)"=="SOLARIS" -SLOFILES+=$(SLO)$/cdeint.obj -ENVCFLAGS+=-DUSE_CDE -.ENDIF - -.IF "$(XRENDER_LINK)" == "YES" -CFLAGS+=-DXRENDER_LINK -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - -ALLTAR : $(MACOSXRC) - -XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST) - -$(INCCOM)$/rtsname.hxx: - @rm -f $(INCCOM)$/rtsname.hxx ; \ - echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx - -$(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx -$(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx - diff --git a/vcl/unx/source/inc/salcursors.h b/vcl/unx/source/inc/salcursors.h deleted file mode 100644 index e8a63d6195aa..000000000000 --- a/vcl/unx/source/inc/salcursors.h +++ /dev/null @@ -1,162 +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 "nodrop_curs.h" -#include "nodrop_mask.h" -#include "magnify_curs.h" -#include "magnify_mask.h" -#include "rotate_curs.h" -#include "rotate_mask.h" -#include "hshear_curs.h" -#include "hshear_mask.h" -#include "vshear_curs.h" -#include "vshear_mask.h" -#include "drawline_curs.h" -#include "drawline_mask.h" -#include "drawrect_curs.h" -#include "drawrect_mask.h" -#include "drawpolygon_curs.h" -#include "drawpolygon_mask.h" -#include "drawbezier_curs.h" -#include "drawbezier_mask.h" -#include "drawarc_curs.h" -#include "drawarc_mask.h" -#include "drawpie_curs.h" -#include "drawpie_mask.h" -#include "drawcirclecut_curs.h" -#include "drawcirclecut_mask.h" -#include "drawellipse_curs.h" -#include "drawellipse_mask.h" -#include "drawconnect_curs.h" -#include "drawconnect_mask.h" -#include "drawtext_curs.h" -#include "drawtext_mask.h" -#include "mirror_curs.h" -#include "mirror_mask.h" -#include "crook_curs.h" -#include "crook_mask.h" -#include "crop_curs.h" -#include "crop_mask.h" -#include "movepoint_curs.h" -#include "movepoint_mask.h" -#include "movebezierweight_curs.h" -#include "movebezierweight_mask.h" -#include "drawfreehand_curs.h" -#include "drawfreehand_mask.h" -#include "drawcaption_curs.h" -#include "drawcaption_mask.h" -#include "movedata_curs.h" -#include "movedata_mask.h" -#include "copydata_curs.h" -#include "copydata_mask.h" -#include "linkdata_curs.h" -#include "linkdata_mask.h" -#include "movedlnk_curs.h" -#include "movedlnk_mask.h" -#include "copydlnk_curs.h" -#include "copydlnk_mask.h" -#include "movefile_curs.h" -#include "movefile_mask.h" -#include "copyfile_curs.h" -#include "copyfile_mask.h" -#include "linkfile_curs.h" -#include "linkfile_mask.h" -#include "moveflnk_curs.h" -#include "moveflnk_mask.h" -#include "copyflnk_curs.h" -#include "copyflnk_mask.h" -#include "movefiles_curs.h" -#include "movefiles_mask.h" -#include "copyfiles_curs.h" -#include "copyfiles_mask.h" - -#include "chart_curs.h" -#include "chart_mask.h" -#include "detective_curs.h" -#include "detective_mask.h" -#include "pivotcol_curs.h" -#include "pivotcol_mask.h" -#include "pivotfld_curs.h" -#include "pivotfld_mask.h" -#include "pivotrow_curs.h" -#include "pivotrow_mask.h" -#include "pivotdel_curs.h" -#include "pivotdel_mask.h" - -#include "chain_curs.h" -#include "chain_mask.h" -#include "chainnot_curs.h" -#include "chainnot_mask.h" - -#include "timemove_curs.h" -#include "timemove_mask.h" -#include "timesize_curs.h" -#include "timesize_mask.h" - -#include "ase_curs.h" -#include "ase_mask.h" -#include "asn_curs.h" -#include "asn_mask.h" -#include "asne_curs.h" -#include "asne_mask.h" -#include "asns_curs.h" -#include "asns_mask.h" -#include "asnswe_curs.h" -#include "asnswe_mask.h" -#include "asnw_curs.h" -#include "asnw_mask.h" -#include "ass_curs.h" -#include "ass_mask.h" -#include "asse_curs.h" -#include "asse_mask.h" -#include "assw_curs.h" -#include "assw_mask.h" -#include "asw_curs.h" -#include "asw_mask.h" -#include "aswe_curs.h" -#include "aswe_mask.h" -#include "null_curs.h" -#include "null_mask.h" - -#include "airbrush_curs.h" -#include "airbrush_mask.h" -#include "fill_curs.h" -#include "fill_mask.h" -#include "vertcurs_curs.h" -#include "vertcurs_mask.h" -#include "tblsele_curs.h" -#include "tblsele_mask.h" -#include "tblsels_curs.h" -#include "tblsels_mask.h" -#include "tblselse_curs.h" -#include "tblselse_mask.h" -#include "tblselw_curs.h" -#include "tblselw_mask.h" -#include "tblselsw_curs.h" -#include "tblselsw_mask.h" -#include "paintbrush_curs.h" -#include "paintbrush_mask.h" diff --git a/vcl/unx/source/plugadapt/makefile.mk b/vcl/unx/source/plugadapt/makefile.mk deleted file mode 100644 index af409c04af35..000000000000 --- a/vcl/unx/source/plugadapt/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salplug - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -CFLAGS+=-DSAL_DLLPOSTFIX=\"$(DLLPOSTFIX)\" - -SLOFILES=$(SLO)$/salplug.obj - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/unx/source/printer/makefile.mk b/vcl/unx/source/printer/makefile.mk deleted file mode 100644 index 5cd35088acd9..000000000000 --- a/vcl/unx/source/printer/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -ENABLE_EXCEPTIONS=TRUE -PRJNAME=vcl -TARGET=printer - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_CUPS)" != "" -CDEFS += -DENABLE_CUPS -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"=="aqua" - -SLOFILES=\ - $(SLO)$/ppdparser.obj \ - $(SLO)$/printerinfomanager.obj \ - $(SLO)$/jobdata.obj \ - $(SLO)$/cupsmgr.obj - -.ENDIF # GUIBASE = aqua - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST) - -$(INCCOM)$/rtsname.hxx: - rm -f $(INCCOM)$/rtsname.hxx ; \ - echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx - -$(SLO)$/cupsmgr.obj : $(INCCOM)$/rtsname.hxx - diff --git a/vcl/unx/source/printergfx/makefile.mk b/vcl/unx/source/printergfx/makefile.mk deleted file mode 100644 index cc5692e951f5..000000000000 --- a/vcl/unx/source/printergfx/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=printergfx - -# --- Settings ----------------------------------------------------- - -ENABLE_EXCEPTIONS=true - -.INCLUDE : settings.mk - -.IF "$(ENABLE_CUPS)" != "" -CDEFS += -DENABLE_CUPS -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"=="aqua" - -SLOFILES=\ - $(SLO)$/printerjob.obj \ - $(SLO)$/text_gfx.obj \ - $(SLO)$/psputil.obj \ - $(SLO)$/common_gfx.obj \ - $(SLO)$/glyphset.obj \ - $(SLO)$/bitmap_gfx.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/vcl/unx/source/window/makefile.mk b/vcl/unx/source/window/makefile.mk deleted file mode 100644 index c5cd95ba6b1c..000000000000 --- a/vcl/unx/source/window/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salwin -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="unx" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="unx" - -SLOFILES= \ - $(SLO)/FWS.obj $(SLO)/salframe.obj $(SLO)/salobj.obj - -.ENDIF # "$(GUIBASE)"!="unx" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk deleted file mode 100644 index 99d1c4537111..000000000000 --- a/vcl/util/linksvp/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=vcl -TARGET=svp -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(OS)" == "SOLARIS" -LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO) -.ENDIF - -.IF "$(GUIBASE)" == "unx" -# headless plugin -LIB1TARGET=$(SLB)$/isvpplug -LIB1FILES= $(SLB)$/svpplug.lib \ - $(SLB)$/printergfx.lib -SHL1TARGET=vclplug_svp$(DLLPOSTFIX) -SHL1IMPLIB=isvpplug -SHL1LIBS=$(LIB1TARGET) -SHL1DEPN=$(LB)$/libvcl$(DLLPOSTFIX)$(DLLPOST) -SHL1STDLIBS=\ - $(VCLLIB)\ - $(I18NPAPERLIB)\ - $(BASEBMPLIB)\ - $(BASEGFXLIB)\ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) -.ENDIF # GUIBASE unx - - -# --- Allgemein ---------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 8d1de2ed30f0..75b3f9f527c1 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -99,6 +99,8 @@ HXXDEPNLST= $(INC)$/vcl$/accel.hxx \ $(INC)$/vcl$/print.hxx \ $(INC)$/vcl$/prndlg.hxx \ $(INC)$/vcl$/region.hxx \ + $(INC)$/vcl$/rendergraphic.hxx \ + $(INC)$/vcl$/rendergraphicrasterizer.hxx \ $(INC)$/vcl$/salbtype.hxx \ $(INC)$/vcl$/scrbar.hxx \ $(INC)$/vcl$/slider.hxx \ diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk deleted file mode 100644 index ac2977ca8eab..000000000000 --- a/vcl/util/makefile2.pmk +++ /dev/null @@ -1,41 +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. -# -#************************************************************************* - -# Reduction of exported symbols: -CDEFS += -DVCL_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE - -.IF "$(GUIBASE)"=="aqua" -CFLAGSCXX+=$(OBJCXXFLAGS) -.ENDIF # "$(GUIBASE)"=="aqua" - -#building with stlport, but graphite was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_GRAPHITE)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF diff --git a/vcl/util/vcl.macosx.component b/vcl/vcl.macosx.component index 3aabcd8c7050..023f805672bd 100644 --- a/vcl/util/vcl.macosx.component +++ b/vcl/vcl.macosx.component @@ -46,4 +46,7 @@ <implementation name="vcl::FontIdentificator"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> + <implementation name="vcl::rsvg::Rasterizer"> + <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/> + </implementation> </component> diff --git a/vcl/util/vcl.component b/vcl/vcl.unx.component index da20fc916c32..ea14667d17c1 100644 --- a/vcl/util/vcl.component +++ b/vcl/vcl.unx.component @@ -46,4 +46,7 @@ <implementation name="vcl::FontIdentificator"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> + <implementation name="vcl::rsvg::Rasterizer"> + <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/> + </implementation> </component> diff --git a/vcl/util/vcl.windows.component b/vcl/vcl.windows.component index 72f7ace9f251..df786c4d832b 100644 --- a/vcl/util/vcl.windows.component +++ b/vcl/vcl.windows.component @@ -37,4 +37,7 @@ <implementation name="vcl::FontIdentificator"> <service name="com.sun.star.awt.FontIdentificator"/> </implementation> + <implementation name="vcl::rsvg::Rasterizer"> + <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/> + </implementation> </component> diff --git a/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK deleted file mode 100644 index 9b3237567eff..000000000000 --- a/vcl/win/source/app/MAKEFILE.MK +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salapp -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salshl.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/salinst.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/salinfo.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 1eb897b55b8d..4faaf7bd4def 100644..100755 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -27,11 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> + +#include "tools/svwin.h" #include "rtl/tencinfo.h" -#include <saldata.hxx> -#include <vcl/svapp.hxx> +#include "vcl/svapp.hxx" +#include "win/saldata.hxx" // ======================================================================= diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index c635fdfc9845..431e9ca9c15f 100644..100755 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -34,28 +34,20 @@ #define WINVER 0x0500 #endif -#define VCL_NEED_BASETSD -#include "tools/presys.h" -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#include <winuser.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#include "tools/postsys.h" +#include "svsys.h" +#include "rtl/ustrbuf.hxx" -#include "tools/string.hxx" -#include "salsys.h" -#include "salframe.h" -#include "salinst.h" -#include "saldata.hxx" #include "tools/debug.hxx" -#include "vcl/svdata.hxx" +#include "tools/string.hxx" + #include "vcl/window.hxx" -#include "rtl/ustrbuf.hxx" +#include "win/salsys.h" +#include "win/salframe.h" +#include "win/salinst.h" +#include "win/saldata.hxx" + +#include "svdata.hxx" #include <hash_map> diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 05cb20750abd..1e5a306d852d 100755 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -36,23 +36,28 @@ #ifdef __MINGW32__ #include <excpt.h> #endif + #include <osl/file.hxx> + #include <vos/mutex.hxx> + +#include <tools/solarmutex.hxx> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salids.hrc> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> -#include <vcl/salsys.hxx> -#include <saltimer.h> -#include <vcl/apptypes.hxx> -#include <salbmp.h> -#include <vcl/salimestatus.hxx> + #include <vcl/timer.hxx> -#include <wincomp.hxx> // CS_DROPSHADOW -#include <tools/solarmutex.hxx> +#include <vcl/apptypes.hxx> + +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> +#include <win/saltimer.h> +#include <win/salbmp.h> + +#include <salimestatus.hxx> +#include <salsys.hxx> #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 578b3cb804bd..427f2092a0dc 100644..100755 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -27,9 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> -#include <saldata.hxx> + #include <tools/debug.hxx> +#include <tools/svwin.h> +#include <win/saldata.hxx> // ======================================================================= diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 6026f80e6346..f0b88a8e381c 100644..100755 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -31,9 +31,9 @@ #ifdef __MINGW32__ #include <excpt.h> #endif -#include <saldata.hxx> -#include <saltimer.h> -#include <salinst.h> +#include <win/saldata.hxx> +#include <win/saltimer.h> +#include <win/salinst.h> // ======================================================================= diff --git a/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/MAKEFILE.MK deleted file mode 100644 index 7489be633f2b..000000000000 --- a/vcl/win/source/gdi/MAKEFILE.MK +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salgdi - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -.IF "$(COM)"=="GCC" -.ELSE -CFLAGS += -DWINVER=0x0400 -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salgdi.obj \ - $(SLO)$/salgdi2.obj \ - $(SLO)$/salgdi3.obj \ - $(SLO)$/salgdi_gdiplus.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/salprn.obj \ - $(SLO)$/salbmp.obj \ - $(SLO)$/winlayout.obj \ - $(SLO)$/wntgdi.obj \ - $(SLO)$/salnativewidgets-luna.obj - - -EXCEPTIONSFILES= $(SLO)$/salprn.obj - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 8be85d210bd6..3dc176ae23b8 100644..100755 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -27,13 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <vcl/salbtype.hxx> -#include <salgdi.h> -#include <saldata.hxx> -#include <salbmp.h> + #include <vcl/bitmap.hxx> // for BitmapSystemData +#include <vcl/salbtype.hxx> + +#include <win/wincomp.hxx> +#include <win/salgdi.h> +#include <win/saldata.hxx> +#include <win/salbmp.h> + #include <string.h> // ----------- diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 73d93d42dd03..bc2f8ade3ccc 100755..100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -30,17 +30,22 @@ #include <stdio.h> #include <string.h> + +#include <rtl/strbuf.hxx> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> -#include <salframe.h> #include <tools/poly.hxx> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <rtl/strbuf.hxx> -#include <vcl/region.h> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> +#include <win/salframe.h> + +#include <region.h> using namespace rtl; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index dc3368c26912..5ac117a596d9 100755..100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -30,16 +30,16 @@ #include <string.h> #include <stdlib.h> + #include <tools/svwin.h> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salbmp.h> -#include <saldata.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif -#include <salgdi.h> -#include <salframe.h> + +#include <win/wincomp.hxx> +#include <win/salbmp.h> +#include <win/saldata.hxx> +#include <win/salids.hrc> +#include <win/salgdi.h> +#include <win/salframe.h> bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index eded1a8f7aaf..86f6ad0f4af1 100755 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -31,25 +31,6 @@ #include <string.h> #include <malloc.h> -#include <tools/prewin.h> -#include <windows.h> -#include <tools/postwin.h> -#include <vcl/sysdata.hxx> -#include "tools/svwin.h" - -#include "wincomp.hxx" -#include "saldata.hxx" -#include "salgdi.h" - -#include "vcl/svapp.hxx" -#include "vcl/outfont.hxx" -#include "vcl/font.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sallayout.hxx" - -#include "vcl/outdev.h" // for ImplGlyphFallbackFontSubstitution -#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL - #include "rtl/logfile.hxx" #include "rtl/tencinfo.h" #include "rtl/textcvt.h" @@ -62,15 +43,34 @@ #include "osl/thread.hxx" #include "osl/process.h" +#include "basegfx/polygon/b2dpolygon.hxx" +#include "basegfx/polygon/b2dpolypolygon.hxx" +#include "basegfx/matrix/b2dhommatrix.hxx" +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL + +#include "vcl/font.hxx" +#include "vcl/svapp.hxx" + #include "tools/poly.hxx" #include "tools/debug.hxx" #include "tools/stream.hxx" -#include "basegfx/polygon/b2dpolygon.hxx" -#include "basegfx/polygon/b2dpolypolygon.hxx" -#include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> + +#include <vcl/sysdata.hxx> + +#include "win/wincomp.hxx" +#include "win/saldata.hxx" +#include "win/salgdi.h" +#include "outfont.hxx" +#include "fontsubset.hxx" +#include "sallayout.hxx" +#include "outdev.h" // for ImplGlyphFallbackFontSubstitution #include "sft.hxx" #ifdef GCP_KERN_HACK diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 88efbb29d30a..2b46ce47b82d 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -30,12 +30,14 @@ #include <stdio.h> #include <string.h> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> + #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 403d6c3780cd..0f1b8151967d 100755 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -30,14 +30,16 @@ #define _SV_SALNATIVEWIDGETS_CXX -#include "svsys.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.h" + #include "osl/module.h" +#include "vcl/svapp.hxx" + +#include "win/svsys.h" +#include "win/salgdi.h" +#include "win/saldata.hxx" + #include "uxtheme.h" #include "vssym32.h" diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index a235d6785706..263d06670584 100755..100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -29,26 +29,26 @@ #include "precompiled_vcl.hxx" #include <string.h> -#include <tools/svwin.h> +#include <osl/module.h> + +#include <tools/urlobj.hxx> +#include <tools/svwin.h> #ifdef __MINGW32__ #include <excpt.h> #endif -#ifndef _OSL_MODULE_H -#include <osl/module.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salframe.h> -#include <vcl/salptype.hxx> -#include <salprn.h> -#include <vcl/print.h> -#include <vcl/jobset.h> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salframe.h> +#include <win/salprn.h> + +#include <salptype.hxx> +#include <print.h> +#include <jobset.h> -#include <tools/urlobj.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 3a6e89059a69..94f08a33179c 100644..100755 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salvd.h> + #include <vcl/sysdata.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salvd.h> + // ======================================================================= static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 14b9fd5a59c2..dd896059160e 100755 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -28,21 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/svwin.h" - -#include "salgdi.h" -#include "saldata.hxx" -// for GetMirroredChar -#include "sft.hxx" - -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.hxx" #include "osl/module.h" #include "osl/file.h" +#include "tools/svwin.h" + +#include "vcl/svapp.hxx" + +#include "win/salgdi.h" +#include "win/saldata.hxx" + +// for GetMirroredChar +#include "sft.hxx" +#include "sallayout.hxx" #include <cstdio> #include <malloc.h> @@ -74,9 +74,9 @@ typedef std::set<int> IntSet; #include <graphite/GrClient.h> #include <graphite/WinFont.h> #include <graphite/Segment.h> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> -#include <vcl/graphite_features.hxx> +#include <graphite_layout.hxx> +#include <graphite_cache.hxx> +#include <graphite_features.hxx> #endif #define DROPPED_OUTGLYPH 0xFFFF diff --git a/vcl/win/source/src/MAKEFILE.MK b/vcl/win/source/src/MAKEFILE.MK deleted file mode 100644 index 7addba363481..000000000000 --- a/vcl/win/source/src/MAKEFILE.MK +++ /dev/null @@ -1,130 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salsrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -RCDEPN= nullptr.cur \ - help.cur \ - hsize.cur \ - vsize.cur \ - neswsize.cur \ - nwsesize.cur \ - cross.cur \ - move.cur \ - hsplit.cur \ - vsplit.cur \ - hsizebar.cur \ - vsizebar.cur \ - hand.cur \ - refhand.cur \ - pen.cur \ - magnify.cur \ - fill.cur \ - rotate.cur \ - hshear.cur \ - vshear.cur \ - mirror.cur \ - crook.cur \ - crop.cur \ - movept.cur \ - movebw.cur \ - movedata.cur \ - copydata.cur \ - linkdata.cur \ - movedlnk.cur \ - copydlnk.cur \ - movef.cur \ - copyf.cur \ - linkf.cur \ - moveflnk.cur \ - copyflnk.cur \ - movef2.cur \ - copyf2.cur \ - notallow.cur \ - dline.cur \ - drect.cur \ - dpolygon.cur \ - dbezier.cur \ - darc.cur \ - dpie.cur \ - dcirccut.cur \ - dellipse.cur \ - dfree.cur \ - dconnect.cur \ - dtext.cur \ - dcapt.cur \ - chart.cur \ - detectiv.cur \ - pivotcol.cur \ - pivotrow.cur \ - pivotfld.cur \ - pivotdel.cur \ - chain.cur \ - chainnot.cur \ - timemove.cur \ - timesize.cur \ - asn.cur \ - ass.cur \ - asw.cur \ - ase.cur \ - asnw.cur \ - asne.cur \ - assw.cur \ - asse.cur \ - asns.cur \ - aswe.cur \ - asnswe.cur \ - airbrush.cur \ - vtext.cur \ - tblsels.cur \ - tblsele.cur \ - tblselse.cur \ - tblselw.cur \ - tblselsw.cur \ - pntbrsh.cur \ - 50.bmp \ - sd.ico - -RCFILES= salsrc.rc - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 1db1bfc910cf..11b967ff475b 100644..100755 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -29,7 +29,7 @@ #include <windows.h> #ifndef _SV_SALIDS_HRC -#include <salids.hrc> +#include <win/salids.hrc> #endif SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR diff --git a/vcl/win/source/window/MAKEFILE.MK b/vcl/win/source/window/MAKEFILE.MK deleted file mode 100644 index cecfbcf5b2e5..000000000000 --- a/vcl/win/source/window/MAKEFILE.MK +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salwin -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CDEFS +=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/salframe.obj \ - $(SLO)$/salmenu.obj \ - $(SLO)$/salobj.obj - -.IF "$(COM)"=="GCC" -EXCEPTIONSFILES= $(SLO)$/salframe.obj -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index c1b3a632556e..bcbaee6d8b6c 100755 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -46,51 +46,48 @@ #include <stdio.h> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #ifdef __MINGW32__ #include <excpt.h> #endif + #include <rtl/string.h> #include <rtl/ustring.h> #include <osl/module.h> + #include <tools/debug.hxx> -// Warning in SDK header -#if defined(_MSC_VER) && (_MSC_VER > 1400) -#pragma warning( disable: 4242 4244 ) -#endif -#include <wincomp.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif #include <vcl/sysdata.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salbmp.h> -#include <salgdi.h> -#include <salsys.h> -#include <salframe.h> -#include <salvd.h> -#include <salmenu.h> -#include <salobj.h> -#include <vcl/impbmp.hxx> #include <vcl/timer.hxx> -#include <saltimer.h> #include <vcl/settings.hxx> -#ifndef _SV_KEYCOES_HXX #include <vcl/keycodes.hxx> -#endif -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/sallayout.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_IMPDEL_HXX -#include <impdel.hxx> +#include <vcl/impdel.hxx> + +// Warning in SDK header +#if defined(_MSC_VER) && (_MSC_VER > 1400) +#pragma warning( disable: 4242 4244 ) #endif +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salbmp.h> +#include <win/salgdi.h> +#include <win/salsys.h> +#include <win/salframe.h> +#include <win/salvd.h> +#include <win/salmenu.h> +#include <win/salobj.h> +#include <win/saltimer.h> + +#include <impbmp.hxx> +#include <window.h> +#include <sallayout.hxx> + #define COMPILE_MULTIMON_STUBS #include <multimon.h> #include <vector> diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 23295838bfc9..ce7c6064f790 100755 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -27,16 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <vcl/salgdi.hxx> -#include <salmenu.h> + #include <vcl/menu.hxx> #include <vcl/sysdata.hxx> -#include <salframe.h> -#include <vcl/impbmp.hxx> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salmenu.h> + +#include <impbmp.hxx> +#include <salgdi.hxx> // uncomment the following line to have ownerdrawn menues, ie, with bitmaps // however, this is incompatible with OLE inplace editing diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 00ee39092aff..51712f07e709 100644..100755 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -30,17 +30,17 @@ #include <string.h> -#ifndef _SVWIN_HXX -#include <tools/svwin.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> #include <tools/debug.hxx> +#include <tools/svwin.h> + #include <vcl/svapp.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> + // ======================================================================= static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) |