summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx16
-rwxr-xr-x[-rw-r--r--]comphelper/inc/comphelper/docpasswordrequest.hxx0
-rw-r--r--comphelper/inc/comphelper/servicedecl.hxx31
-rwxr-xr-x[-rw-r--r--]comphelper/source/misc/docpasswordrequest.cxx0
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx27
-rw-r--r--cppcanvas/source/mtfrenderer/makefile.mk3
-rw-r--r--cppcanvas/source/mtfrenderer/rendergraphicaction.cxx201
-rw-r--r--cppcanvas/source/mtfrenderer/rendergraphicaction.hxx77
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx1
-rw-r--r--i18npool/source/transliteration/transliterationImpl.cxx15
-rwxr-xr-xl10ntools/scripts/localize.pl2
-rw-r--r--l10ntools/source/directory.cxx11
-rw-r--r--l10ntools/source/srciter.cxx4
-rw-r--r--svl/inc/svl/nfkeytab.hxx14
-rw-r--r--svl/inc/svl/undo.hxx1
-rw-r--r--svl/source/numbers/zforlist.cxx14
-rw-r--r--svl/source/numbers/zformat.cxx20
-rw-r--r--svl/source/numbers/zforscan.cxx22
-rw-r--r--svl/source/numbers/zforscan.hxx2
-rw-r--r--svtools/AllLangResTarget_svt.mk2
-rw-r--r--svtools/Library_svt.mk45
-rw-r--r--svtools/inc/svtools/filter.hxx52
-rw-r--r--svtools/inc/svtools/grfmgr.hxx33
-rw-r--r--svtools/source/filter/FilterConfigCache.cxx (renamed from svtools/source/filter.vcl/filter/FilterConfigCache.cxx)3
-rw-r--r--svtools/source/filter/FilterConfigCache.hxx (renamed from svtools/source/filter.vcl/filter/FilterConfigCache.hxx)0
-rw-r--r--[-rwxr-xr-x]svtools/source/filter/FilterConfigItem.cxx (renamed from svtools/source/filter.vcl/filter/FilterConfigItem.cxx)0
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx (renamed from svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx)0
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.hxx (renamed from svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx)0
-rw-r--r--svtools/source/filter/exportdialog.cxx (renamed from svtools/source/filter.vcl/filter/exportdialog.cxx)1
-rw-r--r--[-rwxr-xr-x]svtools/source/filter/exportdialog.hrc (renamed from svtools/source/filter.vcl/filter/exportdialog.hrc)0
-rw-r--r--[-rwxr-xr-x]svtools/source/filter/exportdialog.hxx (renamed from svtools/source/filter.vcl/filter/exportdialog.hxx)0
-rw-r--r--svtools/source/filter/exportdialog.src (renamed from svtools/source/filter.vcl/filter/exportdialog.src)0
-rw-r--r--svtools/source/filter/filter.cxx (renamed from svtools/source/filter.vcl/filter/filter.cxx)119
-rw-r--r--svtools/source/filter/filter2.cxx (renamed from svtools/source/filter.vcl/filter/filter2.cxx)19
-rw-r--r--svtools/source/filter/igif/decode.cxx (renamed from svtools/source/filter.vcl/igif/decode.cxx)0
-rw-r--r--svtools/source/filter/igif/decode.hxx (renamed from svtools/source/filter.vcl/igif/decode.hxx)0
-rw-r--r--svtools/source/filter/igif/gifread.cxx (renamed from svtools/source/filter.vcl/igif/gifread.cxx)0
-rw-r--r--svtools/source/filter/ixbm/xbmread.cxx (renamed from svtools/source/filter.vcl/ixbm/xbmread.cxx)0
-rw-r--r--svtools/source/filter/ixpm/rgbtable.hxx (renamed from svtools/source/filter.vcl/ixpm/rgbtable.hxx)0
-rw-r--r--svtools/source/filter/ixpm/xpmread.cxx (renamed from svtools/source/filter.vcl/ixpm/xpmread.cxx)0
-rw-r--r--svtools/source/filter/jpeg/jpeg.cxx (renamed from svtools/source/filter.vcl/jpeg/jpeg.cxx)8
-rw-r--r--svtools/source/filter/jpeg/jpeg.h (renamed from svtools/source/filter.vcl/jpeg/jpeg.h)0
-rw-r--r--svtools/source/filter/jpeg/jpegc.c (renamed from svtools/source/filter.vcl/jpeg/jpegc.c)0
-rw-r--r--svtools/source/filter/sgf.ini (renamed from svtools/source/filter.vcl/filter/sgf.ini)0
-rw-r--r--svtools/source/filter/sgfbram.cxx (renamed from svtools/source/filter.vcl/filter/sgfbram.cxx)0
-rw-r--r--svtools/source/filter/sgvmain.cxx (renamed from svtools/source/filter.vcl/filter/sgvmain.cxx)0
-rw-r--r--svtools/source/filter/sgvspln.cxx (renamed from svtools/source/filter.vcl/filter/sgvspln.cxx)0
-rw-r--r--svtools/source/filter/sgvtext.cxx (renamed from svtools/source/filter.vcl/filter/sgvtext.cxx)0
-rw-r--r--svtools/source/filter/wmf/emfwr.cxx (renamed from svtools/source/filter.vcl/wmf/emfwr.cxx)27
-rw-r--r--svtools/source/filter/wmf/emfwr.hxx (renamed from svtools/source/filter.vcl/wmf/emfwr.hxx)0
-rw-r--r--svtools/source/filter/wmf/enhwmf.cxx (renamed from svtools/source/filter.vcl/wmf/enhwmf.cxx)13
-rw-r--r--svtools/source/filter/wmf/winmtf.cxx (renamed from svtools/source/filter.vcl/wmf/winmtf.cxx)1
-rw-r--r--svtools/source/filter/wmf/winmtf.hxx (renamed from svtools/source/filter.vcl/wmf/winmtf.hxx)2
-rw-r--r--svtools/source/filter/wmf/winwmf.cxx (renamed from svtools/source/filter.vcl/wmf/winwmf.cxx)1
-rw-r--r--svtools/source/filter/wmf/wmf.cxx (renamed from svtools/source/filter.vcl/wmf/wmf.cxx)0
-rw-r--r--svtools/source/filter/wmf/wmfwr.cxx (renamed from svtools/source/filter.vcl/wmf/wmfwr.cxx)28
-rw-r--r--svtools/source/filter/wmf/wmfwr.hxx (renamed from svtools/source/filter.vcl/wmf/wmfwr.hxx)4
-rw-r--r--svtools/source/graphic/descriptor.cxx1
-rw-r--r--svtools/source/graphic/grfmgr.cxx16
-rw-r--r--svtools/source/graphic/grfmgr2.cxx3
-rw-r--r--svtools/source/uno/unoiface.cxx1
-rw-r--r--toolkit/inc/toolkit/helper/formpdfexport.hxx14
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx9
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx4
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx5
-rw-r--r--toolkit/source/controls/unocontrol.cxx18
-rw-r--r--toolkit/source/helper/formpdfexport.cxx58
-rw-r--r--toolkit/source/helper/unowrapper.cxx10
-rw-r--r--unotools/source/misc/fontcvt.cxx2
-rw-r--r--vcl/AllLangResTarget_vcl.mk (renamed from vcl/aqua/source/res/makefile.mk)46
-rw-r--r--vcl/Library_desktop_detector.mk85
-rwxr-xr-xvcl/Library_vcl.mk511
-rwxr-xr-xvcl/Library_vclplug_gen.mk205
-rwxr-xr-xvcl/Library_vclplug_gtk.mk127
-rwxr-xr-xvcl/Library_vclplug_kde.mk93
-rwxr-xr-xvcl/Library_vclplug_kde4.mk99
-rwxr-xr-xvcl/Library_vclplug_svp.mk97
-rw-r--r--vcl/Makefile (renamed from vcl/source/salmain/makefile.mk)19
-rw-r--r--vcl/Module_vcl.mk (renamed from vcl/aqua/source/app/makefile.mk)69
-rw-r--r--vcl/Package_inc.mk168
-rw-r--r--vcl/Package_osx.mk (renamed from vcl/util/makefile2.pmk)23
-rwxr-xr-xvcl/StaticLibrary_vclmain.mk62
-rwxr-xr-xvcl/WinResTarget_vcl.mk123
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ycomponentwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yfactory.mm8
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.cxx9
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.hxx4
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocustracker.cxx13
-rw-r--r--vcl/aqua/source/a11y/aqua11ylistener.cxx13
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.mm6
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.mm22
-rw-r--r--vcl/aqua/source/a11y/aqua11yutil.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11yvaluewrapper.h6
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapper.mm23
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm4
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.mm2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.h2
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm2
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.hxx7
-rw-r--r--vcl/aqua/source/a11y/makefile.mk88
-rw-r--r--vcl/aqua/source/app/saldata.cxx7
-rw-r--r--vcl/aqua/source/app/salinst.cxx42
-rwxr-xr-xvcl/aqua/source/app/salnstimer.mm11
-rw-r--r--vcl/aqua/source/app/salsys.cxx13
-rw-r--r--vcl/aqua/source/app/saltimer.cxx10
-rwxr-xr-xvcl/aqua/source/app/vclnsapp.mm38
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx2
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx75
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx22
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx4
-rw-r--r--vcl/aqua/source/dtrans/aqua_service.cxx86
-rw-r--r--vcl/aqua/source/dtrans/makefile.mk68
-rw-r--r--vcl/aqua/source/dtrans/service_entry.cxx11
-rw-r--r--vcl/aqua/source/dtrans/test_aquacb.cxx208
-rw-r--r--vcl/aqua/source/gdi/aquaprintaccessoryview.mm13
-rwxr-xr-xvcl/aqua/source/gdi/aquaprintview.mm6
-rw-r--r--vcl/aqua/source/gdi/makefile.mk74
-rwxr-xr-xvcl/aqua/source/gdi/salatslayout.cxx16
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx7
-rw-r--r--vcl/aqua/source/gdi/salbmp.cxx19
-rwxr-xr-xvcl/aqua/source/gdi/salcolorutils.cxx3
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx73
-rwxr-xr-xvcl/aqua/source/gdi/salgdiutils.cxx12
-rwxr-xr-xvcl/aqua/source/gdi/salmathutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx24
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx46
-rw-r--r--vcl/aqua/source/gdi/salvd.cxx16
-rw-r--r--vcl/aqua/source/window/makefile.mk63
-rw-r--r--vcl/aqua/source/window/salframe.cxx38
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm92
-rw-r--r--vcl/aqua/source/window/salmenu.cxx34
-rwxr-xr-xvcl/aqua/source/window/salnsmenu.mm12
-rw-r--r--vcl/aqua/source/window/salobj.cxx12
-rw-r--r--vcl/inc/accel.h (renamed from vcl/inc/vcl/accel.h)0
-rw-r--r--vcl/inc/accmgr.hxx (renamed from vcl/inc/vcl/accmgr.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11yfactory.h (renamed from vcl/aqua/inc/aqua11yfactory.h)0
-rw-r--r--vcl/inc/aqua/aqua11yfocustracker.hxx (renamed from vcl/aqua/inc/aqua11yfocustracker.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11ylistener.hxx (renamed from vcl/aqua/inc/aqua11ylistener.hxx)0
-rw-r--r--vcl/inc/aqua/aqua11ywrapper.h (renamed from vcl/aqua/inc/aqua11ywrapper.h)0
-rwxr-xr-xvcl/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-xvcl/inc/aqua/salcolorutils.hxx (renamed from vcl/aqua/inc/salcolorutils.hxx)0
-rwxr-xr-xvcl/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-xvcl/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-xvcl/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-xvcl/inc/aqua/salnativewidgets.h (renamed from vcl/aqua/inc/salnativewidgets.h)0
-rwxr-xr-xvcl/inc/aqua/salnsmenu.h (renamed from vcl/aqua/inc/salnsmenu.h)0
-rwxr-xr-xvcl/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-xvcl/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.mk49
-rw-r--r--vcl/inc/outdata.hxx (renamed from vcl/inc/vcl/outdata.hxx)0
-rw-r--r--vcl/inc/outdev.h (renamed from vcl/inc/vcl/outdev.h)2
-rw-r--r--vcl/inc/outfont.hxx (renamed from vcl/inc/vcl/outfont.hxx)0
-rw-r--r--vcl/inc/print.h (renamed from vcl/inc/vcl/print.h)2
-rw-r--r--vcl/inc/printdlg.hxx (renamed from vcl/inc/vcl/prndlg.hxx)4
-rw-r--r--vcl/inc/printergfx.hxx (renamed from vcl/inc/vcl/printergfx.hxx)2
-rw-r--r--vcl/inc/printerjob.hxx (renamed from vcl/inc/vcl/printerjob.hxx)0
-rw-r--r--vcl/inc/region.h (renamed from vcl/inc/vcl/region.h)0
-rw-r--r--vcl/inc/salbmp.hxx (renamed from vcl/inc/vcl/salbmp.hxx)0
-rw-r--r--vcl/inc/saldatabasic.hxx (renamed from vcl/inc/vcl/saldatabasic.hxx)6
-rw-r--r--vcl/inc/salframe.hxx (renamed from vcl/inc/vcl/salframe.hxx)4
-rwxr-xr-xvcl/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-xvcl/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.hxx10
-rw-r--r--vcl/inc/subedit.hxx (renamed from vcl/inc/vcl/subedit.hxx)0
-rw-r--r--vcl/inc/svdata.hxx (renamed from vcl/inc/vcl/svdata.hxx)13
-rw-r--r--vcl/inc/svids.hrc (renamed from vcl/inc/vcl/svids.hrc)0
-rw-r--r--vcl/inc/svsys.h42
-rwxr-xr-xvcl/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.h162
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_curs.h (renamed from vcl/unx/source/inc/tblsele_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_mask.h (renamed from vcl/unx/source/inc/tblsele_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_curs.h (renamed from vcl/unx/source/inc/tblsels_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_mask.h (renamed from vcl/unx/source/inc/tblsels_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_curs.h (renamed from vcl/unx/source/inc/tblselse_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_mask.h (renamed from vcl/unx/source/inc/tblselse_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_curs.h (renamed from vcl/unx/source/inc/tblselsw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_mask.h (renamed from vcl/unx/source/inc/tblselsw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_curs.h (renamed from vcl/unx/source/inc/tblselw_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_mask.h (renamed from vcl/unx/source/inc/tblselw_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_curs.h (renamed from vcl/unx/source/inc/timemove_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_mask.h (renamed from vcl/unx/source/inc/timemove_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_curs.h (renamed from vcl/unx/source/inc/timesize_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_mask.h (renamed from vcl/unx/source/inc/timesize_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_curs.h (renamed from vcl/unx/source/inc/vertcurs_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_mask.h (renamed from vcl/unx/source/inc/vertcurs_mask.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_curs.h (renamed from vcl/unx/source/inc/vshear_curs.h)0
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_mask.h (renamed from vcl/unx/source/inc/vshear_mask.h)0
-rw-r--r--vcl/inc/vcl/cursor.hxx2
-rw-r--r--vcl/inc/vcl/gdimtf.hxx12
-rw-r--r--vcl/inc/vcl/gfxlink.hxx3
-rw-r--r--vcl/inc/vcl/graph.hxx16
-rw-r--r--vcl/inc/vcl/jobdata.hxx2
-rw-r--r--vcl/inc/vcl/metaact.hxx51
-rw-r--r--[-rwxr-xr-x]vcl/inc/vcl/outdev.hxx23
-rw-r--r--vcl/inc/vcl/pdfextoutdevdata.hxx34
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx23
-rw-r--r--vcl/inc/vcl/polyscan.hxx155
-rw-r--r--vcl/inc/vcl/ppdparser.hxx10
-rw-r--r--vcl/inc/vcl/rendergraphic.hxx124
-rw-r--r--vcl/inc/vcl/rendergraphicrasterizer.hxx111
-rw-r--r--vcl/inc/vcl/salctype.hxx1
-rw-r--r--vcl/inc/vcl/svcompat.hxx70
-rw-r--r--vcl/inc/vcl/svgread.hxx80
-rw-r--r--vcl/inc/vcl/unobrok.hxx39
-rw-r--r--vcl/inc/vclpluginapi.h70
-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-xvcl/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-xvcl/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-xvcl/inc/win/salinst.h (renamed from vcl/win/inc/salinst.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salmenu.h (renamed from vcl/win/inc/salmenu.h)4
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salnativewidgets.h (renamed from vcl/win/inc/salnativewidgets.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salobj.h (renamed from vcl/win/inc/salobj.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salprn.h (renamed from vcl/win/inc/salprn.h)3
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salsys.h (renamed from vcl/win/inc/salsys.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/saltimer.h (renamed from vcl/win/inc/saltimer.h)2
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/salvd.h (renamed from vcl/win/inc/salvd.h)3
-rw-r--r--vcl/inc/win/svsys.h (renamed from vcl/win/inc/svsys.h)0
-rwxr-xr-x[-rw-r--r--]vcl/inc/win/wincomp.hxx (renamed from vcl/win/inc/wincomp.hxx)1
-rw-r--r--vcl/inc/window.h (renamed from vcl/inc/vcl/window.h)0
-rw-r--r--vcl/inc/xconnection.hxx (renamed from vcl/inc/vcl/xconnection.hxx)0
-rw-r--r--vcl/prj/build.lst55
-rw-r--r--vcl/prj/d.lst158
-rw-r--r--vcl/prj/makefile.mk (renamed from vcl/util/makefile.pmk)16
-rwxr-xr-x[-rw-r--r--]vcl/source/app/dbggui.cxx30
-rw-r--r--vcl/source/app/help.cxx12
-rw-r--r--vcl/source/app/i18nhelp.cxx10
-rw-r--r--vcl/source/app/idlemgr.cxx5
-rw-r--r--vcl/source/app/makefile.mk69
-rw-r--r--vcl/source/app/salvtables.cxx20
-rw-r--r--vcl/source/app/session.cxx13
-rw-r--r--vcl/source/app/settings.cxx13
-rw-r--r--vcl/source/app/sound.cxx17
-rw-r--r--vcl/source/app/stdtext.cxx6
-rw-r--r--vcl/source/app/svapp.cxx50
-rw-r--r--vcl/source/app/svdata.cxx32
-rw-r--r--vcl/source/app/svmain.cxx82
-rw-r--r--vcl/source/app/timer.cxx12
-rw-r--r--vcl/source/app/unohelp.cxx22
-rw-r--r--vcl/source/app/vclevent.cxx3
-rw-r--r--vcl/source/components/dtranscomp.cxx15
-rw-r--r--vcl/source/components/factory.cxx15
-rw-r--r--vcl/source/components/fontident.cxx14
-rw-r--r--vcl/source/components/makefile.mk21
-rw-r--r--vcl/source/components/rasterizer_rsvg.cxx640
-rw-r--r--vcl/source/control/button.cxx22
-rw-r--r--vcl/source/control/combobox.cxx14
-rw-r--r--vcl/source/control/ctrl.cxx15
-rwxr-xr-xvcl/source/control/edit.cxx15
-rw-r--r--vcl/source/control/field.cxx7
-rw-r--r--vcl/source/control/field2.cxx13
-rw-r--r--vcl/source/control/fixed.cxx8
-rw-r--r--vcl/source/control/group.cxx8
-rw-r--r--vcl/source/control/ilstbox.cxx20
-rw-r--r--vcl/source/control/longcurr.cxx4
-rw-r--r--vcl/source/control/lstbox.cxx22
-rw-r--r--vcl/source/control/makefile.mk78
-rw-r--r--vcl/source/control/scrbar.cxx3
-rw-r--r--vcl/source/control/spinfld.cxx6
-rw-r--r--vcl/source/control/tabctrl.cxx9
-rw-r--r--vcl/source/fontsubset/cff.cxx3
-rw-r--r--vcl/source/fontsubset/fontsubset.cxx5
-rw-r--r--vcl/source/fontsubset/makefile.mk51
-rw-r--r--vcl/source/gdi/bitmap.cxx15
-rw-r--r--vcl/source/gdi/bitmap3.cxx6
-rw-r--r--vcl/source/gdi/bitmapex.cxx17
-rw-r--r--vcl/source/gdi/bmpacc.cxx5
-rw-r--r--vcl/source/gdi/bmpacc3.cxx7
-rw-r--r--vcl/source/gdi/bmpfast.cxx2
-rw-r--r--vcl/source/gdi/configsettings.cxx4
-rw-r--r--vcl/source/gdi/cvtgrf.cxx8
-rw-r--r--vcl/source/gdi/font.cxx15
-rw-r--r--vcl/source/gdi/gdimtf.cxx768
-rw-r--r--vcl/source/gdi/gfxlink.cxx1
-rw-r--r--vcl/source/gdi/graph.cxx34
-rw-r--r--vcl/source/gdi/image.cxx13
-rw-r--r--vcl/source/gdi/imagerepository.cxx6
-rw-r--r--vcl/source/gdi/impbmp.cxx13
-rw-r--r--vcl/source/gdi/impgraph.cxx67
-rw-r--r--vcl/source/gdi/impimage.cxx4
-rw-r--r--vcl/source/gdi/impimagetree.cxx11
-rw-r--r--vcl/source/gdi/jobset.cxx8
-rwxr-xr-xvcl/source/gdi/makefile.mk94
-rw-r--r--vcl/source/gdi/metaact.cxx90
-rw-r--r--vcl/source/gdi/metric.cxx2
-rw-r--r--vcl/source/gdi/octree.cxx5
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/outdev.cxx31
-rwxr-xr-xvcl/source/gdi/outdev2.cxx25
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/outdev3.cxx52
-rw-r--r--vcl/source/gdi/outdev4.cxx17
-rw-r--r--vcl/source/gdi/outdev5.cxx13
-rw-r--r--vcl/source/gdi/outdev6.cxx45
-rwxr-xr-xvcl/source/gdi/outdevnative.cxx3
-rw-r--r--vcl/source/gdi/outmap.cxx18
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx53
-rw-r--r--vcl/source/gdi/pdffontcache.cxx6
-rw-r--r--vcl/source/gdi/pdffontcache.hxx4
-rw-r--r--vcl/source/gdi/pdfwriter.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx46
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx8
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx17
-rw-r--r--vcl/source/gdi/polyscan.cxx358
-rw-r--r--vcl/source/gdi/print.cxx26
-rw-r--r--vcl/source/gdi/print2.cxx37
-rwxr-xr-xvcl/source/gdi/print3.cxx11
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/region.cxx13
-rw-r--r--vcl/source/gdi/rendergraphic.cxx240
-rw-r--r--vcl/source/gdi/rendergraphicrasterizer.cxx400
-rwxr-xr-xvcl/source/gdi/salgdilayout.cxx29
-rwxr-xr-xvcl/source/gdi/sallayout.cxx11
-rw-r--r--vcl/source/gdi/salmisc.cxx2
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx2
-rw-r--r--vcl/source/gdi/svcompat.cxx78
-rw-r--r--vcl/source/gdi/svgread.cxx131
-rwxr-xr-xvcl/source/gdi/textlayout.cxx5
-rw-r--r--vcl/source/gdi/virdev.cxx17
-rw-r--r--vcl/source/gdi/wall.cxx7
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx7
-rw-r--r--vcl/source/glyphs/gcach_ftyp.hxx2
-rwxr-xr-xvcl/source/glyphs/gcach_layout.cxx4
-rwxr-xr-xvcl/source/glyphs/gcach_rbmp.cxx2
-rw-r--r--vcl/source/glyphs/gcach_vdev.cxx287
-rw-r--r--vcl/source/glyphs/gcach_vdev.hxx57
-rw-r--r--vcl/source/glyphs/glyphcache.cxx8
-rw-r--r--vcl/source/glyphs/graphite_adaptors.cxx8
-rw-r--r--vcl/source/glyphs/graphite_cache.cxx6
-rw-r--r--vcl/source/glyphs/graphite_features.cxx2
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx10
-rw-r--r--vcl/source/glyphs/graphite_serverfont.cxx6
-rw-r--r--vcl/source/glyphs/graphite_textsrc.cxx2
-rw-r--r--vcl/source/glyphs/graphite_textsrc.hxx12
-rw-r--r--vcl/source/glyphs/makefile.mk80
-rw-r--r--vcl/source/helper/canvasbitmap.cxx2
-rw-r--r--vcl/source/helper/canvastools.cxx2
-rw-r--r--vcl/source/helper/lazydelete.cxx2
-rw-r--r--vcl/source/helper/makefile.mk55
-rw-r--r--vcl/source/helper/xconnection.cxx9
-rw-r--r--vcl/source/salmain/salmain.cxx3
-rw-r--r--vcl/source/src/btntext.src4
-rw-r--r--vcl/source/src/helptext.src4
-rw-r--r--vcl/source/src/images.src4
-rw-r--r--vcl/source/src/makefile.mk57
-rw-r--r--vcl/source/src/menu.src5
-rw-r--r--vcl/source/src/print.src2
-rw-r--r--vcl/source/src/stdtext.src4
-rw-r--r--vcl/source/src/units.src4
-rw-r--r--vcl/source/window/abstdlg.cxx3
-rw-r--r--vcl/source/window/accel.cxx9
-rw-r--r--vcl/source/window/accmgr.cxx5
-rw-r--r--vcl/source/window/arrange.cxx3
-rw-r--r--vcl/source/window/brdwin.cxx13
-rw-r--r--vcl/source/window/btndlg.cxx9
-rw-r--r--vcl/source/window/cursor.cxx24
-rw-r--r--vcl/source/window/dialog.cxx10
-rw-r--r--vcl/source/window/dlgctrl.cxx7
-rw-r--r--vcl/source/window/dndevdis.cxx9
-rw-r--r--vcl/source/window/dndlcon.cxx2
-rw-r--r--vcl/source/window/dockingarea.cxx5
-rw-r--r--vcl/source/window/dockmgr.cxx13
-rw-r--r--vcl/source/window/dockwin.cxx15
-rw-r--r--vcl/source/window/floatwin.cxx15
-rw-r--r--vcl/source/window/introwin.cxx11
-rw-r--r--vcl/source/window/keycod.cxx15
-rw-r--r--vcl/source/window/makefile.mk106
-rwxr-xr-xvcl/source/window/menu.cxx19
-rw-r--r--vcl/source/window/msgbox.cxx16
-rwxr-xr-xvcl/source/window/printdlg.cxx9
-rw-r--r--vcl/source/window/scrwnd.cxx15
-rw-r--r--vcl/source/window/seleng.cxx6
-rw-r--r--vcl/source/window/split.cxx9
-rw-r--r--vcl/source/window/splitwin.cxx8
-rw-r--r--vcl/source/window/status.cxx10
-rwxr-xr-x[-rw-r--r--]vcl/source/window/syschild.cxx20
-rw-r--r--vcl/source/window/syswin.cxx12
-rw-r--r--vcl/source/window/tabpage.cxx9
-rw-r--r--vcl/source/window/taskpanelist.cxx7
-rwxr-xr-x[-rw-r--r--]vcl/source/window/toolbox.cxx22
-rw-r--r--vcl/source/window/toolbox2.cxx16
-rwxr-xr-x[-rw-r--r--]vcl/source/window/window.cxx78
-rw-r--r--vcl/source/window/window2.cxx27
-rw-r--r--vcl/source/window/window4.cxx5
-rw-r--r--vcl/source/window/winproc.cxx45
-rw-r--r--vcl/source/window/wpropset.cxx3
-rwxr-xr-x[-rw-r--r--]vcl/source/window/wrkwin.cxx18
-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-xvcl/unx/generic/fontmanager/afm_hash.cpp (renamed from vcl/unx/source/fontmanager/afm_hash.cpp)0
-rwxr-xr-xvcl/unx/generic/fontmanager/afm_keyword_list (renamed from vcl/unx/source/fontmanager/afm_keyword_list)0
-rw-r--r--vcl/unx/generic/fontmanager/fontcache.cxx (renamed from vcl/unx/source/fontmanager/fontcache.cxx)2
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx (renamed from vcl/unx/source/fontmanager/fontconfig.cxx)4
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx (renamed from vcl/unx/source/fontmanager/fontmanager.cxx)11
-rw-r--r--vcl/unx/generic/fontmanager/helper.cxx (renamed from vcl/unx/source/fontmanager/helper.cxx)0
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.cxx (renamed from vcl/unx/source/fontmanager/parseAFM.cxx)0
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.hxx (renamed from vcl/unx/source/fontmanager/parseAFM.hxx)0
-rw-r--r--vcl/unx/generic/gdi/cdeint.cxx (renamed from vcl/unx/source/gdi/cdeint.cxx)11
-rw-r--r--vcl/unx/generic/gdi/dtint.cxx (renamed from vcl/unx/source/gdi/dtint.cxx)26
-rw-r--r--vcl/unx/generic/gdi/dtsetenum.hxx (renamed from vcl/unx/source/gdi/dtsetenum.hxx)0
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx (renamed from vcl/unx/source/gdi/gcach_xpeer.cxx)19
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx (renamed from vcl/unx/source/gdi/gcach_xpeer.hxx)4
-rw-r--r--vcl/unx/generic/gdi/pspgraphics.cxx (renamed from vcl/unx/source/gdi/pspgraphics.cxx)36
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx (renamed from vcl/unx/source/gdi/salbmp.cxx)23
-rw-r--r--vcl/unx/generic/gdi/salcvt.cxx (renamed from vcl/unx/source/gdi/salcvt.cxx)0
-rw-r--r--vcl/unx/generic/gdi/salcvt.hxx (renamed from vcl/unx/source/gdi/salcvt.hxx)3
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx (renamed from vcl/unx/source/gdi/salgdi.cxx)28
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx (renamed from vcl/unx/source/gdi/salgdi2.cxx)20
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx (renamed from vcl/unx/source/gdi/salgdi3.cxx)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.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx2
-rw-r--r--vcl/unx/gtk/a11y/makefile.mk93
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx16
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx15
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx6
-rw-r--r--vcl/unx/gtk/app/makefile.mk76
-rw-r--r--vcl/unx/gtk/gdi/makefile.mk67
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx18
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx21
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx8
-rw-r--r--vcl/unx/gtk/window/makefile.mk79
-rw-r--r--vcl/unx/headless/makefile.mk66
-rw-r--r--vcl/unx/headless/svpbmp.hxx2
-rw-r--r--vcl/unx/headless/svpdummies.hxx7
-rw-r--r--vcl/unx/headless/svpframe.hxx2
-rw-r--r--vcl/unx/headless/svpgdi.cxx2
-rw-r--r--vcl/unx/headless/svpgdi.hxx5
-rw-r--r--vcl/unx/headless/svpinst.cxx12
-rw-r--r--vcl/unx/headless/svpinst.hxx7
-rw-r--r--vcl/unx/headless/svpprn.cxx15
-rw-r--r--vcl/unx/headless/svpprn.hxx11
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx41
-rw-r--r--vcl/unx/headless/svppspgraphics.hxx5
-rw-r--r--vcl/unx/headless/svptext.cxx12
-rw-r--r--vcl/unx/headless/svpvd.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx15
-rw-r--r--vcl/unx/kde/makefile.mk81
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx19
-rw-r--r--vcl/unx/kde4/KDEData.hxx4
-rw-r--r--vcl/unx/kde4/KDESalDisplay.hxx3
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx7
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx4
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDESalInstance.hxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx9
-rw-r--r--vcl/unx/kde4/KDEXLib.hxx3
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.cxx4
-rw-r--r--vcl/unx/kde4/main.cxx4
-rw-r--r--vcl/unx/kde4/makefile.mk88
-rw-r--r--vcl/unx/source/app/makefile.mk110
-rw-r--r--vcl/unx/source/desktopdetect/makefile.mk57
-rw-r--r--vcl/unx/source/dtrans/makefile.mk68
-rw-r--r--vcl/unx/source/fontmanager/makefile.mk72
-rw-r--r--vcl/unx/source/gdi/makefile.mk101
-rw-r--r--vcl/unx/source/inc/salcursors.h162
-rw-r--r--vcl/unx/source/plugadapt/makefile.mk59
-rw-r--r--vcl/unx/source/printer/makefile.mk70
-rw-r--r--vcl/unx/source/printergfx/makefile.mk65
-rw-r--r--vcl/unx/source/window/makefile.mk59
-rw-r--r--vcl/util/hidother.src31
-rw-r--r--vcl/util/linksvp/makefile.mk65
-rw-r--r--vcl/util/makefile.mk2
-rw-r--r--vcl/util/target.pmk39
-rw-r--r--vcl/vcl.macosx.component (renamed from vcl/util/vcl.macosx.component)3
-rw-r--r--vcl/vcl.unx.component (renamed from vcl/util/vcl.component)3
-rw-r--r--vcl/vcl.windows.component (renamed from vcl/util/vcl.windows.component)3
-rw-r--r--vcl/win/source/app/MAKEFILE.MK53
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/saldata.cxx7
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/salinfo.cxx28
-rwxr-xr-xvcl/win/source/app/salinst.cxx31
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/salshl.cxx5
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/saltimer.cxx6
-rw-r--r--vcl/win/source/gdi/MAKEFILE.MK69
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/salbmp.cxx14
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salgdi.cxx17
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salgdi2.cxx16
-rwxr-xr-xvcl/win/source/gdi/salgdi3.cxx46
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx8
-rwxr-xr-xvcl/win/source/gdi/salnativewidgets-luna.cxx12
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salprn.cxx28
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/salvd.cxx13
-rwxr-xr-xvcl/win/source/gdi/winlayout.cxx26
-rw-r--r--vcl/win/source/src/MAKEFILE.MK130
-rwxr-xr-x[-rw-r--r--]vcl/win/source/src/salsrc.rc2
-rw-r--r--vcl/win/source/window/MAKEFILE.MK60
-rwxr-xr-xvcl/win/source/window/salframe.cxx51
-rwxr-xr-xvcl/win/source/window/salmenu.cxx18
-rwxr-xr-x[-rw-r--r--]vcl/win/source/window/salobj.cxx16
798 files changed, 7633 insertions, 6953 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 725a6ae0f2a6..7556e76fba42 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -214,8 +214,8 @@ namespace cairocanvas
return geometry::RealRectangle2D( 0, nAboveBaseline,
aVDev.GetTextWidth(
maText.Text,
- ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
- ::canvas::tools::numeric_cast<USHORT>(maText.Length) ),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ),
nBelowBaseline );
}
}
@@ -404,8 +404,8 @@ namespace cairocanvas
}
aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text,
- ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
- ::canvas::tools::numeric_cast<USHORT>(maText.Length),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length),
maLogicalAdvancements.getLength() ? aOffsets.get() : NULL);
// Sort them so that all glyphs on the same glyph fallback level are consecutive
@@ -446,15 +446,15 @@ namespace cairocanvas
if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances
{
rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(),
- ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
- ::canvas::tools::numeric_cast<USHORT>(maText.Length) );
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
return true;
}
else // VCL FALLBACK - without advances
{
rOutDev.DrawText( rOutpos, maText.Text,
- ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
- ::canvas::tools::numeric_cast<USHORT>(maText.Length) );
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition),
+ ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) );
return true;
}
}
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index effc47392078..effc47392078 100644..100755
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 5ea7972e29a2..a7d51824f7c0 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -27,26 +27,17 @@
#if ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
#define COMPHELPER_SERVICEDECL_HXX_INCLUDED
-#if ! defined(INCLUDED_COMPHELPERDLLAPI_H)
-#include "comphelper/comphelperdllapi.h"
-#endif
-#if ! defined(_CPPUHELPER_IMPLBASE1_HXX_)
-#include "cppuhelper/implbase1.hxx"
-#endif
-#if ! defined(_COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_)
-#include "com/sun/star/uno/XComponentContext.hpp"
-#endif
-#if ! defined(_COM_SUN_STAR_LANG_XSERVICEINFO_HPP_)
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#endif
-#if ! defined(_COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_)
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#endif
-#include "boost/utility.hpp"
-#include "boost/function.hpp"
-#include "boost/preprocessor/cat.hpp"
-#include "boost/preprocessor/repetition.hpp"
-#include "boost/preprocessor/seq/enum.hpp"
+#include <comphelper/comphelperdllapi.h>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <uno/environment.h>
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
namespace comphelper {
namespace service_decl {
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 15c2e09ba0f3..15c2e09ba0f3 100644..100755
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 1e0611ab037a..d0382997a9db 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -83,6 +83,7 @@
#include <lineaction.hxx>
#include <pointaction.hxx>
#include <polypolyaction.hxx>
+#include <rendergraphicaction.hxx>
#include <textaction.hxx>
#include <transparencygroupaction.hxx>
#include <vector>
@@ -2653,6 +2654,32 @@ namespace cppcanvas
}
break;
+ case META_RENDERGRAPHIC_ACTION:
+ {
+ MetaRenderGraphicAction* pAct = static_cast<MetaRenderGraphicAction*>(pCurrAct);
+
+ ActionSharedPtr pRenderGraphicAction(
+ internal::RenderGraphicActionFactory::createRenderGraphicAction(
+ pAct->GetRenderGraphic(),
+ getState( rStates ).mapModeTransform *
+ ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ getState( rStates ).mapModeTransform *
+ ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ rCanvas,
+ getState( rStates ) ) );
+
+ if( pRenderGraphicAction )
+ {
+ maActions.push_back(
+ MtfAction(
+ pRenderGraphicAction,
+ io_rCurrActionIndex ) );
+
+ io_rCurrActionIndex += pRenderGraphicAction->getActionCount()-1;
+ }
+ }
+ break;
+
default:
OSL_ENSURE( false,
"Unknown meta action type encountered" );
diff --git a/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/source/mtfrenderer/makefile.mk
index dfe6e28030bf..92ae7e1200bc 100644
--- a/cppcanvas/source/mtfrenderer/makefile.mk
+++ b/cppcanvas/source/mtfrenderer/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -48,6 +48,7 @@ SLOFILES = $(SLO)$/cachedprimitivebase.obj \
$(SLO)$/lineaction.obj \
$(SLO)$/pointaction.obj \
$(SLO)$/polypolyaction.obj \
+ $(SLO)$/rendergraphicaction.obj \
$(SLO)$/textaction.obj \
$(SLO)$/transparencygroupaction.obj \
$(SLO)$/mtftools.obj
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
new file mode 100644
index 000000000000..764d3eabc6af
--- /dev/null
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
@@ -0,0 +1,201 @@
+/*************************************************************************
+ *
+ * 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_cppcanvas.hxx"
+
+#include <rtl/logfile.hxx>
+#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/XCachedPrimitive.hpp>
+#include <vcl/rendergraphicrasterizer.hxx>
+#include <tools/gen.hxx>
+#include <vcl/canvastools.hxx>
+#include <canvas/canvastools.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/vector/b2dsize.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/tools/canvastools.hxx>
+#include <boost/utility.hpp>
+#include "cachedprimitivebase.hxx"
+#include "rendergraphicaction.hxx"
+#include "outdevstate.hxx"
+#include "mtftools.hxx"
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+
+using namespace ::com::sun::star;
+
+namespace cppcanvas
+{
+ namespace internal
+ {
+ namespace
+ {
+
+ class RenderGraphicAction : public CachedPrimitiveBase
+ {
+ public:
+ RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+ const ::basegfx::B2DPoint& rDstPoint,
+ const ::basegfx::B2DVector& rDstSize,
+ const CanvasSharedPtr&,
+ const OutDevState& );
+
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
+ const Subset& rSubset ) const;
+
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
+ const Subset& rSubset ) const;
+
+ virtual sal_Int32 getActionCount() const;
+
+ private:
+ using Action::render;
+ virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
+ const ::basegfx::B2DHomMatrix& rTransformation ) const;
+
+ ::vcl::RenderGraphic maRenderGraphic;
+ uno::Reference< rendering::XBitmap > mxBitmap;
+ CanvasSharedPtr mpCanvas;
+ rendering::RenderState maState;
+ };
+
+ RenderGraphicAction::RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+ const ::basegfx::B2DPoint& rDstPoint,
+ const ::basegfx::B2DVector& rDstSize,
+ const CanvasSharedPtr& rCanvas,
+ const OutDevState& rState ) :
+ CachedPrimitiveBase( rCanvas, true ),
+ maRenderGraphic( rRenderGraphic ),
+ mpCanvas( rCanvas )
+ {
+ tools::initRenderState( maState,rState );
+
+ const ::vcl::RenderGraphicRasterizer aRasterizer( rRenderGraphic );
+ const BitmapEx aBmpEx( aRasterizer.Rasterize( ::vcl::unotools::sizeFromB2DSize( rDstSize ) ) );
+ const Size aRasteredSizePixel( aBmpEx.GetSizePixel() );
+
+ if( aRasteredSizePixel.Width() && aRasteredSizePixel.Height() )
+ {
+ const ::basegfx::B2DVector aScale( rDstSize.getX() / aRasteredSizePixel.Width(),
+ rDstSize.getY() / aRasteredSizePixel.Height() );
+ const basegfx::B2DHomMatrix aLocalTransformation(
+ basegfx::tools::createScaleTranslateB2DHomMatrix( aScale, rDstPoint)) ;
+
+ ::canvas::tools::appendToRenderState( maState, aLocalTransformation );
+
+ // correct clip (which is relative to original transform)
+ tools::modifyClip( maState, rState, rCanvas, rDstPoint, &aScale, NULL );
+
+ mxBitmap = ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), aBmpEx );
+ }
+ }
+
+ bool RenderGraphicAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
+ const ::basegfx::B2DHomMatrix& rTransformation ) const
+ {
+ RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::RenderGraphicAction::render()" );
+ RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::RenderGraphicAction: 0x%X", this );
+
+ if( mxBitmap.is() )
+ {
+ rendering::RenderState aLocalState( maState );
+ ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
+
+ rCachedPrimitive = mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
+ mpCanvas->getViewState(),
+ aLocalState );
+ }
+
+ return true;
+ }
+
+ bool RenderGraphicAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
+ const Subset& rSubset ) const
+ {
+ // rendergraphic only contains a single action, fail if subset
+ // requests different range
+ if( rSubset.mnSubsetBegin != 0 ||
+ rSubset.mnSubsetEnd != 1 )
+ return false;
+
+ return CachedPrimitiveBase::render( rTransformation );
+ }
+
+ ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const
+ {
+ ::basegfx::B2DRange aRet;
+
+ if( mxBitmap.is() )
+ {
+ rendering::RenderState aLocalState( maState );
+ ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
+
+ geometry::IntegerSize2D aSize( mxBitmap->getSize() );
+
+ aRet = tools::calcDevicePixelBounds( ::basegfx::B2DRange( 0, 0, aSize.Width, aSize.Height ),
+ mpCanvas->getViewState(), aLocalState );
+ }
+
+ return( aRet );
+ }
+
+ ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
+ const Subset& rSubset ) const
+ {
+ // rendergraphic only contains a single action, empty bounds
+ // if subset requests different range
+ if( rSubset.mnSubsetBegin != 0 ||
+ rSubset.mnSubsetEnd != 1 )
+ return ::basegfx::B2DRange();
+
+ return getBounds( rTransformation );
+ }
+
+ sal_Int32 RenderGraphicAction::getActionCount() const
+ {
+ return 1;
+ }
+ }
+
+ ActionSharedPtr RenderGraphicActionFactory::createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+ const ::basegfx::B2DPoint& rDstPoint,
+ const ::basegfx::B2DVector& rDstSize,
+ const CanvasSharedPtr& rCanvas,
+ const OutDevState& rState )
+ {
+ return ActionSharedPtr( new RenderGraphicAction(rRenderGraphic,
+ rDstPoint,
+ rDstSize,
+ rCanvas,
+ rState ) );
+ }
+ }
+}
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
new file mode 100644
index 000000000000..f1e2dccdfe0d
--- /dev/null
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * 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 _CPPCANVAS_RENDERGRAPHICACTION_HXX
+#define _CPPCANVAS_RENDERGRAPHICACTION_HXX
+
+#include <cppcanvas/canvas.hxx>
+#include <action.hxx>
+
+namespace basegfx {
+ class B2DPoint;
+ class B2DVector;
+}
+namespace vcl {
+ class RenderGraphic;
+}
+
+/* Definition of internal::RenderGraphicActionFactory class */
+
+namespace cppcanvas
+{
+ namespace internal
+ {
+ struct OutDevState;
+
+ /** Creates encapsulated converters between GDIMetaFile and
+ XCanvas. The Canvas argument is deliberately placed at the
+ constructor, to force reconstruction of this object for a
+ new canvas. This considerably eases internal state
+ handling, since a lot of the internal state (e.g. fonts,
+ text layout) is Canvas-dependent.
+ */
+ class RenderGraphicActionFactory
+ {
+ public:
+ /// Scaled rendergraphic action, dest point and dest size
+ static ActionSharedPtr createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+ const ::basegfx::B2DPoint& rDstPoint,
+ const ::basegfx::B2DVector& rDstSize,
+ const CanvasSharedPtr&,
+ const OutDevState& );
+
+ private:
+ // static factory, disable big four
+ RenderGraphicActionFactory();
+ ~RenderGraphicActionFactory();
+ RenderGraphicActionFactory(const RenderGraphicActionFactory&);
+ RenderGraphicActionFactory& operator=( const RenderGraphicActionFactory& );
+ };
+ }
+}
+
+#endif /*_CPPCANVAS_RENDERGRAPHICACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a8984d41e585..7255df14cd47 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -391,6 +391,7 @@ namespace cppcanvas
case META_TEXTLINE_ACTION:
case META_TEXTRECT_ACTION:
case META_STRETCHTEXT_ACTION:
+ case META_RENDERGRAPHIC_ACTION:
// output-generating action - only
// copy, if we're within the
// requested subset
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 2109c310b233..7506ec5c15aa 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -43,6 +43,8 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
+#include <algorithm>
+
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
@@ -474,24 +476,25 @@ TransliterationImpl::equals(
OUString tmpStr1 = folding(str1, pos1, nCount1, offset1);
OUString tmpStr2 = folding(str2, pos2, nCount2, offset2);
+ // Length of offset1 and offset2 may still be 0 if there was no folding
+ // necessary!
const sal_Unicode *p1 = tmpStr1.getStr();
const sal_Unicode *p2 = tmpStr2.getStr();
- sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ?
- tmpStr1.getLength() : tmpStr2.getLength());
+ sal_Int32 i, nLen = ::std::min( tmpStr1.getLength(), tmpStr2.getLength());
for (i = 0; i < nLen; ++i, ++p1, ++p2 ) {
if (*p1 != *p2) {
// return number of matched code points so far
- nMatch1 = offset1[i];
- nMatch2 = offset2[i];
+ nMatch1 = (i < offset1.getLength()) ? offset1[i] : i;
+ nMatch2 = (i < offset2.getLength()) ? offset2[i] : i;
return sal_False;
}
}
// i==nLen
if ( tmpStr1.getLength() != tmpStr2.getLength() ) {
// return number of matched code points so far
- nMatch1 = offset1[i-1] + 1;
- nMatch2 = offset2[i-1] + 1;
+ nMatch1 = (i <= offset1.getLength()) ? offset1[i-1] + 1 : i;
+ nMatch2 = (i <= offset2.getLength()) ? offset2[i-1] + 1 : i;
return sal_False;
} else {
nMatch1 = nCount1;
diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl
index e432869d3a7b..6dac386011e0 100755
--- a/l10ntools/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -175,7 +175,7 @@ sub splitfile{
exit( -1 );
}
my $src_root = $ENV{SOURCE_ROOT_DIR};
- my $ooo_src_root = $src_root."/l10n/l10n";
+ my $ooo_src_root = $src_root."/l10n";
my $so_l10n_path = $src_root."/sun/l10n_so/source";
my $ooo_l10n_path = $ooo_src_root."/l10n/source";
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index f7330a9b5ed9..c354d54ad4ea 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -187,21 +187,18 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
struct stat statbuf2;
struct dirent *dirp;
DIR *dir;
- //int ret;
- //char *ptr;
if( sFullpath.getLength() < 1 ) return;
rtl::OString sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 , sFullpath.getLength() ).getStr();
- //printf("%s\n",sFullpathext.getStr());
- const char* path = sFullpathext.getStr();
// stat
- if( stat( path , &statbuf ) < 0 ){ printf("warning: Can not stat %s" , path ); return; }// error }
+ if( stat( sFullpathext.getStr() , &statbuf ) < 0 ){ printf("warning: Can not stat %s" , sFullpathext.getStr() ); return; }// error }
if( S_ISDIR(statbuf.st_mode ) == 0 ) { return; }// error } return; // not dir
- if( (dir = opendir( path ) ) == NULL ) {printf("readerror 2 in %s \n",path); return; } // error } return; // error
+ if( (dir = opendir( sFullpathext.getStr() ) ) == NULL ) {printf("readerror 2 in %s \n",sFullpathext.getStr()); return; } // error } return; // error
+
dirholder aHolder(dir);
sFullpathext += rtl::OString( "/" );
@@ -209,7 +206,7 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
const rtl::OString sDot ( "." ) ;
const rtl::OString sDDot( ".." );
- if ( chdir( path ) == -1 ) { printf("chdir error in %s \n",path); return; } // error
+ if ( chdir( sFullpathext.getStr() ) == -1 ) { printf("chdir error in %s \n",sFullpathext.getStr()); return; } // error
while( ( dirp = readdir( dir ) ) != NULL )
{
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index 0c5071fca053..3434d4c39c55 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -70,6 +70,7 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
static rtl::OUString WCARD5 ( rtl::OUString::createFromAscii( "unxmac" ) );
static rtl::OUString WCARD6 ( rtl::OUString::createFromAscii( "unxubt" ) );
static rtl::OUString WCARD7 ( rtl::OUString::createFromAscii( ".svn" ) );
+ static rtl::OUString WCARD8 ( rtl::OUString::createFromAscii( ".hg" ) );
if( sDirName.indexOf( WCARD1 , 0 ) > -1 ||
@@ -78,7 +79,8 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
sDirName.indexOf( WCARD4 , 0 ) > -1 ||
sDirName.indexOf( WCARD5 , 0 ) > -1 ||
sDirName.indexOf( WCARD6 , 0 ) > -1 ||
- sDirName.indexOf( WCARD7 , 0 ) > -1
+ sDirName.indexOf( WCARD7 , 0 ) > -1 ||
+ sDirName.indexOf( WCARD8 , 0 ) > -1
) return;
//printf("**** %s \n", OUStringToOString( sDirName , RTL_TEXTENCODING_UTF8 , sDirName.getLength() ).getStr() );
diff --git a/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index 7c3fef4b88cc..34d483ab4d86 100644
--- a/svl/inc/svl/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
@@ -28,6 +28,7 @@
#ifndef INCLUDED_SVTOOLS_NFKEYTAB_HXX
#define INCLUDED_SVTOOLS_NFKEYTAB_HXX
+#include <vector>
#include <tools/string.hxx>
//! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
@@ -111,7 +112,18 @@ enum NfKeywordIndex
NF_KEYWORD_ENTRIES_COUNT
};
-typedef String NfKeywordTable [NF_KEYWORD_ENTRIES_COUNT];
+class NfKeywordTable
+{
+ typedef ::std::vector<String> Keywords_t;
+ Keywords_t m_keywords;
+
+public:
+ NfKeywordTable() : m_keywords(NF_KEYWORD_ENTRIES_COUNT) {};
+ virtual ~NfKeywordTable() {}
+
+ String & operator[] (Keywords_t::size_type n) { return m_keywords[n]; }
+ const String & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; }
+};
#endif // INCLUDED_SVTOOLS_NFKEYTAB_HXX
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 3d2c46af496c..57a26c3109ec 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -35,6 +35,7 @@
#include <boost/scoped_ptr.hpp>
#include <vector>
+#include <limits>
//====================================================================
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index ebc1fa673fe2..d4d0f8550907 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -939,10 +939,10 @@ void SvNumberFormatter::FillKeywordTable( NfKeywordTable& rKeywords,
LanguageType eLang )
{
ChangeIntl( eLang );
- const String* pTable = pFormatScanner->GetKeywords();
+ const NfKeywordTable & rTable = pFormatScanner->GetKeywords();
for ( sal_uInt16 i = 0; i < NF_KEYWORD_ENTRIES_COUNT; ++i )
{
- rKeywords[i] = pTable[i];
+ rKeywords[i] = rTable[i];
}
}
@@ -950,9 +950,9 @@ void SvNumberFormatter::FillKeywordTable( NfKeywordTable& rKeywords,
String SvNumberFormatter::GetKeyword( LanguageType eLnge, sal_uInt16 nIndex )
{
ChangeIntl(eLnge);
- const String* pTable = pFormatScanner->GetKeywords();
- if ( pTable && nIndex < NF_KEYWORD_ENTRIES_COUNT )
- return pTable[nIndex];
+ const NfKeywordTable & rTable = pFormatScanner->GetKeywords();
+ if ( nIndex < NF_KEYWORD_ENTRIES_COUNT )
+ return rTable[nIndex];
DBG_ERROR("GetKeyword: invalid index");
return String();
@@ -2589,8 +2589,8 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi
CLOffset + SetIndexTable( NF_FRACTION_2, ZF_STANDARD_FRACTION+1 ));
// Week of year must be appended here because of nNewExtended
- const String* pKeyword = pFormatScanner->GetKeywords();
- aSingleFormatCode.Code = pKeyword[NF_KEY_WW];
+ const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords();
+ aSingleFormatCode.Code = rKeyword[NF_KEY_WW];
ImpInsertNewStandardFormat( aSingleFormatCode,
CLOffset + SetIndexTable( NF_DATE_WW, nNewExtended++ ),
SV_NUMBERFORMATTER_VERSION_NF_DATE_WW );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 92398792077d..9b01c2ee91be 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1149,7 +1149,7 @@ short SvNumberformat::ImpNextSymbol(String& rString,
xub_StrLen nLen = rString.Len();
ScanState eState = SsStart;
sSymbol.Erase();
- const String* pKeywords = rScan.GetKeywords();
+ const NfKeywordTable & rKeywords = rScan.GetKeywords();
while (nPos < nLen && eState != SsStop)
{
cToken = rString.GetChar(nPos);
@@ -1267,9 +1267,9 @@ short SvNumberformat::ImpNextSymbol(String& rString,
BRACKET_SYMBOLTYPE_DBNUM1 - (cDBNum - '1'));
eState = SsGetPrefix;
}
- else if (cUpper == pKeywords[NF_KEY_H].GetChar(0) || // H
- cUpper == pKeywords[NF_KEY_MI].GetChar(0) || // M
- cUpper == pKeywords[NF_KEY_S].GetChar(0) ) // S
+ else if (cUpper == rKeywords[NF_KEY_H].GetChar(0) || // H
+ cUpper == rKeywords[NF_KEY_MI].GetChar(0) || // M
+ cUpper == rKeywords[NF_KEY_S].GetChar(0) ) // S
{
sSymbol += cToken;
eState = SsGetTime;
@@ -1306,9 +1306,9 @@ short SvNumberformat::ImpNextSymbol(String& rString,
else
{
sal_Unicode cUpper = rChrCls().toUpper( rString, nPos-1, 1 ).GetChar(0);
- if (cUpper == pKeywords[NF_KEY_H].GetChar(0) || // H
- cUpper == pKeywords[NF_KEY_MI].GetChar(0) || // M
- cUpper == pKeywords[NF_KEY_S].GetChar(0) ) // S
+ if (cUpper == rKeywords[NF_KEY_H].GetChar(0) || // H
+ cUpper == rKeywords[NF_KEY_MI].GetChar(0) || // M
+ cUpper == rKeywords[NF_KEY_S].GetChar(0) ) // S
{
if (cLetter == cToken)
{
@@ -4230,10 +4230,10 @@ String SvNumberformat::GetMappedFormatstring(
const String& rColorName = NumFor[n].GetColorName();
if ( rColorName.Len() )
{
- const String* pKey = rScan.GetKeywords() + NF_KEY_FIRSTCOLOR;
- for ( int j=NF_KEY_FIRSTCOLOR; j<=NF_KEY_LASTCOLOR; j++, pKey++ )
+ const NfKeywordTable & rKey = rScan.GetKeywords();
+ for ( int j=NF_KEY_FIRSTCOLOR; j<=NF_KEY_LASTCOLOR; j++ )
{
- if ( *pKey == rColorName )
+ if ( rKey[j] == rColorName )
{
aPrefix += '[';
aPrefix += rKeywords[j];
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 000649a6de80..83dbd512a4e2 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -473,10 +473,10 @@ void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec)
Color* ImpSvNumberformatScan::GetColor(String& sStr)
{
String sString = pFormatter->GetCharClass()->upper(sStr);
- const String* pKeyword = GetKeywords();
+ const NfKeywordTable & rKeyword = GetKeywords();
size_t i = 0;
while (i < NF_MAX_DEFAULT_COLORS &&
- sString != pKeyword[NF_KEY_FIRSTCOLOR+i] )
+ sString != rKeyword[NF_KEY_FIRSTCOLOR+i] )
i++;
if ( i >= NF_MAX_DEFAULT_COLORS )
{
@@ -492,7 +492,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
Color* pResult = NULL;
if (i >= NF_MAX_DEFAULT_COLORS)
{
- const String& rColorWord = pKeyword[NF_KEY_COLOR];
+ const String& rColorWord = rKeyword[NF_KEY_COLOR];
xub_StrLen nPos = sString.Match(rColorWord);
if (nPos > 0)
{
@@ -529,7 +529,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
pFormatter->ChangeIntl(eTmpLnge);
}
else
- sStr = pKeyword[NF_KEY_FIRSTCOLOR+i];
+ sStr = rKeyword[NF_KEY_FIRSTCOLOR+i];
pResult = &(StandardColor[i]);
}
@@ -540,16 +540,16 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos )
{
String sString = pFormatter->GetCharClass()->toUpper( sSymbol, nPos, sSymbol.Len() - nPos );
- const String* pKeyword = GetKeywords();
+ const NfKeywordTable & rKeyword = GetKeywords();
// #77026# for the Xcl perverts: the GENERAL keyword is recognized anywhere
- if ( sString.Search( pKeyword[NF_KEY_GENERAL] ) == 0 )
+ if ( sString.Search( rKeyword[NF_KEY_GENERAL] ) == 0 )
return NF_KEY_GENERAL;
//! MUST be a reverse search to find longer strings first
short i = NF_KEYWORD_ENTRIES_COUNT-1;
sal_Bool bFound = sal_False;
for ( ; i > NF_KEY_LASTKEYWORD_SO5; --i )
{
- bFound = sString.Search(pKeyword[i]) == 0;
+ bFound = sString.Search(rKeyword[i]) == 0;
if ( bFound )
{
break;
@@ -559,15 +559,15 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos
if ( !bFound )
{ // skip the gap of colors et al between new and old keywords and search on
i = NF_KEY_LASTKEYWORD;
- while ( i > 0 && sString.Search(pKeyword[i]) != 0 )
+ while ( i > 0 && sString.Search(rKeyword[i]) != 0 )
i--;
- if ( i > NF_KEY_LASTOLDKEYWORD && sString != pKeyword[i] )
+ if ( i > NF_KEY_LASTOLDKEYWORD && sString != rKeyword[i] )
{ // found something, but maybe it's something else?
// e.g. new NNN is found in NNNN, for NNNN we must search on
short j = i - 1;
- while ( j > 0 && sString.Search(pKeyword[j]) != 0 )
+ while ( j > 0 && sString.Search(rKeyword[j]) != 0 )
j--;
- if ( j && pKeyword[j].Len() > pKeyword[i].Len() )
+ if ( j && rKeyword[j].Len() > rKeyword[i].Len() )
return j;
}
}
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 9b04921cb7f4..a1372866a46e 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -66,7 +66,7 @@ public:
const LocaleDataWrapper& GetLoc() const { return *pFormatter->GetLocaleData(); }
CalendarWrapper& GetCal() const { return *pFormatter->GetCalendar(); }
- const String* GetKeywords() const
+ const NfKeywordTable & GetKeywords() const
{
if ( bKeywordsNeedInit )
InitKeywords();
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 6c13a6fcdb3f..59088cb126c3 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -60,7 +60,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/dialogs/prnsetup.src \
svtools/source/dialogs/so3res.src \
svtools/source/dialogs/wizardmachine.src \
- svtools/source/filter.vcl/filter/exportdialog.src \
+ svtools/source/filter/exportdialog.src \
svtools/source/java/javaerror.src \
svtools/source/misc/ehdl.src \
svtools/source/misc/helpagent.src \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 01bc05ebaeca..f1c5dfef1590 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_set_include,svt,\
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
-I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_set_defs,svt,\
@@ -178,27 +177,27 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/edit/textwindowpeer \
svtools/source/edit/txtattr \
svtools/source/edit/xtextedt \
- svtools/source/filter.vcl/filter/FilterConfigCache \
- svtools/source/filter.vcl/filter/FilterConfigItem \
- svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
- svtools/source/filter.vcl/filter/exportdialog \
- svtools/source/filter.vcl/filter/filter \
- svtools/source/filter.vcl/filter/filter2 \
- svtools/source/filter.vcl/filter/sgfbram \
- svtools/source/filter.vcl/filter/sgvmain \
- svtools/source/filter.vcl/filter/sgvspln \
- svtools/source/filter.vcl/filter/sgvtext \
- svtools/source/filter.vcl/igif/decode \
- svtools/source/filter.vcl/igif/gifread \
- svtools/source/filter.vcl/ixbm/xbmread \
- svtools/source/filter.vcl/ixpm/xpmread \
- svtools/source/filter.vcl/jpeg/jpeg \
- svtools/source/filter.vcl/wmf/emfwr \
- svtools/source/filter.vcl/wmf/enhwmf \
- svtools/source/filter.vcl/wmf/winmtf \
- svtools/source/filter.vcl/wmf/winwmf \
- svtools/source/filter.vcl/wmf/wmf \
- svtools/source/filter.vcl/wmf/wmfwr \
+ svtools/source/filter/FilterConfigCache \
+ svtools/source/filter/FilterConfigItem \
+ svtools/source/filter/SvFilterOptionsDialog \
+ svtools/source/filter/exportdialog \
+ svtools/source/filter/filter \
+ svtools/source/filter/filter2 \
+ svtools/source/filter/sgfbram \
+ svtools/source/filter/sgvmain \
+ svtools/source/filter/sgvspln \
+ svtools/source/filter/sgvtext \
+ svtools/source/filter/igif/decode \
+ svtools/source/filter/igif/gifread \
+ svtools/source/filter/ixbm/xbmread \
+ svtools/source/filter/ixpm/xpmread \
+ svtools/source/filter/jpeg/jpeg \
+ svtools/source/filter/wmf/emfwr \
+ svtools/source/filter/wmf/enhwmf \
+ svtools/source/filter/wmf/winmtf \
+ svtools/source/filter/wmf/winwmf \
+ svtools/source/filter/wmf/wmf \
+ svtools/source/filter/wmf/wmfwr \
svtools/source/graphic/descriptor \
svtools/source/graphic/graphic \
svtools/source/graphic/graphicunofactory \
@@ -291,7 +290,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
))
$(eval $(call gb_Library_add_cobjects,svt,\
- svtools/source/filter.vcl/jpeg/jpegc \
+ svtools/source/filter/jpeg/jpegc \
))
ifeq ($(OS),WNT)
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 66c80dde2d79..3245200605d4 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -83,6 +83,7 @@ class Graphic;
#define IMP_JPEG "SVIJPEG"
#define IMP_XBM "SVIXBM"
#define IMP_XPM "SVIXPM"
+#define IMP_SVG "SVISVG"
#define EXP_BMP "SVBMP"
#define EXP_SVMETAFILE "SVMETAFILE"
#define EXP_WMF "SVWMF"
@@ -101,6 +102,7 @@ class Graphic;
#define TIF_SHORTNAME "TIF"
#define WMF_SHORTNAME "WMF"
#define EMF_SHORTNAME "EMF"
+#define SVG_SHORTNAME "SVG"
// ------------------------------------
// - Info-Klasse fuer alle von uns
@@ -132,6 +134,7 @@ class Graphic;
#define GFF_WMF ( (sal_uInt16)0x00f6 )
#define GFF_SGV ( (sal_uInt16)0x00f7 )
#define GFF_EMF ( (sal_uInt16)0x00f8 )
+#define GFF_SVG ( (sal_uInt16)0x00f9 )
#define GFF_XXX ( (sal_uInt16)0xffff )
// ---------------------
@@ -153,30 +156,31 @@ class SVT_DLLPUBLIC GraphicDescriptor
void ImpConstruct();
- sal_Bool ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo );
- sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo );
+ sal_Bool ImpDetectSVG( SvStream& rStm, sal_Bool bExtendedInfo );
GraphicDescriptor( const GraphicDescriptor& );
GraphicDescriptor& operator=( const GraphicDescriptor& );
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 9841d4e312ef..155bd8402a74 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -213,14 +213,16 @@ private:
sal_uLong mnAnimationLoopCount;
void* mpDummy1;
void* mpDummy2;
- sal_Bool mbAutoSwapped : 1;
- sal_Bool mbTransparent : 1;
- sal_Bool mbAnimated : 1;
- sal_Bool mbEPS : 1;
- sal_Bool mbIsInSwapIn : 1;
- sal_Bool mbIsInSwapOut : 1;
- sal_Bool mbAlpha : 1;
- sal_Bool mbDummyFlag8 : 1;
+ sal_Bool mbAutoSwapped : 1;
+ sal_Bool mbTransparent : 1;
+ sal_Bool mbAnimated : 1;
+ sal_Bool mbEPS : 1;
+ sal_Bool mbIsInSwapIn : 1;
+ sal_Bool mbIsInSwapOut : 1;
+ sal_Bool mbAlpha : 1;
+ sal_Bool mbDummyFlag8 : 1;
+ sal_Bool mbIsRenderGraphic : 1;
+ sal_Bool mbHasRenderGraphic : 1;
void SVT_DLLPRIVATE ImplConstruct();
void SVT_DLLPRIVATE ImplAssignGraphicData();
@@ -396,12 +398,14 @@ public:
GraphicType GetType() const { return meType; }
const Size& GetPrefSize() const { return maPrefSize; }
const MapMode& GetPrefMapMode() const { return maPrefMapMode; }
- sal_uLong GetSizeBytes() const { return mnSizeBytes; }
- sal_uLong GetChecksum() const;
- sal_Bool IsTransparent() const { return mbTransparent; }
- sal_Bool IsAlpha() const { return mbAlpha; }
- sal_Bool IsAnimated() const { return mbAnimated; }
- sal_Bool IsEPS() const { return mbEPS; }
+ sal_uLong GetSizeBytes() const { return mnSizeBytes; }
+ sal_uLong GetChecksum() const;
+ sal_Bool IsTransparent() const { return mbTransparent; }
+ sal_Bool IsAlpha() const { return mbAlpha; }
+ sal_Bool IsAnimated() const { return mbAnimated; }
+ sal_Bool IsEPS() const { return mbEPS; }
+ sal_Bool IsRenderGraphic() const { return mbIsRenderGraphic; }
+ sal_Bool HasRenderGraphic() const { return mbHasRenderGraphic; }
void ResetAnimationLoopCount();
List* GetAnimationInfoList() const;
@@ -568,4 +572,3 @@ public:
};
#endif // _GRFMGR_HXX
-
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index 48408609cf98..979eba91767d 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -56,7 +56,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameLi
const char* FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameList[] =
{
- IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV,
+ IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG,
EXP_SVMETAFILE, EXP_WMF, EXP_EMF, EXP_SVG, NULL
};
@@ -303,6 +303,7 @@ const char* FilterConfigCache::InternalFilterListForSvxLight[] =
"xbm","1","SVIXBM",
"xpm","1","SVIXPM",
"xpm","2","exp",
+ "svg","1","SVISVG",
"svg","2","SVESVG",
NULL
};
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx
index 2c6b7361e540..2c6b7361e540 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter/FilterConfigCache.hxx
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index 8d7752ddd7df..8d7752ddd7df 100755..100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 1c4eeeff1bbf..1c4eeeff1bbf 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter/SvFilterOptionsDialog.hxx
index 027fac99c2e8..027fac99c2e8 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.hxx
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 701619d31f6c..472fe327329d 100644
--- a/svtools/source/filter.vcl/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -1510,4 +1510,3 @@ IMPL_LINK( ExportDialog, OK, void *, EMPTYARG )
return 0;
}
-
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc
index e230bcd2c5c3..e230bcd2c5c3 100755..100644
--- a/svtools/source/filter.vcl/filter/exportdialog.hrc
+++ b/svtools/source/filter/exportdialog.hrc
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 20a9ac3ea832..20a9ac3ea832 100755..100644
--- a/svtools/source/filter.vcl/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter/exportdialog.src
index c9e87989a314..c9e87989a314 100644
--- a/svtools/source/filter.vcl/filter/exportdialog.src
+++ b/svtools/source/filter/exportdialog.src
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 9c2c28dfbe3b..78d97cc25c5c 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -39,6 +39,7 @@
#include <vcl/salctype.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
+#include <vcl/svgread.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <osl/file.hxx>
@@ -555,7 +556,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 )
{
short y1,x1,y2,x2;
- bool bdBoxOk = true;
+ sal_Bool bdBoxOk = sal_True;
rStream.Seek( nStreamPos + nOffset);
// size of the pict in version 1 pict ( 2bytes) : ignored
@@ -568,7 +569,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if (x1 > x2 || y1 > y2 || // bad bdbox
(x1 == x2 && y1 == y2) || // 1 pixel picture
x2-x1 > 2048 || y2-y1 > 2048 ) // picture anormaly big
- bdBoxOk = false;
+ bdBoxOk = sal_False;
// read version op
rStream.Read( sBuf,3 );
@@ -677,10 +678,22 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
return sal_True;
}
+ //--------------------------- SVG ------------------------------------
+ if( !bTest || ( rFormatExtension.CompareToAscii( "SVG", 3 ) == COMPARE_EQUAL ) )
+ {
+ bSomethingTested=sal_True;
+
+ // just a simple test for the extension
+ if( rFormatExtension.CompareToAscii( "SVG", 3 ) == COMPARE_EQUAL )
+ return sal_True;
+ }
+
//--------------------------- TGA ------------------------------------
if( !bTest || ( rFormatExtension.CompareToAscii( "TGA", 3 ) == COMPARE_EQUAL ) )
{
bSomethingTested = sal_True;
+
+ // just a simple test for the extension
if( rFormatExtension.CompareToAscii( "TGA", 3 ) == COMPARE_EQUAL )
return sal_True;
}
@@ -689,6 +702,8 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if( !bTest || ( rFormatExtension.CompareToAscii( "SGV", 3 ) == COMPARE_EQUAL ) )
{
bSomethingTested = sal_True;
+
+ // just a simple test for the extension
if( rFormatExtension.CompareToAscii( "SGV", 3 ) == COMPARE_EQUAL )
return sal_True;
}
@@ -1486,6 +1501,27 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath,
else
eLinkType = GFX_LINK_TYPE_NATIVE_JPG;
}
+ else if( aFilterName.EqualsIgnoreCaseAscii( IMP_SVG ) )
+ {
+ if( rGraphic.GetContext() == (GraphicReader*) 1 )
+ rGraphic.SetContext( NULL );
+
+ vcl::SVGReader aSVGReader( rIStream );
+ GDIMetaFile aSVGMtf;
+
+ if( 0 == aSVGReader.Read( aSVGMtf ).GetActionCount() )
+ nStatus = GRFILTER_FILTERERROR;
+ else
+ rGraphic = Graphic( aSVGMtf );
+
+ // Dont set any GfxLink here, since the MetaRenderGraphicAction
+ // inside the just read MetaFile contains excatly this native data;
+ // setting a ǴfxLink would also affect other program parts, since
+ // GfxLinks are preferably written to the file format in general,
+ // which would be a bad idea in case of SVG files, since earlier
+ // implementations are not able to handle native SVG data in any
+ // case. (KA 01/19/2011)
+ }
else if( aFilterName.EqualsIgnoreCaseAscii( IMP_XBM ) )
{
if( rGraphic.GetContext() == (GraphicReader*) 1 )
@@ -1748,7 +1784,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
// Maximalen Speicherbedarf fuer das Bildes holen:
// if( GetOptionsConfig() )
-// nMaxMem = (sal_uInt32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
+// nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
// else
nMaxMem = 1024;
@@ -1826,7 +1862,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
aMTF.SetPrefSize( aGraphic.GetPrefSize() );
aMTF.SetPrefMapMode( aGraphic.GetPrefMapMode() );
}
- rOStm << aMTF;
+ aMTF.Write( rOStm, GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
if( rOStm.GetError() )
nStatus = GRFILTER_IOERROR;
}
@@ -1943,44 +1979,69 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
}
else if( aFilterName.EqualsIgnoreCaseAscii( EXP_SVG ) )
{
- try
+ sal_Bool bDone = sal_False;
+
+ // do we have a native SVG RenderGraphic, whose data can be written directly?
+ if( ( GRAPHIC_GDIMETAFILE == eType ) && aGraphic.IsRenderGraphic() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+ const ::vcl::RenderGraphic aRenderGraphic( aGraphic.GetRenderGraphic() );
- if( xMgr.is() )
+ if( aRenderGraphic.GetGraphicDataLength() &&
+ aRenderGraphic.GetGraphicDataMimeType().equalsIgnoreAsciiCase(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "image/svg+xml" ) ) ) )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > xSaxWriter( xMgr->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), ::com::sun::star::uno::UNO_QUERY );
+ rOStm.Write( aRenderGraphic.GetGraphicData().get(),
+ aRenderGraphic.GetGraphicDataLength() );
- ::com::sun::star::uno::Reference< ::com::sun::star::svg::XSVGWriter > xSVGWriter( xMgr->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.svg.SVGWriter" ) ), ::com::sun::star::uno::UNO_QUERY );
+ if( rOStm.GetError() )
+ {
+ nStatus = GRFILTER_IOERROR;
+ }
+ }
+ }
- if( xSaxWriter.is() && xSVGWriter.is() )
+ if( !bDone )
+ {
+ // do the normal GDIMetaFile export instead
+ try
+ {
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+
+ if( xMgr.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > xActiveDataSource(
- xSaxWriter, ::com::sun::star::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > xSaxWriter( xMgr->createInstance(
+ ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), ::com::sun::star::uno::UNO_QUERY );
- if( xActiveDataSource.is() )
+ ::com::sun::star::uno::Reference< ::com::sun::star::svg::XSVGWriter > xSVGWriter( xMgr->createInstance(
+ ::rtl::OUString::createFromAscii( "com.sun.star.svg.SVGWriter" ) ), ::com::sun::star::uno::UNO_QUERY );
+
+ if( xSaxWriter.is() && xSVGWriter.is() )
{
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf(
- static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) );
+ ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > xActiveDataSource(
+ xSaxWriter, ::com::sun::star::uno::UNO_QUERY );
- SvMemoryStream aMemStm( 65535, 65535 );
+ if( xActiveDataSource.is() )
+ {
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf(
+ static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) );
- aMemStm.SetCompressMode( COMPRESSMODE_FULL );
- ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( aMemStm );
+ SvMemoryStream aMemStm( 65535, 65535 );
- xActiveDataSource->setOutputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(
- xStmIf, ::com::sun::star::uno::UNO_QUERY ) );
- ::com::sun::star::uno::Sequence< sal_Int8 > aMtfSeq( (sal_Int8*) aMemStm.GetData(), aMemStm.Tell() );
- xSVGWriter->write( xSaxWriter, aMtfSeq );
+ aMemStm.SetCompressMode( COMPRESSMODE_FULL );
+ ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( aMemStm );
+
+ xActiveDataSource->setOutputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(
+ xStmIf, ::com::sun::star::uno::UNO_QUERY ) );
+ ::com::sun::star::uno::Sequence< sal_Int8 > aMtfSeq( (sal_Int8*) aMemStm.GetData(), aMemStm.Tell() );
+ xSVGWriter->write( xSaxWriter, aMtfSeq );
+ }
}
}
}
- }
- catch( ::com::sun::star::uno::Exception& )
- {
- nStatus = GRFILTER_IOERROR;
+ catch( ::com::sun::star::uno::Exception& )
+ {
+ nStatus = GRFILTER_IOERROR;
+ }
}
}
else
@@ -2127,6 +2188,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
case( CVT_TIF ): aShortName = TIF_SHORTNAME; break;
case( CVT_WMF ): aShortName = WMF_SHORTNAME; break;
case( CVT_EMF ): aShortName = EMF_SHORTNAME; break;
+ case( CVT_SVG ): aShortName = SVG_SHORTNAME; break;
default:
break;
@@ -2196,4 +2258,3 @@ int GraphicFilter::LoadGraphic( const String &rPath, const String &rFilterName,
return nRes;
}
-
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index 9b655c732036..58fafc47c0f2 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -114,6 +114,7 @@ sal_Bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo )
else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = sal_True;
else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = sal_True;
else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = sal_True;
+ else if ( ImpDetectSVG( rStm, bExtendedInfo ) ) bRet = sal_True;
else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = sal_True;
else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = sal_True;
else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = sal_True;
@@ -1301,6 +1302,21 @@ sal_Bool GraphicDescriptor::ImpDetectEMF( SvStream&, sal_Bool )
|*
\************************************************************************/
+sal_Bool GraphicDescriptor::ImpDetectSVG( SvStream& /*rStm*/, sal_Bool /*bExtendedInfo*/ )
+{
+ sal_Bool bRet = aPathExt.CompareToAscii( "svg", 3 ) == COMPARE_EQUAL;
+ if (bRet)
+ nFormat = GFF_SVG;
+
+ return bRet;
+}
+
+/*************************************************************************
+|*
+|*
+|*
+\************************************************************************/
+
String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
{
ByteString aKeyName;
@@ -1331,9 +1347,8 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
case( GFF_SVM ) : aKeyName = "svm"; break;
case( GFF_WMF ) : aKeyName = "wmf"; break;
case( GFF_EMF ) : aKeyName = "emf"; break;
+ case( GFF_SVG ) : aKeyName = "svg"; break;
}
return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
}
-
-
diff --git a/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter/igif/decode.cxx
index ddea94a5555e..ddea94a5555e 100644
--- a/svtools/source/filter.vcl/igif/decode.cxx
+++ b/svtools/source/filter/igif/decode.cxx
diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter/igif/decode.hxx
index e85cc30eaf9e..e85cc30eaf9e 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter/igif/decode.hxx
diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter/igif/gifread.cxx
index 16318e5b143e..16318e5b143e 100644
--- a/svtools/source/filter.vcl/igif/gifread.cxx
+++ b/svtools/source/filter/igif/gifread.cxx
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter/ixbm/xbmread.cxx
index 5084f7267e46..5084f7267e46 100644
--- a/svtools/source/filter.vcl/ixbm/xbmread.cxx
+++ b/svtools/source/filter/ixbm/xbmread.cxx
diff --git a/svtools/source/filter.vcl/ixpm/rgbtable.hxx b/svtools/source/filter/ixpm/rgbtable.hxx
index 054e1e86b064..054e1e86b064 100644
--- a/svtools/source/filter.vcl/ixpm/rgbtable.hxx
+++ b/svtools/source/filter/ixpm/rgbtable.hxx
diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter/ixpm/xpmread.cxx
index 425ed6323bcc..425ed6323bcc 100644
--- a/svtools/source/filter.vcl/ixpm/xpmread.cxx
+++ b/svtools/source/filter/ixpm/xpmread.cxx
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter/jpeg/jpeg.cxx
index dff6ec8ff51f..6f157a248ddc 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.cxx
+++ b/svtools/source/filter/jpeg/jpeg.cxx
@@ -34,8 +34,8 @@ extern "C"
{
#include "stdio.h"
#include "jpeg.h"
- #include "jpeglib.h"
- #include "jerror.h"
+ #include "jpeg/jpeglib.h"
+ #include "jpeg/jerror.h"
}
#define _JPEGPRIVATE
@@ -112,7 +112,7 @@ extern "C" void init_destination (j_compress_ptr cinfo)
dest->pub.free_in_buffer = BUF_SIZE;
}
-extern "C" int empty_output_buffer (j_compress_ptr cinfo)
+extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
{
my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
@@ -217,7 +217,7 @@ long StreamRead( SvStream* pSvStm, void* pBuffer, long nBufferSize )
return nRead;
}
-extern "C" int fill_input_buffer (j_decompress_ptr cinfo)
+extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
{
my_src_ptr src = (my_src_ptr) cinfo->src;
size_t nbytes;
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter/jpeg/jpeg.h
index ca9b294d2f9d..ca9b294d2f9d 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.h
+++ b/svtools/source/filter/jpeg/jpeg.h
diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter/jpeg/jpegc.c
index 8d3a82a86ef3..8d3a82a86ef3 100644
--- a/svtools/source/filter.vcl/jpeg/jpegc.c
+++ b/svtools/source/filter/jpeg/jpegc.c
diff --git a/svtools/source/filter.vcl/filter/sgf.ini b/svtools/source/filter/sgf.ini
index 7444e40c8836..7444e40c8836 100644
--- a/svtools/source/filter.vcl/filter/sgf.ini
+++ b/svtools/source/filter/sgf.ini
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter/sgfbram.cxx
index 9b981f8c0d94..9b981f8c0d94 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter/sgfbram.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter/sgvmain.cxx
index 3b0f3ebd2912..3b0f3ebd2912 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter/sgvmain.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter/sgvspln.cxx
index aac7e1f04e0a..aac7e1f04e0a 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter/sgvspln.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index f0130b21c9d6..f0130b21c9d6 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx
index d82f11cdce5a..99ca92c76abb 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.cxx
+++ b/svtools/source/filter/wmf/emfwr.cxx
@@ -33,6 +33,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <vcl/lineinfo.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
// -----------
// - Defines -
@@ -1186,7 +1187,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
case META_BMP_ACTION:
{
const MetaBmpAction* pA = (const MetaBmpAction *) pAction;
- ImplWriteBmpRecord( pA->GetBitmap(), pA->GetPoint(), pA->GetBitmap().GetSizePixel(), WIN_SRCCOPY );
+ ImplWriteBmpRecord( pA->GetBitmap(), pA->GetPoint(), maVDev.PixelToLogic( pA->GetBitmap().GetSizePixel() ), WIN_SRCCOPY );
}
break;
@@ -1217,8 +1218,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
{
aBmp.Replace( aMsk, COL_WHITE );
aMsk.Invert();
- ImplWriteBmpRecord( aMsk, pA->GetPoint(), aMsk.GetSizePixel(), WIN_SRCPAINT );
- ImplWriteBmpRecord( aBmp, pA->GetPoint(), aBmp.GetSizePixel(), WIN_SRCAND );
+ ImplWriteBmpRecord( aMsk, pA->GetPoint(), maVDev.PixelToLogic( aMsk.GetSizePixel() ), WIN_SRCPAINT );
+ ImplWriteBmpRecord( aBmp, pA->GetPoint(), maVDev.PixelToLogic( aBmp.GetSizePixel() ), WIN_SRCAND );
}
else
ImplWriteBmpRecord( aBmp, pA->GetPoint(), aBmp.GetSizePixel(), WIN_SRCCOPY );
@@ -1407,6 +1408,26 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
+ case( META_RENDERGRAPHIC_ACTION ):
+ {
+ const MetaRenderGraphicAction* pA = (const MetaRenderGraphicAction*) pAction;
+ const ::vcl::RenderGraphicRasterizer aRasterizer( pA->GetRenderGraphic() );
+ const BitmapEx aBmpEx( aRasterizer.Rasterize( maVDev.LogicToPixel( pA->GetSize() ) ) );
+ Bitmap aBmp( aBmpEx.GetBitmap() );
+ Bitmap aMsk( aBmpEx.GetMask() );
+
+ if( !!aMsk )
+ {
+ aBmp.Replace( aMsk, COL_WHITE );
+ aMsk.Invert();
+ ImplWriteBmpRecord( aMsk, pA->GetPoint(), pA->GetSize(), WIN_SRCPAINT );
+ ImplWriteBmpRecord( aBmp, pA->GetPoint(), pA->GetSize(), WIN_SRCAND );
+ }
+ else
+ ImplWriteBmpRecord( aBmp, pA->GetPoint(), pA->GetSize(), WIN_SRCCOPY );
+ }
+ break;
+
default:
DBG_ERROR( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() );
break;
diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter/wmf/emfwr.hxx
index 8c65e91e5f73..8c65e91e5f73 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.hxx
+++ b/svtools/source/filter/wmf/emfwr.hxx
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index 29128ffd7904..ec7fec9fdb1e 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -1268,13 +1268,13 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
sal_Bool EnhWMFReader::ReadHeader()
{
- sal_uInt32 nUINT32, nHeaderSize, nPalEntries;
+ sal_uInt32 nsal_uInt32, nHeaderSize, nPalEntries;
sal_Int32 nLeft, nTop, nRight, nBottom;
// METAFILEHEADER SPARE ICH MIR HIER
// Einlesen des METAHEADER
- *pWMF >> nUINT32 >> nHeaderSize;
- if ( nUINT32 != 1 ) // Typ
+ *pWMF >> nsal_uInt32 >> nHeaderSize;
+ if ( nsal_uInt32 != 1 ) // Typ
return sal_False;
// bound size
@@ -1293,12 +1293,12 @@ sal_Bool EnhWMFReader::ReadHeader()
rclFrame.Right() = nRight;
rclFrame.Bottom() = nBottom;
- *pWMF >> nUINT32; // signature
+ *pWMF >> nsal_uInt32; // signature
- if ( nUINT32 != 0x464d4520 )
+ if ( nsal_uInt32 != 0x464d4520 )
return sal_False;
- *pWMF >> nUINT32; // nVersion
+ *pWMF >> nsal_uInt32; // nVersion
*pWMF >> nEndPos; // size of metafile
nEndPos += nStartPos;
@@ -1340,4 +1340,3 @@ EnhWMFReader::~EnhWMFReader()
{
};
-
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index feff21933ab6..30fc670ac22f 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -2200,4 +2200,3 @@ void WinMtfOutput::AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile )
{
rGDIMetaFile.Play( *mpGDIMetaFile, 0xFFFFFFFF );
}
-
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx
index 299d297c90bc..ca7b62b38ef3 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -773,5 +773,3 @@ public:
};
#endif
-
-
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index 880841cd36f8..feb1a2895793 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -1428,4 +1428,3 @@ WMFReader::~WMFReader()
if( pEMFStream )
delete pEMFStream;
}
-
diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter/wmf/wmf.cxx
index 4e84cd920b56..4e84cd920b56 100644
--- a/svtools/source/filter.vcl/wmf/wmf.cxx
+++ b/svtools/source/filter/wmf/wmf.cxx
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx
index 36b84316271b..26bda76a11d9 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -29,6 +29,7 @@
#include "precompiled_svtools.hxx"
#include <vcl/salbtype.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
#include "wmfwr.hxx"
#include <unotools/fontcvt.hxx>
#include "emfwr.hxx"
@@ -318,6 +319,7 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF )
case META_BMPEX_ACTION:
case META_BMPEXSCALE_ACTION:
case META_BMPEXSCALEPART_ACTION:
+ case META_RENDERGRAPHIC_ACTION:
nNumberOfBitmaps++;
break;
}
@@ -1796,6 +1798,32 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
DBG_ERROR( "Unsupported action: MetaMoveClipRegionAction!" );
}
break;
+
+ case( META_RENDERGRAPHIC_ACTION ):
+ {
+ const MetaRenderGraphicAction* pA = (const MetaRenderGraphicAction*) pMA;
+ const ::vcl::RenderGraphicRasterizer aRasterizer( pA->GetRenderGraphic() );
+ const BitmapEx aBmpEx( aRasterizer.Rasterize( pVirDev->LogicToPixel( pA->GetSize(), aSrcMapMode ) ) );
+ Bitmap aBmp( aBmpEx.GetBitmap() );
+ Bitmap aMsk( aBmpEx.GetMask() );
+
+ if( !!aMsk )
+ {
+ aBmp.Replace( aMsk, COL_WHITE );
+ aMsk.Invert();
+ WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aMsk, W_SRCPAINT );
+ WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aBmp, W_SRCAND );
+ }
+ else
+ WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aBmp );
+ }
+ break;
+
+ default:
+ {
+ DBG_ERROR( "Unsupported meta action!" );
+ }
+ break;
}
nWrittenActions++;
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter/wmf/wmfwr.hxx
index c5830b3bab8f..a76b39ad154f 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.hxx
+++ b/svtools/source/filter/wmf/wmfwr.hxx
@@ -132,7 +132,7 @@ private:
void MayCallback();
// Berechnet anhand der obigen 5 Parameter eine Prozentzahl
- // und macht dann ggf. einen Callback. Setzt bStatus auf sal_False wenn User abbrechen
+ // und macht dann ggf. einen Callback. Setzt bStatus auf FALSE wenn User abbrechen
// moechte.
void CountActionsAndBitmaps(const GDIMetaFile & rMTF);
@@ -154,7 +154,7 @@ private:
void UpdateRecordHeader();
// berichtig die Groesse des Records nach dem Schreiben der Parameter, wenn
// nSizeWords bei Aufruf von WriteRecordHeader(..) unbekannt war.
- // fuegt ggf. noch ein sal_uInt8 0 ein damit Anzahl Bytes immer gerade.
+ // fuegt ggf. noch ein BYTE 0 ein damit Anzahl Bytes immer gerade.
void WMFRecord_Arc(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
void WMFRecord_Chord(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 6c808baa169d..395d3dfea0de 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -169,6 +169,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
case( GFF_WMF ): pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break;
case( GFF_SGV ): pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break;
case( GFF_EMF ): pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break;
+ case( GFF_SVG ): pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break;
default:
break;
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 77a582e5ae20..9241cbd04d51 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -190,15 +190,10 @@ void GraphicObject::ImplAssignGraphicData()
mbTransparent = maGraphic.IsTransparent();
mbAlpha = maGraphic.IsAlpha();
mbAnimated = maGraphic.IsAnimated();
+ mbEPS = maGraphic.IsEPS();
+ mbIsRenderGraphic = maGraphic.IsRenderGraphic();
+ mbHasRenderGraphic = maGraphic.HasRenderGraphic();
mnAnimationLoopCount = ( mbAnimated ? maGraphic.GetAnimationLoopCount() : 0 );
-
- if( maGraphic.GetType() == GRAPHIC_GDIMETAFILE )
- {
- const GDIMetaFile& rMtf = GetGraphic().GetGDIMetaFile();
- mbEPS = ( rMtf.GetActionCount() >= 1 ) && ( META_EPS_ACTION == rMtf.GetAction( 0 )->GetType() );
- }
- else
- mbEPS = sal_False;
}
// -----------------------------------------------------------------------------
@@ -447,7 +442,7 @@ void GraphicObject::Assign( const SvDataCopyStream& rCopyStream )
ByteString GraphicObject::GetUniqueID() const
{
- if ( !IsInSwapIn() && IsEPS() )
+ if ( !IsInSwapIn() && ( IsEPS() || IsRenderGraphic() ) )
const_cast<GraphicObject*>(this)->FireSwapInRequest();
ByteString aRet;
@@ -751,7 +746,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() );
// Notify PDF writer about linked graphic (if any)
- bool bWritingPdfLinkedGraphic( false );
+ sal_Bool bWritingPdfLinkedGraphic( sal_False );
Point aPt( rPt );
Size aSz( rSz );
Rectangle aCropRect;
@@ -1379,4 +1374,3 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
return GraphicObject( aGraphic );
}
}
-
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 9c86c7e44130..4a6fb67187bc 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -869,6 +869,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
// FALLTHROUGH intended
case META_GRADIENTEX_ACTION:
// FALLTHROUGH intended
+ case META_RENDERGRAPHIC_ACTION:
+ // FALLTHROUGH intended
// OutDev state changes that _do_ affect bitmap
// output
@@ -2379,4 +2381,3 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx,
}
}
}
-
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index a60a210e8fa7..18af2c696a8c 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -80,6 +80,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
if ( pParent )
{
pWindow = new MultiLineEdit( pParent, nWinBits|WB_IGNORETAB);
+ static_cast< MultiLineEdit* >( pWindow )->DisableSelectionOnFocus();
*ppNewComp = new VCLXMultiLineEdit;
}
else
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index 502f25520145..cafcb5d00d38 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx
@@ -28,22 +28,21 @@
#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
#define _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
-#ifndef TOOLKIT_DLLAPI_H
#include <toolkit/dllapi.h>
-#endif
/** === begin UNO includes === **/
-#ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_
#include <com/sun/star/awt/XControl.hpp>
-#endif
/** === end UNO includes === **/
-#ifndef _VCL_PDFWRITER_HXX
#include <vcl/pdfwriter.hxx>
-#endif
#include <memory>
+namespace vcl
+{
+ class PDFExtOutDevData;
+}
+
//........................................................................
namespace toolkitform
{
@@ -53,7 +52,8 @@ namespace toolkitform
*/
void TOOLKIT_DLLPUBLIC describePDFControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
- ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor
+ ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor,
+ ::vcl::PDFExtOutDevData& i_pdfExportData
) SAL_THROW(());
//........................................................................
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index dd6e28807bc6..1c2df22e56a7 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -786,7 +786,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
if ( (pParent == NULL ) && ( rDescriptor.ParentIndex == -1 ) )
pParent = DIALOG_NO_PARENT;
pNewWindow = new Dialog( pParent, nWinBits );
- *ppNewComp = new VCLXDialog;
+ // #i70217# Don't always create a new component object. It's possible that VCL has called
+ // GetComponentInterface( sal_True ) in the Dialog ctor itself (see Window::IsTopWindow() )
+ // which creates a component object.
+ css::uno::Reference< css::awt::XWindowPeer > xWinPeer = pNewWindow->GetComponentInterface( sal_False );
+ if ( xWinPeer.is() )
+ *ppNewComp = dynamic_cast< VCLXDialog* >( xWinPeer.get() );
+ else
+ *ppNewComp = new VCLXDialog;
}
break;
case WINDOW_MOREBUTTON:
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index f037f10bbe31..25f30cb88d34 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -427,7 +427,7 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames(
static Sequence< ::rtl::OUString >* pNamesSeq = NULL;
if ( !pNamesSeq )
{
- pNamesSeq = new Sequence< ::rtl::OUString >( 23 );
+ pNamesSeq = new Sequence< ::rtl::OUString >( 24 );
::rtl::OUString* pNames = pNamesSeq->getArray();
pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel );
pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );
@@ -452,7 +452,7 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames(
pNames[20] = ::rtl::OUString::createFromAscii( szServiceName_TreeControlModel );
pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );
pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel );
-
+ pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel );
}
return *pNamesSeq;
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 556acbf5d0d2..069e1d497324 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -338,7 +338,10 @@ throw (::com::sun::star::uno::RuntimeException)
Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), UNO_QUERY );
OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" );
- if ( xDialogDevice.is() )
+
+ // #i87592 In design mode the drawing layer works with sizes with decoration.
+ // Therefore we have to substract them before writing back to the properties (model).
+ if ( xDialogDevice.is() && mbDesignMode )
{
DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 7fbac44035c6..38f2fd7c2603 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -92,17 +92,6 @@ static const LanguageDependentProp aLanguageDependentProp[] =
{ 0, 0 }
};
-WorkWindow* lcl_GetDefaultWindow()
-{
- static WorkWindow* pW = NULL;
- if ( !pW )
- {
- pW = new WorkWindow( NULL, 0 );
- pW->EnableChildTransparentMode();
- }
- return pW;
-}
-
static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMultiPropertySet > & rxModel )
{
Sequence< ::rtl::OUString> aNames;
@@ -238,14 +227,15 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
Reference< XControl > xMe;
OWeakAggObject::queryInterface( ::getCppuType( &xMe ) ) >>= xMe;
- WorkWindow* pWW;
+ Window* pParentWindow( NULL );
{
osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() );
- pWW = lcl_GetDefaultWindow();
+ pParentWindow = dynamic_cast< Window* >( Application::GetDefaultDevice() );
+ ENSURE_OR_THROW( pParentWindow != NULL, "could obtain a default parent window!" );
}
try
{
- xMe->createPeer( NULL, pWW->GetComponentInterface( sal_True ) );
+ xMe->createPeer( NULL, pParentWindow->GetComponentInterface( sal_True ) );
}
catch( const Exception& )
{
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index bff2d6008d10..1bde6f66a3c0 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -28,58 +28,27 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
-#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
#include <toolkit/helper/formpdfexport.hxx>
-#endif
/** === begin UNO includes === **/
-#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_
#include <com/sun/star/container/XIndexAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FORM_XFORM_HPP_
#include <com/sun/star/form/XForm.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
#include <com/sun/star/container/XChild.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
#include <com/sun/star/form/FormComponentType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_
#include <com/sun/star/awt/TextAlign.hpp>
-#endif
-#ifndef _COM_SUN_STAR_STYLE_VERTICALALIGNMENT_HPP_
#include <com/sun/star/style/VerticalAlignment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FORM_FORMBUTTONTYPE_HPP_
#include <com/sun/star/form/FormButtonType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FORM_SUBMITMETHOD_HPP_
#include <com/sun/star/form/FormSubmitMethod.hpp>
-#endif
/** === end UNO includes === **/
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
-#endif
-#ifndef _VCL_PDFEXTOUTDEVDATA_HXX
+#include <tools/diagnose_ex.h>
#include <vcl/pdfextoutdevdata.hxx>
-#endif
-#ifndef _SV_OUTDEV_HXX
#include <vcl/outdev.hxx>
-#endif
#include <functional>
#include <algorithm>
@@ -315,7 +284,8 @@ namespace toolkitform
//--------------------------------------------------------------------
/** creates a PDF compatible control descriptor for the given control
*/
- void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl, ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor ) SAL_THROW(())
+ void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
+ ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
{
_rpDescriptor.reset( NULL );
OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" );
@@ -529,7 +499,25 @@ namespace toolkitform
}
else if ( eButtonType == FormButtonType_URL )
{
- OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= pButtonWidget->URL);
+ ::rtl::OUString sURL;
+ OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= sURL );
+ const bool bDocumentLocalTarget = ( sURL.getLength() > 0 ) && ( sURL.getStr()[0] == '#' );
+ if ( bDocumentLocalTarget )
+ {
+ const ::rtl::OUString sDestinationName( sURL.copy(1) );
+ // Register the destination for for future handling ...
+ pButtonWidget->Dest = i_pdfExportData.RegisterDest();
+
+ // and put it into the bookmarks, to ensure the future handling really happens
+ ::std::vector< ::vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() );
+ ::vcl::PDFExtOutDevBookmarkEntry aBookmark;
+ aBookmark.nDestId = pButtonWidget->Dest;
+ aBookmark.aBookmark = sURL;
+ rBookmarks.push_back( aBookmark );
+ }
+ else
+ pButtonWidget->URL = sURL;
+
pButtonWidget->Submit = false;
}
@@ -630,7 +618,7 @@ namespace toolkitform
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "describePDFControl: caught an exception!" );
+ DBG_UNHANDLED_EXCEPTION();
}
}
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 943723ea5910..9612e450ee81 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -179,11 +179,13 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref
DBG_ASSERT( pVCLXWindow, "SetComponentInterface - unsupported type" );
if ( pVCLXWindow )
{
- if( pWindow->GetWindowPeer() )
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer();
+ if( xPeer.is() )
{
- int i = 0;
- i++;
- // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+ bool bSameInstance( pVCLXWindow == dynamic_cast< VCLXWindow* >( xPeer.get() ));
+ DBG_ASSERT( bSameInstance, "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+ if ( bSameInstance )
+ return;
}
pVCLXWindow->SetWindow( pWindow );
pWindow->SetWindowPeer( xIFace, pVCLXWindow );
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 5f5011d9d863..b7e3b452483a 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -343,7 +343,7 @@ static const sal_Unicode aWingDings2Tab[224] =
0xe5c1, 0xe5c2, 0xe5c3, 0xe5c4,
0xe5c5, 0xe5c6, 0xe5c7, 0xe5c8,
// F0f0
- 0xe5c9, 0x2022, 0xe5cb, 0xe5cc,
+ 0xe5c9, 0, 0xe5cb, 0xe5cc,
0xe5cd, 0xe5ce, 0xe5cf, 0xe5d0,
0x203b, 0x2042, 0, 0,
0, 0, 0, 0
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/makefile2.pmk b/vcl/Package_osx.mk
index ac2977ca8eab..414479a88fed 100644
--- a/vcl/util/makefile2.pmk
+++ b/vcl/Package_osx.mk
@@ -14,28 +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.
#
#*************************************************************************
-# Reduction of exported symbols:
-CDEFS += -DVCL_DLLIMPLEMENTATION
-VISIBILITY_HIDDEN=TRUE
+### 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))
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF # "$(GUIBASE)"=="aqua"
+/$(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
-#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/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/inc/svsys.h b/vcl/inc/svsys.h
new file mode 100644
index 000000000000..df0b58c548ca
--- /dev/null
+++ b/vcl/inc/svsys.h
@@ -0,0 +1,42 @@
+/*************************************************************************
+ *
+ * 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 _VCL_SVSYS_H
+#define _VCL_SVSYS_H
+
+#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/