summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Package_osx.mk1
-rw-r--r--vcl/aqua/source/a11y/aqua11yactionwrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ycomponentwrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.cxx2
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocuslistener.hxx7
-rw-r--r--vcl/aqua/source/a11y/aqua11yfocustracker.cxx3
-rw-r--r--vcl/aqua/source/a11y/aqua11ylistener.cxx3
-rw-r--r--vcl/aqua/source/a11y/aqua11yrolehelper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11yselectionwrapper.mm12
-rw-r--r--vcl/aqua/source/a11y/aqua11ytablewrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm24
-rw-r--r--vcl/aqua/source/a11y/aqua11ytextwrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11yutil.h4
-rw-r--r--vcl/aqua/source/a11y/aqua11yvaluewrapper.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperbutton.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercheckbox.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappercombobox.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappergroup.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperlist.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperrow.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappersplitter.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrapperstatictext.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertabgroup.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertextarea.h3
-rw-r--r--vcl/aqua/source/a11y/aqua11ywrappertoolbar.h3
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.cxx9
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.hxx4
-rw-r--r--vcl/aqua/source/app/saldata.cxx7
-rw-r--r--vcl/aqua/source/app/salinst.cxx49
-rw-r--r--vcl/aqua/source/app/salsys.cxx5
-rw-r--r--vcl/aqua/source/app/saltimer.cxx2
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx8
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.hxx3
-rw-r--r--vcl/aqua/source/dtrans/DragActionConversion.cxx3
-rw-r--r--vcl/aqua/source/dtrans/DragActionConversion.hxx3
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx4
-rw-r--r--vcl/aqua/source/dtrans/DragSource.hxx3
-rw-r--r--vcl/aqua/source/dtrans/DragSourceContext.cxx2
-rw-r--r--vcl/aqua/source/dtrans/DragSourceContext.hxx3
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx7
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.hxx5
-rw-r--r--vcl/aqua/source/dtrans/HtmlFmtFlt.cxx3
-rw-r--r--vcl/aqua/source/dtrans/HtmlFmtFlt.hxx3
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx10
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.hxx3
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.cxx6
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.hxx3
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx4
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.hxx3
-rw-r--r--vcl/aqua/source/dtrans/service_entry.cxx2
-rw-r--r--vcl/aqua/source/gdi/aquaprintaccessoryview.mm8
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salatslayout.cxx113
-rw-r--r--vcl/aqua/source/gdi/salatsuifontutils.cxx71
-rw-r--r--vcl/aqua/source/gdi/salbmp.cxx14
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salcolorutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx115
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salgdiutils.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salmathutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx7
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx23
-rw-r--r--vcl/aqua/source/gdi/salvd.cxx3
-rw-r--r--vcl/aqua/source/window/salframe.cxx30
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm9
-rw-r--r--vcl/aqua/source/window/salmenu.cxx8
-rwxr-xr-xvcl/aqua/source/window/salnsmenu.mm4
-rw-r--r--vcl/aqua/source/window/salobj.cxx2
-rw-r--r--vcl/inc/accel.h3
-rw-r--r--vcl/inc/accmgr.hxx7
-rw-r--r--vcl/inc/aqua/aqua11yfactory.h3
-rw-r--r--vcl/inc/aqua/aqua11yfocustracker.hxx5
-rw-r--r--vcl/inc/aqua/aqua11ylistener.hxx4
-rw-r--r--vcl/inc/aqua/aqua11ywrapper.h3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/aquaprintview.h3
-rw-r--r--vcl/inc/aqua/aquavclevents.hxx3
-rw-r--r--vcl/inc/aqua/aquavcltypes.h3
-rw-r--r--vcl/inc/aqua/keyboardfocuslistener.hxx6
-rw-r--r--vcl/inc/aqua/salatsuifontutils.hxx4
-rw-r--r--vcl/inc/aqua/salbmp.h6
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salcolorutils.hxx3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salconst.h3
-rw-r--r--vcl/inc/aqua/saldata.hxx11
-rw-r--r--vcl/inc/aqua/salfontutils.hxx2
-rw-r--r--vcl/inc/aqua/salframe.h6
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salframeview.h3
-rw-r--r--vcl/inc/aqua/salgdi.h10
-rw-r--r--vcl/inc/aqua/salinst.h20
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salmathutils.hxx3
-rw-r--r--vcl/inc/aqua/salmenu.h3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salnativewidgets.h3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salnsmenu.h3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/salnstimer.h3
-rw-r--r--vcl/inc/aqua/salobj.h3
-rw-r--r--vcl/inc/aqua/salprn.h3
-rw-r--r--vcl/inc/aqua/salsys.h3
-rw-r--r--vcl/inc/aqua/saltimer.h3
-rw-r--r--vcl/inc/aqua/salvd.h3
-rw-r--r--vcl/inc/aqua/svsys.h3
-rw-r--r--[-rwxr-xr-x]vcl/inc/aqua/vclnsapp.h3
-rw-r--r--vcl/inc/bmpfast.hxx3
-rw-r--r--vcl/inc/brdwin.hxx6
-rw-r--r--vcl/inc/canvasbitmap.hxx3
-rw-r--r--vcl/inc/controldata.hxx3
-rw-r--r--vcl/inc/cupsmgr.hxx9
-rw-r--r--vcl/inc/dbggui.hxx3
-rw-r--r--vcl/inc/dndevdis.hxx6
-rw-r--r--vcl/inc/dndlcon.hxx3
-rw-r--r--vcl/inc/fontcache.hxx9
-rw-r--r--vcl/inc/fontsubset.hxx2
-rw-r--r--vcl/inc/glyphcache.hxx27
-rw-r--r--vcl/inc/graphite_adaptors.hxx152
-rw-r--r--vcl/inc/graphite_cache.hxx289
-rw-r--r--vcl/inc/graphite_features.hxx53
-rw-r--r--vcl/inc/graphite_layout.hxx121
-rw-r--r--vcl/inc/graphite_serverfont.hxx26
-rw-r--r--vcl/inc/helpwin.hxx3
-rw-r--r--vcl/inc/idlemgr.hxx7
-rw-r--r--vcl/inc/ilstbox.hxx18
-rw-r--r--vcl/inc/image.h9
-rw-r--r--vcl/inc/impbmp.hxx3
-rw-r--r--vcl/inc/impfont.hxx29
-rw-r--r--vcl/inc/impgraph.hxx3
-rw-r--r--vcl/inc/impimagetree.hxx19
-rw-r--r--vcl/inc/impoct.hxx3
-rw-r--r--vcl/inc/impprn.hxx140
-rw-r--r--vcl/inc/jobset.h7
-rw-r--r--vcl/inc/list.h3
-rw-r--r--vcl/inc/outdata.hxx3
-rw-r--r--vcl/inc/outdev.h7
-rw-r--r--vcl/inc/outfont.hxx9
-rw-r--r--vcl/inc/pch/precompiled_vcl.cxx2
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx2
-rw-r--r--vcl/inc/print.h7
-rw-r--r--vcl/inc/printdlg.hxx6
-rw-r--r--vcl/inc/printergfx.hxx6
-rw-r--r--vcl/inc/printerjob.hxx2
-rw-r--r--vcl/inc/region.h3
-rw-r--r--vcl/inc/salbmp.hxx10
-rw-r--r--vcl/inc/saldatabasic.hxx3
-rw-r--r--vcl/inc/salframe.hxx21
-rw-r--r--[-rwxr-xr-x]vcl/inc/salgdi.hxx9
-rw-r--r--vcl/inc/salgeom.hxx3
-rw-r--r--vcl/inc/salimestatus.hxx3
-rw-r--r--vcl/inc/salinst.hxx14
-rw-r--r--[-rwxr-xr-x]vcl/inc/sallayout.hxx3
-rw-r--r--vcl/inc/salmenu.hxx2
-rw-r--r--vcl/inc/salobj.hxx5
-rw-r--r--vcl/inc/salprn.hxx3
-rw-r--r--vcl/inc/salptype.hxx3
-rw-r--r--vcl/inc/salsession.hxx3
-rw-r--r--vcl/inc/salsys.hxx3
-rw-r--r--vcl/inc/salvd.hxx3
-rw-r--r--vcl/inc/salwtype.hxx3
-rw-r--r--vcl/inc/sft.hxx29
-rw-r--r--vcl/inc/subedit.hxx3
-rw-r--r--vcl/inc/svdata.hxx23
-rw-r--r--vcl/inc/svids.hrc8
-rw-r--r--[-rwxr-xr-x]vcl/inc/textlayout.hxx3
-rw-r--r--vcl/inc/toolbox.h3
-rw-r--r--vcl/inc/unx/XIM.h3
-rw-r--r--vcl/inc/unx/cdeint.hxx3
-rw-r--r--vcl/inc/unx/dtint.hxx3
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx5
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx17
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx5
-rw-r--r--vcl/inc/unx/i18n_cb.hxx3
-rw-r--r--vcl/inc/unx/i18n_ic.hxx2
-rw-r--r--vcl/inc/unx/i18n_im.hxx2
-rw-r--r--vcl/inc/unx/i18n_keysym.hxx2
-rw-r--r--vcl/inc/unx/i18n_status.hxx4
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx2
-rw-r--r--vcl/inc/unx/kde/kdedata.hxx3
-rw-r--r--vcl/inc/unx/pspgraphics.h6
-rw-r--r--vcl/inc/unx/salbmp.h9
-rw-r--r--vcl/inc/unx/saldata.hxx12
-rw-r--r--vcl/inc/unx/saldisp.hxx22
-rw-r--r--vcl/inc/unx/salfont.h180
-rw-r--r--vcl/inc/unx/salframe.h14
-rw-r--r--vcl/inc/unx/salgdi.h32
-rw-r--r--vcl/inc/unx/salinst.h21
-rw-r--r--vcl/inc/unx/salmenu.h2
-rw-r--r--vcl/inc/unx/salobj.h3
-rw-r--r--vcl/inc/unx/salprn.h24
-rw-r--r--vcl/inc/unx/salstd.hxx2
-rw-r--r--vcl/inc/unx/salsys.h11
-rw-r--r--vcl/inc/unx/saltimer.h3
-rw-r--r--vcl/inc/unx/salunx.h5
-rw-r--r--vcl/inc/unx/salvd.h4
-rw-r--r--vcl/inc/unx/sm.hxx5
-rw-r--r--vcl/inc/unx/soicon.hxx3
-rw-r--r--vcl/inc/unx/strhelper.hxx3
-rw-r--r--vcl/inc/unx/svsys.h3
-rw-r--r--vcl/inc/unx/svunx.h2
-rw-r--r--vcl/inc/unx/wmadaptor.hxx5
-rw-r--r--vcl/inc/unx/x11_cursors/airbrush_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/airbrush_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/ase_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/ase_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asn_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asn_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asne_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asne_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asns_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asns_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asnswe_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asnswe_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asnw_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asnw_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/ass_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/ass_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asse_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asse_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/assw_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/assw_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asw_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/asw_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/aswe_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/aswe_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chain_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chain_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chainnot_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chainnot_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chart_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/chart_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copydata_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copydata_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copydlnk_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copydlnk_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyfile_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyfile_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyfiles_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyfiles_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyflnk_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/copyflnk_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/crook_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/crook_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/crop_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/crop_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/detective_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/detective_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawarc_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawarc_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawbezier_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawbezier_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcaption_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcaption_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcirclecut_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcirclecut_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawconnect_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawconnect_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrook_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrook_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrop_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawcrop_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawellipse_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawellipse_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawfreehand_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawfreehand_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawline_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawline_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawmirror_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawmirror_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawpie_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawpie_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawpolygon_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawpolygon_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawrect_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawrect_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawtext_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/drawtext_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/fill_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/fill_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/hshear_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/hshear_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/invert50.h5
-rw-r--r--vcl/inc/unx/x11_cursors/linkdata_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/linkdata_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/linkfile_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/linkfile_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/magnify_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/magnify_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/mirror_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/mirror_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movebezierweight_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movebezierweight_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movedata_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movedata_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movedlnk_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movedlnk_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movefile_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movefile_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movefiles_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movefiles_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/moveflnk_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/moveflnk_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movepoint_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/movepoint_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/nodrop_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/nodrop_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/null_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/null_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/paintbrush_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/paintbrush_mask.h4
-rw-r--r--vcl/inc/unx/x11_cursors/pivotcol_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotcol_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotdel_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotdel_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotfld_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotfld_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotrow_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/pivotrow_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/rotate_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/rotate_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/tblsele_mask.h4
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_curs.h4
-rw-r--r--vcl/inc/unx/x11_cursors/tblsels_mask.h4
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/tblselse_mask.h4
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/tblselsw_mask.h4
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/tblselw_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/timemove_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/timesize_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/vertcurs_mask.h5
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_curs.h5
-rw-r--r--vcl/inc/unx/x11_cursors/vshear_mask.h5
-rw-r--r--vcl/inc/vcl/ImageListProvider.hxx3
-rw-r--r--vcl/inc/vcl/abstdlg.hxx2
-rw-r--r--vcl/inc/vcl/accel.hxx5
-rw-r--r--vcl/inc/vcl/alpha.hxx3
-rw-r--r--vcl/inc/vcl/animate.hxx5
-rw-r--r--vcl/inc/vcl/apptypes.hxx3
-rw-r--r--vcl/inc/vcl/arrange.hxx2
-rw-r--r--vcl/inc/vcl/bitmap.hxx22
-rw-r--r--vcl/inc/vcl/bitmapex.hxx9
-rw-r--r--vcl/inc/vcl/bmpacc.hxx8
-rw-r--r--vcl/inc/vcl/btndlg.hxx8
-rw-r--r--vcl/inc/vcl/button.hxx18
-rw-r--r--vcl/inc/vcl/canvastools.hxx3
-rw-r--r--vcl/inc/vcl/cmdevt.h2
-rw-r--r--vcl/inc/vcl/cmdevt.hxx7
-rw-r--r--vcl/inc/vcl/combobox.h3
-rw-r--r--vcl/inc/vcl/combobox.hxx5
-rw-r--r--vcl/inc/vcl/configsettings.hxx8
-rw-r--r--vcl/inc/vcl/controllayout.hxx3
-rw-r--r--vcl/inc/vcl/ctrl.hxx5
-rw-r--r--vcl/inc/vcl/cursor.hxx3
-rw-r--r--vcl/inc/vcl/cvtgrf.hxx4
-rw-r--r--vcl/inc/vcl/cvtsvm.hxx5
-rw-r--r--vcl/inc/vcl/decoview.hxx3
-rw-r--r--vcl/inc/vcl/dialog.hxx13
-rw-r--r--vcl/inc/vcl/dllapi.h3
-rw-r--r--vcl/inc/vcl/dndhelp.hxx2
-rw-r--r--vcl/inc/vcl/dockingarea.hxx3
-rw-r--r--vcl/inc/vcl/dockwin.hxx5
-rw-r--r--[-rwxr-xr-x]vcl/inc/vcl/edit.hxx3
-rw-r--r--vcl/inc/vcl/event.hxx4
-rw-r--r--vcl/inc/vcl/evntpost.hxx5
-rw-r--r--vcl/inc/vcl/extoutdevdata.hxx3
-rw-r--r--vcl/inc/vcl/field.hxx7
-rw-r--r--vcl/inc/vcl/fixbrd.hxx3
-rw-r--r--vcl/inc/vcl/fixed.hxx15
-rw-r--r--vcl/inc/vcl/floatwin.hxx8
-rw-r--r--vcl/inc/vcl/fntstyle.hxx3
-rw-r--r--vcl/inc/vcl/font.hxx3
-rw-r--r--vcl/inc/vcl/fontcapabilities.hxx221
-rw-r--r--vcl/inc/vcl/fontmanager.hxx43
-rw-r--r--vcl/inc/vcl/gdimtf.hxx41
-rw-r--r--vcl/inc/vcl/gfxlink.hxx3
-rw-r--r--vcl/inc/vcl/gradient.hxx6
-rw-r--r--vcl/inc/vcl/graph.h3
-rw-r--r--vcl/inc/vcl/graph.hxx7
-rw-r--r--vcl/inc/vcl/graphictools.hxx3
-rw-r--r--vcl/inc/vcl/group.hxx3
-rw-r--r--vcl/inc/vcl/hatch.hxx3
-rw-r--r--vcl/inc/vcl/help.hxx3
-rw-r--r--vcl/inc/vcl/helper.hxx3
-rw-r--r--vcl/inc/vcl/i18nhelp.hxx2
-rw-r--r--vcl/inc/vcl/image.hxx3
-rw-r--r--vcl/inc/vcl/imagerepository.hxx9
-rw-r--r--vcl/inc/vcl/imgctrl.hxx6
-rw-r--r--vcl/inc/vcl/impdel.hxx3
-rw-r--r--vcl/inc/vcl/inputctx.hxx3
-rw-r--r--vcl/inc/vcl/introwin.hxx3
-rw-r--r--vcl/inc/vcl/javachild.hxx3
-rw-r--r--vcl/inc/vcl/jobdata.hxx3
-rw-r--r--vcl/inc/vcl/jobset.hxx5
-rw-r--r--vcl/inc/vcl/keycod.hxx3
-rw-r--r--vcl/inc/vcl/keycodes.hxx18
-rw-r--r--vcl/inc/vcl/lazydelete.hxx6
-rw-r--r--vcl/inc/vcl/lineinfo.hxx3
-rw-r--r--vcl/inc/vcl/longcurr.hxx7
-rw-r--r--vcl/inc/vcl/lstbox.h3
-rw-r--r--vcl/inc/vcl/lstbox.hxx5
-rw-r--r--vcl/inc/vcl/mapmod.hxx3
-rw-r--r--vcl/inc/vcl/menu.hxx4
-rw-r--r--vcl/inc/vcl/menubtn.hxx3
-rw-r--r--vcl/inc/vcl/metaact.hxx3
-rw-r--r--vcl/inc/vcl/metric.hxx3
-rw-r--r--vcl/inc/vcl/mnemonic.hxx3
-rw-r--r--vcl/inc/vcl/mnemonicengine.hxx2
-rw-r--r--vcl/inc/vcl/morebtn.hxx3
-rw-r--r--vcl/inc/vcl/msgbox.hxx12
-rw-r--r--vcl/inc/vcl/octree.hxx6
-rw-r--r--vcl/inc/vcl/oldprintadaptor.hxx3
-rw-r--r--vcl/inc/vcl/outdev.hxx12
-rw-r--r--vcl/inc/vcl/pdfextoutdevdata.hxx3
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx9
-rw-r--r--vcl/inc/vcl/pngread.hxx3
-rw-r--r--vcl/inc/vcl/pngwrite.hxx3
-rw-r--r--vcl/inc/vcl/pointr.hxx3
-rw-r--r--vcl/inc/vcl/popupmenuwindow.hxx3
-rw-r--r--vcl/inc/vcl/ppdparser.hxx17
-rw-r--r--vcl/inc/vcl/print.hxx9
-rw-r--r--vcl/inc/vcl/printerinfomanager.hxx16
-rw-r--r--vcl/inc/vcl/prntypes.hxx3
-rw-r--r--vcl/inc/vcl/ptrstyle.hxx3
-rw-r--r--vcl/inc/vcl/regband.hxx3
-rw-r--r--[-rwxr-xr-x]vcl/inc/vcl/region.hxx3
-rw-r--r--vcl/inc/vcl/salbtype.hxx7
-rw-r--r--vcl/inc/vcl/salctype.hxx3
-rw-r--r--vcl/inc/vcl/salgtype.hxx3
-rw-r--r--[-rwxr-xr-x]vcl/inc/vcl/salnativewidgets.hxx17
-rw-r--r--vcl/inc/vcl/scrbar.hxx3
-rw-r--r--vcl/inc/vcl/seleng.hxx12
-rw-r--r--vcl/inc/vcl/settings.hxx29
-rw-r--r--vcl/inc/vcl/slider.hxx3
-rw-r--r--vcl/inc/vcl/sndstyle.hxx3
-rw-r--r--vcl/inc/vcl/solarmutex.hxx79
-rw-r--r--vcl/inc/vcl/sound.hxx2
-rw-r--r--vcl/inc/vcl/spin.h3
-rw-r--r--vcl/inc/vcl/spin.hxx3
-rw-r--r--vcl/inc/vcl/spinfld.hxx3
-rw-r--r--vcl/inc/vcl/split.hxx3
-rw-r--r--vcl/inc/vcl/splitwin.hxx3
-rw-r--r--vcl/inc/vcl/status.hxx9
-rw-r--r--vcl/inc/vcl/stdtext.hxx3
-rw-r--r--vcl/inc/vcl/strhelper.hxx5
-rw-r--r--vcl/inc/vcl/sv.h3
-rw-r--r--vcl/inc/vcl/svapp.hxx168
-rw-r--r--vcl/inc/vcl/svgread.hxx5
-rw-r--r--vcl/inc/vcl/symbol.hxx3
-rw-r--r--vcl/inc/vcl/syschild.hxx7
-rw-r--r--vcl/inc/vcl/sysdata.hxx13
-rw-r--r--vcl/inc/vcl/syswin.hxx5
-rw-r--r--vcl/inc/vcl/tabctrl.hxx4
-rw-r--r--vcl/inc/vcl/tabdlg.hxx3
-rw-r--r--vcl/inc/vcl/tabpage.hxx5
-rw-r--r--vcl/inc/vcl/taskpanelist.hxx5
-rw-r--r--vcl/inc/vcl/threadex.hxx2
-rw-r--r--vcl/inc/vcl/throbber.hxx2
-rw-r--r--vcl/inc/vcl/timer.hxx3
-rw-r--r--vcl/inc/vcl/toolbox.hxx11
-rw-r--r--vcl/inc/vcl/unohelp.hxx21
-rw-r--r--vcl/inc/vcl/unohelp2.hxx2
-rw-r--r--vcl/inc/vcl/unowrap.hxx3
-rw-r--r--vcl/inc/vcl/vclenum.hxx3
-rw-r--r--vcl/inc/vcl/vclevent.hxx9
-rw-r--r--vcl/inc/vcl/virdev.hxx3
-rw-r--r--vcl/inc/vcl/waitobj.hxx3
-rw-r--r--vcl/inc/vcl/wall.hxx6
-rw-r--r--[-rwxr-xr-x]vcl/inc/vcl/window.hxx35
-rw-r--r--vcl/inc/vcl/wpropset.hxx3
-rw-r--r--vcl/inc/vcl/wrkwin.hxx3
-rw-r--r--vcl/inc/vclpluginapi.h3
-rw-r--r--vcl/inc/wall2.hxx3
-rwxr-xr-xvcl/inc/win/salbmp.h6
-rw-r--r--[-rwxr-xr-x]vcl/inc/win/saldata.hxx17
-rwxr-xr-xvcl/inc/win/salframe.h6
-rw-r--r--[-rwxr-xr-x]vcl/inc/win/salgdi.h45
-rw-r--r--[-rwxr-xr-x]vcl/inc/win/salinst.h9
-rwxr-xr-xvcl/inc/win/salmenu.h2
-rwxr-xr-xvcl/inc/win/salnativewidgets.h3
-rwxr-xr-xvcl/inc/win/salobj.h3
-rwxr-xr-xvcl/inc/win/salprn.h3
-rwxr-xr-xvcl/inc/win/salsys.h2
-rwxr-xr-xvcl/inc/win/saltimer.h3
-rwxr-xr-xvcl/inc/win/salvd.h3
-rw-r--r--vcl/inc/win/svsys.h8
-rwxr-xr-xvcl/inc/win/wincomp.hxx19
-rw-r--r--vcl/inc/window.h3
-rw-r--r--vcl/inc/xconnection.hxx3
-rw-r--r--vcl/os2/inc/salbmp.h3
-rw-r--r--vcl/os2/inc/saldata.hxx3
-rw-r--r--vcl/os2/inc/salframe.h6
-rw-r--r--vcl/os2/inc/salgdi.h26
-rw-r--r--vcl/os2/inc/salinst.h10
-rw-r--r--vcl/os2/inc/sallang.hxx6
-rw-r--r--vcl/os2/inc/sallayout.h41
-rw-r--r--vcl/os2/inc/salmenu.h2
-rw-r--r--vcl/os2/inc/salobj.h3
-rw-r--r--vcl/os2/inc/salprn.h3
-rw-r--r--vcl/os2/inc/salsound.h3
-rw-r--r--vcl/os2/inc/salsound.hxx5
-rw-r--r--vcl/os2/inc/salsys.h3
-rw-r--r--vcl/os2/inc/saltimer.h3
-rw-r--r--vcl/os2/inc/salvd.h3
-rw-r--r--vcl/os2/inc/svsys.h3
-rw-r--r--vcl/os2/inc/wingdi.h3
-rw-r--r--vcl/os2/inc/xwphook.h2
-rw-r--r--vcl/os2/source/app/makefile.mk3
-rw-r--r--vcl/os2/source/app/printf.c3
-rw-r--r--vcl/os2/source/app/salinfo.cxx24
-rw-r--r--vcl/os2/source/app/salinst.cxx34
-rw-r--r--vcl/os2/source/app/sallang.cxx49
-rw-r--r--vcl/os2/source/app/salshl.cxx4
-rw-r--r--vcl/os2/source/app/saltimer.cxx2
-rw-r--r--vcl/os2/source/gdi/os2layout.cxx27
-rw-r--r--vcl/os2/source/gdi/salbmp.cxx3
-rw-r--r--vcl/os2/source/gdi/salgdi.cxx108
-rw-r--r--vcl/os2/source/gdi/salgdi2.cxx4
-rw-r--r--vcl/os2/source/gdi/salgdi3.cxx100
-rw-r--r--vcl/os2/source/gdi/salprn.cxx19
-rw-r--r--vcl/os2/source/gdi/salvd.cxx3
-rw-r--r--vcl/os2/source/window/salframe.cxx300
-rw-r--r--vcl/os2/source/window/salobj.cxx21
-rw-r--r--vcl/prj/build.lst2
-rw-r--r--vcl/prj/d.lst2
-rw-r--r--[-rwxr-xr-x]vcl/qa/complex/memCheck/testdocuments/CalcDoc.sxcbin9547 -> 9547 bytes
-rw-r--r--[-rwxr-xr-x]vcl/qa/complex/memCheck/testdocuments/ImpressDoc.sxibin35135 -> 35135 bytes
-rw-r--r--[-rwxr-xr-x]vcl/qa/complex/memCheck/testdocuments/WriterDoc.sxwbin5754 -> 5754 bytes
-rw-r--r--vcl/source/app/brand.cxx81
-rwxr-xr-xvcl/source/app/dbggui.cxx3
-rw-r--r--vcl/source/app/dndhelp.cxx2
-rw-r--r--vcl/source/app/help.cxx14
-rw-r--r--vcl/source/app/i18nhelp.cxx3
-rw-r--r--vcl/source/app/idlemgr.cxx88
-rw-r--r--vcl/source/app/salvtables.cxx2
-rw-r--r--vcl/source/app/session.cxx8
-rw-r--r--vcl/source/app/settings.cxx120
-rw-r--r--vcl/source/app/solarmutex.cxx57
-rw-r--r--vcl/source/app/sound.cxx4
-rw-r--r--vcl/source/app/stdtext.cxx3
-rw-r--r--vcl/source/app/svapp.cxx72
-rw-r--r--vcl/source/app/svdata.cxx24
-rw-r--r--vcl/source/app/svmain.cxx147
-rw-r--r--vcl/source/app/svmainhook.cxx11
-rw-r--r--vcl/source/app/timer.cxx5
-rw-r--r--vcl/source/app/unohelp.cxx28
-rw-r--r--vcl/source/app/unohelp2.cxx3
-rw-r--r--vcl/source/app/vclevent.cxx22
-rw-r--r--vcl/source/components/display.cxx3
-rw-r--r--vcl/source/components/dtranscomp.cxx22
-rw-r--r--vcl/source/components/factory.cxx7
-rw-r--r--vcl/source/components/fontident.cxx3
-rw-r--r--vcl/source/control/button.cxx200
-rw-r--r--vcl/source/control/combobox.cxx15
-rw-r--r--vcl/source/control/ctrl.cxx5
-rw-r--r--[-rwxr-xr-x]vcl/source/control/edit.cxx60
-rw-r--r--vcl/source/control/field.cxx93
-rw-r--r--vcl/source/control/field2.cxx12
-rw-r--r--vcl/source/control/fixbrd.cxx5
-rw-r--r--vcl/source/control/fixed.cxx63
-rw-r--r--vcl/source/control/group.cxx3
-rw-r--r--vcl/source/control/ilstbox.cxx87
-rw-r--r--vcl/source/control/imgctrl.cxx9
-rw-r--r--vcl/source/control/longcurr.cxx3
-rw-r--r--vcl/source/control/lstbox.cxx3
-rw-r--r--vcl/source/control/menubtn.cxx5
-rw-r--r--vcl/source/control/morebtn.cxx43
-rw-r--r--vcl/source/control/scrbar.cxx7
-rw-r--r--vcl/source/control/slider.cxx5
-rw-r--r--vcl/source/control/spinbtn.cxx5
-rw-r--r--vcl/source/control/spinfld.cxx5
-rw-r--r--vcl/source/control/tabctrl.cxx48
-rw-r--r--vcl/source/control/throbber.cxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx64
-rw-r--r--vcl/source/fontsubset/fontsubset.cxx8
-rw-r--r--vcl/source/fontsubset/gsub.cxx7
-rw-r--r--vcl/source/fontsubset/gsub.h3
-rw-r--r--vcl/source/fontsubset/list.c274
-rw-r--r--vcl/source/fontsubset/sft.cxx681
-rw-r--r--vcl/source/fontsubset/ttcr.cxx16
-rw-r--r--vcl/source/fontsubset/ttcr.hxx3
-rw-r--r--vcl/source/fontsubset/xlat.cxx2
-rw-r--r--vcl/source/fontsubset/xlat.hxx2
-rw-r--r--vcl/source/gdi/alpha.cxx3
-rw-r--r--vcl/source/gdi/animate.cxx3
-rw-r--r--vcl/source/gdi/base14.cxx6
-rw-r--r--vcl/source/gdi/bitmap.cxx38
-rw-r--r--vcl/source/gdi/bitmap2.cxx56
-rw-r--r--vcl/source/gdi/bitmap3.cxx10
-rw-r--r--vcl/source/gdi/bitmap4.cxx14
-rw-r--r--vcl/source/gdi/bitmapex.cxx92
-rw-r--r--vcl/source/gdi/bmpacc.cxx5
-rw-r--r--vcl/source/gdi/bmpacc2.cxx3
-rw-r--r--vcl/source/gdi/bmpacc3.cxx3
-rw-r--r--vcl/source/gdi/bmpconv.cxx14
-rw-r--r--vcl/source/gdi/bmpfast.cxx60
-rw-r--r--vcl/source/gdi/configsettings.cxx14
-rw-r--r--vcl/source/gdi/cvtgrf.cxx3
-rw-r--r--vcl/source/gdi/cvtsvm.cxx14
-rw-r--r--vcl/source/gdi/extoutdevdata.cxx3
-rw-r--r--vcl/source/gdi/font.cxx6
-rw-r--r--vcl/source/gdi/gdimtf.cxx254
-rw-r--r--vcl/source/gdi/gfxlink.cxx3
-rw-r--r--vcl/source/gdi/gradient.cxx96
-rw-r--r--vcl/source/gdi/graph.cxx3
-rw-r--r--vcl/source/gdi/graphictools.cxx19
-rw-r--r--vcl/source/gdi/hatch.cxx5
-rw-r--r--vcl/source/gdi/image.cxx79
-rw-r--r--vcl/source/gdi/imagerepository.cxx14
-rw-r--r--vcl/source/gdi/impanmvw.cxx3
-rw-r--r--vcl/source/gdi/impanmvw.hxx3
-rw-r--r--vcl/source/gdi/impbmp.cxx3
-rw-r--r--vcl/source/gdi/impgraph.cxx12
-rw-r--r--vcl/source/gdi/impimage.cxx21
-rw-r--r--vcl/source/gdi/impimagetree.cxx48
-rw-r--r--vcl/source/gdi/impvect.cxx7
-rw-r--r--vcl/source/gdi/impvect.hxx3
-rw-r--r--vcl/source/gdi/jobset.cxx16
-rw-r--r--vcl/source/gdi/lineinfo.cxx3
-rwxr-xr-xvcl/source/gdi/makefile.mk109
-rw-r--r--vcl/source/gdi/mapmod.cxx3
-rw-r--r--vcl/source/gdi/metaact.cxx30
-rw-r--r--vcl/source/gdi/metric.cxx9
-rw-r--r--vcl/source/gdi/octree.cxx3
-rw-r--r--vcl/source/gdi/oldprintadaptor.cxx2
-rw-r--r--vcl/source/gdi/outdev.cxx74
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/outdev2.cxx33
-rwxr-xr-xvcl/source/gdi/outdev3.cxx307
-rw-r--r--vcl/source/gdi/outdev4.cxx100
-rw-r--r--vcl/source/gdi/outdev5.cxx13
-rw-r--r--vcl/source/gdi/outdev6.cxx25
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/outdevnative.cxx7
-rw-r--r--vcl/source/gdi/outmap.cxx92
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx9
-rw-r--r--vcl/source/gdi/pdffontcache.cxx2
-rw-r--r--vcl/source/gdi/pdffontcache.hxx3
-rw-r--r--vcl/source/gdi/pdfwriter.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx167
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx21
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx4
-rw-r--r--vcl/source/gdi/pngread.cxx35
-rw-r--r--vcl/source/gdi/pngwrite.cxx12
-rw-r--r--vcl/source/gdi/print.cxx11
-rw-r--r--vcl/source/gdi/print2.cxx9
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/print3.cxx56
-rw-r--r--vcl/source/gdi/regband.cxx3
-rw-r--r--vcl/source/gdi/region.cxx23
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/salgdilayout.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/sallayout.cxx72
-rw-r--r--vcl/source/gdi/salmisc.cxx9
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx4
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/textlayout.cxx5
-rw-r--r--vcl/source/gdi/virdev.cxx14
-rw-r--r--vcl/source/gdi/wall.cxx3
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx177
-rw-r--r--vcl/source/glyphs/gcach_ftyp.hxx32
-rw-r--r--[-rwxr-xr-x]vcl/source/glyphs/gcach_layout.cxx51
-rw-r--r--[-rwxr-xr-x]vcl/source/glyphs/gcach_rbmp.cxx3
-rw-r--r--vcl/source/glyphs/glyphcache.cxx11
-rw-r--r--vcl/source/glyphs/graphite_adaptors.cxx336
-rw-r--r--vcl/source/glyphs/graphite_cache.cxx200
-rw-r--r--vcl/source/glyphs/graphite_features.cxx236
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx977
-rw-r--r--vcl/source/glyphs/graphite_serverfont.cxx104
-rw-r--r--vcl/source/glyphs/graphite_textsrc.cxx13
-rw-r--r--vcl/source/glyphs/graphite_textsrc.hxx14
-rw-r--r--vcl/source/helper/canvasbitmap.cxx65
-rw-r--r--vcl/source/helper/canvastools.cxx19
-rw-r--r--vcl/source/helper/evntpost.cxx3
-rw-r--r--vcl/source/helper/lazydelete.cxx2
-rw-r--r--vcl/source/helper/strhelper.cxx3
-rw-r--r--vcl/source/helper/threadex.cxx5
-rw-r--r--vcl/source/helper/xconnection.cxx24
-rw-r--r--vcl/source/salmain/salmain.cxx5
-rw-r--r--vcl/source/src/btntext.src1
-rw-r--r--vcl/source/src/helptext.src23
-rw-r--r--vcl/source/src/images.src242
-rw-r--r--vcl/source/src/print.src10
-rw-r--r--[-rwxr-xr-x]vcl/source/src/throbber.src0
-rw-r--r--vcl/source/src/units.src3
-rw-r--r--vcl/source/window/abstdlg.cxx5
-rw-r--r--vcl/source/window/accel.cxx108
-rw-r--r--vcl/source/window/accmgr.cxx79
-rw-r--r--vcl/source/window/arrange.cxx2
-rw-r--r--vcl/source/window/brdwin.cxx50
-rw-r--r--vcl/source/window/btndlg.cxx208
-rw-r--r--vcl/source/window/cmdevt.cxx7
-rw-r--r--vcl/source/window/cursor.cxx3
-rw-r--r--vcl/source/window/decoview.cxx2
-rw-r--r--vcl/source/window/dialog.cxx23
-rw-r--r--vcl/source/window/dlgctrl.cxx5
-rw-r--r--vcl/source/window/dndevdis.cxx139
-rw-r--r--vcl/source/window/dndlcon.cxx3
-rw-r--r--vcl/source/window/dockingarea.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx5
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/floatwin.cxx10
-rw-r--r--vcl/source/window/introwin.cxx3
-rw-r--r--vcl/source/window/javachild.cxx3
-rw-r--r--vcl/source/window/keycod.cxx3
-rw-r--r--vcl/source/window/keyevent.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/window/menu.cxx43
-rw-r--r--vcl/source/window/mnemonic.cxx3
-rw-r--r--vcl/source/window/mnemonicengine.cxx3
-rw-r--r--vcl/source/window/mouseevent.cxx3
-rw-r--r--vcl/source/window/msgbox.cxx90
-rw-r--r--vcl/source/window/popupmenuwindow.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/window/printdlg.cxx203
-rw-r--r--vcl/source/window/scrwnd.cxx6
-rw-r--r--vcl/source/window/scrwnd.hxx3
-rw-r--r--vcl/source/window/seleng.cxx85
-rw-r--r--vcl/source/window/split.cxx3
-rw-r--r--vcl/source/window/splitwin.cxx46
-rw-r--r--vcl/source/window/status.cxx228
-rwxr-xr-xvcl/source/window/syschild.cxx11
-rw-r--r--vcl/source/window/syswin.cxx10
-rw-r--r--vcl/source/window/tabdlg.cxx4
-rw-r--r--vcl/source/window/tabpage.cxx10
-rw-r--r--vcl/source/window/taskpanelist.cxx22
-rwxr-xr-xvcl/source/window/toolbox.cxx204
-rw-r--r--vcl/source/window/toolbox2.cxx34
-rwxr-xr-xvcl/source/window/window.cxx298
-rw-r--r--vcl/source/window/window2.cxx115
-rw-r--r--vcl/source/window/window3.cxx3
-rw-r--r--vcl/source/window/winproc.cxx5
-rwxr-xr-xvcl/source/window/wrkwin.cxx17
-rw-r--r--vcl/test/canvasbitmaptest.cxx6
-rw-r--r--[-rwxr-xr-x]vcl/test/dndtest.cxx22
-rw-r--r--vcl/test/makefile.mk1
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx18
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx12
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_keysym.cxx3
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx4
-rw-r--r--vcl/unx/generic/app/i18n_wrp.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_xkb.cxx2
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx118
-rw-r--r--vcl/unx/generic/app/randrwrapper.cxx3
-rw-r--r--vcl/unx/generic/app/saldata.cxx30
-rw-r--r--vcl/unx/generic/app/saldisp.cxx244
-rw-r--r--vcl/unx/generic/app/salinst.cxx25
-rw-r--r--vcl/unx/generic/app/salsys.cxx3
-rw-r--r--vcl/unx/generic/app/saltimer.cxx2
-rw-r--r--vcl/unx/generic/app/sm.cxx25
-rw-r--r--vcl/unx/generic/app/soicon.cxx2
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx17
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx47
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx15
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx7
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.cxx3
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.hxx3
-rw-r--r--vcl/unx/generic/dtrans/X11_droptarget.cxx7
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx326
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx21
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx19
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.cxx14
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.hxx5
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx7
-rw-r--r--vcl/unx/generic/dtrans/bmp.hxx3
-rw-r--r--vcl/unx/generic/dtrans/config.cxx9
-rw-r--r--vcl/unx/generic/dtrans/copydata_curs.h5
-rw-r--r--vcl/unx/generic/dtrans/copydata_mask.h5
-rw-r--r--vcl/unx/generic/dtrans/linkdata_curs.h5
-rw-r--r--vcl/unx/generic/dtrans/linkdata_mask.h5
-rw-r--r--vcl/unx/generic/dtrans/movedata_curs.h5
-rw-r--r--vcl/unx/generic/dtrans/movedata_mask.h5
-rw-r--r--vcl/unx/generic/dtrans/nodrop_curs.h5
-rw-r--r--vcl/unx/generic/dtrans/nodrop_mask.h5
-rwxr-xr-xvcl/unx/generic/fontmanager/afm_hash.cpp245
-rwxr-xr-xvcl/unx/generic/fontmanager/afm_keyword_list6
-rw-r--r--vcl/unx/generic/fontmanager/fontcache.cxx8
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx402
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx210
-rw-r--r--vcl/unx/generic/fontmanager/helper.cxx11
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.cxx95
-rw-r--r--vcl/unx/generic/fontmanager/parseAFM.hxx3
-rw-r--r--vcl/unx/generic/gdi/cdeint.cxx13
-rw-r--r--vcl/unx/generic/gdi/dtint.cxx6
-rw-r--r--vcl/unx/generic/gdi/dtsetenum.hxx3
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx2
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx3
-rw-r--r--vcl/unx/generic/gdi/pspgraphics.cxx64
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx76
-rw-r--r--vcl/unx/generic/gdi/salcvt.cxx2
-rw-r--r--vcl/unx/generic/gdi/salcvt.hxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx92
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx37
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx129
-rw-r--r--vcl/unx/generic/gdi/salprnpsp.cxx85
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx16
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx11
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx13
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx28
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx38
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx4
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx119
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx61
-rw-r--r--vcl/unx/generic/printergfx/bitmap_gfx.cxx3
-rw-r--r--vcl/unx/generic/printergfx/common_gfx.cxx27
-rw-r--r--vcl/unx/generic/printergfx/glyphset.cxx15
-rw-r--r--vcl/unx/generic/printergfx/glyphset.hxx8
-rw-r--r--vcl/unx/generic/printergfx/printerjob.cxx44
-rw-r--r--vcl/unx/generic/printergfx/psputil.cxx5
-rw-r--r--vcl/unx/generic/printergfx/psputil.hxx2
-rw-r--r--vcl/unx/generic/printergfx/text_gfx.cxx13
-rw-r--r--vcl/unx/generic/window/FWS.cxx4
-rw-r--r--vcl/unx/generic/window/FWS.hxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx185
-rw-r--r--vcl/unx/generic/window/salobj.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkaction.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atkbridge.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkcomponent.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atkeditabletext.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.hxx3
-rw-r--r--vcl/unx/gtk/a11y/atkhypertext.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atkimage.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atklistener.cxx9
-rw-r--r--vcl/unx/gtk/a11y/atklistener.hxx2
-rw-r--r--vcl/unx/gtk/a11y/atkregistry.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkregistry.hxx3
-rw-r--r--vcl/unx/gtk/a11y/atkselection.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atktable.cxx5
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx17
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx100
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.hxx6
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx78
-rw-r--r--vcl/unx/gtk/a11y/atkutil.hxx3
-rw-r--r--vcl/unx/gtk/a11y/atkvalue.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.hxx3
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx72
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.hxx3
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx43
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx51
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx25
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx184
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx208
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx16
-rw-r--r--vcl/unx/headless/svpbmp.cxx7
-rw-r--r--vcl/unx/headless/svpbmp.hxx6
-rw-r--r--vcl/unx/headless/svpdummies.cxx2
-rw-r--r--vcl/unx/headless/svpdummies.hxx3
-rw-r--r--vcl/unx/headless/svpelement.cxx11
-rw-r--r--vcl/unx/headless/svpelement.hxx3
-rw-r--r--vcl/unx/headless/svpframe.cxx13
-rw-r--r--vcl/unx/headless/svpframe.hxx6
-rw-r--r--vcl/unx/headless/svpgdi.cxx8
-rw-r--r--vcl/unx/headless/svpgdi.hxx5
-rw-r--r--vcl/unx/headless/svpinst.cxx22
-rw-r--r--vcl/unx/headless/svpinst.hxx20
-rw-r--r--vcl/unx/headless/svpprn.cxx745
-rw-r--r--vcl/unx/headless/svpprn.hxx76
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx33
-rw-r--r--vcl/unx/headless/svppspgraphics.hxx5
-rw-r--r--vcl/unx/headless/svptext.cxx17
-rw-r--r--vcl/unx/headless/svpvd.cxx2
-rw-r--r--vcl/unx/headless/svpvd.hxx3
-rw-r--r--vcl/unx/inc/kde_headers.h98
-rw-r--r--vcl/unx/kde/kdedata.cxx34
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx20
-rw-r--r--vcl/unx/kde4/KDEData.cxx3
-rw-r--r--vcl/unx/kde4/KDEData.hxx3
-rw-r--r--vcl/unx/kde4/KDESalDisplay.cxx52
-rw-r--r--vcl/unx/kde4/KDESalDisplay.hxx19
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx26
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx3
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx379
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDESalInstance.cxx3
-rw-r--r--vcl/unx/kde4/KDESalInstance.hxx3
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx294
-rw-r--r--vcl/unx/kde4/KDEXLib.hxx51
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.cxx6
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.hxx7
-rw-r--r--vcl/unx/kde4/main.cxx3
-rwxr-xr-x[-rw-r--r--]vcl/util/makefile.mk30
-rwxr-xr-xvcl/win/source/app/saldata.cxx21
-rwxr-xr-xvcl/win/source/app/salinfo.cxx137
-rw-r--r--[-rwxr-xr-x]vcl/win/source/app/salinst.cxx124
-rwxr-xr-xvcl/win/source/app/salshl.cxx4
-rwxr-xr-xvcl/win/source/app/saltimer.cxx5
-rwxr-xr-xvcl/win/source/gdi/salbmp.cxx12
-rw-r--r--vcl/win/source/gdi/salgdi.cxx37
-rw-r--r--vcl/win/source/gdi/salgdi2.cxx29
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salgdi3.cxx517
-rw-r--r--vcl/win/source/gdi/salgdi_gdiplus.cxx5
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salnativewidgets-luna.cxx7
-rw-r--r--vcl/win/source/gdi/salprn.cxx50
-rwxr-xr-xvcl/win/source/gdi/salvd.cxx5
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/winlayout.cxx150
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/wntgdi.cxx3
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/ase.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asn.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asne.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asns.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asnswe.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asnw.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/ass.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asse.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/assw.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/asw.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/aswe.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/chain.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/chainnot.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/timemove.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/src/timesize.curbin326 -> 326 bytes
-rw-r--r--[-rwxr-xr-x]vcl/win/source/window/salframe.cxx238
-rw-r--r--[-rwxr-xr-x]vcl/win/source/window/salmenu.cxx4
-rwxr-xr-xvcl/win/source/window/salobj.cxx9
-rw-r--r--vcl/workben/makefile.mk4
-rw-r--r--[-rwxr-xr-x]vcl/workben/outdevgrind.cxx20
-rw-r--r--vcl/workben/svdem.cxx3
-rw-r--r--vcl/workben/svpclient.cxx15
-rw-r--r--vcl/workben/svptest.cxx15
-rw-r--r--vcl/workben/vcldemo.cxx3
922 files changed, 10535 insertions, 11690 deletions
diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk
index 414479a88fed..4d5986c36ed2 100644
--- a/vcl/Package_osx.mk
+++ b/vcl/Package_osx.mk
@@ -33,4 +33,3 @@ $(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.
cd $(SRCDIR)/vcl/aqua/source/res ; \
mkdir -p $(dir $@) ; \
zip $@ MainMenu.nib/*.nib cursors/*.png
-
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 94388a98e3c3..9df4fc986859 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
@end
#endif // _SV_AQUA11ACTIONWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index a1a3fbab5ce3..62ab9d7141be 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@
@end
#endif // _SV_AQUA11COMPONENTWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 1a7c72eac9ec..61bc4d44f147 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,4 @@ AquaA11yFocusListener::release() SAL_THROW(())
return ReferenceObject::release();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index db114be14771..bdfc9085ad08 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,8 +34,6 @@
#include "aqua/keyboardfocuslistener.hxx"
#include "aqua/aquavcltypes.h"
-// #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-
class AquaA11yFocusListener :
public KeyboardFocusListener,
public salhelper::ReferenceObject
@@ -59,4 +58,6 @@ public:
virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
};
-#endif // _AQUA11YFOCUSLISTENER_HXX_ \ No newline at end of file
+#endif // _AQUA11YFOCUSLISTENER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index c901eea915a6..187e715c54f7 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,5 @@ void AquaA11yFocusTracker::window_got_focus(Window *pWindow)
#endif
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx
index 36e2c7ab2220..08b56718885a 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,3 +158,5 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw(
if( nil != notification )
NSAccessibilityPostNotification(element, notification);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index c15c39903432..69404fa372a1 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@
@end
#endif // _SV_AQUA11ROLEHELPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index 20bb99938ef0..de78565f4c4a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,5 @@
@end
#endif // _SV_AQUA11SELECTIONWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
index a215bf913cf1..5b8d604f3b1a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -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
@@ -49,14 +49,14 @@ using namespace ::com::sun::star::uno;
for ( sal_Int32 i=0 ; i < n ; ++i ) {
[ children addObject: [ AquaA11yFactory wrapperForAccessible: xAccessibleSelection -> getSelectedAccessibleChild( i ) ] ];
}
-
+
return children;
-
+
} catch ( Exception& e)
{
}
}
-
+
return nil;
}
@@ -84,13 +84,13 @@ using namespace ::com::sun::star::uno;
Reference< XAccessibleSelection > xAccessibleSelection = [ wrapper accessibleSelection ];
try {
xAccessibleSelection -> clearAccessibleSelection();
-
+
unsigned c = [ value count ];
for ( unsigned i = 0 ; i < c ; ++i ) {
xAccessibleSelection -> selectAccessibleChild( [ [ value objectAtIndex: i ] accessibleContext ] -> getAccessibleIndexInParent() );
}
} catch ( Exception& e) {
- }
+ }
}
@end
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index ed70ed219b6e..0b41d48e10c6 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@
-(id)columnsAttribute;
@end
#endif // _SV_AQUA11TABLEWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index 0aa271a7f1e2..a21f75e7fd5a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,5 @@
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
@end
#endif // _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 948e0dfa95aa..2122f56e9565 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -134,18 +134,18 @@ using namespace ::rtl;
+(void)applyAttributesFrom:(Sequence < PropertyValue >)attributes toString:(NSMutableAttributedString *)string forRange:(NSRange)range storeDefaultsTo:(AquaA11yWrapper *)wrapperStore getDefaultsFrom:(AquaA11yWrapper *)wrapper {
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
// constants
- static const OUString attrUnderline = OUString::createFromAscii("CharUnderline");
- static const OUString attrBold = OUString::createFromAscii("CharWeight");
- static const OUString attrFontname = OUString::createFromAscii("CharFontName");
- static const OUString attrItalic = OUString::createFromAscii("CharPosture");
- static const OUString attrHeight = OUString::createFromAscii("CharHeight");
- static const OUString attrStrikethrough = OUString::createFromAscii("CharStrikeout");
- static const OUString attrShadow = OUString::createFromAscii("CharShadowed");
- static const OUString attrUnderlineColor = OUString::createFromAscii("CharUnderlineColor");
- static const OUString attrUnderlineHasColor = OUString::createFromAscii("CharUnderlineHasColor");
- static const OUString attrForegroundColor = OUString::createFromAscii("CharColor");
- static const OUString attrBackgroundColor = OUString::createFromAscii("CharBackColor");
- static const OUString attrSuperscript = OUString::createFromAscii("CharEscapement");
+ static const OUString attrUnderline(RTL_CONSTASCII_USTRINGPARAM("CharUnderline"));
+ static const OUString attrBold(RTL_CONSTASCII_USTRINGPARAM("CharWeight"));
+ static const OUString attrFontname(RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
+ static const OUString attrItalic(RTL_CONSTASCII_USTRINGPARAM("CharPosture"));
+ static const OUString attrHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
+ static const OUString attrStrikethrough(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout"));
+ static const OUString attrShadow(RTL_CONSTASCII_USTRINGPARAM("CharShadowed"));
+ static const OUString attrUnderlineColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor"));
+ static const OUString attrUnderlineHasColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor"));
+ static const OUString attrForegroundColor(RTL_CONSTASCII_USTRINGPARAM("CharColor"));
+ static const OUString attrBackgroundColor(RTL_CONSTASCII_USTRINGPARAM("CharBackColor"));
+ static const OUString attrSuperscript(RTL_CONSTASCII_USTRINGPARAM("CharEscapement"));
// vars
OUString fontname;
int fonttraits = 0;
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index 34ba1611b7b3..dd7fa5c0411c 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@
@end
#endif // _SV_AQUA11TEXTWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index adf565f4d9bb..5007def0487b 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,4 +37,5 @@
+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
@end
-#endif // _SV_AQUA11YUTIL_H \ No newline at end of file
+#endif // _SV_AQUA11YUTIL_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index 35573f855549..517a3014d565 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@
@end
#endif // _SV_AQUA11VALUEWRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index 78c54e2c35ea..e4af22081106 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
@end
#endif // _SV_AQUA11WRAPPERBUTTON_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index e1016a6fe551..9c2580c19f31 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
@end
#endif // _SV_AQUA11WRAPPERCHECKOBOX_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index c9b71585aea3..bdcff4a981d6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@
@end
#endif // _SV_AQUA11WRAPPERCOMBOBOX_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index bdbfb6e6b264..e53676d531ed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
@end
#endif // _SV_AQUA11WRAPPERGROUP_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index db9bf7511af6..367795ff8d16 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERLIST_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 276f1c162e8c..1494e7dfe0b6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
@end
#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index 4c138372e27e..f6c05b955744 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index deaa4f07248f..9b649ea0698d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
@end
#endif // _SV_AQUA11WRAPPERROW_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index e1e37a45d36e..3d4cdd848efc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
@end
#endif // _SV_AQUA11WRAPPERSCROLLAREA_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index df57418803fa..d589da51b153 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERSCROLLBAR_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index a114e6fb7a74..be6e99f8f3c8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERSPLITTER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index aef2957557d4..d7115b879e2a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
@end
#endif // _SV_AQUA11WRAPPERSTATICTEXT_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 7fda77789015..54743abaa390 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERTABGROUP_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index e47795d976b3..7a458163e400 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERTEXTAREA_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index 4ab947484cc4..c02195c7d0fa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@
@end
#endif // _SV_AQUA11WRAPPERTOOLBAR_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 02a7337ce397..964f629bff51 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,17 +28,11 @@
#include "documentfocuslistener.hxx"
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::lang;
@@ -251,3 +246,5 @@ void DocumentFocusListener::detachRecursive(
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 3f02d3fc0ada..340219ec1967 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,4 +96,5 @@ private:
AquaA11yFocusTracker& m_aFocusTracker;
};
-#endif // _DOCUMENTFOCUSLISTENER_HXX_ \ No newline at end of file
+#endif // _DOCUMENTFOCUSLISTENER_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 7b8174e16703..b6f47ab440af 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,7 +112,7 @@ void SalData::ensureThreadAutoreleasePool()
}
else
{
- DBG_ERROR( "no autorelease key" );
+ OSL_FAIL( "no autorelease key" );
}
}
@@ -135,7 +136,7 @@ void SalData::drainThreadAutoreleasePool()
}
else
{
- DBG_ERROR( "no autorelease key" );
+ OSL_FAIL( "no autorelease key" );
}
}
@@ -292,3 +293,5 @@ NSStatusItem* SalData::getStatusItem()
}
return pData->mpStatusItem;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 7a07718efaac..df0d95c12f1d 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,6 +42,7 @@
#include "vcl/svapp.hxx"
#include "vcl/window.hxx"
#include "vcl/timer.hxx"
+#include "vcl/solarmutex.hxx"
#include "aqua/saldata.hxx"
#include "aqua/salinst.h"
@@ -77,7 +79,7 @@ using namespace ::com::sun::star;
extern sal_Bool ImplSVMain();
-static sal_Bool* gpbInit = 0;
+static int* gpnInit = 0;
static NSMenu* pDockMenu = nil;
static bool bNoSVMain = true;
static bool bLeftMain = false;
@@ -114,7 +116,7 @@ class AquaDelayedSettingsChanged : public Timer
void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
{
- vos::OGuard aGuard( *mpSalYieldMutex );
+ osl::SolarGuard aGuard( *mpSalYieldMutex );
AquaDelayedSettingsChanged* pTimer = new AquaDelayedSettingsChanged( bInvalidate );
pTimer->SetTimeout( 50 );
pTimer->Start();
@@ -211,9 +213,9 @@ static void initNSApp()
[NSApp activateIgnoringOtherApps: YES];
}
-sal_Bool ImplSVMainHook( sal_Bool * pbInit )
+sal_Bool ImplSVMainHook( int * pnInit )
{
- gpbInit = pbInit;
+ gpnInit = pnInit;
bNoSVMain = false;
initNSApp();
@@ -248,7 +250,7 @@ sal_Bool ImplSVMainHook( sal_Bool * pbInit )
}
else
{
- DBG_ERROR( "NSApplication initialization could not be done" );
+ OSL_FAIL( "NSApplication initialization could not be done" );
}
return TRUE; // indicate that ImplSVMainHook is implemented
@@ -308,7 +310,7 @@ void InitSalMain()
{
rtl::OUString urlWorkDir;
rtl_uString *sysWorkDir = NULL;
- if (tools::getProcessWorkingDir(&urlWorkDir))
+ if (tools::getProcessWorkingDir(urlWorkDir))
{
oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir.pData, &sysWorkDir);
if (err2 == osl_File_E_None)
@@ -374,27 +376,27 @@ SalYieldMutex::SalYieldMutex()
void SalYieldMutex::acquire()
{
- OMutex::acquire();
- mnThreadId = vos::OThread::getCurrentIdentifier();
+ SolarMutexObject::acquire();
+ mnThreadId = osl::Thread::getCurrentIdentifier();
mnCount++;
}
void SalYieldMutex::release()
{
- if ( mnThreadId == vos::OThread::getCurrentIdentifier() )
+ if ( mnThreadId == osl::Thread::getCurrentIdentifier() )
{
if ( mnCount == 1 )
mnThreadId = 0;
mnCount--;
}
- OMutex::release();
+ SolarMutexObject::release();
}
sal_Bool SalYieldMutex::tryToAcquire()
{
- if ( OMutex::tryToAcquire() )
+ if ( SolarMutexObject::tryToAcquire() )
{
- mnThreadId = vos::OThread::getCurrentIdentifier();
+ mnThreadId = osl::Thread::getCurrentIdentifier();
mnCount++;
return sal_True;
}
@@ -474,7 +476,7 @@ AquaSalInstance::AquaSalInstance()
mpSalYieldMutex = new SalYieldMutex;
mpSalYieldMutex->acquire();
::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
- maMainThread = vos::OThread::getCurrentIdentifier();
+ maMainThread = osl::Thread::getCurrentIdentifier();
mbWaitingYield = false;
maUserEventListMutex = osl_createMutex();
mnActivePrintJobs = 0;
@@ -529,7 +531,7 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi
// -----------------------------------------------------------------------
-vos::IMutex* AquaSalInstance::GetYieldMutex()
+osl::SolarMutex* AquaSalInstance::GetYieldMutex()
{
return mpSalYieldMutex;
}
@@ -540,7 +542,7 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex()
{
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
if ( pYieldMutex->GetThreadId() ==
- vos::OThread::getCurrentIdentifier() )
+ osl::Thread::getCurrentIdentifier() )
{
sal_uLong nCount = pYieldMutex->GetAcquireCount();
sal_uLong n = nCount;
@@ -575,8 +577,7 @@ bool AquaSalInstance::CheckYieldMutex()
bool bRet = true;
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
- if ( pYieldMutex->GetThreadId() !=
- vos::OThread::getCurrentIdentifier() )
+ if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier())
{
bRet = false;
}
@@ -588,7 +589,7 @@ bool AquaSalInstance::CheckYieldMutex()
bool AquaSalInstance::isNSAppThread() const
{
- return vos::OThread::getCurrentIdentifier() == maMainThread;
+ return osl::Thread::getCurrentIdentifier() == maMainThread;
}
// -----------------------------------------------------------------------
@@ -605,9 +606,9 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
break;
case AppExecuteSVMain:
{
- sal_Bool bResult = ImplSVMain();
- if( gpbInit )
- *gpbInit = bResult;
+ int nResult = ImplSVMain();
+ if( gpnInit )
+ *gpnInit = nResult;
[NSApp stop: NSApp];
bLeftMain = true;
if( pDockMenu )
@@ -628,7 +629,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
{
if ( ((*it)->mbFullScreen == true) )
bIsFullScreenMode = true;
- it++;
+ ++it;
}
switch ([pEvent data1])
@@ -685,7 +686,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
break;
default:
- DBG_ERROR( "unhandled NSApplicationDefined event" );
+ OSL_FAIL( "unhandled NSApplicationDefined event" );
break;
};
}
@@ -1340,3 +1341,5 @@ NSImage* CreateNSImage( const Image& rImage )
return pImage;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 21da319b42b7..6bda7feae1df 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@
#include "svids.hrc"
-using namespace rtl;
+using ::rtl::OUString;
// =======================================================================
@@ -221,3 +222,5 @@ int AquaSalSystem::ShowNativeMessageBox( const String& rTitle,
return nRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index b482453704af..a3907ccb9621 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,4 @@ void AquaSalTimer::Stop()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 98cbdcc7c5e2..5c2259ff22c6 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,12 +47,15 @@
#include <postmac.h>
using namespace ::com::sun::star::datatransfer;
-using namespace rtl;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace cppu;
using namespace std;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
namespace // private
{
const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0);
@@ -738,3 +742,5 @@ NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const
return [array autorelease];
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 9847fcbd3987..51e29efed530 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ private:
typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/aqua/source/dtrans/DragActionConversion.cxx
index 06ce57e8748f..1e6880566c24 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.cxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions)
return actions;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/aqua/source/dtrans/DragActionConversion.hxx
index 7facfef794b6..d4b12ae8dce8 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.hxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions);
<type>com::sun::star::datatransfer::dnd::DNDConstants</type>.
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index f3e73b765c94..2586c9ff6a79 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,7 +48,6 @@
#include <memory>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star;
@@ -62,6 +62,7 @@ using namespace com::sun::star::lang;
using namespace comphelper;
using namespace std;
+using ::rtl::OUString;
// For OOo internal D&D we provide the Transferable without NSDragPboard
// interference as a shortcut
@@ -381,3 +382,4 @@ Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (Runt
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 017ca047b679..943c84c5036e 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx
index cd70dc55c896..4d18379e90af 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.cxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,4 @@ void SAL_CALL DragSourceContext::transferablesFlavorsChanged( )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 5d84c165d851..276567af3f99 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,5 @@ private:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index b55a70872372..f5ac3b975491 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
#include <rtl/unload.h>
-#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
#include "comphelper/makesequence.hxx"
-#endif
#include <cppuhelper/interfacecontainer.hxx>
#include "aqua_clipboard.hxx"
@@ -53,7 +52,6 @@
#include <aqua/salframe.h>
#include <aqua/salframeview.h>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star::datatransfer;
@@ -65,6 +63,8 @@ using namespace com::sun::star::uno;
using namespace com::sun::star;
using namespace comphelper;
+using ::rtl::OUString;
+
OUString dropTarget_getImplementationName()
{
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"));
@@ -604,3 +604,4 @@ void DropTarget::concludeDragOperation(id /*sender*/)
return dropTarget_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 77e2a08c5de7..2ec1674a13df 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETLISTENR_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
@@ -169,3 +168,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 3f558b0a5b4f..0bd461d81096 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#include "HtmlFmtFlt.hxx"
#include <rtl/string.h>
@@ -145,3 +146,5 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence)
reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()),
HtmlFormatStartLen) == 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
index 49f0cc70590c..bbf2fc5164eb 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef INCLUDED_HTMLFMTFLT_HXX
#define INCLUDED_HTMLFMTFLT_HXX
@@ -18,3 +19,5 @@ com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::sta
bool isHTMLFormat (const com::sun::star::uno::Sequence<sal_Int8>& aHtmlSequence);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 2e6b327de446..040c452ec6c8 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,13 +30,10 @@
#include "precompiled_vcl.hxx"
#include <sal/types.h>
-#ifndef _TRANSFERABLE_HXX_
#include "OSXTransferable.hxx"
-#endif
#include "DataFlavorMapping.hxx"
-using namespace rtl;
using namespace std;
using namespace osl;
using namespace cppu;
@@ -45,6 +43,8 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+
const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0);
const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0);
@@ -172,7 +172,7 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor
}
catch( IllegalArgumentException& )
{
- OSL_ENSURE( sal_False, "Invalid content type detected" );
+ OSL_FAIL( "Invalid content type detected" );
return false;
}
@@ -213,3 +213,5 @@ bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentTyp
return true;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/aqua/source/dtrans/OSXTransferable.hxx
index 6601905f1610..82e8fea57e20 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.hxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 1410fc2bd66d..3eb4fb8d49fc 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,9 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: OSXTransferable.hxx,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -199,3 +197,5 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
return bResult;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index 12a73452ad7b..cdd0c41d5f4b 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef INCLUDED_PICTTOBMPFLT_HXX
#define INCLUDED_PICTTOBMPFLT_HXX
@@ -35,3 +36,5 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 657211be5dc8..6e47df691623 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,10 +45,10 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
-using namespace rtl;
using namespace std;
using namespace comphelper;
+using ::rtl::OUString;
@implementation EventListener;
@@ -389,3 +390,4 @@ Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( R
return clipboard_getSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 8f45f50717f3..e495ee3c239e 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -179,3 +180,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 327fba900508..4c4aa893ae0b 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,4 @@ uno::Reference<XInterface> AquaSalInstance::CreateDropTarget()
return uno::Reference<XInterface>(static_cast< XInitialization* >(new DropTarget()), UNO_QUERY);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 8786ed7d0013..2bb67dcc1940 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -523,7 +523,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
else
{
- DBG_ERROR( "unsupported class" );
+ OSL_FAIL( "unsupported class" );
}
mpController->updateEnableState();
}
@@ -555,7 +555,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
else
{
- DBG_ERROR( "unsupported class" );
+ OSL_FAIL( "unsupported class" );
}
mpController->updateEnableState();
}
@@ -1033,7 +1033,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
aFieldRect.origin.y = rCurY - aFieldRect.size.height;
[pFieldView setFrame: aFieldRect];
- if( rCtrlType.equalsAscii( "Range" ) )
+ if( rCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Range" ) ) )
{
// add a stepper control
NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5,
@@ -1352,7 +1352,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
}
else
{
- DBG_ERROR( "Unsupported UI option" );
+ OSL_FAIL( "Unsupported UI option" );
}
}
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 62e783522a88..94022b763a03 100755..100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -275,11 +276,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
aTagSizes[0] = sizeof( nLineDirTag );
aTagValues[0] = &nLineDirTag;
// set run-specific layout controls
-#if 0 // why don't line-controls work as reliably as layout-controls???
- ATSUSetLineControls( maATSULayout, rArgs.mnMinCharPos, 1, aTagAttrs, aTagSizes, aTagValues );
-#else
ATSUSetLayoutControls( maATSULayout, 1, aTagAttrs, aTagSizes, aTagValues );
-#endif
}
return true;
@@ -1096,113 +1093,6 @@ void ATSLayout::InvalidateMeasurements()
// =======================================================================
-#if 0
-// helper class to convert ATSUI outlines to VCL PolyPolygons
-class PolyArgs
-{
-public:
- PolyArgs();
- ~PolyArgs();
-
- void Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset );
- void AddPoint( const Float32Point&, PolyFlags );
- void ClosePolygon();
-
-private:
- PolyPolygon* mpPolyPoly;
- long mnXOffset, mnYOffset;
-
- Point* mpPointAry;
- BYTE* mpFlagAry;
- USHORT mnMaxPoints;
-
- USHORT mnPointCount;
- USHORT mnPolyCount;
- bool mbHasOffline;
-};
-
-// -----------------------------------------------------------------------
-
-PolyArgs::PolyArgs()
-: mpPolyPoly(NULL),
- mnPointCount(0),
- mnPolyCount(0),
- mbHasOffline(false)
-{
- mnMaxPoints = 256;
- mpPointAry = new Point[ mnMaxPoints ];
- mpFlagAry = new BYTE [ mnMaxPoints ];
-}
-
-// -----------------------------------------------------------------------
-
-PolyArgs::~PolyArgs()
-{
- delete[] mpFlagAry;
- delete[] mpPointAry;
-}
-
-// -----------------------------------------------------------------------
-
-void PolyArgs::Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset )
-{
- mnXOffset = nXOffset;
- mnYOffset = nYOffset;
- mpPolyPoly = pPolyPoly;
-
- mpPolyPoly->Clear();
- mnPointCount = 0;
- mnPolyCount = 0;
-}
-
-// -----------------------------------------------------------------------
-
-void PolyArgs::AddPoint( const Float32Point& rPoint, PolyFlags eFlags )
-{
- if( mnPointCount >= mnMaxPoints )
- {
- // resize if needed (TODO: use STL?)
- mnMaxPoints *= 4;
- Point* mpNewPoints = new Point[ mnMaxPoints ];
- BYTE* mpNewFlags = new BYTE[ mnMaxPoints ];
- for( int i = 0; i < mnPointCount; ++i )
- {
- mpNewPoints[ i ] = mpPointAry[ i ];
- mpNewFlags[ i ] = mpFlagAry[ i ];
- }
- delete[] mpFlagAry;
- delete[] mpPointAry;
- mpPointAry = mpNewPoints;
- mpFlagAry = mpNewFlags;
- }
-
- // convert to pixels and add startpoint offset
- int nXPos = Float32ToInt( rPoint.x );
- int nYPos = Float32ToInt( rPoint.y );
- mpPointAry[ mnPointCount ] = Point( nXPos + mnXOffset, nYPos + mnYOffset );
- // set point flags
- mpFlagAry[ mnPointCount++ ]= eFlags;
- mbHasOffline |= (eFlags != POLY_NORMAL);
-}
-
-// -----------------------------------------------------------------------
-
-void PolyArgs::ClosePolygon()
-{
- if( !mnPolyCount++ )
- return;
-
- // append finished polygon
- Polygon aPoly( mnPointCount, mpPointAry, (mbHasOffline ? mpFlagAry : NULL) );
- mpPolyPoly->Insert( aPoly );
-
- // prepare for new polygon
- mnPointCount = 0;
- mbHasOffline = false;
-}
-#endif
-// =======================================================================
-
// glyph fallback is supported directly by Aqua
// so methods used only by MultiSalLayout can be dummy implementated
bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; }
@@ -1265,3 +1155,4 @@ SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel
// =======================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index 61fcd78586b3..a8ded318e1e0 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -344,75 +345,6 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF
}
}
-#if 0 // multiple-master fonts are mostly obsolete nowadays
- // if we still want to support them this should probably be done one frame higher
- ItemCount nMaxInstances = 0;
- rc = ATSUCountFontInstances ( nFontID, &nMaxInstances );
- for( ItemCount nInstanceIndex = 0; nInstanceIndex < nMaxInstances; ++nInstanceIndex )
- {
- ItemCount nMaxVariations = 0;
- rc = ATSUGetFontInstance( nFontID, nInstanceIndex, 0, NULL, NULL, &nMaxVariations );
- if( (rc == noErr) && (nMaxVariations > 0) )
- {
- fprintf(stderr,"\tnMaxVariations=%d\n",(int)nMaxVariations);
- typedef ::std::vector<ATSUFontVariationAxis> VariationAxisVector;
- typedef ::std::vector<ATSUFontVariationValue> VariationValueVector;
- VariationAxisVector aVariationAxes( nMaxVariations );
- VariationValueVector aVariationValues( nMaxVariations );
- ItemCount nVariationCount = 0;
- rc = ATSUGetFontInstance ( nFontID, nInstanceIndex, nMaxVariations,
- &aVariationAxes[0], &aVariationValues[0], &nVariationCount );
- fprintf(stderr,"\tnVariationCount=%d\n",(int)nVariationCount);
- for( ItemCount nVariationIndex = 0; nVariationIndex < nMaxVariations; ++nVariationIndex )
- {
- const char* pTag = (const char*)&aVariationAxes[nVariationIndex];
- fprintf(stderr,"\tvariation[%d] \'%c%c%c%c\' is %d\n", (int)nVariationIndex,
- pTag[3],pTag[2],pTag[1],pTag[0], (int)aVariationValues[nVariationIndex]);
- }
- }
- }
-#endif
-
-#if 0 // selecting non-defaulted font features is not enabled yet
- ByteString aFName( rDFA.maName, RTL_TEXTENCODING_UTF8 );
- ByteString aSName( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 );
- ItemCount nMaxFeatures = 0;
- rc = ATSUCountFontFeatureTypes( nFontID, &nMaxFeatures );
- fprintf(stderr,"Font \"%s\" \"%s\" has %d features\n",aFName.GetBuffer(),aSName.GetBuffer(),rc);
- if( (rc == noErr) && (nMaxFeatures > 0) )
- {
- typedef std::vector<ATSUFontFeatureType> FeatureVector;
- FeatureVector aFeatureVector( nMaxFeatures );
- ItemCount nFeatureCount = 0;
- rc = ATSUGetFontFeatureTypes( nFontID, nMaxFeatures, &aFeatureVector[0], &nFeatureCount );
- fprintf(stderr,"nFeatureCount=%d\n",(int)nFeatureCount);
- for( ItemCount nFeatureIndex = 0; nFeatureIndex < nFeatureCount; ++nFeatureIndex )
- {
- ItemCount nMaxSelectors = 0;
- rc = ATSUCountFontFeatureSelectors( nFontID, aFeatureVector[nFeatureIndex], &nMaxSelectors );
- fprintf(stderr,"\tFeature[%d] = %d has %d selectors\n",
- (int)nFeatureIndex, (int)aFeatureVector[nFeatureIndex], (int)nMaxSelectors );
- typedef std::vector<ATSUFontFeatureSelector> SelectorVector;
- SelectorVector aSelectorVector( nMaxSelectors );
- typedef std::vector<MacOSBoolean> BooleanVector;
- BooleanVector aEnabledVector( nMaxSelectors );
- BooleanVector aExclusiveVector( nMaxSelectors );
- ItemCount nSelectorCount = 0;
- rc = ATSUGetFontFeatureSelectors ( nFontID, aFeatureVector[nFeatureIndex], nMaxSelectors,
- &aSelectorVector[0], &aEnabledVector[0], &nSelectorCount, &aExclusiveVector[0]);
- for( ItemCount nSelectorIndex = 0; nSelectorIndex < nSelectorCount; ++nSelectorIndex )
- {
- FontNameCode eFontNameCode;
- rc = ATSUGetFontFeatureNameCode( nFontID, aFeatureVector[nFeatureIndex],
- aSelectorVector[nSelectorIndex], &eFontNameCode );
- fprintf(stderr,"\t\tselector[%d] n=%d e=%d, x=%d\n",
- (int)nSelectorIndex, (int)eFontNameCode,
- aEnabledVector[nSelectorIndex], aExclusiveVector[nSelectorIndex] );
- }
- }
- }
-#endif
-
bool bRet = (rDFA.maName.Len() > 0);
return bRet;
}
@@ -551,3 +483,4 @@ ImplMacFontData* SystemFontList::GetFontDataFromId( ATSUFontID nFontId ) const
// -----------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index d73b3eb25511..bfb15f0a8076 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -156,6 +157,13 @@ bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount )
// ------------------------------------------------------------------
+bool AquaSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ )
+{
+ return false;
+}
+
+// ------------------------------------------------------------------
+
void AquaSalBitmap::Destroy()
{
DestroyContext();
@@ -260,7 +268,7 @@ bool AquaSalBitmap::AllocateUserData()
case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break;
case 32: mnBytesPerRow = mnWidth << 2; break;
default:
- DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!");
+ OSL_FAIL("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!");
}
}
@@ -271,7 +279,7 @@ bool AquaSalBitmap::AllocateUserData()
}
catch( const std::bad_alloc& )
{
- DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
+ OSL_FAIL( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
maUserBuffer.reset( NULL );
mnBytesPerRow = 0;
}
@@ -905,3 +913,5 @@ bool AquaSalBitmap::GetSystemData( BitmapSystemData& rData )
return bRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index 37b6ec65a108..682537771178 100755..100644
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ void SetSalColor( const SalColor& rColor, float* pQuartzColor )
// =======================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 3c228ffcfa40..9e658b24021e 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
#include "osl/file.hxx"
#include "osl/process.h"
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
#include "rtl/bootstrap.h"
#include "rtl/strbuf.hxx"
@@ -75,6 +76,7 @@ ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID
, mbHasOs2Table( false )
, mbCmapEncodingRead( false )
, mbHasCJKSupport( false )
+, mbFontCapabilitiesRead( false )
{}
// -----------------------------------------------------------------------
@@ -150,15 +152,61 @@ const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const
// parse the CMAP
CmapResult aCmapResult;
- if( ParseCMAP( &aBuffer[0], nRawLength, aCmapResult ) )
+ if( !ParseCMAP( &aBuffer[0], nRawLength, aCmapResult ) )
+ return mpCharMap;
+
+ mpCharMap = new ImplFontCharMap( aCmapResult );
+ mpCharMap->AddReference();
+ return mpCharMap;
+}
+
+bool ImplMacFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const
+{
+ // read this only once per font
+ if( mbFontCapabilitiesRead )
{
- // create the matching charmap
- mpCharMap->DeReference();
- mpCharMap = new ImplFontCharMap( aCmapResult );
- mpCharMap->AddReference();
+ rFontCapabilities = maFontCapabilities;
+ return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
}
+ mbFontCapabilitiesRead = true;
- return mpCharMap;
+ // prepare to get the GSUB table raw data
+ ATSFontRef rFont = FMGetATSFontRefFromFont( mnFontId );
+ ByteCount nBufSize = 0;
+ OSStatus eStatus;
+ eStatus = ATSFontGetTable( rFont, GetTag("GSUB"), 0, 0, NULL, &nBufSize );
+ if( eStatus == noErr )
+ {
+ // allocate a buffer for the GSUB raw data
+ ByteVector aBuffer( nBufSize );
+ // get the GSUB raw data
+ ByteCount nRawLength = 0;
+ eStatus = ATSFontGetTable( rFont, GetTag("GSUB"), 0, nBufSize, (void*)&aBuffer[0], &nRawLength );
+ if( eStatus == noErr )
+ {
+ const unsigned char* pGSUBTable = &aBuffer[0];
+ vcl::getTTScripts(maFontCapabilities.maGSUBScriptTags, pGSUBTable, nRawLength);
+ }
+ }
+ eStatus = ATSFontGetTable( rFont, GetTag("OS/2"), 0, 0, NULL, &nBufSize );
+ if( eStatus == noErr )
+ {
+ // allocate a buffer for the GSUB raw data
+ ByteVector aBuffer( nBufSize );
+ // get the OS/2 raw data
+ ByteCount nRawLength = 0;
+ eStatus = ATSFontGetTable( rFont, GetTag("OS/2"), 0, nBufSize, (void*)&aBuffer[0], &nRawLength );
+ if( eStatus == noErr )
+ {
+ const unsigned char* pOS2Table = &aBuffer[0];
+ vcl::getTTCoverage(
+ maFontCapabilities.maUnicodeRange,
+ maFontCapabilities.maCodePageRange,
+ pOS2Table, nRawLength);
+ }
+ }
+ rFontCapabilities = maFontCapabilities;
+ return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
}
// -----------------------------------------------------------------------
@@ -397,17 +445,17 @@ void AquaSalGraphics::initResolution( NSWindow* )
}
else
{
- DBG_ERROR( "no resolution found in device description" );
+ OSL_FAIL( "no resolution found in device description" );
}
}
else
{
- DBG_ERROR( "no device description" );
+ OSL_FAIL( "no device description" );
}
}
else
{
- DBG_ERROR( "no screen found" );
+ OSL_FAIL( "no screen found" );
}
// #i107076# maintaining size-WYSIWYG-ness causes many problems for
@@ -456,7 +504,7 @@ void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
// -----------------------------------------------------------------------
-sal_uInt16 AquaSalGraphics::GetBitCount()
+sal_uInt16 AquaSalGraphics::GetBitCount() const
{
sal_uInt16 nBits = mnBitmapDepth ? mnBitmapDepth : 32;//24;
return nBits;
@@ -1152,23 +1200,6 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l
{
ApplyXorContext();
-#if 0 // TODO: make AquaSalBitmap as fast as the alternative implementation below
- SalBitmap* pBitmap = getBitmap( nSrcX, nSrcY, nSrcWidth, nSrcHeight );
- if( pBitmap )
- {
- SalTwoRect aPosAry;
- aPosAry.mnSrcX = 0;
- aPosAry.mnSrcY = 0;
- aPosAry.mnSrcWidth = nSrcWidth;
- aPosAry.mnSrcHeight = nSrcHeight;
- aPosAry.mnDestX = nDstX;
- aPosAry.mnDestY = nDstY;
- aPosAry.mnDestWidth = nSrcWidth;
- aPosAry.mnDestHeight = nSrcHeight;
- drawBitmap( &aPosAry, *pBitmap );
- delete pBitmap;
- }
-#else
DBG_ASSERT( mxLayer!=NULL, "AquaSalGraphics::copyArea() for non-layered graphics" );
// in XOR mode the drawing context is redirected to the XOR mask
@@ -1207,7 +1238,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l
// mark the destination rectangle as updated
RefreshRect( nDstX, nDstY, nSrcWidth, nSrcHeight );
-#endif
+
}
// -----------------------------------------------------------------------
@@ -1232,7 +1263,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor )
{
- DBG_ERROR("not implemented for color masking!");
+ OSL_FAIL("not implemented for color masking!");
drawBitmap( pPosAry, rSalBitmap );
}
@@ -1997,6 +2028,14 @@ const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const
return mpMacFontData->GetImplFontCharMap();
}
+bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const
+{
+ if( !mpMacFontData )
+ return false;
+
+ return mpMacFontData->GetImplFontCapabilities(rFontCapabilities);
+}
+
// -----------------------------------------------------------------------
// fake a SFNT font directory entry for a font table
@@ -2375,20 +2414,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
else if( pFontData->IsEmbeddable() )
{
// get individual character widths
-#if 0 // FIXME
- rWidths.reserve( 224 );
- for( sal_Unicode i = 32; i < 256; ++i )
- {
- int nCharWidth = 0;
- if( ::GetCharWidth32W( mhDC, i, i, &nCharWidth ) )
- {
- rUnicodeEnc[ i ] = rWidths.size();
- rWidths.push_back( nCharWidth );
- }
- }
-#else
- DBG_ERROR("not implemented for non-subsettable fonts!\n");
-#endif
+ OSL_FAIL("not implemented for non-subsettable fonts!\n");
}
}
@@ -2682,3 +2708,4 @@ bool XorEmulation::UpdateTarget()
// =======================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 1652dadfbdfb..5480b630f373 100755..100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -300,3 +301,4 @@ void AquaSalGraphics::UpdateWindow( NSRect& )
// -----------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 1a0011068194..7c02a276e278 100755..100644
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,3 +162,4 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec )
// =======================================================================
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index f66c7aa2b32d..81060fd38633 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -341,10 +342,6 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa
break;
case CTRL_TOOLTIP: // ** TO DO
- #if 0
- if( nPart == PART_ENTIRE_CONTROL ) // we don't currently support the tooltip
- return true;
- #endif
break;
case CTRL_MENU_POPUP:
@@ -1527,3 +1524,5 @@ sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart
return toReturn;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 92a4e92f6849..5183cb9d9a4c 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
#include "vcl/print.hxx"
#include "vcl/unohelp.hxx"
+#include <sal/macros.h>
#include "aqua/salinst.h"
#include "aqua/salprn.h"
@@ -49,7 +51,6 @@
#include <algorithm>
-using namespace rtl;
using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -57,6 +58,9 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+using ::rtl::OStringToOUString;
+
// =======================================================================
AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
@@ -105,12 +109,6 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter()
delete mpGraphics;
if( mpPrintInfo )
[mpPrintInfo release];
- #if 0
- // FIXME: verify that NSPrintInfo releases the printer
- // else we have a leak here
- if( mpPrinter )
- [mpPrinter release];
- #endif
if( mrContext )
CFRelease( mrContext );
}
@@ -156,7 +154,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 );
}
else
- DBG_ERROR( "no print info in SetupPrinterGraphics" );
+ OSL_FAIL( "no print info in SetupPrinterGraphics" );
}
}
@@ -204,7 +202,7 @@ static struct PaperSizeEntry
static bool getPaperSize( double& o_fWidth, double& o_fHeight, const Paper i_ePaper )
{
- for(unsigned int i = 0; i < sizeof(aPaperSizes)/sizeof(aPaperSizes[0]); i++ )
+ for(unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ )
{
if( aPaperSizes[i].nPaper == i_ePaper )
{
@@ -238,7 +236,7 @@ static Paper recognizePaper( double i_fWidth, double i_fHeight )
if( aPaper == PAPER_USER )
{
// search with fuzz factor
- for( unsigned int i = 0; i < sizeof(aPaperSizes)/sizeof(aPaperSizes[0]); i++ )
+ for( unsigned int i = 0; i < SAL_N_ELEMENTS(aPaperSizes); i++ )
{
double w = (i_fWidth > aPaperSizes[i].fWidth) ? i_fWidth - aPaperSizes[i].fWidth : aPaperSizes[i].fWidth - i_fWidth;
double h = (i_fHeight > aPaperSizes[i].fHeight) ? i_fHeight - aPaperSizes[i].fHeight : aPaperSizes[i].fHeight - i_fHeight;
@@ -508,7 +506,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength(); nProperty < nPropertyCount; ++nProperty )
{
- if( aPageParms[ nProperty ].Name.equalsAscii( "PageSize" ) )
+ if( aPageParms[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) )
{
awt::Size aSize;
aPageParms[ nProperty].Value >>= aSize;
@@ -781,7 +779,7 @@ sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/,
bool /*i_bDirect*/,
ImplJobSetup* )
{
- DBG_ERROR( "should never be called" );
+ OSL_FAIL( "should never be called" );
return sal_False;
}
@@ -891,3 +889,4 @@ int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 8e77c67c7854..af5fa82958f9 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,3 +254,5 @@ void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
rHeight = 0;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 8749774459d3..eda3f5af3051 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -665,12 +666,6 @@ sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState )
SAL_FRAMESTATE_MASK_Y |
SAL_FRAMESTATE_MASK_WIDTH |
SAL_FRAMESTATE_MASK_HEIGHT |
- #if 0
- SAL_FRAMESTATE_MASK_MAXIMIZED_X |
- SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
- SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH |
- SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT |
- #endif
SAL_FRAMESTATE_MASK_STATE;
NSRect aStateRect = [mpWindow frame];
@@ -728,6 +723,10 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
}
}
+void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ )
+{
+}
+
// -----------------------------------------------------------------------
void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay )
@@ -927,7 +926,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
pCursor = GetSalData()->getCursor( mePointerStyle );
if( pCursor == nil )
{
- DBG_ERROR( "unmapped cursor" );
+ OSL_FAIL( "unmapped cursor" );
pCursor = [NSCursor arrowCursor];
}
break;
@@ -1269,6 +1268,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
getResolution( nDPIX, nDPIY );
aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
+ aStyleSettings.SetToolbarIconSize( nDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
+
// TODO: better mapping of aqua<->ooo font settings
aStyleSettings.SetAppFont( aAppFont );
aStyleSettings.SetHelpFont( aAppFont );
@@ -1322,7 +1323,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) );
// images in menus false for MacOSX
- aStyleSettings.SetUseImagesInMenus( false );
+ aStyleSettings.SetPreferredUseImagesInMenus( false );
+ aStyleSettings.SetAcceleratorsInContextMenus( sal_False );
rSettings.SetStyleSettings( aStyleSettings );
@@ -1547,6 +1549,17 @@ SalPointerState AquaSalFrame::GetPointerState()
return state;
}
+SalFrame::SalIndicatorState AquaSalFrame::GetIndicatorState()
+{
+ SalIndicatorState aState;
+ aState.mnState = 0;
+ return aState;
+}
+
+void AquaSalFrame::SimulateKeyPress( sal_uInt16 /*nKeyCode*/ )
+{
+}
+
bool AquaSalFrame::SetPluginParent( SystemParentData* )
{
// plugin parent may be killed unexpectedly by
@@ -1787,3 +1800,4 @@ void AquaSalFrame::EndSetClipRegion()
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index dd2deefdeeaa..ade5594ec667 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -29,6 +29,7 @@
#include "precompiled_vcl.hxx"
#include <sal/alloca.h>
+#include <sal/macros.h>
#include "vcl/window.hxx"
#include "vcl/svapp.hxx"
@@ -106,7 +107,7 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode )
};
sal_uInt16 nKeyCode = 0;
- if( aCode < sizeof( aKeyCodeMap) / sizeof( aKeyCodeMap[0] ) )
+ if( aCode < SAL_N_ELEMENTS( aKeyCodeMap) )
nKeyCode = aKeyCodeMap[ aCode ];
else if( aCode >= 0xf700 && aCode < 0xf780 )
nKeyCode = aFunctionKeyCodeMap[ aCode - 0xf700 ];
@@ -169,7 +170,7 @@ static AquaSalFrame* getMouseContainerFrame()
{
if( GetSalData() && GetSalData()->mpFirstInstance )
{
- vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
+ osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
if( pMutex )
{
pMutex->acquire();
@@ -440,7 +441,7 @@ static AquaSalFrame* getMouseContainerFrame()
return mpFrame ? (mpFrame->getClipPath() != 0 ? NO : YES) : YES;
}
-// helper class similar to a vos::OGuard for the SalYieldMutex
+// helper class similar to a osl::SolarGuard for the SalYieldMutex
// the difference is that it only does tryToAcquire instead of aquire
// so dreaded deadlocks like #i93512# are prevented
class TryGuard
@@ -918,7 +919,7 @@ private:
// Caution: should the table grow to more than 5 or 6 entries,
// we must consider moving it to a kind of hash map
- const unsigned int nExceptions = sizeof( aExceptionalKeys ) / sizeof( aExceptionalKeys[0] );
+ const unsigned int nExceptions = SAL_N_ELEMENTS( aExceptionalKeys );
for( unsigned int i = 0; i < nExceptions; i++ )
{
if( nKeyCode == aExceptionalKeys[i].nKeyCode &&
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index c237b10f1512..ef76f4cf6e61 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -562,7 +563,7 @@ void AquaSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
maItems.insert( maItems.begin() + nPos, pAquaSalMenuItem );
else
{
- DBG_ERROR( "invalid item index in insert" );
+ OSL_FAIL( "invalid item index in insert" );
return;
}
@@ -585,7 +586,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos )
}
else
{
- DBG_ERROR( "invalid item index in remove" );
+ OSL_FAIL( "invalid item index in remove" );
return;
}
@@ -808,7 +809,7 @@ void AquaSalMenu::statusLayout()
if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
[(OOStatusItemView*)pView layout];
else
- DBG_ERROR( "someone stole our status view" );
+ OSL_FAIL( "someone stole our status view" );
}
}
@@ -965,3 +966,4 @@ AquaSalMenuItem::~AquaSalMenuItem()
// -------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index fcc2392a01a9..b86caa49d870 100755
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -62,7 +62,7 @@
pFrame->CallCallback(SALEVENT_MENUDEACTIVATE, &aMenuEvt);
}
else
- DBG_ERROR( "unconnected menu" );
+ OSL_FAIL( "unconnected menu" );
}
}
}
@@ -123,7 +123,7 @@
pPopupMenu->ImplSelectWithStart( pCurMenu );
}
else
- DBG_ERROR( "menubar item without frame !" );
+ OSL_FAIL( "menubar item without frame !" );
}
}
@end
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 6b5952bee8a1..a070a8f0be12 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -243,3 +244,4 @@ void AquaSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h
index 284868748c89..bf3006c9ca7b 100644
--- a/vcl/inc/accel.h
+++ b/vcl/inc/accel.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ public:
void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 );
#endif // _SV_ACCEL_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index 553503380b15..2ffa2b366920 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,11 +30,13 @@
#define _SV_ACCMGR_HXX
#include <vcl/sv.h>
+#include <vector>
-class ImplAccelList;
class Accelerator;
class KeyCode;
+typedef ::std::vector< Accelerator* > ImplAccelList;
+
// --------------------
// - ImplAccelManager -
// --------------------
@@ -62,3 +65,5 @@ public:
};
#endif // _SV_ACCMGR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h
index 30f355dd502c..2fa38d9901db 100644
--- a/vcl/inc/aqua/aqua11yfactory.h
+++ b/vcl/inc/aqua/aqua11yfactory.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@
+(void)revokeView: (NSView *) theViewt;
@end
#endif // _SV_AQUA11FACTORY_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx
index 1dbf68c4a5ef..b9721619b8ac 100644
--- a/vcl/inc/aqua/aqua11yfocustracker.hxx
+++ b/vcl/inc/aqua/aqua11yfocustracker.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _AQUA11YFOCUSTRACKER_HXX_
#define _AQUA11YFOCUSTRACKER_HXX_
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include "keyboardfocuslistener.hxx"
@@ -106,3 +105,5 @@ private:
};
#endif // _AQUA11YFOCUSTRACKER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx
index 461b149e4650..cab8d8c89d58 100644
--- a/vcl/inc/aqua/aqua11ylistener.hxx
+++ b/vcl/inc/aqua/aqua11ylistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,4 +63,5 @@ private:
::com::sun::star::awt::Rectangle m_oldBounds;
};
-#endif // _AQUA11YLISTENER_HXX_ \ No newline at end of file
+#endif // _AQUA11YLISTENER_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index 44640966d760..aebea78f0394 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ struct ReferenceWrapper
@end
#endif // _SV_AQUA11WRAPPER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h
index 391a9546f63a..2c5849f10e65 100755..100644
--- a/vcl/inc/aqua/aquaprintview.h
+++ b/vcl/inc/aqua/aquaprintview.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ struct PrintAccessoryViewState
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquavclevents.hxx b/vcl/inc/aqua/aquavclevents.hxx
index 8e03c59d0954..034edd3882b5 100644
--- a/vcl/inc/aqua/aquavclevents.hxx
+++ b/vcl/inc/aqua/aquavclevents.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ const EventTypeSpec cTextInputEvents[] = { { kEventClassTextInput, kEventTextInp
const EventTypeSpec cAppearanceScrollbarVariantChangedEvent = { kEventClassAppearance, kEventAppearanceScrollBarVariantChanged };
#endif // INCLUDED_AQUAVCLEVENTS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h
index 7346282963d7..93003faecad7 100644
--- a/vcl/inc/aqua/aquavcltypes.h
+++ b/vcl/inc/aqua/aquavcltypes.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,3 +35,5 @@
#include "postmac.h"
#endif _AQUAVCLTYPES_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx
index 71eba2f46c02..bf9c70250005 100644
--- a/vcl/inc/aqua/keyboardfocuslistener.hxx
+++ b/vcl/inc/aqua/keyboardfocuslistener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _KEYBOARDFOCUSLISTENER_HXX_
#define _KEYBOARDFOCUSLISTENER_HXX_
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include <rtl/ref.hxx>
@@ -44,4 +43,5 @@ public:
virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
};
-#endif // _KEYBOARDFOCUSLISTENER_HXX_ \ No newline at end of file
+#endif // _KEYBOARDFOCUSLISTENER_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salatsuifontutils.hxx b/vcl/inc/aqua/salatsuifontutils.hxx
index 81e60871ae86..51079b8ec5d2 100644
--- a/vcl/inc/aqua/salatsuifontutils.hxx
+++ b/vcl/inc/aqua/salatsuifontutils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,7 @@ public:
ATSUFontFallbacks maFontFallbacks;
private:
- typedef std::hash_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
+ typedef boost::unordered_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
MacFontContainer maFontContainer;
void InitGlyphFallbacks();
@@ -61,3 +62,4 @@ private:
#endif // _SV_SALATSUIFONTUTILS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salbmp.h b/vcl/inc/aqua/salbmp.h
index 0f86332ca761..e0dd26554aac 100644
--- a/vcl/inc/aqua/salbmp.h
+++ b/vcl/inc/aqua/salbmp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,6 +80,9 @@ public:
bool Create( const SalBitmap& rSalBmp );
bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics );
bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount );
+ virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
+ Size& rSize,
+ bool bMask = false );
void Destroy();
@@ -110,3 +114,5 @@ public:
};
#endif // _SV_SALBMP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salcolorutils.hxx b/vcl/inc/aqua/salcolorutils.hxx
index 74ccb69756fd..ae6afdabb9ff 100755..100644
--- a/vcl/inc/aqua/salcolorutils.hxx
+++ b/vcl/inc/aqua/salcolorutils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ void SetSalColor( const SalColor& rColor, float* pQuartzColor );
// ------------------------------------------------------------------
#endif // _SV_SALCOLORUTILS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salconst.h b/vcl/inc/aqua/salconst.h
index 2046ec20a806..50971a819c09 100755..100644
--- a/vcl/inc/aqua/salconst.h
+++ b/vcl/inc/aqua/salconst.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ static const long kPixMapHRes = 72;
static const long kPixMapVRes = 72;
#endif // _SV_SALCONST_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index 5dc528b04f4b..ea831f593bfb 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,7 @@
#include <list>
#include <vector>
#include <map>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
#include <cstdio>
#include <cstdarg>
@@ -70,10 +71,10 @@ class SystemFontList;
// -----------
class AquaSalFrame;
-struct FrameHash : public std::hash<sal_IntPtr>
+struct FrameHash : public boost::hash<sal_IntPtr>
{
size_t operator()(const AquaSalFrame* frame) const
- { return std::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); }
+ { return boost::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); }
};
#define INVALID_CURSOR_PTR (NSCursor*)0xdeadbeef
@@ -84,7 +85,7 @@ struct SalData
SALTIMERPROC mpTimerProc; // timer callback proc
AquaSalInstance *mpFirstInstance; // pointer of first instance
std::list<AquaSalFrame*> maFrames; // pointer of first frame
- std::hash_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance
+ boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existance
SalObject *mpFirstObject; // pointer of first object window
SalVirtualDevice *mpFirstVD; // first VirDev
SalPrinter *mpFirstPrinter; // first printing printer
@@ -136,3 +137,5 @@ void ImplSalYieldMutexAcquire();
void ImplSalYieldMutexRelease();
#endif // _SV_SALDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx
index 6f9f61efda70..8394d874bf10 100644
--- a/vcl/inc/aqua/salfontutils.hxx
+++ b/vcl/inc/aqua/salfontutils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,4 @@ static const char *kFontWeightRegular2 = "regular";
#endif // _SV_SALFONTUTILS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 8852b538f537..4d205c08287f 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -151,11 +152,14 @@ public:
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
+ virtual SalIndicatorState GetIndicatorState();
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode );
virtual void SetParent( SalFrame* pNewParent );
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetExtendedFrameStyle( SalExtStyle );
virtual void SetBackgroundBitmap( SalBitmap* );
virtual void SetScreenNumber(unsigned int);
+ virtual void SetApplicationID( const rtl::OUString &rApplicationID );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
@@ -217,3 +221,5 @@ public:
};
#endif // _SV_SALFRAME_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/aqua/salframeview.h
index c79539cf14e8..d4418d36bf5a 100755..100644
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -212,3 +213,5 @@
@end
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 50f2bb1156b9..078859f079b6 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,6 +36,7 @@
#include "postmac.h"
#include "aqua/aquavcltypes.h"
+#include <vcl/fontcapabilities.hxx>
#include "outfont.hxx"
#include "salgdi.hxx"
@@ -60,6 +62,7 @@ public:
virtual sal_IntPtr GetFontId() const;
const ImplFontCharMap* GetImplFontCharMap() const;
+ bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
bool HasChar( sal_uInt32 cChar ) const;
void ReadOs2Table() const;
@@ -69,10 +72,12 @@ public:
private:
const ATSUFontID mnFontId;
mutable const ImplFontCharMap* mpCharMap;
+ mutable vcl::FontCapabilities maFontCapabilities;
mutable bool mbOs2Read; // true if OS2-table related info is valid
mutable bool mbHasOs2Table;
mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read
mutable bool mbHasCJKSupport; // #i78970# CJK fonts need extra leading
+ mutable bool mbFontCapabilitiesRead;
};
// abstracting quartz color instead of having to use an CGFloat[] array
@@ -243,7 +248,7 @@ public:
// get device resolution
virtual void GetResolution( long& rDPIX, long& rDPIY );
// get the depth of the device
- virtual sal_uInt16 GetBitCount();
+ virtual sal_uInt16 GetBitCount() const;
// get the width of the device
virtual long GetGraphicsWidth() const;
@@ -276,6 +281,7 @@ public:
virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
// get the repertoire of the current font
virtual const ImplFontCharMap* GetImplFontCharMap() const;
+ virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
// graphics must fill supplied font list
virtual void GetDevFontList( ImplDevFontList* );
// graphics should call ImplAddDevFontSubstitute on supplied
@@ -409,3 +415,5 @@ inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha
{}
#endif // _SV_SALGDI_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h
index 62baaa2762f8..a53243f65966 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,10 @@
#ifndef _SV_SALINST_H
#define _SV_SALINST_H
-#include "vos/mutex.hxx"
-#include "vos/thread.hxx"
+#include "osl/mutex.hxx"
+#include "osl/thread.hxx"
#include "osl/conditn.h"
+#include <vcl/solarmutex.hxx>
#include "aqua/aquavcltypes.h"
@@ -46,10 +48,10 @@ class Image;
// - SalYieldMutex -
// -----------------
-class SalYieldMutex : public vos::OMutex
+class SalYieldMutex : public vcl::SolarMutexObject
{
sal_uLong mnCount;
- vos::OThread::TThreadIdentifier mnThreadId;
+ oslThreadIdentifier mnThreadId;
public:
SalYieldMutex();
@@ -57,10 +59,10 @@ public:
virtual void release();
virtual sal_Bool tryToAcquire();
sal_uLong GetAcquireCount() const { return mnCount; }
- vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
+ oslThreadIdentifier GetThreadId() const { return mnThreadId; }
};
-#define YIELD_GUARD vos::OGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
+#define YIELD_GUARD osl::SolarGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
// -------------------
@@ -92,7 +94,7 @@ class AquaSalInstance : public SalInstance
public:
SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex
rtl::OUString maDefaultPrinter;
- vos::OThread::TThreadIdentifier maMainThread;
+ oslThreadIdentifier maMainThread;
bool mbWaitingYield;
int mnActivePrintJobs;
std::list< SalUserEvent > maUserEvents;
@@ -131,7 +133,7 @@ public:
virtual SalI18NImeStatus* CreateI18NImeStatus();
virtual SalSystem* CreateSalSystem();
virtual SalBitmap* CreateSalBitmap();
- virtual vos::IMutex* GetYieldMutex();
+ virtual osl::SolarMutex* GetYieldMutex();
virtual sal_uLong ReleaseYieldMutex();
virtual void AcquireYieldMutex( sal_uLong nCount );
virtual bool CheckYieldMutex();
@@ -201,3 +203,5 @@ CGImageRef CreateCGImage( const Image& );
NSImage* CreateNSImage( const Image& );
#endif // _SV_SALINST_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx
index 6106dc328740..e81f68e46b0b 100755..100644
--- a/vcl/inc/aqua/salmathutils.hxx
+++ b/vcl/inc/aqua/salmathutils.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec );
#endif
#endif // _SV_SALMATHUTILS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/aqua/salmenu.h
index 6a83c4a7add3..84c7341889b7 100644
--- a/vcl/inc/aqua/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ public:
};
#endif // _SV_SALMENU_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h
index 11d4ea5c1c62..fd6226c8030b 100755..100644
--- a/vcl/inc/aqua/salnativewidgets.h
+++ b/vcl/inc/aqua/salnativewidgets.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@
#define CLIP_FUZZ 1
#endif // _SV_NATIVEWIDGETS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h
index e9b2cbe922b8..fac4aec75792 100755..100644
--- a/vcl/inc/aqua/salnsmenu.h
+++ b/vcl/inc/aqua/salnsmenu.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ class AquaSalMenuItem;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnstimer.h b/vcl/inc/aqua/salnstimer.h
index e29fef43b6b4..5c4ba0eea430 100755..100644
--- a/vcl/inc/aqua/salnstimer.h
+++ b/vcl/inc/aqua/salnstimer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
@end
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/aqua/salobj.h
index 423e63715065..0eca9e9badbd 100644
--- a/vcl/inc/aqua/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ public:
};
#endif // _SV_SALOBJ_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/aqua/salprn.h
index 725fc9a43861..f2a188cc0340 100644
--- a/vcl/inc/aqua/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -169,3 +170,5 @@ inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+
#endif // _SV_SALPRN_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h
index dbb2ea0b20ea..15415712d896 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ public:
#endif // _SV_SALSYS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saltimer.h b/vcl/inc/aqua/saltimer.h
index f2840eee45ea..305bce14af07 100644
--- a/vcl/inc/aqua/saltimer.h
+++ b/vcl/inc/aqua/saltimer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ class AquaSalTimer : public SalTimer
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/aqua/salvd.h
index 6f184167d22a..a589430e9fb7 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ public:
// =======================================================================
#endif // _SV_SALVD_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/svsys.h b/vcl/inc/aqua/svsys.h
index 1edce25cea28..291e7801db75 100644
--- a/vcl/inc/aqua/svsys.h
+++ b/vcl/inc/aqua/svsys.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,5 @@
#include "postmac.h"
#endif // _SV_SVSYS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h
index f25593d335a7..bdbe15840e0f 100755..100644
--- a/vcl/inc/aqua/vclnsapp.h
+++ b/vcl/inc/aqua/vclnsapp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ class AquaSalFrame;
@end
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index de330704b74f..b43df0e115b2 100644
--- a/vcl/inc/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDst,
bool ImplFastEraseBitmap( BitmapBuffer&, const BitmapColor& );
#endif // _SV_BMPFAST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 7e1dfb6b0b39..e6374ea032f5 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,7 +85,8 @@ class ImplBorderWindowView;
#define BORDERWINDOW_TITLE_NORMAL ((sal_uInt16)0x0001)
#define BORDERWINDOW_TITLE_SMALL ((sal_uInt16)0x0002)
#define BORDERWINDOW_TITLE_TEAROFF ((sal_uInt16)0x0004)
-#define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0008)
+#define BORDERWINDOW_TITLE_POPUP ((sal_uInt16)0x0008)
+#define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0010)
// --------------------
// - ImplBorderWindow -
@@ -350,3 +352,5 @@ public:
#endif // _SV_BRDWIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 6b719ef988ef..e0773257b029 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,5 @@ namespace unotools
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 0be0f5bd402e..b30184be2481 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,5 @@ namespace vcl
//........................................................................
#endif // VCL_CONTROLDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 0250cece817e..b76e8ef99289 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,13 +49,13 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
CUPSWrapper* m_pCUPSWrapper;
- std::hash_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
+ boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
int m_nDests;
void* m_pDests;
bool m_bNewDests;
- std::hash_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
+ boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
- std::hash_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
+ boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
rtl::OString m_aUser;
// this is a security risk, but the CUPS API demands
@@ -106,3 +107,5 @@ public:
} // namespace psp
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index 0526a109a376..61d878de3451 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ sal_uInt16 DbgRegisterNamedUserChannel( const XubString& _rChannelUIName, DbgPri
#endif
#endif // _SV_DBGGUI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 5b91bd0713ec..41be5ba3fc38 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGESTURERECOGNIZER_HPP_
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#endif
#include <cppuhelper/implbase3.hxx>
#include <vcl/window.hxx>
@@ -48,6 +47,7 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
::osl::Mutex m_aMutex;
::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_aDataFlavorList;
+ Window* findTopLevelWindow(Point location);
/*
* fire the events on the dnd listener container of the specified window
*/
@@ -112,3 +112,5 @@ public:
//==================================================================================================
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index 5a41a20e4271..1c3654c1a9ea 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ public:
//==================================================================================================
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 7747b99015fe..ad261e8d8e6d 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
#include "tools/string.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp
{
@@ -51,7 +52,7 @@ class VCL_PLUGIN_PUBLIC FontCache
FontCacheEntry m_aEntry;
};
- typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
+ typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
struct FontDir
{
sal_Int64 m_nTimestamp;
@@ -62,7 +63,7 @@ class VCL_PLUGIN_PUBLIC FontCache
FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {}
};
- typedef std::hash_map< int, FontDir > FontCacheData;
+ typedef boost::unordered_map< int, FontDir > FontCacheData;
FontCacheData m_aCache;
String m_aCacheFile;
bool m_bDoFlush;
@@ -97,3 +98,5 @@ public:
} // namespace psp
#endif // _PSPRINT_FONTCACHE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index a57f5f0fd553..99b627153fa3 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,4 @@ protected:
#endif // _SV_FONTSUBSET_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index a818ef6a75c3..42f90672f87b 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,8 +43,9 @@ struct ImplKernPairData;
class ImplFontOptions;
#include <tools/gen.hxx>
-#include <hash_map>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
+#include <boost/shared_ptr.hpp>
namespace basegfx { class B2DPolyPolygon; }
@@ -55,6 +57,11 @@ class RawBitmap;
class ServerFontLayout;
#include <sallayout.hxx>
+namespace vcl
+{
+ struct FontCapabilities;
+}
+
// =======================================================================
class VCL_PLUGIN_PUBLIC GlyphCache
@@ -96,7 +103,7 @@ private:
// the FontList key's mpFontData member is reinterpreted as integer font id
struct IFSD_Equal{ bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
sal_uLong mnMaxSize; // max overall cache size in bytes
mutable sal_uLong mnBytesUsed;
@@ -180,7 +187,9 @@ public:
virtual bool TestFont() const { return true; }
virtual void* GetFtFace() const { return 0; }
virtual int GetLoadFlags() const { return 0; }
- virtual void SetFontOptions( const ImplFontOptions&) {}
+ virtual void SetFontOptions( boost::shared_ptr<ImplFontOptions> ) {}
+ virtual boost::shared_ptr<ImplFontOptions> GetFontOptions() const
+ { return boost::shared_ptr<ImplFontOptions>(); }
virtual bool NeedsArtificialBold() const { return false; }
virtual bool NeedsArtificialItalic() const { return false; }
@@ -190,6 +199,7 @@ public:
virtual sal_uLong GetKernPairs( ImplKernPairData** ) const { return 0; }
virtual int GetGlyphKernValue( int, int ) const { return 0; }
virtual const ImplFontCharMap* GetImplFontCharMap() const = 0;
+ virtual bool GetFontCapabilities(vcl::FontCapabilities &) const { return false; }
Point TransformPoint( const Point& ) const;
GlyphData& GetGlyphData( int nGlyphIndex );
@@ -225,7 +235,7 @@ protected:
virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
private:
- typedef ::std::hash_map<int,GlyphData> GlyphList;
+ typedef ::boost::unordered_map<int,GlyphData> GlyphList;
mutable GlyphList maGlyphList;
const ImplFontSelectData maFontSelData;
@@ -258,9 +268,8 @@ class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry
{
private:
ServerFont* mpServerFont;
- ImplFontOptions maFontOptions;
+ boost::shared_ptr<ImplFontOptions> mpFontOptions;
bool mbGotFontOptions;
- bool mbValidFontOptions;
public:
ImplServerFontEntry( ImplFontSelectData& );
@@ -371,10 +380,12 @@ protected:
{ return (rA.mnChar1 == rB.mnChar1) && (rA.mnChar2 == rB.mnChar2); } };
struct PairHash{ int operator()(const ImplKernPairData& rA) const
{ return (rA.mnChar1) * 256 ^ rA.mnChar2; } };
- typedef std::hash_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
+ typedef boost::unordered_set< ImplKernPairData, PairHash, PairEqual > UnicodeKernPairs;
mutable UnicodeKernPairs maUnicodeKernPairs;
};
// =======================================================================
#endif // _SV_GLYPHCACHE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphite_adaptors.hxx b/vcl/inc/graphite_adaptors.hxx
deleted file mode 100644
index 753523f4aa0d..000000000000
--- a/vcl/inc/graphite_adaptors.hxx
+++ /dev/null
@@ -1,152 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_GRAPHITEADAPTORS_HXX
-#define _SV_GRAPHITEADAPTORS_HXX
-
-// We need this to enable namespace support in libgrengine headers.
-#define GR_NAMESPACE
-
-// Standard Library
-#include <stdexcept>
-// Platform
-
-#ifndef _SVWIN_H
-#include <tools/svwin.h>
-#endif
-
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-
-#ifndef _SV_SALGDI_HXX
-#include <salgdi.hxx>
-#endif
-
-#ifndef _SV_SALLAYOUT_HXX
-#include <sallayout.hxx>
-#endif
-
-// Module
-#include "vcl/dllapi.h"
-
-// Libraries
-#include <preextstl.h>
-#include <graphite/GrClient.h>
-#include <graphite/Font.h>
-#include <graphite/ITextSource.h>
-#include <postextstl.h>
-
-// Module type definitions and forward declarations.
-//
-#ifndef MSC
-// SAL/VCL types
-class ServerFont;
-class FreetypeServerFont;
-
-// Graphite types
-
-struct FontProperties : gr::FontProps
-{
- FontProperties(const FreetypeServerFont & font) throw();
-};
-
-namespace grutils
-{
- class GrFeatureParser;
-}
-
-// This class adapts the Sal font and graphics services to form required by
-// the Graphite engine.
-// @author tse
-//
-class VCL_PLUGIN_PUBLIC GraphiteFontAdaptor : public gr::Font
-{
- typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
- friend class GrFontHasher;
-public:
- static bool IsGraphiteEnabledFont(ServerFont &) throw();
-
- GraphiteFontAdaptor(ServerFont & font, const sal_Int32 dpi_x, const sal_Int32 dpi_y);
- GraphiteFontAdaptor(const GraphiteFontAdaptor &) throw();
- ~GraphiteFontAdaptor() throw();
-
- gr::Font * copyThis();
-
- // Basic attribute accessors.
- virtual float ascent();
- virtual float descent();
- virtual bool bold();
- virtual bool italic();
- virtual float height();
- virtual unsigned int getDPIx();
- virtual unsigned int getDPIy();
-
- // Font access methods.
- virtual const void * getTable(gr::fontTableId32 tableID, size_t * pcbSize);
- virtual void getFontMetrics(float * ascent_out, float * descent_out = 0, float * em_square_out = 0);
-
- // Glyph metrics.
- virtual void getGlyphMetrics(gr::gid16 glyphID, gr::Rect & boundingBox, gr::Point & advances);
-
- // Adaptor attributes.
- const FontProperties & fontProperties() const throw();
- FreetypeServerFont & font() const throw();
- const grutils::GrFeatureParser * features() const { return mpFeatures; };
-
-private:
- virtual void UniqueCacheInfo(ext_std::wstring &, bool &, bool &);
-
- FreetypeServerFont& mrFont;
- FontProperties maFontProperties;
- const unsigned int mnDpiX, mnDpiY;
- const float mfAscent,
- mfDescent,
- mfEmUnits;
- grutils::GrFeatureParser * mpFeatures;
- GlyphMetricMap maGlyphMetricMap;
-};
-
-// Partial implementation of class GraphiteFontAdaptor.
-//
-inline const FontProperties & GraphiteFontAdaptor::fontProperties() const throw() {
- return maFontProperties;
-}
-
-inline FreetypeServerFont & GraphiteFontAdaptor::font() const throw() {
- return mrFont;
-}
-#endif // not MFC
-
-// Partial implementation of class TextSourceAdaptor.
-//
-//inline const ImplLayoutArgs & TextSourceAdaptor::layoutArgs() const throw() {
-// return _layout_args;
-//}
-
-
-#endif // _SV_GRAPHITEADAPTORS_HXX
diff --git a/vcl/inc/graphite_cache.hxx b/vcl/inc/graphite_cache.hxx
deleted file mode 100644
index af1392ed4d4b..000000000000
--- a/vcl/inc/graphite_cache.hxx
+++ /dev/null
@@ -1,289 +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.
- *
- ************************************************************************/
-
-// Description: Classes to cache Graphite Segments to try to improve
-// rendering performance.
-
-#ifndef GraphiteSegmentCache_h
-#define GraphiteSegmentCache_h
-
-#include <tools/solar.h>
-#include <rtl/ustring.h>
-
-#define GRCACHE_REUSE_VECTORS 1
-
-//#include <rope>
-#include <hash_map>
-
-class TextSourceAdaptor;
-/**
-* GrSegRecord stores a Graphite Segment and its associated text
-*/
-class GrSegRecord {
-public:
- GrSegRecord(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl);
-
- ~GrSegRecord();
-
- void reuse(rtl::OUString * rope, TextSourceAdaptor * textSrc, gr::Segment * seg, bool bIsRtl);
-
- void clearVectors();
- void clear();
-#ifdef GRCACHE_REUSE_VECTORS
- void setGlyphVectors(long nWidth, GraphiteLayout::Glyphs & vGlyphs, std::vector<int> vCharDxs,
- std::vector<int> & vChar2Base, std::vector<int> & vGlyph2Char, float fScale)
- {
- clearVectors();
- mnWidth = nWidth;
- m_fontScale = fScale;
- mvGlyphs.insert(mvGlyphs.begin(), vGlyphs.begin(), vGlyphs.end());
- mvCharDxs.insert(mvCharDxs.begin(),vCharDxs.begin(),vCharDxs.end());
- mvChar2BaseGlyph.insert(mvChar2BaseGlyph.begin(),vChar2Base.begin(),vChar2Base.end());
- mvGlyph2Char.insert(mvGlyph2Char.begin(),vGlyph2Char.begin(),vGlyph2Char.end());
- }
-#endif
- gr::Segment * getSegment() { return m_seg; }
- TextSourceAdaptor * getTextSrc() { return m_text; }
- void unlock() { --m_lockCount; }
- bool isRtl() const { return mbIsRtl; }
-#ifdef GRCACHE_REUSE_VECTORS
- const long & width() const { return mnWidth; }
- const GraphiteLayout::Glyphs & glyphs() const { return mvGlyphs; }
- const std::vector<int> & charDxs() const { return mvCharDxs; }
- const std::vector<int> & char2BaseGlyph() const { return mvChar2BaseGlyph; }
- const std::vector<int> & glyph2Char() const { return mvGlyph2Char; }
- float & fontScale() { return m_fontScale; }
-#endif
-private:
- rtl::OUString * m_rope;
- TextSourceAdaptor * m_text;
- gr::Segment * m_seg;
- const xub_Unicode * m_nextKey;
- const xub_Unicode* m_pStr;
- size_t m_startChar;
- float m_fontScale;
- long mnWidth;
- GraphiteLayout::Glyphs mvGlyphs; // glyphs in display order
- std::vector<int> mvCharDxs; // right hand side x offset of each glyph
- std::vector<int> mvChar2BaseGlyph;
- std::vector<int> mvGlyph2Char;
- bool mbIsRtl;
- int m_lockCount;
- friend class GraphiteSegmentCache;
-};
-
-typedef std::hash_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap;
-typedef std::hash_multimap<size_t, GrSegRecord*> GraphiteRopeMap;
-typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntry;
-
-/**
-* GraphiteSegmentCache contains the cached Segments for one particular font size
-*/
-class GraphiteSegmentCache
-{
-public:
- enum {
- // not really sure what good values are here,
- // bucket size should be >> cache size
- SEG_BUCKET_FACTOR = 4,
- SEG_DEFAULT_CACHE_SIZE = 2047
- };
- GraphiteSegmentCache(sal_uInt32 nSegCacheSize)
- : m_segMap(nSegCacheSize * SEG_BUCKET_FACTOR),
- m_nSegCacheSize(nSegCacheSize),
- m_oldestKey(NULL) {};
- ~GraphiteSegmentCache()
- {
- m_ropeMap.clear();
- GraphiteSegMap::iterator i = m_segMap.begin();
- while (i != m_segMap.end())
- {
- GrSegRecord *r = i->second;
- delete r;
- ++i;
- }
- m_segMap.clear();
- };
- GrSegRecord * getSegment(ImplLayoutArgs & layoutArgs, bool bIsRtl, int segCharLimit)
- {
- GrSegRecord * found = NULL;
- // try to find a segment starting at correct place, if not, try to find a
- // match for the complete buffer
- GraphiteSegMap::iterator iMap =
- m_segMap.find(reinterpret_cast<long>(layoutArgs.mpStr +
- layoutArgs.mnMinCharPos));
- if (iMap != m_segMap.end())
- {
- found = iMap->second;
- }
- else
- {
- iMap = m_segMap.find(reinterpret_cast<long>(layoutArgs.mpStr));
- if (iMap != m_segMap.end())
- {
- found = iMap->second;
- }
- }
- if (found)
- {
- if (found->m_seg->startCharacter() <= layoutArgs.mnMinCharPos &&
- found->m_seg->stopCharacter() >= layoutArgs.mnEndCharPos)
- {
- DBG_ASSERT(found && found->m_seg, "null entry in GraphiteSegmentCache");
- // restore original start character, in case it has changed
- found->m_seg->setTextSourceOffset(found->m_startChar);
- // check that characters are the same, at least in the range of
- // interest
- // We could use substr and ==, but substr does a copy,
- // so its probably faster to do it like this
- for (int i = layoutArgs.mnMinCharPos; i < segCharLimit; i++)
- {
- //if (!found->m_rope->match(rtl::OUString(layoutArgs.mpStr[i], layoutArgs.mnLength), i - found->m_seg->startCharacter()))
- if (found->m_rope->getStr()[i-found->m_seg->startCharacter()] != layoutArgs.mpStr[i])
- return NULL;
- }
- if (found->isRtl() != bIsRtl)
- {
- return NULL;
- }
- if (found->m_seg->stopCharacter() > layoutArgs.mnEndCharPos &&
- static_cast<int>(found->char2BaseGlyph().size()) > layoutArgs.mnEndCharPos)
- {
- // check that the requested end character isn't mid cluster
- if (found->char2BaseGlyph()[layoutArgs.mnEndCharPos-layoutArgs.mnMinCharPos] == -1)
- {
- return NULL;
- }
- }
-// if (found->m_lockCount != 0)
-// OutputDebugString("Multple users of SegRecord!");
- found->m_lockCount++;
- }
- else found = NULL;
- }
- else
- {
- // the pointers aren't the same, but we might still have the same text in a segment
- // this is expecially needed when editing a large paragraph
- // each edit changes the pointers, but if we don't reuse any segments it gets very
- // slow.
- rtl::OUString * rope = new rtl::OUString(layoutArgs.mpStr + layoutArgs.mnMinCharPos,
- segCharLimit - layoutArgs.mnMinCharPos);
- if (!rope) return NULL;
- size_t nHash = (*(rope)).hashCode();
- GrRMEntry range = m_ropeMap.equal_range(nHash);
- while (range.first != range.second)
- {
- found = range.first->second;
- if (found->m_lockCount == 0)
- {
- if(rope->match(*(found->m_rope)))
- {
- // found, but the pointers are all wrong
- found->m_seg->setTextSourceOffset(layoutArgs.mnMinCharPos);
- // the switch is done in graphite_layout.cxx
- //found->m_text->switchLayoutArgs(layoutArgs);
- found->m_lockCount++;
- break;
- }
- else
- found = NULL;
- }
- else
- found = NULL;
- ++(range.first);
- }
- delete rope;
- }
- return found;
- };
- GrSegRecord * cacheSegment(TextSourceAdaptor * adapter, gr::Segment * seg, bool bIsRtl);
-private:
- GraphiteSegMap m_segMap;
- GraphiteRopeMap m_ropeMap;
- sal_uInt32 m_nSegCacheSize;
- const xub_Unicode * m_oldestKey;
- const xub_Unicode * m_prevKey;
-};
-
-typedef std::hash_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap;
-
-/**
-* GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache
-*/
-class GraphiteCacheHandler
-{
-public:
- GraphiteCacheHandler() : m_cacheMap(255)
- {
- const char * pEnvCache = getenv( "SAL_GRAPHITE_CACHE_SIZE" );
- if (pEnvCache != NULL)
- {
- int envCacheSize = atoi(pEnvCache);
- if (envCacheSize <= 0)
- m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE;
- else
- {
- m_nSegCacheSize = envCacheSize;
- }
- }
- else
- {
- m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE;
- }
- };
- ~GraphiteCacheHandler()
- {
- GraphiteCacheMap::iterator i = m_cacheMap.begin();
- while (i != m_cacheMap.end())
- {
- GraphiteSegmentCache *r = i->second;
- delete r;
- ++i;
- }
- m_cacheMap.clear();
- };
-
- static GraphiteCacheHandler instance;
-
- GraphiteSegmentCache * getCache(sal_Int32 & fontHash)
- {
- if (m_cacheMap.count(fontHash) > 0)
- {
- return m_cacheMap.find(fontHash)->second;
- }
- GraphiteSegmentCache *pCache = new GraphiteSegmentCache(m_nSegCacheSize);
- m_cacheMap[fontHash] = pCache;
- return pCache;
- }
-private:
- GraphiteCacheMap m_cacheMap;
- sal_uInt32 m_nSegCacheSize;
-};
-
-#endif
-
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 47b8f062e299..742ad2c3f5f5 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,14 +30,17 @@
// Parse a string of features specified as ; separated pairs.
// e.g.
// 1001=1&2002=2&fav1=0
-#include <preextstl.h>
-#include <graphite/GrClient.h>
-#include <graphite/Font.h>
-#include <graphite/GrFeature.h>
-#include <postextstl.h>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+#include <graphite2/Font.h>
namespace grutils
{
+ union FeatId
+ {
+ gr_uint32 num;
+ unsigned char label[5];
+ };
class GrFeatureParser
{
@@ -45,31 +49,30 @@ namespace grutils
static const char FEAT_PREFIX;
static const char FEAT_SEPARATOR;
static const char FEAT_ID_VALUE_SEPARATOR;
- static const std::string ISO_LANG;
- GrFeatureParser(gr::Font & font, const std::string features, const std::string lang);
- GrFeatureParser(gr::Font & font, const std::string lang);
- GrFeatureParser(const GrFeatureParser & copy);
+ GrFeatureParser(const gr_face * face, const ::rtl::OString features, const ::rtl::OString lang);
+ GrFeatureParser(const gr_face * face, const ::rtl::OString lang);
~GrFeatureParser();
- size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const;
+ //size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const;
bool parseErrors() { return mbErrors; };
- static bool isValid(gr::Font & font, gr::FeatureSetting & setting);
- gr::isocode getLanguage() const { return maLang; };
- bool hasLanguage() const { return (maLang.rgch[0] != '\0'); }
- sal_Int32 hashCode() const;
+ //static bool isValid(gr::Font & font, gr::FeatureSetting & setting);
+ gr_uint32 getLanguage() const { return maLang.num; };
+ bool hasLanguage() const { return (maLang.label[0] != '\0'); }
+ sal_Int32 hashCode() const { return mnHash; }
+ size_t numFeatures() const { return mnNumSettings; }
+ gr_feature_val * values() const { return mpSettings; };
private:
- void setLang(gr::Font & font, const std::string & lang);
- bool isCharId(const std::string & id, size_t offset, size_t length);
- int getCharId(const std::string & id, size_t offset, size_t length);
- int getIntValue(const std::string & id, size_t offset, size_t length);
+ GrFeatureParser(const GrFeatureParser & copy);
+ void setLang(const gr_face * face, const ::rtl::OString & lang);
+ bool isCharId(const ::rtl::OString & id, size_t offset, size_t length);
+ gr_uint32 getCharId(const ::rtl::OString & id, size_t offset, size_t length);
+ short getIntValue(const ::rtl::OString & id, size_t offset, size_t length);
size_t mnNumSettings;
- gr::isocode maLang;
+ FeatId maLang;
bool mbErrors;
- gr::FeatureSetting maSettings[64];
+ sal_uInt32 mnHash;
+ gr_feature_val * mpSettings;
};
- union FeatId
- {
- gr::featid num;
- unsigned char label[5];
- };
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index d4f89d4cb91d..c6c711d94dc7 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,31 +34,19 @@
// We need this to enable namespace support in libgrengine headers.
#define GR_NAMESPACE
-#define GRCACHE 1
-
// Standard Library
#include <memory>
#include <vector>
+#include <map>
#include <utility>
// Libraries
-#include <preextstl.h>
-#include <graphite/GrClient.h>
-#include <graphite/Font.h>
-#include <graphite/GrConstants.h>
-#include <graphite/GrAppData.h>
-#include <graphite/SegmentAux.h>
-#include <postextstl.h>
+#include <graphite2/Font.h>
+#include <graphite2/Segment.h>
// Platform
#include <sallayout.hxx>
#include <vcl/dllapi.h>
// Module
-// For backwards compatibility with 2.4.x
-#if (SUPD == 680)
-typedef sal_Int32 sal_GlyphId;
-#endif
-
-
// Module type definitions and forward declarations.
//
class TextSourceAdaptor;
@@ -66,21 +55,40 @@ class GrSegRecord;
// SAL/VCL types
class ServerFont;
-#ifdef WNT
-// The GraphiteWinFont is just a wrapper to enable GrFontHasher to be a friend
-// so that UniqueCacheInfo can be called.
-#include <graphite/WinFont.h>
-class GraphiteWinFont : public gr::WinFont
+// Graphite types
+namespace grutils { class GrFeatureParser; }
+
+class GraphiteFaceWrapper
{
- friend class GrFontHasher;
public:
- GraphiteWinFont(HDC hdc) : gr::WinFont(hdc) {};
- virtual ~GraphiteWinFont() {};
+ typedef std::map<int, gr_font*> GrFontMap;
+ GraphiteFaceWrapper(gr_face * pFace) : m_pFace(pFace) {}
+ ~GraphiteFaceWrapper()
+ {
+ GrFontMap::iterator i = m_fonts.begin();
+ while (i != m_fonts.end())
+ gr_font_destroy((*i++).second);
+ m_fonts.clear();
+ gr_face_destroy(m_pFace);
+ }
+ const gr_face * face() const { return m_pFace; }
+ gr_font * font(int ppm) const
+ {
+ GrFontMap::const_iterator i = m_fonts.find(ppm);
+ if (i != m_fonts.end())
+ return i->second;
+ return NULL;
+ };
+ void addFont(int ppm, gr_font * pFont)
+ {
+ if (m_fonts[ppm])
+ gr_font_destroy(m_fonts[ppm]);
+ m_fonts[ppm] = pFont;
+ }
+private:
+ gr_face * m_pFace;
+ GrFontMap m_fonts;
};
-#endif
-// Graphite types
-namespace gr { class Segment; class GlyphIterator; }
-namespace grutils { class GrFeatureParser; }
// This class uses the SIL Graphite engine to provide complex text layout services to the VCL
// @author tse
@@ -88,63 +96,38 @@ namespace grutils { class GrFeatureParser; }
class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout
{
public:
- // Mask to allow Word break status to be stored within mvChar2BaseGlyph
- enum {
- WORD_BREAK_BEFORE = 0x40000000,
- HYPHEN_BREAK_BEFORE = 0x80000000,
- BREAK_MASK = 0xC0000000,
- GLYPH_INDEX_MASK = 0x3FFFFFFF
- } LineBreakMask;
class Glyphs : public std::vector<GlyphItem>
{
public:
typedef std::pair<Glyphs::const_iterator, Glyphs::const_iterator> iterator_pair_t;
- void fill_from(gr::Segment & rSeg, ImplLayoutArgs & rArgs,
- bool bRtl, long &rWidth, float fScaling,
- std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char,
- std::vector<int> & rCharDxs);
- void move_glyph(Glyphs::iterator, long dx);
-
- const_iterator cluster_base(const_iterator) const;
- iterator_pair_t neighbour_clusters(const_iterator) const;
- private:
- std::pair<float,float> appendCluster(gr::Segment & rSeg, ImplLayoutArgs & rArgs,
- bool bRtl, float fSegmentAdvance, int nFirstCharInCluster, int nNextChar,
- int nFirstGlyphInCluster, int nNextGlyph, float fScaling,
- std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char,
- std::vector<int> & rCharDxs, long & rDXOffset);
- void append(gr::Segment & rSeg, ImplLayoutArgs & rArgs, gr::GlyphInfo & rGi, float nextGlyphOrigin, float fScaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs, long & rDXOffset, bool bIsBase);
};
mutable Glyphs mvGlyphs;
void clear();
private:
- TextSourceAdaptor * mpTextSrc; // Text source.
- gr::LayoutEnvironment maLayout;
- const gr::Font &mrFont;
+ const gr_face * mpFace; // not owned by layout
+ gr_font * mpFont; // not owned by layout
+ int mnSegCharOffset; // relative to ImplLayoutArgs::mpStr
long mnWidth;
- std::vector<int> mvCharDxs;
std::vector<int> mvChar2BaseGlyph;
std::vector<int> mvGlyph2Char;
+ std::vector<int> mvCharDxs;
+ std::vector<int> mvCharBreaks;
float mfScaling;
const grutils::GrFeatureParser * mpFeatures;
public:
- explicit GraphiteLayout( const gr::Font& font, const grutils::GrFeatureParser* features = NULL ) throw();
+ GraphiteLayout(const gr_face * pFace, gr_font * pFont = NULL,
+ const grutils::GrFeatureParser * features = NULL) throw();
// used by upper layers
virtual bool LayoutText( ImplLayoutArgs& ); // first step of layout
// split into two stages to allow dc to be restored on the segment
-#ifdef GRCACHE
- gr::Segment * CreateSegment(ImplLayoutArgs& rArgs, GrSegRecord ** pRecord = NULL);
- bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment, GrSegRecord * pSegRecord);
-#else
- gr::Segment * CreateSegment(ImplLayoutArgs& rArgs);
- bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment);
-#endif
+ gr_segment * CreateSegment(ImplLayoutArgs& rArgs);
+ bool LayoutGlyphs(ImplLayoutArgs& rArgs, gr_segment * pSegment);
virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting positions
@@ -168,19 +151,25 @@ public:
virtual void DrawText(SalGraphics&) const {};
virtual ~GraphiteLayout() throw();
+ void SetFont(gr_font * pFont) { mpFont = pFont; }
+ gr_font * GetFont() { return mpFont; }
void SetFeatures(grutils::GrFeatureParser * aFeature) { mpFeatures = aFeature; }
void SetFontScale(float s) { mfScaling = s; };
- const TextSourceAdaptor * textSrc() const { return mpTextSrc; };
virtual sal_GlyphId getKashidaGlyph(int & width) = 0;
void kashidaJustify(std::vector<int> & rDeltaWidth, sal_GlyphId, int width);
static const int EXTRA_CONTEXT_LENGTH;
private:
- int glyph_to_char(Glyphs::iterator);
- std::pair<int,int> glyph_to_chars(const GlyphItem &) const;
-
- std::pair<long,long> caret_positions(size_t) const;
void expandOrCondense(ImplLayoutArgs &rArgs);
+ void fillFrom(gr_segment * rSeg, ImplLayoutArgs & rArgs, float fScaling);
+
+ void append(gr_segment * pSeg,
+ ImplLayoutArgs & rArgs,
+ const gr_slot * pSlot,
+ float nextGlyphOrigin, float fScaling,
+ long & rDXOffset, bool bIsBase, int baseChar);
};
#endif // _SV_GRAPHITELAYOUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 819180b30bf6..63adf526c2a1 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,19 +34,19 @@
#ifndef MSC
#include <graphite_layout.hxx>
-#include <graphite_adaptors.hxx>
// Modules
class VCL_PLUGIN_PUBLIC GraphiteLayoutImpl : public GraphiteLayout
{
public:
- GraphiteLayoutImpl(const gr::Font & font, const grutils::GrFeatureParser * features, GraphiteFontAdaptor * pFont) throw()
- : GraphiteLayout(font, features), mpFont(pFont) {};
+ GraphiteLayoutImpl(const gr_face * pFace,
+ ServerFont & rServerFont) throw()
+ : GraphiteLayout(pFace), mrServerFont(rServerFont) {};
virtual ~GraphiteLayoutImpl() throw() {};
virtual sal_GlyphId getKashidaGlyph(int & width);
private:
- GraphiteFontAdaptor * mpFont;
+ ServerFont & mrServerFont;
};
// This class implments the server font specific parts.
@@ -54,13 +55,19 @@ private:
class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout
{
private:
- mutable GraphiteFontAdaptor * mpFont;
// mutable so that the DrawOffset/DrawBase can be set
mutable GraphiteLayoutImpl maImpl;
+ grutils::GrFeatureParser * mpFeatures;
+ const sal_Unicode * mpStr;
public:
- explicit GraphiteServerFontLayout( GraphiteFontAdaptor* font ) throw();
+ GraphiteServerFontLayout(ServerFont& pServerFont) throw();
- virtual bool LayoutText( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); }; // first step of layout
+ virtual bool LayoutText( ImplLayoutArgs& rArgs)
+ {
+ mpStr = rArgs.mpStr;
+ SalLayout::AdjustLayout(rArgs);
+ return maImpl.LayoutText(rArgs);
+ }; // first step of layout
virtual void AdjustLayout( ImplLayoutArgs& rArgs)
{
SalLayout::AdjustLayout(rArgs);
@@ -88,11 +95,14 @@ public:
virtual ~GraphiteServerFontLayout() throw();
+ static bool IsGraphiteEnabledFont(ServerFont * pServerFont);
// For use with PspGraphics
- const sal_Unicode* getTextPtr() const;
+ const sal_Unicode* getTextPtr() const { return mpStr; };
int getMinCharPos() const { return mnMinCharPos; }
int getMaxCharPos() const { return mnEndCharPos; }
};
#endif
#endif //_SV_GRAPHITESERVERFONT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index fc3e2d5ffce8..7862a4961bbd 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uI
const Point& rPos, const Rectangle* pHelpArea );
#endif // _SV_HELPWIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 93da741827eb..674bdf070c3a 100644
--- a/vcl/inc/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +31,10 @@
#include <vcl/sv.h>
#include <vcl/timer.hxx>
+#include <vector>
-class ImplIdleList;
+struct ImplIdleData;
+typedef ::std::vector< ImplIdleData* > ImplIdleList;
// ---------------
// - ImplIdleMgr -
@@ -58,3 +61,5 @@ public:
};
#endif // _SV_IDLEMGR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index b509464bae4e..850531c64d9d 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,7 +61,7 @@ enum LB_EVENT_TYPE
// -----------------
// - ImplEntryType -
// -----------------
-
+
struct ImplEntryType
{
XubString maStr;
@@ -102,7 +103,7 @@ struct ImplEntryType
// -----------------
// - ImplEntryList -
// -----------------
-
+
class ImplEntryList : private List
{
private:
@@ -390,7 +391,7 @@ protected:
// ---------------
// - ImplListBox -
// ---------------
-
+
class ImplListBox : public Control
{
private:
@@ -513,7 +514,7 @@ public:
// -----------------------------
// - ImplListBoxFloatingWindow -
// -----------------------------
-
+
class ImplListBoxFloatingWindow : public FloatingWindow
{
private:
@@ -556,7 +557,7 @@ public:
// -----------
// - ImplWin -
// -----------
-
+
class ImplWin : public Control
{
private:
@@ -564,7 +565,6 @@ private:
sal_uInt16 mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle.
XubString maString;
Image maImage;
- Image maImageHC;
Rectangle maFocusRect;
Size maUserItemSize;
@@ -600,8 +600,8 @@ public:
const Image& GetImage() const { return maImage; }
void SetImage( const Image& rImg ) { maImage = rImg; }
- sal_Bool SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
- const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+ sal_Bool SetModeImage( const Image& rImage );
+ const Image& GetModeImage( ) const;
virtual void MBDown();
@@ -647,3 +647,5 @@ void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground,
void ImplInitDropDownButton( PushButton* pButton );
#endif // _SV_ILSTBOX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 6ae9ad3a9c4a..86f924993ed3 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
#include <vcl/bitmapex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
// ----------------
// - ImplImageBmp -
@@ -53,7 +54,7 @@ public:
void Replace( sal_uInt16 nPos, const BitmapEx& rBmpEx );
void ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uIntPtr nColorCount );
- void ColorTransform( BmpColorMode eColorMode );
+ void ColorTransform();
void Invert();
BitmapEx GetBitmapEx( sal_uInt16 nPosCount, sal_uInt16* pPosAry ) const;
@@ -111,7 +112,7 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef std::hash_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
+ typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
@@ -180,3 +181,5 @@ private: // prevent assignment and copy construction
};
#endif // _SV_IMAGE_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 778cc0f8f750..c77e906bd8ae 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,3 +107,5 @@ inline void ImpBitmap::ImplSetSourceSize( const Size& rSize)
}
#endif // _SV_IMPBMP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index cc4271932b47..40355af21518 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,7 +135,7 @@ public:
};
// ------------------
-// - ImplFontHints -
+// - ImplFontOptions -
// ------------------
class ImplFontOptions
@@ -153,19 +154,20 @@ public:
meHinting(HINTING_DONTKNOW),
meHintStyle(HINT_SLIGHT)
{}
- ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias,
- FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) :
- meEmbeddedBitmap(eEmbeddedBitmap),
- meAntiAlias(eAntiAlias),
- meAutoHint(eAutoHint),
- meHinting(eHinting),
- meHintStyle(eHintStyle)
+ virtual ~ImplFontOptions()
{}
- FontAutoHint GetUseAutoHint() const { return meAutoHint; }
- FontHintStyle GetHintStyle() const { return meHintStyle; }
- bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
- bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
- bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
+ FontAutoHint GetUseAutoHint() const
+ { return meAutoHint; }
+ FontHintStyle GetHintStyle() const
+ { return meHintStyle; }
+ bool DontUseEmbeddedBitmaps() const
+ { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
+ bool DontUseAntiAlias() const
+ { return meAntiAlias == ANTIALIAS_FALSE; }
+ bool DontUseHinting() const
+ { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
+ virtual void *GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const
+ { return NULL; }
};
// -------------------
@@ -237,3 +239,4 @@ bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
#endif // _SV_IMPFONT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index e136fcc06ade..6b6bce184770 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,5 @@ private:
};
#endif // _SV_IMPGRAPH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 9649fe2f5ec8..41c4f565ef22 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
#include <utility>
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -57,7 +58,11 @@ public:
bool loadImage(
rtl::OUString const & name, rtl::OUString const & style,
- BitmapEx & bitmap, bool localized = false );
+ BitmapEx & bitmap, bool localized = false, bool loadMissing = false );
+
+ bool loadDefaultImage(
+ rtl::OUString const & style,
+ BitmapEx& bitmap);
void shutDown();
// a crude form of life cycle control (called from DeInitVCL; otherwise,
@@ -65,15 +70,19 @@ public:
// be too late for the destructors of the bitmaps in m_iconCache)
private:
+ bool doLoadImage(
+ rtl::OUString const & name, rtl::OUString const & style,
+ BitmapEx & bitmap, bool localized);
+
typedef std::list<
std::pair<
rtl::OUString,
com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess > > > Zips;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
- typedef std::hash_map<
+ typedef boost::unordered_map<
rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
rtl::OUString m_style;
@@ -94,3 +103,5 @@ private:
typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef;
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index 8b0e85021db9..daf6a275ada1 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -174,3 +175,5 @@ inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode )
}
#endif // _SV_IMPOCT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impprn.hxx b/vcl/inc/impprn.hxx
deleted file mode 100644
index 883bd55c66be..000000000000
--- a/vcl/inc/impprn.hxx
+++ /dev/null
@@ -1,140 +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.
- *
- ************************************************************************/
-
-#if 0
-#define _SV_IMPPRN_HXX
-
-#include <vcl/print.hxx>
-#include <vcl/timer.hxx>
-#ifndef _VCL_IMPDEL_HXX
-#include <vcl/impdel.hxx>
-#endif
-
-#include <vector>
-
-struct QueuePage;
-
-// ----------------
-// - ImplQPrinter -
-// ----------------
-
-/*
- ImplQPrinter is on most systems a simple buffer that allows a potential
- lengthy print job to be printed in the background. For this it saves all
- normal drawing operations for each printed page to a metafile, then spooling
- the metafiles timer based to a normal printer. The application can act in the meantime
- including changing the original document without influencing the print job.
-
- On some systems (currently Mac/Aqua Cocoa) ImplQPrinter has the additional
- purpose of adapting to the print system: here theprint systems starts a
- job and will not return from that function until it has ended; to do so
- it queries for each consecutive page to be printed. Also the Cocoa print system
- needs to know the number of pages BEFORE starting a print job. Since our Printer
- does not know that, we need to do the completing spooling to ImplQPrinter before
- we can actually print to the real print system. Let's call this the pull model
- instead of the push model (because the systems pulls the pages).
-*/
-
-class ImplQPrinter : public Printer, public vcl::DeletionNotifier
-{
-private:
- Printer* mpParent;
- std::vector< QueuePage* > maQueue;
- AutoTimer maTimer;
- bool mbAborted;
- bool mbUserCopy;
- bool mbDestroyAllowed;
- bool mbDestroyed;
-
- GDIMetaFile maCurPageMetaFile;
- long mnMaxBmpDPIX;
- long mnMaxBmpDPIY;
- sal_uLong mnRestoreDrawMode;
- int mnCurCopyCount;
-
- DECL_LINK( ImplPrintHdl, Timer* );
-
- ~ImplQPrinter();
-
- void ImplPrintMtf( GDIMetaFile& rMtf, long nMaxBmpDPIX, long nMaxBmpDPIY );
-
- ImplQPrinter( const ImplQPrinter& rPrinter );
- Printer& operator =( const ImplQPrinter& rPrinter );
-
- void PrePrintPage( QueuePage* );
- void PostPrintPage();
-
-public:
-
- ImplQPrinter( Printer* pParent );
- void Destroy();
-
- void StartQueuePrint();
- void EndQueuePrint();
- void AbortQueuePrint();
- void AddQueuePage( GDIMetaFile* pPage, sal_uInt16 nPage, sal_Bool bNewJobSetup );
-
- bool IsUserCopy() const { return mbUserCopy; }
- void SetUserCopy( bool bSet ) { mbUserCopy = bSet; }
-
- /**
- used by pull implementation to emit the next page
- */
- void PrintPage( unsigned int nPage );
- /**
- used by pull implementation to get the number of physical pages
- (that is how often PrintNextPage should be called)
- */
- sal_uLong GetPrintPageCount() const;
-
- /**
- used by pull implementation to get ranges of physical pages that
- are to be printed on the same paper. If bIncludeOrientationChanges is true
- then orientation changes will not break a page run; the implementation has
- to rotate the page contents accordingly in that case.
-
- The returned vector contains all pages indices beginning a new medium and additionally
- the index that of the last page+1 (for convenience, so the length of a range
- is always v[i+1] - v[i])
-
- Example: 5 pages, all A4
- return: [0 5]
-
- Example: 6 pages, beginning A4, switching tol A5 on fourth page, back to A4 on fifth page
- return [0 3 4 6]
-
- returns an false in push model (error condition)
- */
- bool GetPaperRanges( std::vector< sal_uLong >& o_rRanges, bool i_bIncludeOrientationChanges ) const;
-
- /**
- get the jobsetup for a page
- */
- ImplJobSetup* GetPageSetup( unsigned int nPage ) const;
-};
-
-#endif // _SV_IMPPRN_HXX
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 981194080ede..b1cbdb9853f9 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
#include <tools/string.hxx>
#include <vcl/sv.h>
#include <vcl/prntypes.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
// ------------------
@@ -64,7 +65,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th mm)
sal_uIntPtr mnDriverDataLen; // length of system specific data
sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block)
- ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
+ ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup& rJobSetup );
@@ -77,3 +78,5 @@ struct ImplJobSetup
// Papierformat berechnet, wenn dieses ungleich PAPER_USER ist
#endif // _SV_JOBSET_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/list.h b/vcl/inc/list.h
index 82fff328681b..78c7edce2839 100644
--- a/vcl/inc/list.h
+++ b/vcl/inc/list.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,3 +98,5 @@ extern "C"
#endif /* __CLIST_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx
index 5d2852444767..2f4a9b5ed7aa 100644
--- a/vcl/inc/outdata.hxx
+++ b/vcl/inc/outdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ inline int ImplIsColorTransparent( Color aColor )
}
#endif // _SV_OUTDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 50aee1fbe049..43ba77df8ab7 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -217,11 +218,11 @@ private:
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const ImplFontSelectData&, const ImplFontSelectData& ) const; };
struct IFSD_Hash { size_t operator()( const ImplFontSelectData& ) const; };
- typedef ::std::hash_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
+ typedef ::boost::unordered_map<ImplFontSelectData,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
FontInstanceList maFontInstanceList;
// cache of recently requested font names vs. selected font names
- typedef ::std::hash_map<String,String,FontNameHash> FontNameList;
+ typedef ::boost::unordered_map<String,String,FontNameHash> FontNameList;
FontNameList maFontNameList;
public:
@@ -262,3 +263,5 @@ struct ImplOutDevData
void ImplFreeOutDevFontData();
#endif // _SV_OUTDEV_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index aabc6bd2797f..faf2b00793f2 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,6 @@
#define _SV_OUTFONT_HXX
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <i18npool/lang.h>
#include <tools/gen.hxx>
#include <tools/solar.h>
@@ -37,7 +37,7 @@
#include <unotools/fontdefs.hxx>
#include <vcl/vclenum.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
class ImplDevFontListData;
class ImplGetDevFontList;
@@ -192,7 +192,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available
- typedef std::hash_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
+ typedef boost::unordered_map<const String, ImplDevFontListData*,FontNameHash> DevFontList;
DevFontList maDevFontList;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
@@ -351,7 +351,7 @@ private:
// TODO: at least the ones which just differ in orientation, stretching or height
typedef ::std::pair<sal_UCS4,FontWeight> GFBCacheKey;
struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; };
- typedef ::std::hash_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
+ typedef ::boost::unordered_map<GFBCacheKey,String,GFBCacheKey_Hash> UnicodeFallbackList;
UnicodeFallbackList* mpUnicodeFallbackList;
};
@@ -404,3 +404,4 @@ private:
#endif // _SV_OUTFONT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/pch/precompiled_vcl.cxx b/vcl/inc/pch/precompiled_vcl.cxx
index af8e2048bd88..66c95bc3b2e1 100644
--- a/vcl/inc/pch/precompiled_vcl.cxx
+++ b/vcl/inc/pch/precompiled_vcl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_vcl.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 37ba36569834..c07523757071 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,3 +32,4 @@
#include <tools/debug.hxx>
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index b90eaae756bf..dc54ca28dc8b 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
#include "rtl/ustring.hxx"
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
struct SalPrinterQueueInfo;
class QueueInfo;
@@ -60,7 +61,7 @@ struct ImplPrnQueueData
class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{
public:
- std::hash_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
+ boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< rtl::OUString > m_aPrinterList;
@@ -81,3 +82,5 @@ void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
#endif // _SV_PRINT_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 8201610593af..d162bc07ea8a 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,7 +64,6 @@ namespace vcl
FixedLine maHorzDim;
FixedLine maVertDim;
- bool useHCColorReplacement() const;
public:
PrintPreviewWindow( Window* pParent, const ResId& );
virtual ~PrintPreviewWindow();
@@ -174,9 +174,7 @@ namespace vcl
CheckBox maReverseOrderBox;
Image maCollateImg;
- Image maCollateHCImg;
Image maNoCollateImg;
- Image maNoCollateHCImg;
long mnCollateUIMode;
@@ -335,3 +333,5 @@ namespace vcl
#endif // _SV_PRNDLG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printergfx.hxx b/vcl/inc/printergfx.hxx
index c11bfa867148..65d31e65e0aa 100644
--- a/vcl/inc/printergfx.hxx
+++ b/vcl/inc/printergfx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
#include "tools/gen.hxx"
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace psp {
@@ -252,7 +253,7 @@ private:
/* font / font substitution */
friend class Font3;
- const ::std::hash_map< fontID, fontID >* mpFontSubstitutes;
+ const ::boost::unordered_map< fontID, fontID >* mpFontSubstitutes;
int getCharWidth (sal_Bool b_vert, sal_Unicode n_char,
CharacterMetric *p_bbox);
fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char,
@@ -440,3 +441,4 @@ public:
#endif /* _PSPRINT_PRINTERGFX_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printerjob.hxx b/vcl/inc/printerjob.hxx
index cdf8745febcc..62a1c078bc32 100644
--- a/vcl/inc/printerjob.hxx
+++ b/vcl/inc/printerjob.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,4 @@ public:
#endif /* _PSPRINT_PRINTERJOB_HXX_ */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/region.h b/vcl/inc/region.h
index b45ab91be149..5814e981aac2 100644
--- a/vcl/inc/region.h
+++ b/vcl/inc/region.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ public:
};
#endif // _SV_REGION_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index b19c2ac33aeb..d880be0d6d37 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,11 +29,11 @@
#ifndef _SV_SALBMP_HXX
#define _SV_SALBMP_HXX
-#ifndef _TL_GEN_HXX
#include <tools/gen.hxx>
-#endif
#include <vcl/dllapi.h>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
+
struct BitmapBuffer;
class SalGraphics;
class BitmapPalette;
@@ -52,6 +53,9 @@ public:
SalGraphics* pGraphics ) = 0;
virtual bool Create( const SalBitmap& rSalBmp,
sal_uInt16 nNewBitCount ) = 0;
+ virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
+ Size& rSize,
+ bool bMask = false ) = 0;
virtual void Destroy() = 0;
virtual Size GetSize() const = 0;
virtual sal_uInt16 GetBitCount() const = 0;
@@ -63,3 +67,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 0a27089ceb47..9d4eb0fc73f9 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ inline SalData* GetSalData()
{ return (SalData*)ImplGetSVData()->mpSalData; }
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 8fbbe96ba8bf..51c6bcf7e73e 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#ifdef __cplusplus
-#ifndef _SV_PTRSTYLE_HXX
#include <vcl/ptrstyle.hxx>
-#endif
#include <vcl/sndstyle.hxx>
#endif // __cplusplus
@@ -44,9 +43,7 @@
#include <tools/gen.hxx>
#include <vcl/region.hxx>
-#ifndef _VCL_IMPDEL_HXX
#include <vcl/impdel.hxx>
-#endif
#include <rtl/ustring.hxx>
#include <vcl/keycod.hxx>
@@ -135,7 +132,8 @@ typedef sal_uInt64 SalExtStyle;
#ifdef __cplusplus
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
// ------------
// - SalFrame -
@@ -250,6 +248,15 @@ public:
virtual SalPointerState GetPointerState() = 0;
+ struct SalIndicatorState
+ {
+ sal_uInt16 mnState;
+ };
+
+ virtual SalIndicatorState GetIndicatorState() = 0;
+
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) = 0;
+
// set new parent window
virtual void SetParent( SalFrame* pNewParent ) = 0;
// reparent window to act as a plugin; implementation
@@ -260,6 +267,8 @@ public:
// move the frame to a new screen
virtual void SetScreenNumber( unsigned int nScreen ) = 0;
+ virtual void SetApplicationID( const rtl::OUString &rApplicationID) = 0;
+
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
virtual void ResetClipRegion() = 0;
@@ -290,3 +299,5 @@ public:
#endif // __cplusplus
#endif // _SV_SALFRAME_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 1a9b9ccaea59..5b9e59f68d8f 100755..100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
#include "vcl/sv.h"
#include "vcl/dllapi.h"
#include "vcl/salgtype.hxx"
-#include "vos/thread.hxx"
+#include "osl/thread.hxx"
#include "vcl/outdev.hxx"
#include "vcl/salnativewidgets.hxx"
@@ -197,7 +198,7 @@ public:
// get device resolution
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0;
// get the depth of the device
- virtual sal_uInt16 GetBitCount() = 0;
+ virtual sal_uInt16 GetBitCount() const = 0;
// get the width of the device
virtual long GetGraphicsWidth() const = 0;
@@ -233,6 +234,8 @@ public:
virtual sal_uLong GetKernPairs( sal_uLong nMaxPairCount, ImplKernPairData* ) = 0;
// get the repertoire of the current font
virtual const ImplFontCharMap* GetImplFontCharMap() const = 0;
+ // get the layout capabilities of the current font
+ virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0;
// graphics must fill supplied font list
virtual void GetDevFontList( ImplDevFontList* ) = 0;
// graphics should call ImplAddDevFontSubstitute on supplied
@@ -484,3 +487,5 @@ public:
};
#endif // _SV_SALGDI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx
index 3d59e6199fa7..c512d0a195fa 100644
--- a/vcl/inc/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ typedef struct _SalFrameGeometry {
} SalFrameGeometry;
#endif // _SV_SALGEOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salimestatus.hxx b/vcl/inc/salimestatus.hxx
index 20184a059d9a..13362c20071d 100644
--- a/vcl/inc/salimestatus.hxx
+++ b/vcl/inc/salimestatus.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 51f1f5b3b4e0..d878dd7fea80 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,8 +65,6 @@ struct SystemGraphicsData;
struct SystemWindowData;
class Menu;
-namespace vos { class IMutex; }
-
// ---------------
// - SalInstance -
// ---------------
@@ -123,7 +122,7 @@ public:
virtual SalBitmap* CreateSalBitmap() = 0;
// YieldMutex
- virtual vos::IMutex* GetYieldMutex() = 0;
+ virtual osl::SolarMutex* GetYieldMutex() = 0;
virtual sal_uLong ReleaseYieldMutex() = 0;
virtual void AcquireYieldMutex( sal_uLong nCount ) = 0;
// return true, if yield mutex is owned by this thread, else false
@@ -167,6 +166,11 @@ public:
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
+
+ // callbacks for printer updates
+ virtual void updatePrinterUpdate() {}
+ virtual void jobStartedPrinterUpdate() {}
+ virtual void jobEndedPrinterUpdate() {}
};
// called from SVMain
@@ -196,6 +200,8 @@ void DeInitSalMain();
// ----------
// Callbacks (indepen in \sv\source\app\svmain.cxx)
-VCL_DLLPUBLIC sal_Bool SVMain();
+VCL_DLLPUBLIC int SVMain();
#endif // _SV_SALINST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index bb5c6e829a70..b91185769b27 100755..100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -388,3 +389,5 @@ private:
#undef SalGraphics
#endif // _SV_SALLAYOUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 030952388dfb..63fb12ee4a84 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,4 @@ public:
#endif // _SV_SALMENU_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 5ece9e93613d..d83379d3a09a 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,6 +72,8 @@ public:
virtual void SetBackground() = 0;
virtual void SetBackground( SalColor nSalColor ) = 0;
+ virtual void SetForwardKey( sal_Bool /*bEnable*/ ) {}
+
virtual const SystemEnvData* GetSystemData() const = 0;
virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ) = 0;
@@ -90,3 +93,5 @@ public:
};
#endif // _SV_SALOBJ_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 572b766ea909..e820614e4cdd 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ public: // public for Sal Implementation
};
#endif // _SV_SALPRN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index 136821b76855..ca47f599271c 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ class SalPrinter;
typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter );
#endif // _SV_SALPTYPE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index c11054a79eef..c912565a920c 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index da16d8d5b656..2f2f6d08e9e6 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -144,3 +145,5 @@ public:
SalSystem* ImplGetSalSystem();
#endif // _SV_SALSYS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 6bf4b820a176..68ed56a901d8 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ public: // public for Sal Implementation
};
#endif // _SV_SALVD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 55753465a860..d8bd6c527f85 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -344,3 +345,5 @@ struct SalInputContext
typedef void (*SALTIMERPROC)();
#endif // _SV_SALWTYPE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 7758545dd37c..1683e1af150c 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,6 +73,8 @@
#include <vector>
+#include "vcl/fontcapabilities.hxx"
+
namespace vcl
{
@@ -302,6 +305,12 @@ namespace vcl
int VCL_DLLPUBLIC OpenTTFontFile(const char *fname, sal_uInt32 facenum, TrueTypeFont** ttf);
#endif
+ void getTTScripts(std::vector< sal_uInt32 > &rScriptTags, const unsigned char* pTable, size_t nLength);
+ bool getTTCoverage(
+ boost::dynamic_bitset<sal_uInt32> &rUnicodeCoverage,
+ boost::dynamic_bitset<sal_uInt32> &rCodePageCoverage,
+ const unsigned char* pTable, size_t nLength);
+
/**
* TrueTypeFont destructor. Deallocates the memory.
* @ingroup sft
@@ -540,24 +549,6 @@ namespace vcl
*/
void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info);
-#ifdef TEST5
-/**
- * Returns kerning information for an array of glyphs.
- * Kerning is not cumulative.
- * kern[i] contains kerning information for a pair of glyphs at positions i and i+1
- *
- * @param ttf pointer to a TrueTypeFont structure
- * @param glyphs array of source glyphs
- * @param nglyphs number of glyphs in the array
- * @param wmode writing mode: 0 - horizontal, 1 - vertical
- * @param kern array of KernData structures. It should contain nglyphs-1 elements
- * @see KernData
- * @ingroup sft
- *
- */
- void KernGlyphs(TrueTypeFont *ttf, sal_uInt16 *glyphs, int nglyphs, int wmode, KernData *kern);
-#endif
-
/**
* Returns nonzero if font is a symbol encoded font
*/
@@ -630,3 +621,5 @@ namespace vcl
} // namespace vcl
#endif /* __SUBFONT_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/subedit.hxx b/vcl/inc/subedit.hxx
index 3ea1eaffa864..17b22e2b5587 100644
--- a/vcl/inc/subedit.hxx
+++ b/vcl/inc/subedit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ public:
};
#endif // _SV_SUBEDIT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 5dba6441cd1c..79daa17b7933 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,15 +29,14 @@
#ifndef _SV_SVDATA_HXX
#define _SV_SVDATA_HXX
-#include "rtl/ref.hxx"
+#include <osl/thread.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 "tools/string.hxx"
#include "tools/color.hxx"
#include "tools/debug.hxx"
@@ -50,7 +50,7 @@
#include "com/sun/star/uno/Reference.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace com {
namespace sun {
@@ -117,8 +117,6 @@ class SalI18NImeStatus;
class DockingManager;
class VclEventListeners2;
-namespace vos { class OMutex; }
-namespace vos { class OCondition; }
namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; }
namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; }
@@ -184,7 +182,7 @@ struct ImplSVAppData
*/
ImeStatusWindowMode meShowImeStatusWindow;
- DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
+ DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
};
@@ -241,7 +239,6 @@ struct ImplSVWinData
Window* mpTrackWin; // window, that is in tracking mode
AutoTimer* mpTrackTimer; // tracking timer
ImageList* mpMsgBoxImgList; // ImageList for MessageBox
- ImageList* mpMsgBoxHCImgList; // ImageList for MessageBox (high contrast mode)
Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode
sal_uInt16 mnTrackFlags; // tracking flags
sal_uInt16 mnAutoScrollFlags; // auto scroll flags
@@ -267,9 +264,7 @@ struct ImplSVCtrlData
ImageList* mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows)
ImageList* mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows)
Image* mpDisclosurePlus;
- Image* mpDisclosurePlusHC;
Image* mpDisclosureMinus;
- Image* mpDisclosureMinusHC;
ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox
sal_uInt16 mnCheckStyle; // CheckBox-Style for ImageList-Update
sal_uInt16 mnRadioStyle; // Radio-Style for ImageList-Update
@@ -367,14 +362,14 @@ struct ImplSVData
DockingManager* mpDockingManager;
sal_Bool mbIsTestTool;
- vos::OThread::TThreadIdentifier mnMainThreadId;
+ oslThreadIdentifier mnMainThreadId;
rtl::Reference< vcl::DisplayConnection > mxDisplayConnection;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge;
com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient;
::vcl::SettingsConfigItem* mpSettingsConfigItem;
std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList;
- std::hash_map< int, rtl::OUString >* mpPaperNames;
+ boost::unordered_map< int, rtl::OUString >* mpPaperNames;
};
void ImplInitSVData();
@@ -468,3 +463,5 @@ struct ImplSVEvent
};
#endif // _SV_SVDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 61622bcabade..bc76c70e1ebe 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -39,7 +39,6 @@
#define SV_RESID_BITMAP_RADIO 1010
#define SV_RESID_BITMAP_MSGBOX 1020
-#define SV_RESID_BITMAP_MSGBOX_HC 1021
#define SV_RESID_BITMAP_PIN 1030
@@ -51,12 +50,9 @@
#define SV_RESID_BITMAP_SCROLLMSK 1050
#define SV_RESID_BITMAP_SCROLLBMP 1051
#define SV_RESID_BITMAP_CLOSEDOC 1052
-#define SV_RESID_BITMAP_CLOSEDOCHC 1053
#define SV_DISCLOSURE_PLUS 1060
#define SV_DISCLOSURE_MINUS 1061
-#define SV_DISCLOSURE_PLUS_HC 1062
-#define SV_DISCLOSURE_MINUS_HC 1063
#define RID_STR_PAPERNAMES 1070
@@ -142,8 +138,6 @@
#define SV_PRINT_BUTTONLINE 14
#define SV_PRINT_COLLATE_IMG 15
#define SV_PRINT_NOCOLLATE_IMG 16
-#define SV_PRINT_COLLATE_HC_IMG 17
-#define SV_PRINT_NOCOLLATE_HC_IMG 18
#define SV_PRINT_NOPAGES 19
#define SV_PRINT_STATUS_TXT 20
#define SV_PRINT_LOCATION_TXT 21
@@ -235,8 +229,6 @@
#define SV_ICON_LARGE_START 24000
#define SV_ICON_SMALL_START 25000
-#define SV_ICON_LARGE_HC_START 26000
-#define SV_ICON_SMALL_HC_START 27000
#define SV_ICON_ID_OFFICE 1
#define SV_ICON_ID_TEXT 2
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 183cb5ac9b0f..5902573f8746 100755..100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ namespace vcl
//........................................................................
#endif // VCL_TEXTLAYOUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 4fd3238647d0..aec0c11cf790 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,5 @@ struct ImplToolBoxPrivateData
#endif // _SV_TOOLBOX_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
index b00634090b5d..9a061edd1ed4 100644
--- a/vcl/inc/unx/XIM.h
+++ b/vcl/inc/unx/XIM.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ typedef struct _XIMSwitchIMNotifyCallbackStruct {
#define XNLookupDoneCallback "lookupDoneCallback"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/cdeint.hxx b/vcl/inc/unx/cdeint.hxx
index 572f358955c1..c2b7d578b137 100644
--- a/vcl/inc/unx/cdeint.hxx
+++ b/vcl/inc/unx/cdeint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/dtint.hxx b/vcl/inc/unx/dtint.hxx
index 6e6cf13575ed..010a0417d89b 100644
--- a/vcl/inc/unx/dtint.hxx
+++ b/vcl/inc/unx/dtint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 9d51ed0cc194..b54c0a517914 100644
--- a/vcl/inc/unx/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,3 +35,5 @@ bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void);
void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void);
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index bba4399b76c5..5fa0c10f9f56 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,7 +62,7 @@ class GtkSalDisplay : public SalDisplay
bool m_bStartupCompleted;
std::vector< int > m_aXineramaScreenIndexMap;
- GdkCursor* getFromXPM( const char *pBitmap, const char *pMask,
+ GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask,
int nWidth, int nHeight, int nXHot, int nYHot );
public:
GtkSalDisplay( GdkDisplay* pDisplay );
@@ -91,3 +92,5 @@ public:
#endif // _VCL_GTKDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index d03537361056..f4f01a4bb801 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,11 +118,12 @@ class GtkSalFrame : public SalFrame
return (event != NULL)
&& (event->window == window)
&& (event->send_event == send_event)
- && (event->state == state)
+ // ignore non-Gdk state bits, e.g., these used by IBus
+ && ((event->state & GDK_MODIFIER_MASK) == (state & GDK_MODIFIER_MASK))
&& (event->keyval == keyval)
&& (event->hardware_keycode == hardware_keycode)
&& (event->group == group)
- && (event->time - time < 3)
+ && (event->time - time < 300)
;
}
};
@@ -183,13 +185,13 @@ class GtkSalFrame : public SalFrame
guint m_nGSMCookie;
int m_nWorkArea;
bool m_bFullscreen;
- bool m_bSingleAltPress;
bool m_bDefaultPos;
bool m_bDefaultSize;
bool m_bSendModChangeOnRelease;
bool m_bWindowIsGtkPlug;
bool m_bSetFocusOnMap;
String m_aTitle;
+ rtl::OUString m_sWMClass;
IMHandler* m_pIMHandler;
@@ -268,6 +270,8 @@ class GtkSalFrame : public SalFrame
void createNewWindow( XLIB_Window aParent, bool bXEmbed, int nScreen );
void askForXEmbedFocus( sal_Int32 nTimecode );
+ void updateWMClass();
+
DECL_LINK( ImplDelayedFullScreenHdl, void* );
public:
GtkSalFrame( SalFrame* pParent, sal_uLong nStyle );
@@ -371,6 +375,10 @@ public:
// get current modifier and button mask
virtual SalPointerState GetPointerState();
+ virtual SalIndicatorState GetIndicatorState();
+
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode );
+
// set new parent window
virtual void SetParent( SalFrame* pNewParent );
// reparent window to act as a plugin; implementation
@@ -381,6 +389,7 @@ public:
virtual void SetBackgroundBitmap( SalBitmap* );
virtual void SetScreenNumber( unsigned int );
+ virtual void SetApplicationID( const rtl::OUString &rWMClass );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
@@ -405,3 +414,5 @@ GType ooo_fixed_get_type( void );
} // extern "C"
#endif //_VCL_GTKFRAME_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index bc16e94f832e..33120ac8453a 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,3 +179,5 @@ protected:
};
#endif // _VCL_GTKGDI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 40e18b41f7dc..506c78191115 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ public:
};
#endif // _VCL_GTKINST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 18c2fa95d13d..4822a7772be2 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,9 +63,13 @@ public:
virtual void SetBackground();
virtual void SetBackground( SalColor nSalColor );
+ virtual void SetForwardKey( sal_Bool bEnable );
+
virtual const SystemEnvData* GetSystemData() const;
virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
};
#endif // _SV_SALOBJ_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 3a84aa2667c1..43b76615e8ed 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ typedef struct {
} preedit_data_t;
#endif /* _SAL_I18N_CALLBACK_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 977d7f3e3a6f..b038d179f4a2 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,4 @@ private:
#endif // _SAL_I18N_INPUTCONTEXT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index c54749772dd3..e363a47d0c85 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,4 @@ public:
#endif // _SAL_I18N_INPUTMETHOD_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index 641d00dc02c0..e34d80900b79 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,4 @@ sal_Unicode KeysymToUnicode (KeySym nKeySym);
#endif /* _SAL_I18N_KEYSYM_HXX */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 46e4e48f76e1..0b88d778e966 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
#include <tools/gen.hxx>
#include <rtl/ustring.hxx>
-
#include <salimestatus.hxx>
#include <vector>
@@ -122,3 +122,5 @@ public:
} // namespace
#endif // _SAL_I18N_STATUS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 2d75ea6f7d23..c1a1a2864861 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,4 @@ SalI18N_KeyboardExtension::GetEventBase() const
#endif // _SAL_I18N_XKBDEXTENSION_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index 1f23da40a3f8..6f04d0a01220 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ public:
};
#endif // _VCL_KDEDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/pspgraphics.h b/vcl/inc/unx/pspgraphics.h
index 7b39ec80537c..6a9a80647e42 100644
--- a/vcl/inc/unx/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,7 +85,7 @@ public:
// overload all pure virtual methods
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
- virtual sal_uInt16 GetBitCount();
+ virtual sal_uInt16 GetBitCount() const;
virtual long GetGraphicsWidth() const;
virtual void ResetClipRegion();
@@ -103,6 +104,7 @@ public:
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
virtual sal_uLong GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
virtual const ImplFontCharMap* GetImplFontCharMap() const;
+ virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
@@ -189,3 +191,5 @@ public:
};
#endif // _VCL_PSPGRAPHICS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index d5ecdec34961..a389195308d3 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,8 @@ private:
int nScreen,
long nDrawableDepth,
long nX, long nY,
- long nWidth, long nHeight );
+ long nWidth, long nHeight,
+ bool bGrey );
public:
@@ -78,6 +80,7 @@ private:
BitmapBuffer* mpDIB;
ImplSalDDB* mpDDB;
+ bool mbGrey;
public:
@@ -110,6 +113,9 @@ public:
SalGraphics* pGraphics );
virtual bool Create( const SalBitmap& rSalBmp,
sal_uInt16 nNewBitCount );
+ virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
+ Size& rSize,
+ bool bMask = false );
virtual void Destroy();
@@ -235,3 +241,4 @@ public:
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index ac26f81548b4..7bce61cc9ce7 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include <salframe.hxx>
#include <unx/salinst.h>
#include <saldatabasic.hxx>
-#ifndef _OSL_MODULE_H
#include <osl/module.h>
-#endif
#include <vclpluginapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -46,9 +45,8 @@ class SalPrinter;
// -=-= typedefs -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-DECLARE_LIST( SalDisplays, SalDisplay* )
-
-#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD
+#if defined LINUX || defined NETBSD || defined AIX || \
+ defined FREEBSD || defined OPENBSD || defined DRAGONFLY
#include <pthread.h>
#else
typedef unsigned int pthread_t;
@@ -89,8 +87,7 @@ public:
inline void StopTimer();
void Timeout() const;
- const rtl::OUString& GetLocalHostName() const
- { return maLocalHostName; }
+ const rtl::OUString& GetLocalHostName();
rtl::OUString& GetUnicodeAccumulator() { return maUnicodeAccumulator; }
static int XErrorHdl( Display*, XErrorEvent* );
@@ -132,3 +129,4 @@ inline YieldMutexReleaser::~YieldMutexReleaser()
#endif // _SV_SALDATA_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index b97044f8036d..6687762c1e9d 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,16 +38,12 @@ class SalXLib;
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <unx/salunx.h>
#include <vcl/salgtype.hxx>
-#ifndef _SV_PTRSTYLE_HXX
#include <vcl/ptrstyle.hxx>
-#endif
#include <sal/types.h>
-#ifndef _OSL_MUTEX_H
#include <osl/mutex.h>
-#endif
#include <vector>
#include <list>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <tools/gen.hxx>
#include <salwtype.hxx>
@@ -249,9 +246,9 @@ public:
virtual void Remove( int fd );
void XError( Display *pDisp, XErrorEvent *pEvent );
- bool HasXErrorOccured() const { return m_aXErrorHandlerStack.back().m_bWas; }
+ bool HasXErrorOccurred() const { return m_aXErrorHandlerStack.back().m_bWas; }
unsigned int GetLastXErrorRequestCode() const { return m_aXErrorHandlerStack.back().m_nLastErrorRequest; }
- void ResetXErrorOccured() { m_aXErrorHandlerStack.back().m_bWas = false; }
+ void ResetXErrorOccurred() { m_aXErrorHandlerStack.back().m_bWas = false; }
void PushXErrorLevel( bool bIgnore );
void PopXErrorLevel();
@@ -291,7 +288,7 @@ public:
RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {}
};
- typedef std::hash_map<int,RenderEntry> RenderEntryMap;
+ typedef boost::unordered_map<int,RenderEntry> RenderEntryMap;
struct ScreenData
{
@@ -382,6 +379,7 @@ protected:
bool m_bXinerama;
std::vector< Rectangle > m_aXineramaScreens;
+ std::vector< int > m_aXineramaScreenIndexMap;
std::list<SalFrame*> m_aFrames;
std::list<SalObject*> m_aSalObjects;
@@ -396,7 +394,7 @@ protected:
int processRandREvent( XEvent* );
void doDestruct();
- int addXineramaScreenUnique( long i_nX, long i_nY, long i_nWidth, long i_nHeight );
+ void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight );
public:
static SalDisplay *GetSalDisplay( Display* display );
static sal_Bool BestVisual( Display *pDisp,
@@ -428,6 +426,8 @@ public:
void Beep() const;
void ModifierMapping();
+ void SimulateKeyPress( sal_uInt16 nKeyCode );
+ sal_uInt16 GetIndicatorState() const;
String GetKeyNameFromKeySym( KeySym keysym ) const;
XubString GetKeyName( sal_uInt16 nKeyCode ) const;
sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const;
@@ -494,7 +494,7 @@ public:
{ mpInputMethod = pInputMethod; }
void SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension)
{ mpKbdExtension = pKbdExtension; }
- const char* GetKeyboardName( sal_Bool bRefresh = sal_False );
+ const char* GetKeyboardName( bool bRefresh = false );
::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; }
bool IsXinerama() const { return m_bXinerama; }
@@ -549,3 +549,5 @@ namespace vcl_sal {
#endif // _SV_SALDISP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salfont.h b/vcl/inc/unx/salfont.h
deleted file mode 100644
index b3fbe93137f3..000000000000
--- a/vcl/inc/unx/salfont.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALFONT_H
-#define _SV_SALFONT_H
-
-// -=-= exports =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class SalFontCache;
-struct SalFontDimension;
-class SalFontFamily;
-class SalFontFamilyList;
-class SalFontStruct;
-class SalFontStructList;
-class SalFonts;
-
-// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include <salstd.hxx>
-#include <vcl/outfont.hxx>
-
-// -=-= forwards =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-typedef ULONG XFP_FLAGS;
-
-class SalDisplay;
-class SalFontCacheItem;
-
-// -=-= SalFontCache -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-DECLARE_LIST( SalFontCache, SalFontCacheItem* )
-
-// -=-= SalFontDimension -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-struct SalFontDimension
-{
- USHORT nHeight_; // [pixel]
- USHORT nPtHeight_; // [point/10]
- USHORT nAverage_; // [pixel/10]
- USHORT nXRes_; // [dpi]
- USHORT nYRes_; // [dpi]
- USHORT nSlant_; // [pixel]
-// size_t nUnderlineThickness_; // [pixel]
-// size_t nUnderlinePosition_; // [pixel]
-// size_t nStrikeoutAscent_; // [pixel]
-// size_t nStrikeoutDescent_; // [pixel]
-// Subscript, Superscript, Capital, Space ...
-
- inline SalFontDimension( USHORT nA = 0, USHORT nH = 0 );
-
- inline BOOL IsScalable() const;
- inline USHORT GetWidth() const { return (nAverage_ + 5) / 10; }
- inline Size GetSize() const;
- inline void SetSize( const Size & rSize );
- inline BOOL operator == ( const SalFontDimension &r ) const;
- inline BOOL operator != ( const SalFontDimension &r ) const;
- inline BOOL operator >= ( const SalFontDimension &r ) const;
-};
-
-inline SalFontDimension::SalFontDimension( USHORT nA, USHORT nH )
- : nHeight_( nH ), nAverage_( nA )
-{ nPtHeight_ = nXRes_ = nYRes_ = nSlant_ = 0; }
-
-inline BOOL SalFontDimension::IsScalable() const
-{ return !nHeight_ && !nPtHeight_ && !nAverage_; }
-
-inline Size SalFontDimension::GetSize() const
-{ return Size( (nAverage_ + 5) / 10, nHeight_ ); }
-
-inline void SalFontDimension::SetSize( const Size & rSize )
-{ nAverage_ = (USHORT)rSize.Width() * 10; nHeight_ = (USHORT)rSize.Height(); }
-
-inline BOOL SalFontDimension::operator == ( const SalFontDimension &r ) const
-{ return nHeight_ == r.nHeight_ && (!r.nAverage_ || nAverage_ == r.nAverage_); }
-
-inline BOOL SalFontDimension::operator != ( const SalFontDimension &r ) const
-{ return !(*this == r); }
-
-inline BOOL SalFontDimension::operator >= ( const SalFontDimension &r ) const
-{ return nHeight_ > r.nHeight_
- || (nHeight_ == r.nHeight_ && nAverage_ >= r.nAverage_); }
-
-// -=-= SalFontStruct =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class SalFontStruct : public ImplFontMetricData
-{
- friend class SalDisplay;
- friend class SalGraphicsData;
-
- SalFontCacheItem*pCache_;
-
-#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
- ByteString aFontName_;
-#endif
- USHORT nHeightCount_; // Anzahl der Hoehen-Eintraege
- SalFontDimension*pDimensions_; // Hoehen-Array
- USHORT nWeight_;
-
- USHORT nFoundry_; // properties indexies
- USHORT nFamily_;
- USHORT nWeightName_;
- USHORT nSlant_;
- USHORT nSetWidthName_;
- ByteString aAddStyleName_;
- USHORT nSpacing_;
- USHORT nCharSet_;
- USHORT nFaceName_;
- BOOL mbValidFontDescription; // valid xlfd entries
-
- void Init();
- BOOL Init( SalDisplay* pDisp,
- const char* pFontName,
- SalFontDimension& rDim );
-
- ByteString GetXFontName( const SalFontDimension& );
-
- inline void SetFoundry( USHORT n )
- { nFoundry_ = n; }
- inline void SetFamily( USHORT n )
- { meFamily = sal_FamilyToSal( nFamily_ = n ); }
- inline void SetWeightName( USHORT n )
- { meWeight = sal_WeightToSal( nWeightName_ = n ); }
- inline void SetSlant( USHORT n )
- { meItalic = sal_ItalicToSal( nSlant_ = n ); }
- inline void SetSetWidthName( USHORT n )
- { nSetWidthName_ = n; }
- inline void SetAddStyleName( const ByteString& rAddStyle )
- { aAddStyleName_ = rAddStyle; aAddStyleName_.ToLowerAscii(); }
- inline void SetSpacing( USHORT n )
- { mePitch = sal_PitchToSal( nSpacing_ = n ); }
- inline void SetAverage( long n )
- { mnWidth = (n + 5) / 10; }
- void SetCharSet( USHORT n );
-
- SalFontStruct( const SalFontStruct& rFont );
-public:
- SalFontStruct( SalDisplay* pDisp,
- const char* pFontName,
- SalFontDimension& rDim );
-
- ~SalFontStruct();
-
- inline void Cache( SalFontCacheItem *p ) { pCache_ = p; }
- inline SalFontCacheItem*IsCache() const { return pCache_; }
- inline BOOL IsScalable() const { return TYPE_SCALABLE==meType; }
- inline SalFontDimension*GetDim() const { return pDimensions_; }
- inline BOOL IsValid() const { return mbValidFontDescription; }
-#ifdef DBG_UTIL
- const ByteString& GetName() const { return aFontName_; }
-#endif
-
- ImplFontData *GetDevFontData();
- SalFontCacheItem*Load( SalDisplay *pDisp, const SalFontDimension &rDim );
- CharSet GetCharSet() { return meCharSet; }
-
-};
-
-// -=-= SalFontStructList =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-DECLARE_LIST( SalFontStructList, SalFontStruct* )
-
-#endif // _SV_SALFONT_H
-
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 02dc58f67d2b..4bfe8958d728 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,7 +92,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
sal_uInt16 nKeyCode_; // last key code
sal_uInt16 nKeyState_; // last key state
int nCompose_; // compose state
- bool mbKeyMenu;
bool mbSendExtKeyModChange;
sal_uInt16 mnExtKeyMod;
@@ -130,6 +130,8 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
String m_aTitle;
+ rtl::OUString m_sWMClass;
+
SystemChildData maSystemChildData;
SalI18N_InputContext *mpInputContext;
@@ -139,6 +141,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
int m_nCurClipRect;
int m_nMaxClipRect;
+ bool mPendingSizeEvent;
void GetPosSize( Rectangle &rPosSize );
void SetSize ( const Size &rSize );
@@ -172,6 +175,8 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
void setXEmbedInfo();
void askForXEmbedFocus( sal_Int32 i_nTimeCode );
+
+ void updateWMClass();
public:
X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL );
virtual ~X11SalFrame();
@@ -259,11 +264,14 @@ public:
virtual void Beep( SoundType eSoundType );
virtual const SystemEnvData* GetSystemData() const;
virtual SalPointerState GetPointerState();
+ virtual SalIndicatorState GetIndicatorState();
+ virtual void SimulateKeyPress( sal_uInt16 nKeyCode );
virtual void SetParent( SalFrame* pNewParent );
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetBackgroundBitmap( SalBitmap* pBitmap );
virtual void SetScreenNumber( unsigned int );
+ virtual void SetApplicationID( const rtl::OUString &rWMClass );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
@@ -277,6 +285,9 @@ public:
static void SaveYourselfDone( SalFrame* );
static Bool checkKeyReleaseForRepeat( Display*, XEvent*, XPointer pX11SalFrame );
+
+ /// @internal
+ void setPendingSizeEvent();
};
#ifdef _SV_SALDISP_HXX
@@ -291,3 +302,4 @@ inline XLIB_Window X11SalFrame::GetDrawable() const
#endif // _SV_SALFRAME_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index a6f30ee92930..7786ffe195ea 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,14 +66,27 @@ namespace basegfx {
class CairoFontsCache
{
+public:
+ struct CacheId
+ {
+ const void *mpFace;
+ const void *mpOptions;
+ bool mbEmbolden;
+ bool operator ==(const CacheId& rOther) const
+ {
+ return mpFace == rOther.mpFace &&
+ mpOptions == rOther.mpOptions &&
+ mbEmbolden == rOther.mbEmbolden;
+ }
+ };
private:
static int mnRefCount;
- typedef std::deque< std::pair<void *, void*> > LRUFonts;
+ typedef std::deque< std::pair<void *, CacheId> > LRUFonts;
static LRUFonts maLRUFonts;
public:
CairoFontsCache();
- static void CacheFont(void *pFont, void *pId);
- static void* FindCachedFont(void *pId);
+ static void CacheFont(void *pFont, const CacheId &rId);
+ static void* FindCachedFont(const CacheId &rId);
~CairoFontsCache();
};
@@ -88,8 +102,8 @@ protected:
SalColormap *m_pDeleteColormap;
Drawable hDrawable_; // use
int m_nScreen;
- void* m_pRenderFormat;
- XID m_aRenderPicture;
+ mutable XRenderPictFormat* m_pXRenderFormat;
+ XID m_aXRenderPicture;
CairoFontsCache m_aCairoFontsCache;
XLIB_Region pPaintRegion_;
@@ -217,8 +231,8 @@ public:
inline Drawable GetDrawable() const { return hDrawable_; }
void SetDrawable( Drawable d, int nScreen );
XID GetXRenderPicture();
- void* GetXRenderFormat() const { return m_pRenderFormat; }
- inline void SetXRenderFormat( void* pRenderFormat ) { m_pRenderFormat = pRenderFormat; }
+ XRenderPictFormat* GetXRenderFormat() const;
+ inline void SetXRenderFormat( XRenderPictFormat* pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
inline const SalColormap& GetColormap() const { return *m_pColormap; }
using SalGraphics::GetPixel;
inline Pixel GetPixel( SalColor nSalColor ) const;
@@ -227,7 +241,7 @@ public:
// overload all pure virtual methods
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
- virtual sal_uInt16 GetBitCount();
+ virtual sal_uInt16 GetBitCount() const;
virtual long GetGraphicsWidth() const;
virtual long GetGraphicsHeight() const;
@@ -250,6 +264,7 @@ public:
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
virtual sal_uLong GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
virtual const ImplFontCharMap* GetImplFontCharMap() const;
+ virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
@@ -386,3 +401,4 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
#endif // _SV_SALGDI_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 31da4b1a86bd..4d264f7c9f45 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,20 +31,16 @@
#define _SV_SALINST_H
#include <vcl/sv.h>
-#ifndef _VOS_MUTEX_HXX
-#include <vos/mutex.hxx>
-#endif
-#ifndef _VOS_THREAD_HXX
-#include <vos/thread.hxx>
-#endif
+#include <osl/thread.hxx>
#include <vclpluginapi.h>
#include <salinst.hxx>
+#include <vcl/solarmutex.hxx>
-class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vos::OMutex
+class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vcl::SolarMutexObject
{
protected:
sal_uIntPtr mnCount;
- vos::OThread::TThreadIdentifier mnThreadId;
+ oslThreadIdentifier mnThreadId;
public:
SalYieldMutex();
@@ -53,7 +50,7 @@ public:
virtual sal_Bool tryToAcquire();
sal_uIntPtr GetAcquireCount() const { return mnCount; }
- vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
+ oslThreadIdentifier GetThreadId() const { return mnThreadId; }
};
// -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -99,7 +96,7 @@ public:
virtual SalBitmap* CreateSalBitmap();
virtual SalSession* CreateSalSession();
- virtual vos::IMutex* GetYieldMutex();
+ virtual osl::SolarMutex* GetYieldMutex();
virtual sal_uIntPtr ReleaseYieldMutex();
virtual void AcquireYieldMutex( sal_uIntPtr nCount );
virtual bool CheckYieldMutex();
@@ -117,6 +114,9 @@ public:
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void updatePrinterUpdate();
+ virtual void jobStartedPrinterUpdate();
+ virtual void jobEndedPrinterUpdate();
bool isPrinterInit() const
{
@@ -126,3 +126,4 @@ public:
#endif // _SV_SALINST_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 09a753ff1d98..e7b5effed653 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,4 @@ public:
#endif // _SV_SALMENU_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index c9c6bfe4a8e7..5f10027a0d8b 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ public:
};
#endif // _SV_SALOBJ_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salprn.h b/vcl/inc/unx/salprn.h
index 3f23836828d8..783c85b160b5 100644
--- a/vcl/inc/unx/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,7 @@
class PspGraphics;
-class PspSalInfoPrinter : public SalInfoPrinter
+class VCL_DLLPUBLIC PspSalInfoPrinter : public SalInfoPrinter
{
public:
PspGraphics* m_pGraphics;
@@ -63,7 +64,7 @@ public:
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
-class PspSalPrinter : public SalPrinter
+class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter
{
public:
String m_aFileName;
@@ -85,7 +86,6 @@ public:
virtual ~PspSalPrinter();
// overload all pure virtual methods
- using SalPrinter::StartJob;
virtual sal_Bool StartJob( const XubString* pFileName,
const XubString& rJobName,
const XubString& rAppName,
@@ -105,23 +105,7 @@ public:
virtual sal_uIntPtr GetErrorCode();
};
-class Timer;
-
-namespace vcl_sal {
-class VCLPLUG_GEN_PUBLIC PrinterUpdate
-{
- static Timer* pPrinterUpdateTimer;
- static int nActiveJobs;
-
- static void doUpdate();
- DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, void* );
-public:
- static void update();
- static void jobStarted() { nActiveJobs++; }
- static void jobEnded();
-};
-}
-
#endif // _SV_SALPRN_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index cc03b3fb35a4..07056a91bdec 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,4 @@ struct XWindowChanges;
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salsys.h b/vcl/inc/unx/salsys.h
index 3b21985b8282..e4ce898e9550 100644
--- a/vcl/inc/unx/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,12 +31,8 @@
#define _SV_SALSYS_H
#include <vcl/sv.h>
-#ifndef _VOS_MUTEX_HXX
-#include <vos/mutex.hxx>
-#endif
-#ifndef _VOS_THREAD_HXX
-#include <vos/thread.hxx>
-#endif
+#include <osl/mutex.hxx>
+#include <osl/thread.hxx>
#include <salsys.hxx>
#include <vclpluginapi.h>
@@ -65,3 +62,5 @@ public:
};
#endif // _SV_SALSYS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index f92c6df7c8a5..f5c889cabe6e 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 8e82258e51a2..f022f43ce028 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,8 @@
#define _SALUNX_H
// -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || defined NETBSD
+#if defined LINUX || defined FREEBSD || \
+ defined NETBSD || defined OPENBSD || defined DRAGONFLY
#include <sys/time.h>
#elif defined AIX
#include <time.h>
@@ -126,3 +128,4 @@ inline timeval operator - ( const timeval &t1, const timeval &t2 )
}
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index d5f6b0988147..42ce192ea76f 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,7 +62,7 @@ public:
sal_uInt16 nBitCount,
int nScreen,
Pixmap hDrawable = None,
- void* pRenderFormat = NULL );
+ XRenderPictFormat* pXRenderFormat = NULL );
inline void InitGraphics( X11SalVirtualDevice *pVD );
inline Display *GetXDisplay() const;
@@ -99,3 +100,4 @@ inline sal_Bool X11SalVirtualDevice::IsDisplay() const
#endif // _SV_SALVD_H
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index f5123f3e7ae0..a7900d3981e7 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,7 @@ public:
static void saveDone();
static void interactionDone( bool bCancelShutdown );
- static String getExecName();
+ static rtl::OUString getExecName();
static VCLPLUG_GEN_PUBLIC const ByteString& getSessionID();
};
@@ -90,3 +91,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/soicon.hxx b/vcl/inc/unx/soicon.hxx
index 4efaea4e736f..cb3302cb777b 100644
--- a/vcl/inc/unx/soicon.hxx
+++ b/vcl/inc/unx/soicon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,3 +36,5 @@ sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,
sal_uInt16 nIcon, sal_uInt16 iconSize,
Pixmap& icon_pixmap, Pixmap& icon_mask );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/strhelper.hxx b/vcl/inc/unx/strhelper.hxx
index cd0220b77e05..78db60567133 100644
--- a/vcl/inc/unx/strhelper.hxx
+++ b/vcl/inc/unx/strhelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ int GetCommandLineTokenCount( const String& );
String WhitespaceToSpace( const String&, BOOL bProtect = TRUE );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index a2ee16f7091d..0adc3e423329 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,5 @@
#include <unx/svunx.h>
#endif // _SV_SVSYS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/svunx.h b/vcl/inc/unx/svunx.h
index e7d6150b79f4..e3ea4cc3e790 100644
--- a/vcl/inc/unx/svunx.h
+++ b/vcl/inc/unx/svunx.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 88f0e62024a9..dc0fe65f290b 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _VCL_WMADAPTOR_HXX_
#define _VCL_WMADAPTOR_HXX_
-#ifndef _TL_STRING_HXX
#include <tools/string.hxx>
-#endif
#include <tools/gen.hxx>
#ifndef _PREX_H
#include <tools/prex.h>
@@ -352,3 +351,5 @@ public:
} // namespace
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h
index 293c9757e77b..a78666bb243d 100644
--- a/vcl/inc/unx/x11_cursors/airbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define airbrush_curs_height 32
#define airbrush_curs_x_hot 5
#define airbrush_curs_y_hot 22
-static char airbrush_curs_bits[] = {
+static unsigned char airbrush_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
@@ -38,3 +39,5 @@ static char airbrush_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h
index 811ea2819669..82d70f05bbb7 100644
--- a/vcl/inc/unx/x11_cursors/airbrush_mask.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define airbrush_mask_height 32
#define airbrush_mask_x_hot 5
#define airbrush_mask_y_hot 22
-static char airbrush_mask_bits[] = {
+static unsigned char airbrush_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
@@ -38,3 +39,5 @@ static char airbrush_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/ase_curs.h b/vcl/inc/unx/x11_cursors/ase_curs.h
index 52b67f56d2ae..0a7c9bfd29c2 100644
--- a/vcl/inc/unx/x11_cursors/ase_curs.h
+++ b/vcl/inc/unx/x11_cursors/ase_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define ase_curs_height 32
#define ase_curs_x_hot 19
#define ase_curs_y_hot 16
-static char ase_curs_bits[] = {
+static unsigned char ase_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char ase_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/ase_mask.h b/vcl/inc/unx/x11_cursors/ase_mask.h
index 5dbd5c134dbf..4ded0773a72a 100644
--- a/vcl/inc/unx/x11_cursors/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define ase_mask_height 32
#define ase_mask_x_hot 19
#define ase_mask_y_hot 16
-static char ase_mask_bits[] = {
+static unsigned char ase_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char ase_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asn_curs.h b/vcl/inc/unx/x11_cursors/asn_curs.h
index 3b5f4364b5e2..68ab521de1a5 100644
--- a/vcl/inc/unx/x11_cursors/asn_curs.h
+++ b/vcl/inc/unx/x11_cursors/asn_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asn_curs_height 32
#define asn_curs_x_hot 16
#define asn_curs_y_hot 12
-static char asn_curs_bits[] = {
+static unsigned char asn_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,
0x00,0x00,0xc0,0x07,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0x20,
0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,
@@ -38,3 +39,5 @@ static char asn_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asn_mask.h b/vcl/inc/unx/x11_cursors/asn_mask.h
index 902fe80df8a1..0e7a30e5a190 100644
--- a/vcl/inc/unx/x11_cursors/asn_mask.h
+++ b/vcl/inc/unx/x11_cursors/asn_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asn_mask_height 32
#define asn_mask_x_hot 16
#define asn_mask_y_hot 12
-static char asn_mask_bits[] = {
+static unsigned char asn_mask_bits[] = {
0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,
0x00,0x00,0xe0,0x0f,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0,
0x1f,0x00,0x00,0x20,0x08,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
@@ -38,3 +39,5 @@ static char asn_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asne_curs.h b/vcl/inc/unx/x11_cursors/asne_curs.h
index 0939b1d07e4b..8ba58f9639e2 100644
--- a/vcl/inc/unx/x11_cursors/asne_curs.h
+++ b/vcl/inc/unx/x11_cursors/asne_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asne_curs_height 32
#define asne_curs_x_hot 21
#define asne_curs_y_hot 10
-static char asne_curs_bits[] = {
+static unsigned char asne_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x80,
0x3f,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x1c,0x00,0x00,
0x00,0x1c,0x00,0x00,0x70,0x18,0x00,0x00,0xf8,0x08,0x00,0x00,0xf8,0x00,0x00,
@@ -38,3 +39,5 @@ static char asne_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asne_mask.h b/vcl/inc/unx/x11_cursors/asne_mask.h
index 9ab55c293218..6408f127b1f4 100644
--- a/vcl/inc/unx/x11_cursors/asne_mask.h
+++ b/vcl/inc/unx/x11_cursors/asne_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asne_mask_height 32
#define asne_mask_x_hot 21
#define asne_mask_y_hot 10
-static char asne_mask_bits[] = {
+static unsigned char asne_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x80,0x7f,0x00,0x00,0xc0,
0x7f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xc0,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00,
0x70,0x3e,0x00,0x00,0xf8,0x3c,0x00,0x00,0xfc,0x1d,0x00,0x00,0xfc,0x09,0x00,
@@ -38,3 +39,5 @@ static char asne_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asns_curs.h b/vcl/inc/unx/x11_cursors/asns_curs.h
index fef8fe2f4ab5..3e039241ba61 100644
--- a/vcl/inc/unx/x11_cursors/asns_curs.h
+++ b/vcl/inc/unx/x11_cursors/asns_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asns_curs_height 32
#define asns_curs_x_hot 15
#define asns_curs_y_hot 15
-static char asns_curs_bits[] = {
+static unsigned char asns_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,
0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00,
@@ -38,3 +39,5 @@ static char asns_curs_bits[] = {
0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,0x80,0x00,0x00,0x00,
0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asns_mask.h b/vcl/inc/unx/x11_cursors/asns_mask.h
index f90cb95ee721..2a753501bc9d 100644
--- a/vcl/inc/unx/x11_cursors/asns_mask.h
+++ b/vcl/inc/unx/x11_cursors/asns_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asns_mask_height 32
#define asns_mask_x_hot 15
#define asns_mask_y_hot 15
-static char asns_mask_bits[] = {
+static unsigned char asns_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,
0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,
@@ -38,3 +39,5 @@ static char asns_mask_bits[] = {
0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,
0xc0,0x01,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asnswe_curs.h b/vcl/inc/unx/x11_cursors/asnswe_curs.h
index fd6ddaca65cb..599511e1d433 100644
--- a/vcl/inc/unx/x11_cursors/asnswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asnswe_curs_height 32
#define asnswe_curs_x_hot 15
#define asnswe_curs_y_hot 15
-static char asnswe_curs_bits[] = {
+static unsigned char asnswe_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,
0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00,
@@ -38,3 +39,5 @@ static char asnswe_curs_bits[] = {
0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,0x80,0x00,0x00,0x00,
0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asnswe_mask.h b/vcl/inc/unx/x11_cursors/asnswe_mask.h
index e48da90e3de5..a0bcb3c5310e 100644
--- a/vcl/inc/unx/x11_cursors/asnswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asnswe_mask_height 32
#define asnswe_mask_x_hot 15
#define asnswe_mask_y_hot 15
-static char asnswe_mask_bits[] = {
+static unsigned char asnswe_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,
0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,
@@ -38,3 +39,5 @@ static char asnswe_mask_bits[] = {
0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,
0xc0,0x01,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asnw_curs.h b/vcl/inc/unx/x11_cursors/asnw_curs.h
index cb3a35d793c7..139cd4e2ea5e 100644
--- a/vcl/inc/unx/x11_cursors/asnw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnw_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asnw_curs_height 32
#define asnw_curs_x_hot 10
#define asnw_curs_y_hot 10
-static char asnw_curs_bits[] = {
+static unsigned char asnw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0xfc,0x01,0x00,
0x00,0xfc,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,
0x00,0x00,0x18,0x0e,0x00,0x00,0x10,0x1f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char asnw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asnw_mask.h b/vcl/inc/unx/x11_cursors/asnw_mask.h
index e583957c4bae..6f7da9a88661 100644
--- a/vcl/inc/unx/x11_cursors/asnw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnw_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asnw_mask_height 32
#define asnw_mask_x_hot 10
#define asnw_mask_y_hot 10
-static char asnw_mask_bits[] = {
+static unsigned char asnw_mask_bits[] = {
0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0xfe,0x01,0x00,0x00,0xfe,0x03,0x00,
0x00,0xfe,0x07,0x00,0x00,0xfe,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x7c,0x0e,
0x00,0x00,0x3c,0x1f,0x00,0x00,0xb8,0x3f,0x00,0x00,0x90,0x3f,0x00,0x00,0x80,
@@ -38,3 +39,5 @@ static char asnw_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/ass_curs.h b/vcl/inc/unx/x11_cursors/ass_curs.h
index ea942cefe942..ea98bf5b0404 100644
--- a/vcl/inc/unx/x11_cursors/ass_curs.h
+++ b/vcl/inc/unx/x11_cursors/ass_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define ass_curs_height 32
#define ass_curs_x_hot 15
#define ass_curs_y_hot 19
-static char ass_curs_bits[] = {
+static unsigned char ass_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char ass_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x04,0x00,0x00,0xf0,0x07,0x00,0x00,
0xe0,0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00,0x80,0x00,0x00,
0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/ass_mask.h b/vcl/inc/unx/x11_cursors/ass_mask.h
index b35298183cb1..ccb91615d34a 100644
--- a/vcl/inc/unx/x11_cursors/ass_mask.h
+++ b/vcl/inc/unx/x11_cursors/ass_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define ass_mask_height 32
#define ass_mask_x_hot 15
#define ass_mask_y_hot 19
-static char ass_mask_bits[] = {
+static unsigned char ass_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char ass_mask_bits[] = {
0x01,0x00,0x00,0x10,0x04,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,
0xf0,0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,
0x00,0xc0,0x01,0x00,0x00,0x80,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asse_curs.h b/vcl/inc/unx/x11_cursors/asse_curs.h
index 4b30e81882ff..0df55658c10a 100644
--- a/vcl/inc/unx/x11_cursors/asse_curs.h
+++ b/vcl/inc/unx/x11_cursors/asse_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asse_curs_height 32
#define asse_curs_x_hot 21
#define asse_curs_y_hot 21
-static char asse_curs_bits[] = {
+static unsigned char asse_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char asse_curs_bits[] = {
0xf8,0x08,0x00,0x00,0x70,0x18,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x1c,0x00,
0x00,0x00,0x3f,0x00,0x00,0xc0,0x3f,0x00,0x00,0x80,0x3f,0x00,0x00,0x00,0x3c,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asse_mask.h b/vcl/inc/unx/x11_cursors/asse_mask.h
index ad74b0cf724a..1835e939f275 100644
--- a/vcl/inc/unx/x11_cursors/asse_mask.h
+++ b/vcl/inc/unx/x11_cursors/asse_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asse_mask_height 32
#define asse_mask_x_hot 21
#define asse_mask_y_hot 21
-static char asse_mask_bits[] = {
+static unsigned char asse_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char asse_mask_bits[] = {
0xfc,0x1d,0x00,0x00,0xf8,0x3c,0x00,0x00,0x70,0x3e,0x00,0x00,0x00,0x3f,0x00,
0x00,0xc0,0x7f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xc0,0x7f,0x00,0x00,0x80,0x7f,
0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/assw_curs.h b/vcl/inc/unx/x11_cursors/assw_curs.h
index d26c36e79ed4..5956aa5bf40b 100644
--- a/vcl/inc/unx/x11_cursors/assw_curs.h
+++ b/vcl/inc/unx/x11_cursors/assw_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define assw_curs_height 32
#define assw_curs_x_hot 21
#define assw_curs_y_hot 21
-static char assw_curs_bits[] = {
+static unsigned char assw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char assw_curs_bits[] = {
0x00,0x00,0x18,0x0e,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0xfc,
0x00,0x00,0x00,0xfc,0x03,0x00,0x00,0xfc,0x01,0x00,0x00,0x3c,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/assw_mask.h b/vcl/inc/unx/x11_cursors/assw_mask.h
index ea47a3ee27e9..3023b2a6061f 100644
--- a/vcl/inc/unx/x11_cursors/assw_mask.h
+++ b/vcl/inc/unx/x11_cursors/assw_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define assw_mask_height 32
#define assw_mask_x_hot 21
#define assw_mask_y_hot 21
-static char assw_mask_bits[] = {
+static unsigned char assw_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char assw_mask_bits[] = {
0x00,0x00,0x18,0x0e,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0xfc,
0x00,0x00,0x00,0xfc,0x03,0x00,0x00,0xfc,0x01,0x00,0x00,0x3c,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asw_curs.h b/vcl/inc/unx/x11_cursors/asw_curs.h
index 7b9b2199955a..8064570cb8fe 100644
--- a/vcl/inc/unx/x11_cursors/asw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asw_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asw_curs_height 32
#define asw_curs_x_hot 12
#define asw_curs_y_hot 15
-static char asw_curs_bits[] = {
+static unsigned char asw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char asw_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/asw_mask.h b/vcl/inc/unx/x11_cursors/asw_mask.h
index df934399fe91..245c42e7d790 100644
--- a/vcl/inc/unx/x11_cursors/asw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asw_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define asw_mask_height 32
#define asw_mask_x_hot 12
#define asw_mask_y_hot 15
-static char asw_mask_bits[] = {
+static unsigned char asw_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
@@ -38,3 +39,5 @@ static char asw_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/aswe_curs.h b/vcl/inc/unx/x11_cursors/aswe_curs.h
index f06d2140559e..ed83d450c269 100644
--- a/vcl/inc/unx/x11_cursors/aswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/aswe_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define aswe_curs_height 32
#define aswe_curs_x_hot 15
#define aswe_curs_y_hot 15
-static char aswe_curs_bits[] = {
+static unsigned char aswe_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char aswe_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/aswe_mask.h b/vcl/inc/unx/x11_cursors/aswe_mask.h
index c04dbf5deafb..d2a97d7fa4c8 100644
--- a/vcl/inc/unx/x11_cursors/aswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/aswe_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define aswe_mask_height 32
#define aswe_mask_x_hot 15
#define aswe_mask_y_hot 15
-static char aswe_mask_bits[] = {
+static unsigned char aswe_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char aswe_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chain_curs.h b/vcl/inc/unx/x11_cursors/chain_curs.h
index 95b4fbe66c2e..ea319fb6b128 100644
--- a/vcl/inc/unx/x11_cursors/chain_curs.h
+++ b/vcl/inc/unx/x11_cursors/chain_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define chain_curs_height 32
#define chain_curs_x_hot 0
#define chain_curs_y_hot 2
-static char chain_curs_bits[] = {
+static unsigned char chain_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,
0x00,0x05,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x21,0x00,
0x00,0x00,0x41,0x00,0x00,0x00,0x81,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x01,
@@ -38,3 +39,5 @@ static char chain_curs_bits[] = {
0x91,0x28,0x80,0x24,0x91,0x28,0x80,0x24,0x91,0x24,0x80,0x98,0x4f,0x23,0x00,
0x41,0x20,0x10,0x00,0x3e,0xde,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chain_mask.h b/vcl/inc/unx/x11_cursors/chain_mask.h
index 91d89bbed3c6..688835ecbd3e 100644
--- a/vcl/inc/unx/x11_cursors/chain_mask.h
+++ b/vcl/inc/unx/x11_cursors/chain_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define chain_mask_width 32
#define chain_mask_height 32
-static char chain_mask_bits[] = {
+static unsigned char chain_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,
0x00,0x07,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x3f,0x00,
0x00,0x00,0x7f,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0xff,
@@ -36,3 +37,5 @@ static char chain_mask_bits[] = {
0xf1,0x38,0x80,0xe7,0xf1,0x38,0x80,0xe7,0xf1,0x3c,0x80,0xff,0xff,0x3f,0x00,
0x7f,0xff,0x1f,0x00,0x3e,0xde,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chainnot_curs.h b/vcl/inc/unx/x11_cursors/chainnot_curs.h
index 841e2efdec63..e327586e3110 100644
--- a/vcl/inc/unx/x11_cursors/chainnot_curs.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define chainnot_curs_height 32
#define chainnot_curs_x_hot 2
#define chainnot_curs_y_hot 2
-static char chainnot_curs_bits[] = {
+static unsigned char chainnot_curs_bits[] = {
0x00,0x00,0x00,0x00,0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xf0,0x00,
0x00,0x38,0xc0,0x01,0x00,0x7c,0x80,0x03,0x00,0xec,0x00,0x03,0x00,0xce,0x01,
0x07,0x00,0x86,0x03,0x06,0x00,0x06,0x07,0x06,0x00,0x06,0x0e,0x06,0x00,0x06,
@@ -38,3 +39,5 @@ static char chainnot_curs_bits[] = {
0x44,0xa2,0x00,0x92,0x44,0xa2,0x00,0x92,0x44,0x92,0x00,0x62,0x3e,0x8d,0x00,
0x04,0x81,0x40,0x00,0xf8,0x78,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chainnot_mask.h b/vcl/inc/unx/x11_cursors/chainnot_mask.h
index 9fbed6408c54..6666599ad64c 100644
--- a/vcl/inc/unx/x11_cursors/chainnot_mask.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define chainnot_mask_width 32
#define chainnot_mask_height 32
-static char chainnot_mask_bits[] = {
+static unsigned char chainnot_mask_bits[] = {
0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xff,0x00,0x00,0xf8,0xff,0x01,
0x00,0xfc,0xf0,0x03,0x00,0xfe,0xc0,0x07,0x00,0xfe,0x81,0x07,0x00,0xff,0x83,
0x0f,0x00,0xcf,0x07,0x0f,0x00,0x8f,0x0f,0x0f,0x00,0x0f,0x1f,0x0f,0x00,0x0f,
@@ -36,3 +37,5 @@ static char chainnot_mask_bits[] = {
0xc7,0xe3,0x00,0x9e,0xc7,0xe3,0x00,0x9e,0xc7,0xf3,0x00,0xfe,0xff,0xff,0x00,
0xfc,0xfd,0x7f,0x00,0xf8,0x78,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chart_curs.h b/vcl/inc/unx/x11_cursors/chart_curs.h
index 9346fbd8f2c0..f1fbd5557ad4 100644
--- a/vcl/inc/unx/x11_cursors/chart_curs.h
+++ b/vcl/inc/unx/x11_cursors/chart_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define chart_curs_height 32
#define chart_curs_x_hot 15
#define chart_curs_y_hot 16
-static char chart_curs_bits[] = {
+static unsigned char chart_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,
@@ -38,3 +39,5 @@ static char chart_curs_bits[] = {
0x10,0x00,0x00,0x80,0x00,0x06,0x00,0x00,0x10,0x06,0x00,0x00,0x00,0x06,0x00,
0x00,0x10,0x36,0x00,0x00,0xc0,0x36,0x00,0x00,0xd0,0x36,0x00,0x00,0xc0,0x36,
0x00,0x00,0xf0,0x7f,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chart_mask.h b/vcl/inc/unx/x11_cursors/chart_mask.h
index d4804fb6c85b..53f4ae125bda 100644
--- a/vcl/inc/unx/x11_cursors/chart_mask.h
+++ b/vcl/inc/unx/x11_cursors/chart_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define chart_mask_height 32
#define chart_mask_x_hot 15
#define chart_mask_y_hot 16
-static char chart_mask_bits[] = {
+static unsigned char chart_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,
@@ -38,3 +39,5 @@ static char chart_mask_bits[] = {
0x39,0x0f,0x00,0xc0,0x39,0x0f,0x00,0xc0,0x39,0x0f,0x00,0x00,0x38,0x7f,0x00,
0x00,0xf8,0x7f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0xff,
0x00,0x00,0xf8,0xff,0x00,0x00,0xf8,0xff};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydata_curs.h b/vcl/inc/unx/x11_cursors/copydata_curs.h
index e3d0e3e76530..a882a541a6d7 100644
--- a/vcl/inc/unx/x11_cursors/copydata_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydata_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copydata_curs_height 32
#define copydata_curs_x_hot 1
#define copydata_curs_y_hot 1
-static char copydata_curs_bits[] = {
+static unsigned char copydata_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copydata_curs_bits[] = {
0xa8, 0xf2, 0x1e, 0x00, 0x50, 0x35, 0x18, 0x00, 0x00, 0xf0, 0x1e, 0x00,
0x00, 0xf0, 0x1e, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydata_mask.h b/vcl/inc/unx/x11_cursors/copydata_mask.h
index f25b0863d807..9cd73b08d106 100644
--- a/vcl/inc/unx/x11_cursors/copydata_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydata_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copydata_mask_height 32
#define copydata_mask_x_hot 1
#define copydata_mask_y_hot 1
-static char copydata_mask_bits[] = {
+static unsigned char copydata_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copydata_mask_bits[] = {
0xfc, 0xff, 0x3f, 0x00, 0xfc, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00,
0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydlnk_curs.h b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
index 8e22a5bee37b..353297212083 100644
--- a/vcl/inc/unx/x11_cursors/copydlnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copydlnk_curs_height 32
#define copydlnk_curs_x_hot 1
#define copydlnk_curs_y_hot 1
-static char copydlnk_curs_bits[] = {
+static unsigned char copydlnk_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copydlnk_curs_bits[] = {
0xf0, 0xf1, 0x1e, 0x00, 0x00, 0x34, 0x18, 0x00, 0x00, 0xf0, 0x1e, 0x00,
0x00, 0xf0, 0x1e, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydlnk_mask.h b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
index 02ee5db5fbc1..b6ac40003814 100644
--- a/vcl/inc/unx/x11_cursors/copydlnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copydlnk_mask_height 32
#define copydlnk_mask_x_hot 1
#define copydlnk_mask_y_hot 1
-static char copydlnk_mask_bits[] = {
+static unsigned char copydlnk_mask_bits[] = {
0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copydlnk_mask_bits[] = {
0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00, 0x00, 0xfe, 0x3f, 0x00,
0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfile_curs.h b/vcl/inc/unx/x11_cursors/copyfile_curs.h
index c74a1da26b66..da1366c71c6c 100644
--- a/vcl/inc/unx/x11_cursors/copyfile_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyfile_curs_height 32
#define copyfile_curs_x_hot 9
#define copyfile_curs_y_hot 9
-static char copyfile_curs_bits[] = {
+static unsigned char copyfile_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyfile_curs_bits[] = {
0x00, 0x80, 0xe1, 0x3d, 0x00, 0x00, 0x63, 0x30, 0x00, 0x00, 0xe3, 0x3d,
0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfile_mask.h b/vcl/inc/unx/x11_cursors/copyfile_mask.h
index c13089abaea5..5679ee8c2da8 100644
--- a/vcl/inc/unx/x11_cursors/copyfile_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyfile_mask_height 32
#define copyfile_mask_x_hot 9
#define copyfile_mask_y_hot 9
-static char copyfile_mask_bits[] = {
+static unsigned char copyfile_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyfile_mask_bits[] = {
0x00, 0xc0, 0xf7, 0x7f, 0x00, 0xc0, 0xf7, 0x7f, 0x00, 0x80, 0xf7, 0x7f,
0x00, 0x80, 0xf7, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfiles_curs.h b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
index e6a9b7a668af..c761f67ae370 100644
--- a/vcl/inc/unx/x11_cursors/copyfiles_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyfiles_curs_height 32
#define copyfiles_curs_x_hot 8
#define copyfiles_curs_y_hot 9
-static char copyfiles_curs_bits[] = {
+static unsigned char copyfiles_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyfiles_curs_bits[] = {
0x00, 0xc0, 0xe0, 0x3d, 0x00, 0x80, 0x61, 0x30, 0x00, 0x80, 0xe1, 0x3d,
0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfiles_mask.h b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
index f904b7848f64..e6be0c5f105d 100644
--- a/vcl/inc/unx/x11_cursors/copyfiles_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyfiles_mask_height 32
#define copyfiles_mask_x_hot 8
#define copyfiles_mask_y_hot 9
-static char copyfiles_mask_bits[] = {
+static unsigned char copyfiles_mask_bits[] = {
0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyfiles_mask_bits[] = {
0x00, 0xe0, 0xf3, 0x7f, 0x00, 0xe0, 0xf3, 0x7f, 0x00, 0xc0, 0xf3, 0x7f,
0x00, 0xc0, 0xf3, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyflnk_curs.h b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
index b76368923f31..9fdf78685365 100644
--- a/vcl/inc/unx/x11_cursors/copyflnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyflnk_curs_height 32
#define copyflnk_curs_x_hot 9
#define copyflnk_curs_y_hot 9
-static char copyflnk_curs_bits[] = {
+static unsigned char copyflnk_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyflnk_curs_bits[] = {
0x00, 0x80, 0xe1, 0x3d, 0x00, 0x00, 0x63, 0x30, 0x00, 0x00, 0xe3, 0x3d,
0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyflnk_mask.h b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
index b8fac92fdd75..3b678164e0c6 100644
--- a/vcl/inc/unx/x11_cursors/copyflnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define copyflnk_mask_height 32
#define copyflnk_mask_x_hot 9
#define copyflnk_mask_y_hot 9
-static char copyflnk_mask_bits[] = {
+static unsigned char copyflnk_mask_bits[] = {
0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char copyflnk_mask_bits[] = {
0x00, 0xc0, 0xf7, 0x7f, 0x00, 0xc0, 0xf7, 0x7f, 0x00, 0x80, 0xf7, 0x7f,
0x00, 0x80, 0xf7, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/crook_curs.h b/vcl/inc/unx/x11_cursors/crook_curs.h
index 6e4d5f613959..97db1feaa394 100644
--- a/vcl/inc/unx/x11_cursors/crook_curs.h
+++ b/vcl/inc/unx/x11_cursors/crook_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define crook_curs_height 32
#define crook_curs_x_hot 15
#define crook_curs_y_hot 14
-static char crook_curs_bits[] = {
+static unsigned char crook_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3e, 0xff, 0x7f, 0xbb, 0xdd, 0xfe,
@@ -40,3 +41,5 @@ static char crook_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/crook_mask.h b/vcl/inc/unx/x11_cursors/crook_mask.h
index 7493f3a501dc..534ad6da53fd 100644
--- a/vcl/inc/unx/x11_cursors/crook_mask.h
+++ b/vcl/inc/unx/x11_cursors/crook_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define crook_mask_width 32
#define crook_mask_height 32
-static char crook_mask_bits[] = {
+static unsigned char crook_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x83, 0xc1, 0x00, 0x80, 0xc7, 0xe3, 0x01, 0xc0, 0xef, 0xf7, 0x03,
@@ -38,3 +39,5 @@ static char crook_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/crop_curs.h b/vcl/inc/unx/x11_cursors/crop_curs.h
index a546ce6c1ba8..5647de80b196 100644
--- a/vcl/inc/unx/x11_cursors/crop_curs.h
+++ b/vcl/inc/unx/x11_cursors/crop_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define crop_curs_height 32
#define crop_curs_x_hot 9
#define crop_curs_y_hot 9
-static char crop_curs_bits[] = {
+static unsigned char crop_curs_bits[] = {
0xff, 0x0f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff,
0x07, 0x60, 0xf8, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0xf7, 0x6f, 0xfb, 0xff,
0x37, 0x60, 0xf8, 0xff, 0xb7, 0x6f, 0xff, 0xff, 0xb7, 0x6f, 0xff, 0xff,
@@ -40,3 +41,5 @@ static char crop_curs_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/crop_mask.h b/vcl/inc/unx/x11_cursors/crop_mask.h
index 5a10726cf36c..f7d3c87201c3 100644
--- a/vcl/inc/unx/x11_cursors/crop_mask.h
+++ b/vcl/inc/unx/x11_cursors/crop_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define crop_mask_width 32
#define crop_mask_height 32
-static char crop_mask_bits[] = {
+static unsigned char crop_mask_bits[] = {
0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0xfc, 0xff, 0x0f, 0x00,
0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00,
0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xf8, 0x01, 0x00,
@@ -38,3 +39,5 @@ static char crop_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/detective_curs.h b/vcl/inc/unx/x11_cursors/detective_curs.h
index 9d8a0d6a1c47..b2e3e2a375b9 100644
--- a/vcl/inc/unx/x11_cursors/detective_curs.h
+++ b/vcl/inc/unx/x11_cursors/detective_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define detective_curs_height 32
#define detective_curs_x_hot 12
#define detective_curs_y_hot 13
-static char detective_curs_bits[] = {
+static unsigned char detective_curs_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00,
0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,
0x00,0x00,0x00,0x83,0x01,0x00,0x80,0x00,0x02,0x00,0x80,0x10,0x02,0x00,0x40,
@@ -38,3 +39,5 @@ static char detective_curs_bits[] = {
0x70,0x00,0x00,0x10,0x60,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/detective_mask.h b/vcl/inc/unx/x11_cursors/detective_mask.h
index 14402a37b641..e731aff3c989 100644
--- a/vcl/inc/unx/x11_cursors/detective_mask.h
+++ b/vcl/inc/unx/x11_cursors/detective_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define detective_mask_height 32
#define detective_mask_x_hot 12
#define detective_mask_y_hot 13
-static char detective_mask_bits[] = {
+static unsigned char detective_mask_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00,
0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,
0x00,0x00,0x00,0xff,0x01,0x00,0x80,0xff,0x03,0x00,0x80,0xff,0x03,0x00,0xc0,
@@ -38,3 +39,5 @@ static char detective_mask_bits[] = {
0x70,0x00,0x00,0x10,0x60,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/drawarc_curs.h b/vcl/inc/unx/x11_cursors/drawarc_curs.h
index daea116e186e..08a3e324dae6 100644
--- a/vcl/inc/unx/x11_cursors/drawarc_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define drawarc_curs_height 32
#define drawarc_curs_x_hot 7
#define drawarc_curs_y_hot 7
-static char drawarc_curs_bits[] = {
+static unsigned char drawarc_curs_bits[] = {
0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char drawarc_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/drawarc_mask.h b/vcl/inc/unx/x11_cursors/drawarc_mask.h
index c9e2b6dd8737..b4e42dc824c6 100644
--- a/vcl/inc/unx/x11_cursors/drawarc_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define drawarc_mask_width 32
#define drawarc_mask_height 32
-static char drawarc_mask_bits[] = {
+static unsigned char drawarc_mask_bits[] = {
0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
@@ -38,3 +39,5 @@ static char drawarc_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/drawbezier_curs.h b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
index ea677d4734aa..a84a2da70333 100644
--- a/vcl/inc/unx/x11_cursors/drawbezier_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define drawbezier_curs_height 32
#define drawbezier_curs_x_hot 7
#define drawbezier_curs_y_hot 7
-static char drawbezier_curs_bits[] = {
+static unsigned char drawbezier_curs_bits[] = {
0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -40,3 +41,5 @@ static char drawbezier_curs_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/drawbezier_mask.h b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
index 17c1075d07a7..13bac21a4594 100644
--- a/vcl/inc/unx/x11_cursors/drawbezier_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +27,7 @@
************************************************************************/
#define drawbezier_mask_width 32
#define drawbezier_mask_height 32
-static char drawbezier_mask_bits[] = {
+static unsigned char drawbezier_mask_bits[] = {
0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
@@ -38,3 +39,5 @@ static char drawbezier_mask_bits[] = {
0x00, 0x00, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/drawcaption_curs.h b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
index 3fe104f3673e..9905c240002d 100644
--- a/vcl/inc/unx/x11_cursors/drawcaption_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#define drawcaption_curs_height 32
#define drawcaption_curs_x_hot 8
#define drawcaption_curs_y_hot 8
-static char drawcaption_curs_bits[] = {
+static unsigned char drawcaption_curs_bits[] = {
0xff, 0