[Libreoffice-commits] core.git: vcl/android vcl/generic vcl/headless vcl/inc vcl/ios vcl/null vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx vcl/win vcl/workben
Tor Lillqvist
tml at collabora.com
Wed Apr 2 06:54:52 PDT 2014
vcl/android/androidinst.cxx | 1
vcl/generic/app/gendisp.cxx | 3
vcl/generic/app/geninst.cxx | 4
vcl/generic/fontmanager/fontcache.cxx | 3
vcl/generic/fontmanager/fontconfig.cxx | 1
vcl/generic/fontmanager/fontmanager.cxx | 72 -
vcl/generic/fontmanager/fontsubst.cxx | 11
vcl/generic/fontmanager/helper.cxx | 1
vcl/generic/fontmanager/parseAFM.cxx | 15
vcl/generic/fontmanager/parseAFM.hxx | 17
vcl/generic/glyphs/gcach_ftyp.cxx | 93 --
vcl/generic/glyphs/gcach_ftyp.hxx | 10
vcl/generic/glyphs/gcach_layout.cxx | 11
vcl/generic/glyphs/gcach_rbmp.cxx | 8
vcl/generic/glyphs/glyphcache.cxx | 21
vcl/generic/glyphs/graphite_serverfont.cxx | 3
vcl/generic/glyphs/scrptrun.h | 1
vcl/generic/print/bitmap_gfx.cxx | 1
vcl/generic/print/common_gfx.cxx | 3
vcl/generic/print/genprnpsp.cxx | 6
vcl/generic/print/genpspgraphics.cxx | 29
vcl/generic/print/glyphset.cxx | 2
vcl/generic/print/glyphset.hxx | 1
vcl/generic/print/printerjob.cxx | 3
vcl/generic/print/prtsetup.cxx | 22
vcl/generic/print/psputil.cxx | 2
vcl/generic/print/text_gfx.cxx | 1
vcl/headless/svpgdi.cxx | 4
vcl/headless/svpprn.cxx | 2
vcl/headless/svptext.cxx | 15
vcl/inc/PhysicalFontFace.hxx | 3
vcl/inc/android/svsys.h | 1
vcl/inc/controldata.hxx | 5
vcl/inc/dndevdis.hxx | 5
vcl/inc/dndlcon.hxx | 6
vcl/inc/fontmanager.hxx | 1
vcl/inc/generic/gendisp.hxx | 1
vcl/inc/generic/genpspgraphics.h | 1
vcl/inc/generic/glyphcache.hxx | 20
vcl/inc/generic/printergfx.hxx | 2
vcl/inc/generic/printerjob.hxx | 1
vcl/inc/headless/svpdummies.hxx | 1
vcl/inc/helpwin.hxx | 2
vcl/inc/ilstbox.hxx | 4
vcl/inc/image.h | 14
vcl/inc/impfont.hxx | 8
vcl/inc/impgraph.hxx | 5
vcl/inc/impoct.hxx | 22
vcl/inc/ios/svsys.h | 1
vcl/inc/list.h | 1
vcl/inc/octree.hxx | 1
vcl/inc/osx/a11yfocustracker.hxx | 2
vcl/inc/osx/a11ylistener.hxx | 2
vcl/inc/osx/keyboardfocuslistener.hxx | 2
vcl/inc/osx/salframe.h | 2
vcl/inc/osx/salobj.h | 5
vcl/inc/osx/salprn.h | 7
vcl/inc/osx/salsys.h | 3
vcl/inc/osx/saltimer.h | 1
vcl/inc/outdev.h | 1
vcl/inc/outfont.hxx | 6
vcl/inc/print.h | 1
vcl/inc/printdlg.hxx | 1
vcl/inc/quartz/salbmp.h | 2
vcl/inc/quartz/salgdi.h | 2
vcl/inc/regband.hxx | 1
vcl/inc/regionband.hxx | 2
vcl/inc/salgdi.hxx | 3
vcl/inc/sallayout.hxx | 2
vcl/inc/salmenu.hxx | 2
vcl/inc/salobj.hxx | 2
vcl/inc/salptype.hxx | 6
vcl/inc/salwtype.hxx | 12
vcl/inc/sft.hxx | 13
vcl/inc/svdata.hxx | 4
vcl/inc/toolbox.h | 3
vcl/inc/unx/gtk/gtkframe.hxx | 3
vcl/inc/unx/gtk/gtkgdi.hxx | 1
vcl/inc/unx/gtk/gtkinst.hxx | 2
vcl/inc/unx/gtk/gtkprn.hxx | 4
vcl/inc/unx/i18n_ic.hxx | 1
vcl/inc/unx/i18n_im.hxx | 1
vcl/inc/unx/i18n_keysym.hxx | 1
vcl/inc/unx/salbmp.h | 6
vcl/inc/unx/saldisp.hxx | 3
vcl/inc/unx/salframe.h | 1
vcl/inc/unx/salgdi.h | 2
vcl/inc/unx/salobj.h | 1
vcl/inc/unx/salvd.h | 2
vcl/inc/wall2.hxx | 1
vcl/inc/win/salbmp.h | 2
vcl/inc/win/saldata.hxx | 1
vcl/inc/win/salframe.h | 2
vcl/inc/win/salmenu.h | 1
vcl/inc/win/salobj.h | 3
vcl/inc/win/salprn.h | 6
vcl/inc/win/salvd.h | 2
vcl/inc/win/wincomp.hxx | 11
vcl/inc/window.h | 1
vcl/ios/dummies.cxx | 1
vcl/ios/iosinst.cxx | 1
vcl/null/printerinfomanager.cxx | 1
vcl/osx/DataFlavorMapping.cxx | 23
vcl/osx/DataFlavorMapping.hxx | 11
vcl/osx/DragActionConversion.cxx | 2
vcl/osx/DragActionConversion.hxx | 2
vcl/osx/DragSource.cxx | 4
vcl/osx/DragSource.hxx | 3
vcl/osx/DragSourceContext.cxx | 2
vcl/osx/DropTarget.cxx | 4
vcl/osx/DropTarget.hxx | 2
vcl/osx/HtmlFmtFlt.cxx | 3
vcl/osx/OSXTransferable.cxx | 10
vcl/osx/OSXTransferable.hxx | 4
vcl/osx/a11yfocuslistener.cxx | 14
vcl/osx/a11yfocustracker.cxx | 24
vcl/osx/a11ylistener.cxx | 8
vcl/osx/clipboard.cxx | 2
vcl/osx/clipboard.hxx | 11
vcl/osx/documentfocuslistener.cxx | 21
vcl/osx/documentfocuslistener.hxx | 2
vcl/osx/salframe.cxx | 79 -
vcl/osx/salinst.cxx | 88 --
vcl/osx/salmenu.cxx | 11
vcl/osx/salobj.cxx | 23
vcl/osx/salprn.cxx | 53 -
vcl/osx/salsys.cxx | 5
vcl/osx/saltimer.cxx | 5
vcl/osx/service_entry.cxx | 2
vcl/qa/cppunit/app/test_IconThemeInfo.cxx | 1
vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 6
vcl/qa/cppunit/dndtest.cxx | 65 -
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 1
vcl/quartz/ctfonts.cxx | 36
vcl/quartz/salbmp.cxx | 43 -
vcl/quartz/salgdi.cxx | 43 -
vcl/quartz/salgdicommon.cxx | 4
vcl/quartz/salgdiutils.cxx | 7
vcl/quartz/salvd.cxx | 12
vcl/source/app/IconThemeScanner.cxx | 1
vcl/source/app/IconThemeSelector.cxx | 1
vcl/source/app/dbggui.cxx | 2
vcl/source/app/dndhelp.cxx | 3
vcl/source/app/help.cxx | 1
vcl/source/app/i18nhelp.cxx | 3
vcl/source/app/salvtables.cxx | 7
vcl/source/app/session.cxx | 1
vcl/source/app/settings.cxx | 16
vcl/source/app/sound.cxx | 1
vcl/source/app/stdtext.cxx | 2
vcl/source/app/svdata.cxx | 2
vcl/source/app/timer.cxx | 2
vcl/source/app/unohelp2.cxx | 1
vcl/source/app/vclevent.cxx | 1
vcl/source/components/dtranscomp.cxx | 13
vcl/source/components/fontident.cxx | 6
vcl/source/control/button.cxx | 12
vcl/source/control/combobox.cxx | 3
vcl/source/control/ctrl.cxx | 3
vcl/source/control/edit.cxx | 7
vcl/source/control/field2.cxx | 2
vcl/source/control/fixed.cxx | 1
vcl/source/control/group.cxx | 1
vcl/source/control/ilstbox.cxx | 5
vcl/source/control/imgctrl.cxx | 1
vcl/source/control/longcurr.cxx | 8
vcl/source/control/lstbox.cxx | 13
vcl/source/control/menubtn.cxx | 7
vcl/source/control/prgsbar.cxx | 2
vcl/source/control/quickselectionengine.cxx | 1
vcl/source/control/scrbar.cxx | 2
vcl/source/control/slider.cxx | 5
vcl/source/control/spinbtn.cxx | 1
vcl/source/control/spinfld.cxx | 4
vcl/source/control/tabctrl.cxx | 6
vcl/source/edit/textdat2.hxx | 11
vcl/source/edit/textdata.cxx | 6
vcl/source/edit/textdoc.cxx | 2
vcl/source/edit/textdoc.hxx | 2
vcl/source/edit/texteng.cxx | 9
vcl/source/edit/textund2.hxx | 6
vcl/source/edit/textundo.cxx | 3
vcl/source/edit/textview.cxx | 11
vcl/source/edit/txtattr.cxx | 6
vcl/source/edit/vclmedit.cxx | 5
vcl/source/edit/xtextedt.cxx | 4
vcl/source/filter/FilterConfigCache.cxx | 2
vcl/source/filter/FilterConfigItem.cxx | 5
vcl/source/filter/GraphicNativeTransform.cxx | 2
vcl/source/filter/graphicfilter.cxx | 11
vcl/source/filter/graphicfilter2.cxx | 2
vcl/source/filter/igif/decode.cxx | 1
vcl/source/filter/igif/decode.hxx | 1
vcl/source/filter/igif/gifread.cxx | 5
vcl/source/filter/ixbm/xbmread.cxx | 1
vcl/source/filter/ixbm/xbmread.hxx | 1
vcl/source/filter/ixpm/xpmread.cxx | 16
vcl/source/filter/ixpm/xpmread.hxx | 1
vcl/source/filter/jpeg/Exif.hxx | 1
vcl/source/filter/jpeg/JpegTransform.cxx | 1
vcl/source/filter/jpeg/jinclude.h | 1
vcl/source/filter/jpeg/transupp.h | 4
vcl/source/filter/sgfbram.cxx | 2
vcl/source/filter/sgfbram.hxx | 1
vcl/source/filter/sgvmain.cxx | 3
vcl/source/filter/sgvspln.cxx | 28
vcl/source/filter/sgvtext.cxx | 6
vcl/source/filter/wmf/emfwr.cxx | 1
vcl/source/filter/wmf/enhwmf.cxx | 5
vcl/source/filter/wmf/winmtf.cxx | 19
vcl/source/filter/wmf/winmtf.hxx | 13
vcl/source/filter/wmf/winwmf.cxx | 1
vcl/source/filter/wmf/wmf.cxx | 1
vcl/source/filter/wmf/wmfwr.cxx | 33
vcl/source/font/PhysicalFontCollection.cxx | 1
vcl/source/font/PhysicalFontFace.cxx | 1
vcl/source/font/PhysicalFontFamily.cxx | 2
vcl/source/fontsubset/cff.cxx | 22
vcl/source/fontsubset/fontsubset.cxx | 1
vcl/source/fontsubset/gsub.cxx | 2
vcl/source/fontsubset/sft.cxx | 12
vcl/source/fontsubset/ttcr.cxx | 24
vcl/source/fontsubset/ttcr.hxx | 4
vcl/source/fontsubset/xlat.hxx | 1
vcl/source/gdi/animate.cxx | 3
vcl/source/gdi/base14.cxx | 2
vcl/source/gdi/bitmap3.cxx | 10
vcl/source/gdi/bitmap4.cxx | 2
vcl/source/gdi/bitmapex.cxx | 14
vcl/source/gdi/bmpacc.cxx | 2
vcl/source/gdi/bmpacc3.cxx | 1
vcl/source/gdi/bmpfast.cxx | 1
vcl/source/gdi/configsettings.cxx | 2
vcl/source/gdi/cvtgrf.cxx | 1
vcl/source/gdi/dibtools.cxx | 12
vcl/source/gdi/font.cxx | 3
vcl/source/gdi/gdimetafiletools.cxx | 10
vcl/source/gdi/gdimtf.cxx | 1
vcl/source/gdi/gfxlink.cxx | 1
vcl/source/gdi/gradient.cxx | 1
vcl/source/gdi/graphictools.cxx | 1
vcl/source/gdi/hatch.cxx | 1
vcl/source/gdi/image.cxx | 5
vcl/source/gdi/imagerepository.cxx | 1
vcl/source/gdi/impanmvw.cxx | 1
vcl/source/gdi/impbmp.cxx | 1
vcl/source/gdi/impfont.cxx | 66 -
vcl/source/gdi/impimage.cxx | 1
vcl/source/gdi/impimagetree.cxx | 1
vcl/source/gdi/impvect.cxx | 1
vcl/source/gdi/impvect.hxx | 2
vcl/source/gdi/jobset.cxx | 1
vcl/source/gdi/lineinfo.cxx | 49 -
vcl/source/gdi/mapmod.cxx | 1
vcl/source/gdi/metaact.cxx | 939 ----------------------
vcl/source/gdi/metric.cxx | 39
vcl/source/gdi/octree.cxx | 28
vcl/source/gdi/oldprintadaptor.cxx | 1
vcl/source/gdi/outdev.cxx | 1
vcl/source/gdi/outdev3.cxx | 9
vcl/source/gdi/outdev4.cxx | 2
vcl/source/gdi/outdev5.cxx | 14
vcl/source/gdi/outdev6.cxx | 19
vcl/source/gdi/outdevnative.cxx | 15
vcl/source/gdi/outmap.cxx | 166 ---
vcl/source/gdi/pdfextoutdevdata.cxx | 1
vcl/source/gdi/pdfwriter.cxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 7
vcl/source/gdi/pdfwriter_impl.hxx | 7
vcl/source/gdi/pdfwriter_impl2.cxx | 10
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/pngwrite.cxx | 1
vcl/source/gdi/print.cxx | 56 -
vcl/source/gdi/print2.cxx | 27
vcl/source/gdi/print3.cxx | 2
vcl/source/gdi/regband.cxx | 39
vcl/source/gdi/region.cxx | 9
vcl/source/gdi/regionband.cxx | 6
vcl/source/gdi/sallayout.cxx | 108 --
vcl/source/gdi/salnativewidgets-none.cxx | 5
vcl/source/gdi/svgdata.cxx | 17
vcl/source/gdi/textlayout.cxx | 1
vcl/source/gdi/virdev.cxx | 5
vcl/source/gdi/wall.cxx | 71 -
vcl/source/glyphs/graphite_features.cxx | 1
vcl/source/glyphs/graphite_layout.cxx | 3
vcl/source/helper/canvasbitmap.cxx | 2
vcl/source/helper/canvastools.cxx | 5
vcl/source/helper/strhelper.cxx | 1
vcl/source/helper/xconnection.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 1
vcl/source/window/accel.cxx | 54 -
vcl/source/window/accmgr.cxx | 14
vcl/source/window/brdwin.cxx | 150 ---
vcl/source/window/btndlg.cxx | 1
vcl/source/window/builder.cxx | 1
vcl/source/window/cmdevt.cxx | 5
vcl/source/window/cursor.cxx | 39
vcl/source/window/decoview.cxx | 21
vcl/source/window/dialog.cxx | 3
vcl/source/window/dlgctrl.cxx | 40
vcl/source/window/dndevdis.cxx | 36
vcl/source/window/dndlcon.cxx | 49 -
vcl/source/window/dockingarea.cxx | 16
vcl/source/window/dockmgr.cxx | 12
vcl/source/window/dockwin.cxx | 4
vcl/source/window/floatwin.cxx | 4
vcl/source/window/introwin.cxx | 9
vcl/source/window/keycod.cxx | 13
vcl/source/window/keyevent.cxx | 4
vcl/source/window/layout.cxx | 1
vcl/source/window/menu.cxx | 33
vcl/source/window/mnemonic.cxx | 16
vcl/source/window/mouseevent.cxx | 1
vcl/source/window/msgbox.cxx | 64 -
vcl/source/window/popupmenuwindow.cxx | 3
vcl/source/window/printdlg.cxx | 6
vcl/source/window/scrwnd.cxx | 1
vcl/source/window/seleng.cxx | 14
vcl/source/window/split.cxx | 62 -
vcl/source/window/splitwin.cxx | 1
vcl/source/window/status.cxx | 120 --
vcl/source/window/syschild.cxx | 18
vcl/source/window/syswin.cxx | 60 -
vcl/source/window/tabdlg.cxx | 16
vcl/source/window/tabpage.cxx | 20
vcl/source/window/taskpanelist.cxx | 19
vcl/source/window/toolbox.cxx | 181 ----
vcl/source/window/toolbox2.cxx | 5
vcl/source/window/window.cxx | 482 -----------
vcl/source/window/window2.cxx | 87 --
vcl/source/window/window3.cxx | 7
vcl/source/window/winproc.cxx | 89 --
vcl/source/window/wrkwin.cxx | 26
vcl/unx/generic/app/i18n_cb.cxx | 35
vcl/unx/generic/app/i18n_ic.cxx | 46 -
vcl/unx/generic/app/i18n_im.cxx | 23
vcl/unx/generic/app/i18n_keysym.cxx | 1
vcl/unx/generic/app/i18n_status.cxx | 25
vcl/unx/generic/app/keysymnames.cxx | 4
vcl/unx/generic/app/saldata.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 3
vcl/unx/generic/app/salinst.cxx | 5
vcl/unx/generic/app/saltimer.cxx | 1
vcl/unx/generic/app/sm.cxx | 4
vcl/unx/generic/app/wmadaptor.cxx | 3
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2
vcl/unx/generic/dtrans/X11_clipboard.cxx | 32
vcl/unx/generic/dtrans/X11_clipboard.hxx | 7
vcl/unx/generic/dtrans/X11_dndcontext.cxx | 2
vcl/unx/generic/dtrans/X11_droptarget.cxx | 23
vcl/unx/generic/dtrans/X11_selection.cxx | 117 --
vcl/unx/generic/dtrans/X11_selection.hxx | 11
vcl/unx/generic/dtrans/X11_service.cxx | 9
vcl/unx/generic/dtrans/X11_transferable.cxx | 11
vcl/unx/generic/dtrans/bmp.cxx | 1
vcl/unx/generic/dtrans/config.cxx | 3
vcl/unx/generic/gdi/gcach_xpeer.cxx | 15
vcl/unx/generic/gdi/salbmp.cxx | 68 -
vcl/unx/generic/gdi/salgdi2.cxx | 4
vcl/unx/generic/gdi/salgdi3.cxx | 40
vcl/unx/generic/gdi/salvd.cxx | 1
vcl/unx/generic/gdi/xrender_peer.cxx | 7
vcl/unx/generic/gdi/xrender_peer.hxx | 7
vcl/unx/generic/printer/cupsmgr.cxx | 4
vcl/unx/generic/printer/jobdata.cxx | 1
vcl/unx/generic/printer/ppdparser.cxx | 39
vcl/unx/generic/printer/printerinfomanager.cxx | 28
vcl/unx/generic/window/FWS.cxx | 2
vcl/unx/generic/window/salframe.cxx | 21
vcl/unx/generic/window/salobj.cxx | 20
vcl/unx/gtk/a11y/atkaction.cxx | 2
vcl/unx/gtk/a11y/atkbridge.cxx | 1
vcl/unx/gtk/a11y/atkcomponent.cxx | 1
vcl/unx/gtk/a11y/atkeditabletext.cxx | 2
vcl/unx/gtk/a11y/atkfactory.cxx | 1
vcl/unx/gtk/a11y/atkhypertext.cxx | 3
vcl/unx/gtk/a11y/atkimage.cxx | 1
vcl/unx/gtk/a11y/atklistener.cxx | 2
vcl/unx/gtk/a11y/atkselection.cxx | 1
vcl/unx/gtk/a11y/atktable.cxx | 3
vcl/unx/gtk/a11y/atktext.cxx | 1
vcl/unx/gtk/a11y/atktextattributes.cxx | 9
vcl/unx/gtk/a11y/atkutil.cxx | 3
vcl/unx/gtk/a11y/atkvalue.cxx | 1
vcl/unx/gtk/a11y/atkwindow.cxx | 1
vcl/unx/gtk/a11y/atkwrapper.cxx | 6
vcl/unx/gtk/a11y/atkwrapper.hxx | 1
vcl/unx/gtk/app/gtkdata.cxx | 2
vcl/unx/gtk/app/gtkinst.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 52 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 29
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 7
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 8
vcl/unx/gtk/fpicker/eventnotification.hxx | 2
vcl/unx/gtk/fpicker/resourceprovider.cxx | 1
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 84 -
vcl/unx/gtk/gdi/salprn-gtk.cxx | 23
vcl/unx/gtk/window/gloactiongroup.cxx | 2
vcl/unx/gtk/window/glomenu.cxx | 2
vcl/unx/gtk/window/gtkobject.cxx | 1
vcl/unx/gtk/window/gtksalframe.cxx | 4
vcl/unx/gtk/window/gtksalmenu.cxx | 5
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 1
vcl/unx/kde/UnxCommandThread.cxx | 2
vcl/unx/kde/UnxFilePicker.cxx | 4
vcl/unx/kde/UnxNotifyThread.cxx | 2
vcl/unx/kde/fpicker/kdecommandthread.cxx | 4
vcl/unx/kde/fpicker/kdefilepicker.cxx | 3
vcl/unx/kde/fpicker/kdefpmain.cxx | 2
vcl/unx/kde/fpicker/kdemodalityfilter.cxx | 2
vcl/unx/kde/salnativewidgets-kde.cxx | 8
vcl/unx/kde4/KDE4FilePicker.cxx | 4
vcl/unx/kde4/KDEData.cxx | 1
vcl/unx/kde4/KDESalDisplay.cxx | 1
vcl/unx/kde4/KDESalFrame.cxx | 1
vcl/unx/kde4/KDESalGraphics.cxx | 1
vcl/unx/kde4/main.cxx | 1
vcl/unx/x11/x11sys.cxx | 1
vcl/win/source/app/saldata.cxx | 16
vcl/win/source/app/salinfo.cxx | 4
vcl/win/source/app/salinst.cxx | 86 --
vcl/win/source/app/salshl.cxx | 11
vcl/win/source/app/saltimer.cxx | 9
vcl/win/source/gdi/salbmp.cxx | 38
vcl/win/source/gdi/salgdi.cxx | 111 --
vcl/win/source/gdi/salgdi2.cxx | 27
vcl/win/source/gdi/salgdi3.cxx | 103 --
vcl/win/source/gdi/salgdi_gdiplus.cxx | 9
vcl/win/source/gdi/salnativewidgets-luna.cxx | 7
vcl/win/source/gdi/salvd.cxx | 13
vcl/win/source/gdi/winlayout.cxx | 105 --
vcl/win/source/gdi/wntgdi.cxx | 7
vcl/win/source/window/keynames.cxx | 5
vcl/win/source/window/salframe.cxx | 218 -----
vcl/win/source/window/salmenu.cxx | 17
vcl/win/source/window/salobj.cxx | 41
vcl/workben/outdevgrind.cxx | 5
vcl/workben/svdem.cxx | 12
vcl/workben/svpclient.cxx | 9
vcl/workben/svptest.cxx | 14
vcl/workben/vcldemo.cxx | 12
443 files changed, 1 insertion(+), 7141 deletions(-)
New commits:
commit 50bf123ddbeb457b89636621a99c971834adf3ab
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 2 16:45:44 2014 +0300
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 25f8853..21d9007 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -293,7 +293,6 @@ SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
return new AndroidSalFrame( this, pParent, nStyle, NULL );
}
-
// All the interesting stuff is slaved from the AndroidSalInstance
void InitSalData() {}
void DeInitSalData() {}
diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx
index 0e197c1..1275465 100644
--- a/vcl/generic/app/gendisp.cxx
+++ b/vcl/generic/app/gendisp.cxx
@@ -21,7 +21,6 @@
#include <generic/gendisp.hxx>
#include <generic/geninst.h>
-
SalGenericDisplay::SalGenericDisplay()
{
m_pCapture = NULL;
@@ -145,6 +144,4 @@ bool SalGenericDisplay::HasUserEvents() const
return bRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 1bb9fa4..cf2f301 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -26,12 +26,8 @@
#include "generic/geninst.h"
-
-
// SalYieldMutex
-
-
SalYieldMutex::SalYieldMutex()
{
mnCount = 0;
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index ea5b443..8a0f809 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <cstdlib>
#include <cstring>
@@ -45,7 +44,6 @@ using namespace std;
using namespace psp;
using namespace utl;
-
/*
* FontCache constructor
*/
@@ -247,7 +245,6 @@ void FontCache::read()
return;
}
-
OString aLine;
aStream.ReadLine( aLine );
if ( !(aLine == CACHE_MAGIC) )
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index e145c68..05581c5 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "fontcache.hxx"
#include "impfont.hxx"
#include "fontmanager.hxx"
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index e5854a3..12bc307 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -50,7 +50,6 @@
#include "i18nlangtag/mslangid.hxx"
-
#include "parseAFM.hxx"
#include "sft.hxx"
@@ -108,8 +107,6 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer )
return nRet;
}
-
-
static FontWeight parseWeight( const OString& rWeight )
{
FontWeight eWeight = WEIGHT_DONTKNOW;
@@ -173,21 +170,15 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) :
{
}
-
-
PrintFontManager::PrintFont::~PrintFont()
{
delete m_pMetrics;
}
-
-
PrintFontManager::Type1FontFile::~Type1FontFile()
{
}
-
-
PrintFontManager::TrueTypeFontFile::TrueTypeFontFile()
: PrintFont( fonttype::TrueType )
, m_nDirectory( 0 )
@@ -195,21 +186,15 @@ PrintFontManager::TrueTypeFontFile::TrueTypeFontFile()
, m_nTypeFlags( TYPEFLAG_INVALID )
{}
-
-
PrintFontManager::TrueTypeFontFile::~TrueTypeFontFile()
{
}
-
-
bool PrintFontManager::Type1FontFile::queryMetricPage( int /*nPage*/, MultiAtomProvider* pProvider )
{
return readAfmMetrics( pProvider, false, false );
}
-
-
bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ )
{
bool bSuccess = false;
@@ -275,8 +260,6 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
return bSuccess;
}
-
-
/* #i73387# There seem to be fonts with a rather unwell chosen family name
* consider e.g. "Helvetica Narrow" which defines its family as "Helvetica"
* It can really only be distinguished by its PSName and FullName. Both of
@@ -664,8 +647,6 @@ PrintFontManager& PrintFontManager::get()
return *pManager;
}
-
-
/*
* the PrintFontManager
*/
@@ -691,8 +672,6 @@ PrintFontManager::PrintFontManager()
m_aFontInstallerTimer.SetTimeout(5000);
}
-
-
PrintFontManager::~PrintFontManager()
{
m_aFontInstallerTimer.Stop();
@@ -703,16 +682,12 @@ PrintFontManager::~PrintFontManager()
delete m_pFontCache;
}
-
-
OString PrintFontManager::getDirectory( int nAtom ) const
{
::boost::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) );
return it != m_aAtomToDir.end() ? it->second : OString();
}
-
-
int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate )
{
int nAtom = 0;
@@ -729,8 +704,6 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate
return nAtom;
}
-
-
std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
@@ -919,8 +892,6 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, ::
return ! rNewFonts.empty();
}
-
-
fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, int nFaceIndex ) const
{
fontID nID = 0;
@@ -999,8 +970,6 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString
return aIds;
}
-
-
OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
{
NameRecord* pNameRecord = (NameRecord*)pRecord;
@@ -1085,8 +1054,6 @@ namespace
}
}
-
-
void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const
{
OUString aFamily;
@@ -1140,8 +1107,6 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU
return;
}
-
-
bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
{
bool bSuccess = false;
@@ -1436,7 +1401,6 @@ void PrintFontManager::initialize()
aStep1 = times( &tms );
#endif
-
// part three - fill in family styles
::boost::unordered_map< fontID, PrintFont* >::iterator font_it;
for (font_it = m_aFonts.begin(); font_it != m_aFonts.end(); ++font_it)
@@ -1467,8 +1431,6 @@ void PrintFontManager::initialize()
#endif
}
-
-
void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs )
{
rFontIDs.clear();
@@ -1478,8 +1440,6 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs )
rFontIDs.push_back( it->first );
}
-
-
void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const
{
::boost::unordered_map< int, FontFamily >::const_iterator style_it =
@@ -1502,8 +1462,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r
rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
}
-
-
void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const
{
if( ( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 ) ||
@@ -1525,8 +1483,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo
rInfo.m_nWidth = pFont->m_aGlobalMetricX.width < pFont->m_aGlobalMetricY.width ? pFont->m_aGlobalMetricY.width : pFont->m_aGlobalMetricX.width;
}
-
-
bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const
{
PrintFont* pFont = getFont( nFontID );
@@ -1538,8 +1494,6 @@ bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const
return pFont ? true : false;
}
-
-
bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo ) const
{
PrintFont* pFont = getFont( nFontID );
@@ -1551,8 +1505,6 @@ bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo
return pFont ? true : false;
}
-
-
bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax )
{
bool bSuccess = false;
@@ -1576,8 +1528,6 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin,
return bSuccess;
}
-
-
int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
{
int nRet = 0;
@@ -1589,9 +1539,6 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
return nRet;
}
-
-
-
FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
{
typedef struct {
@@ -1657,8 +1604,6 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
return FAMILY_DONTKNOW;
}
-
-
OString PrintFontManager::getAfmFile( PrintFont* pFont ) const
{
OString aMetricPath;
@@ -1680,8 +1625,6 @@ OString PrintFontManager::getAfmFile( PrintFont* pFont ) const
return aMetricPath;
}
-
-
OString PrintFontManager::getFontFile( PrintFont* pFont ) const
{
OString aPath;
@@ -1705,8 +1648,6 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const
return aPath;
}
-
-
const OUString& PrintFontManager::getPSName( fontID nFontID ) const
{
PrintFont* pFont = getFont( nFontID );
@@ -1774,8 +1715,6 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID,
}
}
-
-
bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const
{
static const char* pEnable = getenv( "PSPRINT_ENABLE_TTF_COPYRIGHTAWARENESS" );
@@ -1812,8 +1751,6 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const
return bRet;
}
-
-
bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, int nLen, CharacterMetric* pArray, bool bVertical ) const
{
PrintFont* pFont = getFont( nFontID );
@@ -1855,8 +1792,6 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i
return true;
}
-
-
bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal_Unicode maxCharacter, CharacterMetric* pArray, bool bVertical ) const
{
OSL_PRECOND(minCharacter <= maxCharacter, "invalid char. range");
@@ -1904,8 +1839,6 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal
return true;
}
-
-
// TODO: move most of this stuff into the central font-subsetting code
bool PrintFontManager::createFontSubset(
FontSubsetInfo& rInfo,
@@ -2137,8 +2070,6 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
}
}
-
-
const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const
{
PrintFont* pFont = getFont( nFont );
@@ -2154,8 +2085,6 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font
return pFont->m_aEncodingVector.size() ? &pFont->m_aEncodingVector : NULL;
}
-
-
std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const
{
std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator,
@@ -2176,7 +2105,6 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha
return aRet;
}
-
std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const
{
std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator,
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 4c10c9a..269fd92 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -35,10 +35,8 @@
#include <unotools/fontdefs.hxx>
#include <list>
-
// platform specific font substitution hooks
-
struct FontSelectPatternAttributesHash
{
size_t operator()(const FontSelectPatternAttributes& rAttributes) const
@@ -115,8 +113,6 @@ void SalGenericInstance::RegisterFontSubstitutors( PhysicalFontCollection* pFont
}
}
-
-
static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes )
{
FontSelectPattern aSubstituted(rFontSelData);
@@ -153,8 +149,6 @@ namespace
};
}
-
-
bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
{
// We don't actually want to talk to Fontconfig at all for symbol fonts
@@ -220,8 +214,6 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
return bHaveSubstitute;
}
-
-
bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData,
OUString& rMissingCodes ) const
{
@@ -263,7 +255,4 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
return bHaveSubstitute;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index a35264f..7250964 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -382,5 +382,4 @@ void psp::splitPath( OString& rPath, OString& rDir, OString& rBase )
rBase = rPath.copy( nIndex+1 );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index 1567c9e..8d5690e 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -43,7 +43,6 @@
* in recognize() routine
*/
-
/* parseAFM.c
*
* This file is used in conjuction with the parseAFM.h header file.
@@ -290,7 +289,6 @@ static char *token( FileInputStream* stream, int& rLen )
} /* token */
-
/*************************** linetoken *************************/
/* "linetoken" will get read all tokens until the EOL character from
@@ -319,7 +317,6 @@ static char *linetoken( FileInputStream* stream )
} /* linetoken */
-
/*************************** recognize *************************/
/* This function tries to match a string to a known list of
@@ -349,7 +346,6 @@ static inline enum parseKey recognize( char* ident, int len)
} /* recognize */
-
/************************* parseGlobals *****************************/
/* This function is called by "parseFile". It will parse the AFM file
@@ -555,7 +551,6 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
} /* parseGlobals */
-
/************************* parseCharWidths **************************/
/* This function is called by "parseFile". It will parse the AFM file
@@ -668,7 +663,6 @@ static int parseCharWidths( FileInputStream* fp, int* cwi)
} /* parseCharWidths */
-
/*
* number of char metrics is almost always inaccurate, so be gentle and try to
* adapt our internal storage by adjusting the allocated list
@@ -871,8 +865,6 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi)
} /* parseCharMetrics */
-
-
/************************* parseTrackKernData ***********************/
/* This function is called by "parseFile". It will parse the AFM file
@@ -980,7 +972,6 @@ static int parseTrackKernData( FileInputStream* fp, FontInfo* fi)
} /* parseTrackKernData */
-
/************************* parsePairKernData ************************/
/* This function is called by "parseFile". It will parse the AFM file
@@ -1107,7 +1098,6 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi)
} /* parsePairKernData */
-
/************************* parseCompCharData **************************/
/* This function is called by "parseFile". It will parse the AFM file
@@ -1246,12 +1236,8 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi)
} /* parseCompCharData */
-
-
-
/*************************** 'PUBLIC' FUNCTION ********************/
-
/*************************** parseFile *****************************/
/* parseFile is the only 'public' procedure available. It is called
@@ -1283,7 +1269,6 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags)
char *keyword; /* used to store a token */
-
(*fi) = (FontInfo *) calloc(1, sizeof(FontInfo));
if ((*fi) == NULL) {error = storageProblem; return(error);}
diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/generic/fontmanager/parseAFM.hxx
index 0c390bd..f77f84a 100644
--- a/vcl/generic/fontmanager/parseAFM.hxx
+++ b/vcl/generic/fontmanager/parseAFM.hxx
@@ -98,8 +98,6 @@ namespace psp {
#define MAX_NAME 4096 /* max length for identifiers */
#define FLAGS int
-
-
/* Flags that can be AND'ed together to specify exactly what
* information from the AFM file should be saved.
*/
@@ -110,7 +108,6 @@ namespace psp {
#define P_T 0x10 /* 0001 0000 */ /* Track Kerning Info */
#define P_C 0x20 /* 0010 0000 */ /* Composite Char Info */
-
/* Commonly used flags
*/
#define P_GW (P_G | P_W)
@@ -119,8 +116,6 @@ namespace psp {
#define P_GMK (P_G | P_M | P_P | P_T)
#define P_ALL (P_G | P_M | P_P | P_T | P_C)
-
-
/* Possible return codes from the parseFile procedure.
*
* ok means there were no problems parsing the file.
@@ -140,14 +135,12 @@ namespace psp {
enum afmError { ok = 0, parseError = -1, earlyEOF = -2, storageProblem = -3 };
-
/************************* TYPES *********************************/
/* Below are all of the data structure definitions. These structures
* try to map as closely as possible to grouping and naming of data
* in the AFM Files.
*/
-
/* Bounding box definition. Used for the Font BBox as well as the
* Character BBox.
*/
@@ -159,7 +152,6 @@ typedef struct
int ury; /* upper right y-position */
} BBox;
-
/* Global Font information.
* The key that each field is associated with is in comments. For an
* explanation about each key and its value please refer to the AFM
@@ -187,7 +179,6 @@ typedef struct
int charwidth; /* key: CharWidth */
} GlobalFontInfo;
-
/* Ligature definition is a linked list since any character can have
* any number of ligatures.
*/
@@ -197,7 +188,6 @@ typedef struct _t_ligature
struct _t_ligature *next;
} Ligature;
-
/* Character Metric Information. This structure is used only if ALL
* character metric information is requested. If only the character
* widths is requested, then only an array of the character x-widths
@@ -219,7 +209,6 @@ typedef struct
Ligature *ligs; /* key: L (linked list; not a fixed number of Ls */
} CharMetricInfo;
-
/* Track kerning data structure.
* The fields of this record are the five values associated with every
* TrackKern entry.
@@ -237,7 +226,6 @@ typedef struct
maxKernAmt;
} TrackKernData;
-
/* Pair Kerning data structure.
* The fields of this record are the four values associated with every
* KP entry. For KPX entries, the yamt will be zero.
@@ -254,7 +242,6 @@ typedef struct
yamt;
} PairKernData;
-
/* PCC is a piece of a composite character. This is a sub structure of a
* compCharData described below.
* These fields will be filled in with the values from the key PCC.
@@ -270,7 +257,6 @@ typedef struct
deltay;
} Pcc;
-
/* Composite Character Information data structure.
* The fields ccName and numOfPieces are filled with the values associated
* with the key CC. The field pieces points to an array (size = numOfPieces)
@@ -288,7 +274,6 @@ typedef struct
Pcc *pieces;
} CompCharData;
-
/* FontInfo
* Record type containing pointers to all of the other data
* structures containing information about a font.
@@ -309,8 +294,6 @@ typedef struct
CompCharData *ccd; /* ptr to comp char array */
} FontInfo;
-
-
/************************* PROCEDURES ****************************/
/* Call this procedure to do the grunt work of parsing an AFM file.
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 92da831..ab5ddd8 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "gcach_ftyp.hxx"
#include "vcl/svapp.hxx"
@@ -89,8 +88,6 @@ static void InitGammaTable()
}
}
-
-
static FT_Library aLibFT = 0;
// enable linking with old FT versions
@@ -100,8 +97,6 @@ typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::
namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; }
-
-
// TODO: remove when the priorities are selected by UI
// if (AH==0) => disable autohinting
// if (AA==0) => disable antialiasing
@@ -113,10 +108,8 @@ static int nDefaultPrioEmbedded = 2;
static int nDefaultPrioAutoHint = 1;
static int nDefaultPrioAntiAlias = 1;
-
// FreetypeManager
-
FtFontFile::FtFontFile( const OString& rNativeFileName )
: maNativeFileName( rNativeFileName ),
mpFileMap( NULL ),
@@ -143,8 +136,6 @@ FtFontFile::FtFontFile( const OString& rNativeFileName )
}
}
-
-
FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
{
// font file already known? (e.g. for ttc, synthetic, aliased fonts)
@@ -161,8 +152,6 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
return pFontFile;
}
-
-
bool FtFontFile::Map()
{
if( mnRefCount++ <= 0 )
@@ -190,8 +179,6 @@ bool FtFontFile::Map()
return (mpFileMap != NULL);
}
-
-
void FtFontFile::Unmap()
{
if( (--mnRefCount > 0) || (mpFileMap == NULL) )
@@ -228,8 +215,6 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
}
#endif
-
-
FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic)
:
@@ -254,8 +239,6 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost();
}
-
-
FtFontInfo::~FtFontInfo()
{
if( mpFontCharMap )
@@ -274,8 +257,6 @@ void FtFontInfo::InitHashes() const
mpGlyph2Char = new Int2IntMap();
}
-
-
FT_FaceRec_* FtFontInfo::GetFaceFT()
{
if (!maFaceFT && mpFontFile->Map())
@@ -314,8 +295,6 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
}
#endif
-
-
void FtFontInfo::ReleaseFaceFT()
{
if (--mnRefCount <= 0)
@@ -326,8 +305,6 @@ void FtFontInfo::ReleaseFaceFT()
}
}
-
-
static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
//static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));}
@@ -372,16 +349,12 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
return NULL;
}
-
-
void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection )
{
ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes );
pFontCollection->Add( pFD );
}
-
-
FreetypeManager::FreetypeManager()
: mnMaxFontId( 0 )
{
@@ -407,8 +380,6 @@ FreetypeManager::FreetypeManager()
vclFontFileList::get();
}
-
-
FT_Face ServerFont::GetFtFace() const
{
FT_Activate_Size( maSizeFT );
@@ -416,15 +387,11 @@ FT_Face ServerFont::GetFtFace() const
return maFaceFT;
}
-
-
FreetypeManager::~FreetypeManager()
{
ClearFontList();
}
-
-
void FreetypeManager::AddFontFile( const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr)
{
@@ -441,8 +408,6 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName,
mnMaxFontId = nFontId;
}
-
-
void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const
{
for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it )
@@ -452,8 +417,6 @@ void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const
}
}
-
-
void FreetypeManager::ClearFontList( )
{
for( FontList::iterator it = maFontList.begin(); it != maFontList.end(); ++it )
@@ -464,8 +427,6 @@ void FreetypeManager::ClearFontList( )
maFontList.clear();
}
-
-
ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
{
FtFontInfo* pFontInfo = NULL;
@@ -484,8 +445,6 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
return pNew;
}
-
-
ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA )
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
mpFtFontInfo( pFI )
@@ -494,18 +453,14 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes&
mbOrientation = true;
}
-
-
ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
{
ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
return pEntry;
}
-
// ServerFont
-
ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
: maGlyphList( 0),
maFontSelData(rFSD),
@@ -668,8 +623,6 @@ bool ServerFont::TestFont() const
return mbFaceOk;
}
-
-
ServerFont::~ServerFont()
{
if( mpLayoutEngine )
@@ -683,15 +636,11 @@ ServerFont::~ServerFont()
ReleaseFromGarbageCollect();
}
-
-
int ServerFont::GetEmUnits() const
{
return maFaceFT->units_per_EM;
}
-
-
void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
{
static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes();
@@ -814,8 +763,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
}
}
-
-
static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags )
{
nGlyphFlags = rGlyphId & GF_FLAGMASK;
@@ -825,8 +772,6 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph
rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
}
-
-
int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
{
@@ -900,8 +845,6 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
return nAngle;
}
-
-
sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
{
if( mpFontInfo->IsSymbolFont() )
@@ -945,8 +888,6 @@ sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
return sal_GlyphId( nGlyphIndex);
}
-
-
sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const
{
int nGlyphFlags = GF_NONE;
@@ -981,9 +922,6 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar )
return aGlyphId;
}
-
-
-
sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
{
sal_GlyphId aGlyphId = GetRawGlyphIndex( aChar );
@@ -991,8 +929,6 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
return aGlyphId;
}
-
-
static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags )
{
int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
@@ -1006,8 +942,6 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl
return (nCharWidth + 32) >> 6;
}
-
-
void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
{
FT_Activate_Size( maSizeFT );
@@ -1058,8 +992,6 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
FT_Done_Glyph( pGlyphFT );
}
-
-
bool ServerFont::GetAntialiasAdvice( void ) const
{
if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) )
@@ -1069,8 +1001,6 @@ bool ServerFont::GetAntialiasAdvice( void ) const
return bAdviseAA;
}
-
-
bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
FT_Activate_Size( maSizeFT );
@@ -1210,8 +1140,6 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
return true;
}
-
-
bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
FT_Activate_Size( maSizeFT );
@@ -1342,10 +1270,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
return true;
}
-
// determine unicode ranges in font
-
const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const
{
const ImplFontCharMap* pIFCMap = mpFontInfo->GetImplFontCharMap();
@@ -1442,10 +1368,8 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c
return bRet;
}
-
// outline stuff
-
class PolyArgs
{
public:
@@ -1471,8 +1395,6 @@ private:
bool bHasOffline;
};
-
-
PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
: mrPolyPoly(rPolyPoly),
mnMaxPoints(nMaxPoints),
@@ -1485,17 +1407,12 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
maPosition.x = maPosition.y = 0;
}
-
-
-
PolyArgs::~PolyArgs()
{
delete[] mpFlagAry;
delete[] mpPointAry;
}
-
-
void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
{
DBG_ASSERT( (mnPoints < mnMaxPoints), "FTGlyphOutline: AddPoint overflow!" );
@@ -1509,8 +1426,6 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
bHasOffline |= (aFlag != POLY_NORMAL);
}
-
-
void PolyArgs::ClosePolygon()
{
if( !mnPoly++ )
@@ -1555,8 +1470,6 @@ void PolyArgs::ClosePolygon()
bHasOffline = false;
}
-
-
extern "C" {
// TODO: wait till all compilers accept that calling conventions
@@ -1608,8 +1521,6 @@ static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3,
} // extern "C"
-
-
bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
{
@@ -1686,8 +1597,6 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
return true;
}
-
-
bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
{
#define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
@@ -1943,6 +1852,4 @@ GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const
}
#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 7015b34..7babff3 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -28,8 +28,6 @@
class GraphiteFaceWrapper;
#endif
-
-
// FtFontFile has the responsibility that a font file is only mapped once.
// (#86621#) the old directly ft-managed solution caused it to be mapped
// in up to nTTC*nSizes*nOrientation*nSynthetic times
@@ -56,8 +54,6 @@ private:
int mnLangBoost;
};
-
-
// FtFontInfo corresponds to an unscaled font face
class FtFontInfo
{
@@ -133,8 +129,6 @@ inline void FtFontInfo::CacheGlyphIndex( sal_UCS4 cChar, int nIndex ) const
(*mpGlyph2Char)[ nIndex ] = cChar;
}
-
-
class FreetypeManager
{
public:
@@ -155,8 +149,6 @@ private:
sal_IntPtr mnMaxFontId;
};
-
-
class ImplFTSFontData : public PhysicalFontFace
{
private:
@@ -175,8 +167,6 @@ public:
static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); }
};
-
-
#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index dfbd653..ff644e3 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -38,10 +38,8 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <comphelper/processfactory.hxx>
-
// layout implementation for ServerFont
-
ServerFontLayout::ServerFontLayout( ServerFont& rFont )
: mrServerFont( rFont )
{ }
@@ -51,14 +49,11 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
rSalGraphics.DrawServerFontLayout( *this );
}
-
-
bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
return mrServerFont.GetLayoutEngine()->layout(*this, rArgs);
}
-
void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
GenericSalLayout::AdjustLayout( rArgs );
@@ -115,8 +110,6 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos
rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
}
-
-
std::ostream &operator <<(std::ostream& s, ServerFont* pFont)
{
#ifndef SAL_LOG_INFO
@@ -553,8 +546,6 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
return true;
}
-
-
ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
{
// find best layout engine for font, platform, script and language
@@ -564,6 +555,4 @@ ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
return mpLayoutEngine;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_rbmp.cxx b/vcl/generic/glyphs/gcach_rbmp.cxx
index 0efe54c..23d3ed9 100644
--- a/vcl/generic/glyphs/gcach_rbmp.cxx
+++ b/vcl/generic/glyphs/gcach_rbmp.cxx
@@ -17,20 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "generic/glyphcache.hxx"
#include <string.h>
-
RawBitmap::RawBitmap()
: mnAllocated(0)
{}
-
RawBitmap::~RawBitmap()
{}
-
// used by 90 and 270 degree rotations on 8 bit deep bitmaps
static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int dx, int dy, int nPad )
@@ -44,7 +40,6 @@ static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2,
}
}
-
// used by inplace 180 degree rotation on 8 bit deep bitmaps
static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad )
{
@@ -71,7 +66,6 @@ static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad )
}
}
-
// used by 90 or 270 degree rotations on 1 bit deep bitmaps
static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int dx, int nShift, int nDeltaShift, int nPad )
@@ -110,7 +104,6 @@ static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2,
}
}
-
// used by 180 degrees rotations on 1 bit deep bitmaps
static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int nPad )
@@ -147,7 +140,6 @@ static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2,
}
}
-
bool RawBitmap::Rotate( int nAngle )
{
sal_uLong nNewScanlineSize = 0;
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 7c7e2d1..2509c00 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -51,14 +50,12 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer )
mpFtManager = new FreetypeManager;
}
-
GlyphCache::~GlyphCache()
{
InvalidateAllGlyphs();
delete mpFtManager;
}
-
void GlyphCache::InvalidateAllGlyphs()
{
for( FontList::iterator it = maFontList.begin(), end = maFontList.end(); it != end; ++it )
@@ -72,7 +69,6 @@ void GlyphCache::InvalidateAllGlyphs()
mpCurrentGCFont = NULL;
}
-
inline
size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData ) const
{
@@ -98,7 +94,6 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
return nHash;
}
-
bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const FontSelectPattern& rB) const
{
// check font ids
@@ -146,13 +141,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
return true;
}
-
GlyphCache& GlyphCache::GetInstance()
{
return *pInstance;
}
-
void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA)
{
@@ -160,7 +153,6 @@ void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA);
}
-
void GlyphCache::AnnounceFonts( PhysicalFontCollection* pFontCollection ) const
{
if( mpFtManager )
@@ -174,7 +166,6 @@ void GlyphCache::ClearFontCache()
mpFtManager->ClearFontList();
}
-
ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
{
// a serverfont request has pFontData
@@ -226,7 +217,6 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
return pNew;
}
-
void GlyphCache::UncacheFont( ServerFont& rServerFont )
{
// the interface for rServerFont must be const because a
@@ -241,7 +231,6 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont )
}
}
-
void GlyphCache::GarbageCollect()
{
// when current GC font has been destroyed get another one
@@ -292,13 +281,11 @@ void GlyphCache::GarbageCollect()
}
}
-
inline void GlyphCache::UsingGlyph( ServerFont&, GlyphData& rGlyphData )
{
rGlyphData.SetLruValue( mnLruIndex++ );
}
-
inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData )
{
++mnGlyphCount;
@@ -307,14 +294,12 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa
GrowNotify();
}
-
void GlyphCache::GrowNotify()
{
if( (mnBytesUsed + mrPeer.GetByteCount()) > mnMaxSize )
GarbageCollect();
}
-
inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
{
mrPeer.RemovingGlyph( rGD );
@@ -322,7 +307,6 @@ inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
--mnGlyphCount;
}
-
void ServerFont::ReleaseFromGarbageCollect()
{
// remove from GC list
@@ -334,14 +318,12 @@ void ServerFont::ReleaseFromGarbageCollect()
mpNextGCFont = NULL;
}
-
long ServerFont::Release() const
{
DBG_ASSERT( mnRefCount > 0, "ServerFont: RefCount underflow" );
return --mnRefCount;
}
-
GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
{
// usually the GlyphData is cached
@@ -360,7 +342,6 @@ GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
return rGlyphData;
}
-
void ServerFont::GarbageCollect( long nMinLruIndex )
{
GlyphList::iterator it = maGlyphList.begin();
@@ -379,14 +360,12 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
}
}
-
ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
: ImplFontEntry( rFSD )
, mpServerFont( NULL )
, mbGotFontOptions( false )
{}
-
void ImplServerFontEntry::SetServerFont(ServerFont* p)
{
if (p == mpServerFont)
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx
index e2f5085..09159e4 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -19,7 +19,6 @@
// Header files
-
// Platform
#include <i18nlangtag/languagetag.hxx>
#include <sallayout.hxx>
@@ -41,10 +40,8 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId)
return .0f;
}
-
// An implementation of the GraphiteLayout interface to enable Graphite enabled fonts to be used.
-
GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) throw()
: ServerFontLayout(rServerFont),
maImpl(rServerFont.GetGraphiteFace()->face(), rServerFont)
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 7297546..38302e1 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -176,5 +176,4 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length)
reset(start, length);
}
-
#endif
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index e3f6f44..4b7017b 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "psputil.hxx"
#include "generic/printergfx.hxx"
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 3b1f87e..c5cc108 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -436,7 +436,6 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P
if ( !nPoly || !pPaths || !(maFillColor.Is() || maLineColor.Is()))
return;
-
// setup closed path
for( unsigned int i = 0; i < nPoly; i++ )
{
@@ -597,7 +596,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
if ( !nPoly || !pPtAry || !pPoints || !(maFillColor.Is() || maLineColor.Is()))
return;
-
for (unsigned int i=0; i<nPoly;i++)
{
sal_uInt32 nPoints = pPoints[i];
@@ -654,7 +652,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
PSGRestore();
}
-
/*
* postscript generating routines
*/
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d6e8911..12ffe7a 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**
this file implements the sal printer interface ( SalPrinter, SalInfoPrinter
and some printer relevant methods of SalInstance and SalGraphicsData )
@@ -64,7 +63,6 @@
using namespace psp;
using namespace com::sun::star;
-
/*
* static helpers
*/
@@ -717,7 +715,6 @@ void PspSalInfoPrinter::GetPageInfo(
int left = 0, top = 0, right = 0, bottom = 0;
int nDPI = aData.m_aContext.getRenderResolution();
-
if( aData.m_eOrientation == psp::orientation::Portrait )
{
aData.m_aContext.getPageSize( aPaper, width, height );
@@ -1268,7 +1265,6 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
return true;
}
-
class PrinterUpdate
{
static Timer* pPrinterUpdateTimer;
@@ -1293,8 +1289,6 @@ void PrinterUpdate::doUpdate()
pInst->PostPrintersChanged();
}
-
-
IMPL_STATIC_LINK_NOINSTANCE( PrinterUpdate, UpdateTimerHdl, void*, EMPTYARG )
{
if( nActiveJobs < 1 )
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 5a6aecd..33846e2 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -58,7 +58,6 @@
using namespace psp;
-
// ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
class SalPrinterBmp : public psp::PrinterBmp
@@ -558,8 +557,6 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert)
OSL_FAIL("Warning: PrinterGfx::Invert() not implemented");
}
-
-
class ImplPspFontData : public PhysicalFontFace
{
private:
@@ -574,23 +571,17 @@ public:
static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); }
};
-
-
ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo )
: PhysicalFontFace( GenPspGraphics::Info2DevFontAttributes(rInfo), PSPFD_MAGIC ),
mnFontId( rInfo.m_nID )
{}
-
-
ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
{
ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
return pEntry;
}
-
-
class PspFontLayout : public GenericSalLayout
{
public:
@@ -608,8 +599,6 @@ private:
bool mbArtBold;
};
-
-
PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
: mrPrinterGfx( rGfx )
{
@@ -621,8 +610,6 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
mbArtBold = mrPrinterGfx.GetArtificialBold();
}
-
-
bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
mbVertical = ((rArgs.mnFlags & SAL_LAYOUT_VERTICAL) != 0);
@@ -721,8 +708,6 @@ void PspServerFontLayout::InitFont() const
mnOrientation, mbVertical, mbArtItalic, mbArtBold );
}
-
-
static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout )
{
const int nMaxGlyphs = 200;
@@ -778,16 +763,12 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
}
}
-
-
void PspFontLayout::InitFont() const
{
mrPrinterGfx.SetFont( mnFontID, mnFontHeight, mnFontWidth,
mnOrientation, mbVertical, mbArtItalic, mbArtBold );
}
-
-
void PspFontLayout::DrawText( SalGraphics& ) const
{
DrawPrinterLayout( *this, mrPrinterGfx, false );
@@ -1002,8 +983,6 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
return pLayout;
}
-
-
bool GenPspGraphics::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
@@ -1032,8 +1011,6 @@ bool GenPspGraphics::CreateFontSubset(
return bSuccess;
}
-
-
const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -1045,8 +1022,6 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace
return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
}
-
-
void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
Int32Vector& rWidths,
@@ -1085,7 +1060,6 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont,
rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
}
-
ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPrintFontInfo& rInfo )
{
ImplDevFontAttributes aDFA;
@@ -1161,8 +1135,6 @@ namespace vcl
}
}
-
-
void GenPspGraphics::AnnounceFonts( PhysicalFontCollection* pFontCollection, const psp::FastPrintFontInfo& aInfo )
{
int nQuality = 0;
@@ -1215,7 +1187,6 @@ bool GenPspGraphics::drawTransformedBitmap(
return false;
}
-
bool GenPspGraphics::drawAlphaRect( long, long, long, long, sal_uInt8 )
{
return false;
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index adf08a3..9a87b7e 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "glyphset.hxx"
#include "psputil.hxx"
@@ -43,7 +42,6 @@
using namespace vcl;
using namespace psp;
-
GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical)
: mnFontID (nFontID),
mbVertical (bVertical)
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index f5cec42..d8cd49d 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -118,7 +118,6 @@ public:
bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
};
-
} /* namespace psp */
#endif
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 9575169..48d9967 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -47,7 +46,6 @@
using namespace psp;
-
// forward declaration
#define nBLOCKSIZE 0x2000
@@ -580,7 +578,6 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
mfYScale = -1.0 * (double)72.0 / (double)mnResolution;
}
-
bool
PrinterJob::StartPage (const JobData& rJobSetup)
{
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 32f4c6c..ea93c2d 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -67,8 +67,6 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
rBox.SelectEntry( m_aInvalidString );
}
-
-
/*
* RTSDialog
*/
@@ -128,8 +126,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
return 0;
}
-
-
IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
{
if( pButton == m_pOKButton )
@@ -156,8 +152,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
return 0;
}
-
-
/*
* RTSPaperPage
*/
@@ -194,14 +188,10 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
update();
}
-
-
RTSPaperPage::~RTSPaperPage()
{
}
-
-
void RTSPaperPage::update()
{
const PPDKey* pKey = NULL;
@@ -247,8 +237,6 @@ void RTSPaperPage::update()
}
}
-
-
IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
{
const PPDKey* pKey = NULL;
@@ -281,8 +269,6 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
return 0;
}
-
-
/*
* RTSDevicePage
*/
@@ -371,14 +357,10 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
}
}
-
-
RTSDevicePage::~RTSDevicePage()
{
}
-
-
void RTSDevicePage::update()
{
}
@@ -407,8 +389,6 @@ sal_uLong RTSDevicePage::getColorDevice()
return 0;
}
-
-
sal_uLong RTSDevicePage::getLevel()
{
sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() );
@@ -417,8 +397,6 @@ sal_uLong RTSDevicePage::getLevel()
return nLevel < 10 ? nLevel-1 : 0;
}
-
-
sal_uLong RTSDevicePage::getPDFDevice()
{
sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() );
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index 3c409d9..9d47556 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -89,7 +89,6 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer)
return nRet;
}
-
sal_Int32
getValueOf (sal_Int32 nValue, sal_Char* pBuffer)
{
@@ -245,7 +244,6 @@ ConverterFactory& GetConverterFactory()
return theConverterFactory::get();
}
-
} /* namespace psp */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 71662cf..40a7dad 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <math.h>
#include "psputil.hxx"
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index e7c458c..de7d3ad 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -69,7 +69,6 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSou
return false;
}
-
bool SvpSalGraphics::drawTransformedBitmap(
const basegfx::B2DPoint& rNull,
const basegfx::B2DPoint& rX,
@@ -82,7 +81,6 @@ bool SvpSalGraphics::drawTransformedBitmap(
return false;
}
-
bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ )
{
// TODO(P3) implement alpha blending
@@ -164,7 +162,6 @@ void SvpSalGraphics::ResetClipRegion()
m_aClipRegion.SetNull();
}
-
// verify clip for the whole area is setup
void SvpSalGraphics::ensureClip()
{
@@ -375,7 +372,6 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
}
}
-
void SvpSalGraphics::drawPixel( long nX, long nY )
{
if( m_bUseLineColor )
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index d0ee938..eaba04b 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl/svapp.hxx"
#include "vcl/timer.hxx"
#include "vcl/printerinfomanager.hxx"
@@ -180,7 +179,6 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn
copyJobDataToJobSetup( pJobSetup, aInfo );
}
-
return pPrinter;
}
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 2dd140a..49b1464 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -111,7 +111,6 @@ SvpGlyphCache& SvpGlyphCache::GetInstance()
return theGlyphCacheHolder::get().getGlyphCache();
}
-
BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
sal_GlyphId aGlyphId, basebmp::Format nBmpFormat, B2IPoint& rTargetPos )
{
@@ -172,13 +171,11 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
return pGcpHelper->maBitmapDev;
}
-
void SvpGlyphPeer::RemovingFont( ServerFont& )
{
// nothing to do: no font resources held in SvpGlyphPeer
}
-
void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData )
{
SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>(
@@ -222,7 +219,6 @@ sal_uInt16 SvpSalGraphics::SetFont( FontSelectPattern* pIFSD, int nFallbackLevel
return SAL_SETFONT_USEDRAWTEXTARRAY;
}
-
void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel )
{
if( nFallbackLevel >= MAX_FALLBACK )
@@ -235,7 +231,6 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
}
}
-
const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const
{
if( !m_pServerFont[0] )
@@ -253,7 +248,6 @@ bool SvpSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil
return m_pServerFont[0]->GetFontCapabilities(rFontCapabilities);
}
-
void SvpSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
{
GlyphCache& rGC = SvpGlyphCache::GetInstance();
@@ -293,14 +287,12 @@ void SvpSalGraphics::ClearDevFontCache()
rGC.ClearFontCache();
}
-
bool SvpSalGraphics::AddTempDevFont( PhysicalFontCollection*,
const OUString&, const OUString& )
{
return false;
}
-
bool SvpSalGraphics::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
@@ -329,7 +321,6 @@ bool SvpSalGraphics::CreateFontSubset(
return bSuccess;
}
-
const Ucs2SIntMap* SvpSalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -341,7 +332,6 @@ const Ucs2SIntMap* SvpSalGraphics::GetFontEncodingVector( const PhysicalFontFace
return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
}
-
const void* SvpSalGraphics::GetEmbedFontData(
const PhysicalFontFace* pFont,
const sal_Ucs* pUnicodes,
@@ -359,7 +349,6 @@ const void* SvpSalGraphics::GetEmbedFontData(
return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen );
}
-
void SvpSalGraphics::FreeEmbedFontData( const void* pData, long nLen )
{
GenPspGraphics::DoFreeEmbedFontData( pData, nLen );
@@ -379,7 +368,6 @@ void SvpSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
GenPspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
}
-
bool SvpSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
const int nLevel = aGlyphId >> GF_FONTSHIFT;
@@ -396,7 +384,6 @@ bool SvpSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
return true;
}
-
bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPolyPoly )
{
const int nLevel = aGlyphId >> GF_FONTSHIFT;
@@ -414,7 +401,6 @@ bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPol
return false;
}
-
SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs&, int nFallbackLevel )
{
GenericSalLayout* pLayout = NULL;
@@ -425,7 +411,6 @@ SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs&, int nFallbackLevel )
return pLayout;
}
-
void SvpSalGraphics::DrawServerFontLayout( const ServerFontLayout& rSalLayout )
{
// iterate over all glyphs in the layout
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index f457bcd..5544252 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -27,7 +27,6 @@ struct FontMatchStatus;
class FontSelectPattern;
class PhysicalFontFamily;
-
struct FontMatchStatus
{
public:
@@ -81,7 +80,5 @@ friend class PhysicalFontFamily;
PhysicalFontFace* mpNext;
};
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/android/svsys.h b/vcl/inc/android/svsys.h
index 25fac68..6939e50 100644
--- a/vcl/inc/android/svsys.h
+++ b/vcl/inc/android/svsys.h
@@ -10,7 +10,6 @@
#ifndef INCLUDED_VCL_INC_ANDROID_SVSYS_H
#define INCLUDED_VCL_INC_ANDROID_SVSYS_H
-
// ?
#endif // INCLUDED_VCL_INC_ANDROID_SVSYS_H
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 7162650..2072091 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -22,12 +22,9 @@
#include <vcl/controllayout.hxx>
-
namespace vcl
{
-
-
//= ImplControlData
struct ImplControlData
@@ -47,10 +44,8 @@ namespace vcl
}
};
-
} // namespace vcl
-
#endif // INCLUDED_VCL_INC_CONTROLDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index b325ba5..a62abbd 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -90,7 +90,6 @@ public:
virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
/*
* XEventListener
*/
@@ -98,10 +97,6 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index f385682d..c365c3c 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -87,7 +87,6 @@ public:
virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
/*
* XDropTargetDropContext
*/
@@ -108,11 +107,6 @@ public:
virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
-
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index ab2ceab..acac65c 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -487,7 +487,6 @@ public:
std::vector< sal_Int32 >& rWidths,
std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc );
-
// font administration functions
/* system dependendent font matching
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index 2c5b5ec..4f341da 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -74,7 +74,6 @@ public:
{ return m_pCapture; }
};
-
#endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 076952e..9cc4766 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
-
#include <vcl/vclenum.hxx>
#include "fontmanager.hxx"
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 98d6bc3..7cd7bba 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -63,8 +63,6 @@ namespace vcl
struct FontCapabilities;
}
-
-
class VCL_DLLPUBLIC GlyphCache
{
public:
@@ -112,8 +110,6 @@ private:
class FreetypeManager* mpFtManager;
};
-
-
class GlyphMetric
{
public:
@@ -138,8 +134,6 @@ private:
Size maSize;
};
-
-
// the glyph specific data needed by a GlyphCachePeer is usually trivial,
// not attaching it to the corresponding GlyphData would be overkill;
// this is currently only used by the headless (aka svp) plugin, where meInfo is
@@ -152,8 +146,6 @@ struct ExtGlyphData
ExtGlyphData() : meInfo(0), mpData(NULL) {}
};
-
-
class GlyphData
{
public:
@@ -181,8 +173,6 @@ private:
mutable long mnLruValue;
};
-
-
class FtFontInfo;
class VCL_DLLPUBLIC ServerFont
@@ -285,8 +275,6 @@ private:
ServerFontLayoutEngine* mpLayoutEngine;
};
-
-
// a class for cache entries for physical font instances that are based on serverfonts
class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry
{
@@ -302,8 +290,6 @@ public:
void HandleFontOptions();
};
-
-
class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
{
private:
@@ -325,8 +311,6 @@ public:
ServerFont& GetServerFont() const { return mrServerFont; }
};
-
-
class ServerFontLayoutEngine
{
public:
@@ -334,8 +318,6 @@ public:
virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
};
-
-
class GlyphCachePeer
{
protected:
@@ -351,8 +333,6 @@ protected:
sal_Int32 mnBytesUsed;
};
-
-
class VCL_DLLPUBLIC RawBitmap
{
public:
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index dee151c..1fb8777 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -272,7 +272,6 @@ public:
void PSGSave ();
void PSGRestore ();
-
/* PS helpers */
enum pspath_t { moveto = 0, lineto = 1 };
void PSBinLineTo (const Point& rCurrent, Point& rOld,
@@ -412,7 +411,6 @@ public:
} /* namespace psp */
-
#endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index c9ea6b7..3466025 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -31,7 +31,6 @@ namespace psp {
// forward declarations
class PrinterGfx;
-
class PrinterJob
{
private: // private data
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 8f07589..839568b 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -75,7 +75,6 @@ public:
int nDefButton ) SAL_OVERRIDE;
};
-
#endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index e8c1431..49fa496 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -23,10 +23,8 @@
#include <vcl/floatwin.hxx>
#include <vcl/timer.hxx>
-
// - HelpTextWindow -
-
class HelpTextWindow : public FloatingWindow
{
private:
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 6163da0..9f928c9 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -153,7 +153,6 @@ public:
void SetSelectionAnchor( sal_Int32 nPos ) { mnSelectionAnchor = nPos; }
sal_Int32 GetSelectionAnchor() const { return mnSelectionAnchor; }
-
void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; }
void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; }
@@ -260,7 +259,6 @@ protected:
void ImplShowFocusRect();
void ImplHideFocusRect();
-
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
@@ -467,7 +465,6 @@ public:
void SetReadOnly( bool b ) { maLBWindow.SetReadOnly( b ); }
bool IsReadOnly() const { return maLBWindow.IsReadOnly(); }
-
Size CalcSize( sal_Int32 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); }
long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); }
long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); }
@@ -626,7 +623,6 @@ public:
const Link& GetMBDownHdl() const { return maMBDownHdl; }
};
-
void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground );
void ImplInitDropDownButton( PushButton* pButton );
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index d8b1ab6..d9de98c 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -24,10 +24,8 @@
#include <boost/unordered_map.hpp>
-
// - ImplImageBmp -
-
class ImplImageBmp
{
public:
@@ -56,16 +54,12 @@ private: // prevent assignment and copy construction
void operator=( const ImplImageBmp& );
};
-
// - ImageTypes -
-
enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE };
-
// - ImplImageList -
-
struct ImageAryData
{
OUString maName;
@@ -84,8 +78,6 @@ struct ImageAryData
ImageAryData& operator=( const ImageAryData& rData );
};
-
-
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
@@ -107,10 +99,8 @@ struct ImplImageList
void RemoveImage( sal_uInt16 nPos );
};
-
// - ImplImageRefData -
-
struct ImplImageRefData
{
ImplImageList* mpImplData;
@@ -122,10 +112,8 @@ struct ImplImageRefData
bool IsEqual( const ImplImageRefData& rData );
};
-
// - ImpImageData -
-
struct ImplImageData
{
ImplImageBmp* mpImageBitmap;
@@ -137,10 +125,8 @@ struct ImplImageData
bool IsEqual( const ImplImageData& rData );
};
-
// - ImplImage -
-
struct ImplImage
{
sal_uIntPtr mnRefCount;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 6f27294..df6ea1b 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -29,10 +29,8 @@
#include <vcl/fntstyle.hxx>
#include <outfont.hxx>
-
// - Impl_Font -
-
typedef sal_uInt32 FontRefCount;
class Impl_Font
@@ -86,10 +84,8 @@ private:
friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& );
};
-
// - ImplFontMetric -
-
class ImplFontMetric
{
friend class OutputDevice;
@@ -127,10 +123,8 @@ public:
bool operator==( const ImplFontMetric& ) const;
};
-
// - ImplFontOptions -
-
class ImplFontOptions
{
public:
@@ -163,10 +157,8 @@ public:
{ return NULL; }
};
-
// - ImplFontCharMap -
-
class CmapResult;
class VCL_PLUGIN_PUBLIC ImplFontCharMap
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index e6cee93..20e305d 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -27,20 +27,16 @@
#include <vcl/graph.h>
#include <vcl/svgdata.hxx>
-
// - ImpSwapInfo -
-
struct ImpSwapInfo
{
MapMode maPrefMapMode;
Size maPrefSize;
};
-
// - ImpGraphic -
-
class OutputDevice;
class GfxLink;
struct ImpSwapFile;
@@ -102,7 +98,6 @@ private:
Animation ImplGetAnimation() const;
const GDIMetaFile& ImplGetGDIMetaFile() const;
-
Size ImplGetPrefSize() const;
void ImplSetPrefSize( const Size& rPrefSize );
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index 93f2df9..4183fc7 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -22,10 +22,8 @@
#include "octree.hxx"
-
// - ImpErrorQuad -
-
class ImpErrorQuad
{
long nRed;
@@ -59,8 +57,6 @@ public:
inline BitmapColor ImplGetColor();
};
-
-
inline void ImpErrorQuad::operator=( const BitmapColor& rColor )
{
nRed = (long) rColor.GetRed() << 5L;
@@ -68,8 +64,6 @@ inline void ImpErrorQuad::operator=( const BitmapColor& rColor )
nBlue = (long) rColor.GetBlue() << 5L;
}
-
-
inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor )
{
nRed -= ( (long) rColor.GetRed() << 5L );
@@ -79,8 +73,6 @@ inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor )
return *this;
}
-
-
inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad )
{
nRed += ( rErrQuad.nRed >> 4L );
@@ -88,8 +80,6 @@ inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue >> 4L );
}
-
-
inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad )
{
nRed += ( rErrQuad.nRed * 3L >> 4L );
@@ -97,8 +87,6 @@ inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue * 3L >> 4L );
}
-
-
inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad )
{
nRed += ( rErrQuad.nRed * 5L >> 4L );
@@ -106,8 +94,6 @@ inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue * 5L >> 4L );
}
-
-
inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
{
nRed += ( rErrQuad.nRed * 7L >> 4L );
@@ -115,8 +101,6 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue *7L >> 4L );
}
-
-
inline BitmapColor ImpErrorQuad::ImplGetColor()
{
return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ),
@@ -124,10 +108,8 @@ inline BitmapColor ImpErrorQuad::ImplGetColor()
(sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) );
}
-
// - NodeCache -
-
class ImpNodeCache
{
OctreeNode* pActNode;
@@ -141,8 +123,6 @@ public:
inline void ImplReleaseNode( OctreeNode* pNode );
};
-
-
inline OctreeNode* ImpNodeCache::ImplGetFreeNode()
{
OctreeNode* pNode;
@@ -160,8 +140,6 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode()
return pNode;
}
-
-
inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode )
{
pNode->pNextInCache = pActNode;
diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h
index b476b74..dcd14e7 100644
--- a/vcl/inc/ios/svsys.h
+++ b/vcl/inc/ios/svsys.h
@@ -10,7 +10,6 @@
#ifndef INCLUDED_VCL_INC_IOS_SVSYS_H
#define INCLUDED_VCL_INC_IOS_SVSYS_H
-
// ?
#endif // INCLUDED_VCL_INC_IOS_SVSYS_H
diff --git a/vcl/inc/list.h b/vcl/inc/list.h
index b195910..93a4710 100644
--- a/vcl/inc/list.h
+++ b/vcl/inc/list.h
@@ -84,7 +84,6 @@ extern "C"
}
#endif
-
#endif // INCLUDED_VCL_INC_LIST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx
index 186e440..ad29681 100644
--- a/vcl/inc/octree.hxx
+++ b/vcl/inc/octree.hxx
@@ -104,7 +104,6 @@ private:
sal_uInt8* pMap;
const sal_uLong nBits;
-
SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax );
public:
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 2b5e96f..d4b4886 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -34,10 +34,8 @@ class Window;
class ToolBox;
class DocumentFocusListener;
-
// - AquaA11yFocusTracker -
-
class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker>
{
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 503e986..1861299 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -28,10 +28,8 @@
#include <set>
#include <com/sun/star/awt/Rectangle.hpp>
-
// - AquaA11yEventListener -
-
class AquaA11yEventListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
{
diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx
index bf9e4b4..d31ac31 100644
--- a/vcl/inc/osx/keyboardfocuslistener.hxx
+++ b/vcl/inc/osx/keyboardfocuslistener.hxx
@@ -24,10 +24,8 @@
#include <rtl/ref.hxx>
-
// - KeyboardFocusListener -
-
class KeyboardFocusListener : public rtl::IReference
{
public:
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 7feac6e..24fb17f 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -45,10 +45,8 @@ class AquaBlinker;
typedef struct SalFrame::SalPointerState SalPointerState;
-
// - AquaSalFrame -
-
class AquaSalFrame : public SalFrame
{
public:
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 26eac4d..8e18a7d 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -26,11 +26,8 @@
class AquaSalFrame;
class AquaSalObject;
-
-
// - SalObjectData -
-
struct SalObjectData
{
};
@@ -53,10 +50,8 @@ public:
long mnWidth;
long mnHeight;
-
void setClippedPosSize();
-
AquaSalObject( AquaSalFrame* pFrame );
virtual ~AquaSalObject();
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 3aa17be..7d35a99 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -26,11 +26,8 @@
#include <boost/shared_array.hpp>
-
-
// - AquaSalInfoPrinter -
-
class AquaSalGraphics;
class AquaSalInfoPrinter : public SalInfoPrinter
@@ -116,10 +113,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
};
-
// - AquaSalPrinter -
-
class AquaSalPrinter : public SalPrinter
{
AquaSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter
@@ -158,8 +153,6 @@ inline int PtTo10Mu( double nPoints ) { return (int)(((nPoints)*fPtTo100thMM)+0.
inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+0.5); }
-
-
#endif // INCLUDED_VCL_INC_OSX_SALPRN_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 6373624..91f7d45 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -24,10 +24,8 @@
#include <list>
-
// - SalSystemData -
-
class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
{
public:
@@ -45,7 +43,6 @@ public:
int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
};
-
#endif // INCLUDED_VCL_INC_OSX_SALSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index 4e5a91a..b751a81 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -38,7 +38,6 @@ class AquaSalTimer : public SalTimer
static void handleStartTimerEvent( NSEvent* pEvent );
-
static NSTimer* pRunningTimer;
static bool bDispatchTimer;
};
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index a8f4037..dcde57c 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -173,7 +173,6 @@ struct ImplOutDevData
void ImplFontSubstitute( OUString& rFontName );
-
#endif // INCLUDED_VCL_INC_OUTDEV_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 798f261..2fa0862 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -46,7 +46,6 @@ class Size;
namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}}
-
// - ImplFontAttributes -
// device independent font properties
@@ -87,7 +86,6 @@ private:
bool mbSymbolFlag;
};
-
// - ImplDevFontAttributes -
// device dependent font properties
@@ -160,10 +158,8 @@ public: // TODO: change to private
void copyAttributes(const FontSelectPatternAttributes &rAttributes);
};
-
// - ImplFontMetricData -
-
class ImplFontMetricData : public ImplFontAttributes
{
public:
@@ -218,7 +214,6 @@ public: // TODO: hide members behind accessor methods
long mnDStrikeoutOffset2; // Offset of double strike-out to baseline
};
-
// - ImplFontEntry -
// TODO: rename ImplFontEntry to LogicalFontInstance
@@ -255,7 +250,6 @@ private:
UnicodeFallbackList* mpUnicodeFallbackList;
};
-
class ImplTextLineInfo
{
private:
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index 219f0af..2aa3c6b 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -56,7 +56,6 @@ public:
void ImplDeletePrnQueueList();
void ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
-
#endif // INCLUDED_VCL_INC_PRINT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index a026b1d..f0883d0 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -292,7 +292,6 @@ namespace vcl
};
}
-
#endif // INCLUDED_VCL_INC_PRINTDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index c96257d..cd94431 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -36,10 +36,8 @@
#include "salvd.hxx"
#include "salbmp.hxx"
-
// - SalBitmap -
-
struct BitmapBuffer;
class BitmapPalette;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 28999b4..7451321 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -122,7 +122,6 @@ private:
CFMutableDictionaryRef GetStyleDict( void ) const { return mpStyleDict; }
};
-
// - SystemFontList -
// TODO: move into cross-platform headers
@@ -148,7 +147,6 @@ private:
#ifdef MACOSX
-
// - AquaSalGraphics -
class AquaSalGraphics : public SalGraphics
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 0ef560e9..af63756 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -111,7 +111,6 @@ public:
bool IsInside( long nX );
-
bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); }
bool operator==( const ImplRegionBand& rRegionBand ) const;
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 199e174..5676329 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -27,8 +27,6 @@
const char* ImplDbgTestRegionBand(const void*);
#endif
-
-
class RegionBand
{
private:
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 8da2d40..8ef2638 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -31,7 +31,6 @@
#include <map>
-
class PhysicalFontCollection;
class SalBitmap;
class FontSelectPattern;
@@ -53,10 +52,8 @@ namespace basegfx {
class B2DPolyPolygon;
}
-
// - SalGraphics-Codes -
-
#define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004)
#define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000)
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index d3b70fc..2dfca1f 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -77,7 +77,6 @@ public:
bool PosIsInAnyRun( int nCharPos ) const;
};
-
class ImplLayoutArgs
{
public:
@@ -310,7 +309,6 @@ public:
maGlyphId(aGlyphId), maLinearPos(rLinearPos)
{}
-
enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 };
bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0); }
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index f0cafe3..5711534 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -40,7 +40,6 @@ struct SalItemParams
Image aImage; // Image
};
-
struct SalMenuButtonItem
{
sal_uInt16 mnId;
@@ -91,7 +90,6 @@ public:
virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame );
};
-
#endif // INCLUDED_VCL_INC_SALMENU_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 065eb0d..afe10e6 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -27,10 +27,8 @@
struct SystemEnvData;
-
// - SalObject-Types -
-
#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001)
#define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002)
#define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004)
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index 589adfe..cbd04b0 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -22,10 +22,8 @@
#include <tools/solar.h>
-
// - SalJobSetupFlags -
-
#define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001)
#define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002)
#define SAL_JOBSET_PAPERSIZE ((sal_uLong)0x00000004)
@@ -35,17 +33,13 @@
SAL_JOBSET_PAPERSIZE |\
SAL_JOBSET_DUPLEXMODE)
-
// - SalPrinterError -
-
#define SAL_PRINTER_ERROR_GENERALERROR 1
#define SAL_PRINTER_ERROR_ABORT 2
-
// - SalPrinterProcs -
-
class SalPrinter;
typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter );
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index b104442..36eab51 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -31,10 +31,8 @@ class Window;
class FontSelectPattern;
-
// - SalEvent -
-
#define SALEVENT_MOUSEMOVE ((sal_uInt16)1)
#define SALEVENT_MOUSELEAVE ((sal_uInt16)2)
#define SALEVENT_MOUSEBUTTONDOWN ((sal_uInt16)3)
@@ -234,33 +232,25 @@ struct SalQueryCharPositionEvent
long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height
};
-
// - SalFrame-Types -
-
typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame,
sal_uInt16 nEvent, const void* pEvent );
-
// - SalObject-Events -
-
#define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1)
#define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2)
#define SALOBJ_EVENT_TOTOP ((sal_uInt16)3)
#define SALOBJ_EVENT_COUNT ((sal_uInt16)4)
-
// - SalObject-Types -
-
typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject,
sal_uInt16 nEvent, const void* pEvent );
-
// - SalFrameState -
-
struct SalFrameState
{
sal_uLong mnMask;
@@ -275,10 +265,8 @@ struct SalFrameState
sal_uLong mnState;
};
-
// - SalInputContext -
-
// Have to match DEFINEs in inputctx.hxx, as these are not converted
#define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001)
#define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002)
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 5c0120a..6dae9de 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -48,7 +48,6 @@
*
*/
-
#ifndef INCLUDED_VCL_INC_SFT_HXX
#define INCLUDED_VCL_INC_SFT_HXX
@@ -159,17 +158,12 @@ namespace vcl
};
#endif
-
-
-
/** Structure used by GetTTSimpleGlyphMetrics() and GetTTSimpleCharMetrics() functions */
typedef struct {
sal_uInt16 adv; /**< advance width or height */
sal_Int16 sb; /**< left or top sidebearing */
} TTSimpleGlyphMetrics;
-
-
/** Structure used by the TrueType Creator and GetRawGlyphData() */
typedef struct {
@@ -195,8 +189,6 @@ namespace vcl
sal_uInt8 *sptr; /**< Pointer to string data (not zero-terminated!) */
} NameRecord;
-
-
/** Return value of GetTTGlobalFontInfo() */
typedef struct {
@@ -245,7 +237,6 @@ namespace vcl
int y; /**< positive: up, negative: down */
} KernData;
-
/** ControlPoint structure used by GetTTGlyphPoints() */
typedef struct {
sal_uInt32 flags; /**< 00000000 00000000 e0000000 bbbbbbbb */
@@ -262,7 +253,6 @@ namespace vcl
* @defgroup sft Sun Font Tools Exported Functions
*/
-
/**
* Get the number of fonts contained in a TrueType collection
* @param fname - file name
@@ -271,7 +261,6 @@ namespace vcl
*/
int CountTTCFonts(const char* fname);
-
/**
* TrueTypeFont constructor.
* The font file has to be provided as a memory buffer and length
@@ -375,7 +364,6 @@ namespace vcl
*/
void DisposeNameRecords(NameRecord* nr, int n);
-
#ifndef NO_TYPE3
/**
* Generates a new PostScript Type 3 font and dumps it to <b>outf</b> file.
@@ -457,7 +445,6 @@ namespace vcl
int nGlyphs);
#endif
-
/**
* Queries glyph metrics. Allocates an array of TTSimpleGlyphMetrics structs and returns it.
*
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 2fbaa84..7f64bd5 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -154,7 +154,6 @@ struct ImplSVAppData
DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
};
-
struct ImplSVGDIData
{
OutputDevice* mpFirstWinGraphics; // First OutputDevice with a Frame Graphics
@@ -180,7 +179,6 @@ struct ImplSVGDIData
bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects
};
-
struct ImplSVWinData
{
Window* mpFirstFrame; // First FrameWindow
@@ -204,7 +202,6 @@ struct ImplSVWinData
bool mbNoSaveBackground; // true: save background is unnecessary or even less performant
};
-
typedef std::vector< std::pair< OUString, FieldUnit > > FieldUnitStringList;
struct ImplSVCtrlData
@@ -232,7 +229,6 @@ struct ImplSVCtrlData
FieldUnitStringList* mpCleanUnitStrings; // same list but with some "fluff" like spaces removed
};
-
struct ImplSVHelpData
{
bool mbContextHelp : 1; // is ContextHelp enabled
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index cf89d02..43c0c91 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -117,10 +117,8 @@ struct ToolBoxLayoutData : public ControlLayoutData
std::vector< sal_uInt16 > m_aLineItemPositions;
};
-
} /* namespace vcl */
-
struct ImplToolBoxPrivateData
{
vcl::ToolBoxLayoutData* m_pLayoutData;
@@ -169,7 +167,6 @@ struct ImplToolBoxPrivateData
mbDropDownByKeyboard:1; // tells whether a dropdown was started by key input
};
-
#endif // INCLUDED_VCL_INC_TOOLBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4466ca6..becc2b3 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -139,7 +139,6 @@ class GtkSalFrame : public SalFrame
}
};
-
GtkSalFrame* m_pFrame;
std::list< PreviousKeyPress > m_aPrevKeyPresses;
int m_nPrevKeyPresses; // avoid using size()
@@ -267,7 +266,6 @@ class GtkSalFrame : public SalFrame
bool bSendRelease
);
-
GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow );
static int m_nFloats;
@@ -418,7 +416,6 @@ public:
// returns system data (most prominent: window handle)
virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
-
// get current modifier and button mask
virtual SalPointerState GetPointerState() SAL_OVERRIDE;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 006e298..f6cec54 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -128,7 +128,6 @@ public:
inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
void SetWindow( GtkWidget* window ) { m_pWindow = window; }
-
// will be set when UI theme was changed
static bool bThemeChanged;
static bool bNeedPixmapPaint;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 2596111..ceda303 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -49,8 +49,6 @@ public:
void ThreadsLeave();
};
-
-
class GtkSalTimer;
#if GTK_CHECK_VERSION(3,0,0)
class GtkInstance : public SvpSalInstance
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 56dfe8b..1e9cddc 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
@@ -17,7 +16,6 @@
struct GtkSalPrinter_Impl;
-
class VCL_DLLPUBLIC GtkSalPrinter : public PspSalPrinter
{
public:
@@ -40,14 +38,12 @@ private:
boost::scoped_ptr<GtkSalPrinter_Impl> m_pImpl;
};
-
class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter
{
public:
sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType) SAL_OVERRIDE;
};
-
#endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_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 9e7182d..1cf47fa 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -86,5 +86,4 @@ private:
#endif // INCLUDED_VCL_INC_UNX_I18N_IC_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 9f41884..d1741ee 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -51,5 +51,4 @@ public:
#endif // INCLUDED_VCL_INC_UNX_I18N_IM_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 8613867..ae9c4ae 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -60,5 +60,4 @@ sal_Unicode KeysymToUnicode (KeySym nKeySym);
#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index f472d51..f6cadaa 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -34,10 +34,8 @@ class SalGraphics;
class ImplSalDDB;
class ImplSalBitmapCache;
-
// - SalBitmap -
-
class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap
{
private:
@@ -149,10 +147,8 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
};
-
// - ImplSalDDB -
-
class ImplSalDDB
{
private:
@@ -219,10 +215,8 @@ public:
) const;
};
-
// - ImplSalBitmapCache -
-
struct ImplBmpObj;
class ImplSalBitmapCache
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 564f78f..9207bee 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -62,7 +62,6 @@ namespace vcl_sal { class WMAdaptor; }
#define PROPERTY_DEFAULT 0x00000FCB
-
// server vendor
typedef enum {
@@ -405,7 +404,6 @@ public:
void SetupInput( SalI18N_InputMethod *pInputMethod );
};
-
// get foreign key names
namespace vcl_sal {
OUString getKeysymReplacementName(
@@ -413,7 +411,6 @@ namespace vcl_sal {
KeySym nSymbol );
}
-
#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 8b0d0fa..b4f57e9 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -99,7 +99,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
int m_nWorkArea;
bool m_bSetFocusOnMap;
-
int nScreenSaversTimeout_;
Rectangle maPaintRegion;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 527aa87..7c799f4 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -354,7 +354,6 @@ public:
static void releaseGlyphPeer();
};
-
inline const SalDisplay *X11SalGraphics::GetDisplay() const
{ return GetColormap().GetDisplay(); }
@@ -367,7 +366,6 @@ inline Display *X11SalGraphics::GetXDisplay() const
inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
{ return GetColormap().GetPixel( nSalColor ); }
-
#ifdef DBG_UTIL
#define stderr0( s ) fprintf( stderr, s )
#else
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 01fbc99..7cc7395 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -54,7 +54,6 @@ private:
sal_uInt16 nClipRegionType;
};
-
class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
{
public:
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 1ec2017..dd84c35 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -34,7 +34,6 @@ class X11SalVirtualDevice : public SalVirtualDevice
SalDisplay *pDisplay_;
X11SalGraphics *pGraphics_;
-
Pixmap hDrawable_;
SalX11Screen m_nXScreen;
@@ -84,7 +83,6 @@ public:
virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
};
-
#endif // INCLUDED_VCL_INC_UNX_SALVD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index 14c5e1f..724a651 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -48,7 +48,6 @@ public:
void ImplReleaseCachedBitmap();
};
-
#endif // INCLUDED_VCL_INC_WALL2_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index c045e90..0962fac 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -25,10 +25,8 @@
#include <salbmp.hxx>
#include <boost/shared_ptr.hpp>
-
// - SalBitmap -
-
struct BitmapBuffer;
class BitmapColor;
class BitmapPalette;
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 8d297cd..6ab16db 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -285,7 +285,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
// POSTFOCUS-Message; wParam == bFocus; lParam == 0
#define SALOBJ_MSG_POSTFOCUS (WM_USER+161)
-
// A/W-Wrapper
BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 526b87a..e2305b7 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -25,10 +25,8 @@
class WinSalGraphics;
-
// - WinSalFrame -
-
class WinSalFrame : public SalFrame
{
public:
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index 119bf1d..bd82312 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -54,7 +54,6 @@ public:
WinSalMenuItem();
virtual ~WinSalMenuItem();
-
MENUITEMINFOW mInfo;
void* mpMenu; // pointer to corresponding VCL menu
OUString mText; // the item text
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index bbb59ff..71f6c6e 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -22,10 +22,8 @@
#include <salobj.hxx>
-
// - SalObjectData -
-
class WinSalObject : public SalObject
{
public:
@@ -39,7 +37,6 @@ public:
bool mbFirstClipRect; // Flag for first cliprect to insert
WinSalObject* mpNextObject; // pointer to next object
-
WinSalObject();
virtual ~WinSalObject();
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 7c15d01..1dcbb13 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -22,10 +22,8 @@
#include <salprn.hxx>
-
// - SalDriverData -
-
// WNT3
#define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433)
@@ -40,10 +38,8 @@ struct SalDriverData
#pragma pack()
-
// - WinSalInfoPrinter -
-
class WinSalGraphics;
class WinSalInfoPrinter : public SalInfoPrinter
@@ -75,10 +71,8 @@ public:
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
-
// - WinSalPrinter -
-
class WinSalPrinter : public SalPrinter
{
public:
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 3c7d3e9..546a1f0 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -24,10 +24,8 @@
class WinSalGraphics;
-
// - SalVirDevData -
-
class WinSalVirtualDevice : public SalVirtualDevice
{
private:
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index 07e01fa..e92095c 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -22,10 +22,8 @@
#include <string.h>
-
// - Strict -
-
// Anpassungen fuer TypeChecking
inline HPEN SelectPen( HDC hDC, HPEN hPen )
@@ -173,10 +171,8 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE );
}
-
// - ZMouse Erweiterungen -
-
#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG"
#define MOUSEZ_CLASSNAME "MouseZ" // wheel window class
@@ -203,20 +199,15 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
#define WHEEL_PAGESCROLL (UINT_MAX)
#endif
-
-
// - SystemAgent Erweiterungen -
-
#define ENABLE_AGENT 1
#define DISABLE_AGENT 2
#define GET_AGENT_STATUS 3
typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
-
// - 5.0-Erweiterungen -
-
#ifndef COLOR_GRADIENTACTIVECAPTION
#define COLOR_GRADIENTACTIVECAPTION 27
#endif
@@ -238,11 +229,9 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
#define CS_DROPSHADOW 0x00020000
#endif
-
// MT 12/03: From winuser.h, only needed in salframe.cxx
// Better change salframe.cxx to include winuser.h
-
#define WS_EX_LAYERED 0x00080000
#ifndef WM_UNICHAR
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 3bd78ae..0895836 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -47,7 +47,6 @@ class VCLXWindow;
class SalFrame;
class SalObject;
-
namespace com {
namespace sun {
namespace star {
diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index a98fdbc..bf73412 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -41,7 +41,6 @@ void SvpSalInstance::DestroyPrinter( SalPrinter* pPrinter )
delete pPrinter;
}
-
void SvpSalInstance::PostPrintersChanged()
{
}
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 5c243dc..857e076 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -227,7 +227,6 @@ SalFrame *IosSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
return new IosSalFrame( this, pParent, nStyle, NULL );
}
-
// All the interesting stuff is slaved from the IosSalInstance
void InitSalData() {}
void DeInitSalData() {}
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index f79c018..65a67c5 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -24,7 +24,6 @@
using namespace psp;
using namespace osl;
-
PrinterInfoManager& PrinterInfoManager::get()
{
SalData* pSalData = GetSalData();
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index b971b05..1f8fd70 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::lang;
using namespace cppu;
using namespace std;
-
namespace // private
{
/* Determine whether or not a DataFlavor is valid.
@@ -99,7 +98,6 @@ namespace // private
const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
-
struct FlavorMap
{
const NSString* SystemFlavor;
@@ -130,10 +128,8 @@ namespace // private
{ PBTYPE_DUMMY_INTERNAL, FLAVOR_DUMMY_INTERNAL, "internal data",false }
};
-
#define SIZE_FLAVOR_MAP (sizeof(flavorMap)/sizeof(FlavorMap))
-
inline bool isByteSequenceType(const Type& theType)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list