From 50bf123ddbeb457b89636621a99c971834adf3ab Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 2 Apr 2014 16:45:44 +0300 Subject: Kill superfluous vertical whitespace Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9 --- 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(-) diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 25f885377ba5..21d9007604ba 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 0e197c15d24a..1275465c4fb1 100644 --- a/vcl/generic/app/gendisp.cxx +++ b/vcl/generic/app/gendisp.cxx @@ -21,7 +21,6 @@ #include #include - 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 1bb9fa4d3172..cf2f301e3805 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 ea5b443cc0a3..8a0f809ff5d9 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 #include @@ -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 e145c6803be8..05581c55792d 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 e5854a310579..12bc30713155 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 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 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 4c10c9a63394..269fd9292719 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -35,10 +35,8 @@ #include #include - // 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 a35264f19b6b..7250964deb6b 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 1567c9e97657..8d5690e7120a 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 0c390bd8cf8d..f77f84a6ea4e 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 92da831181eb..ab5ddd8afa7b 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, 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(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 7015b343f960..7babff34e085 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 dfbd653224a2..ff644e34c00f 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -38,10 +38,8 @@ #include #include - // 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 0efe54cef3e0..23d3ed9abe75 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 - 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 7c7e2d15d8fc..2509c00bdb54 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 #include #include @@ -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 e2f50852d124..09159e4d985b 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -19,7 +19,6 @@ // Header files - // Platform #include #include @@ -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 72975464a38e..38302e1413d8 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 e3f6f44e1e4f..4b7017b6b70f 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 3b1f87e88ebb..c5cc108c5e8e 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; iPostPrintersChanged(); } - - 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 5a6aecd5b2eb..33846e2f88c3 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 adf08a3cd34f..9a87b7e26c62 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 f5cec42d9c0e..d8cd49d22be3 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 9575169fb1fe..48d996729e73 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 #include #include @@ -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 32f4c6ccc7ab..ea93c2df1abf 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 3c409d9c6e57..9d47556fb3d4 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 71662cf58ac6..40a7dad60558 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 #include "psputil.hxx" diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index e7c458c3f96c..de7d3ad3315e 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 d0ee938de0c0..eaba04bf8713 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 2dd140ac14a8..49b1464b09c7 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( @@ -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 f457bcd5c7f4..5544252d70dc 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 25fac687d6ac..6939e5066f93 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 716265059f99..20720911d038 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -22,12 +22,9 @@ #include - 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 b325ba57906c..a62abbd90360 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 f385682d069c..c365c3c511d7 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 ab2ceab50fc2..acac65cf524d 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 2c5b5ec11a0d..4f341da9f5f3 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 076952e2340a..9cc47663949a 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 #include "fontmanager.hxx" diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 98d6bc371013..7cd7bbae788e 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 dee151c6541d..1fb877740bd6 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 c9ea6b7b5d92..3466025318b1 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 8f075891fe4c..839568b13091 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 e8c1431e2542..49fa496fa0eb 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -23,10 +23,8 @@ #include #include - // - HelpTextWindow - - class HelpTextWindow : public FloatingWindow { private: diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 6163da02b023..9f928c9b7937 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 d8b1ab639cbe..d9de98caa13f 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -24,10 +24,8 @@ #include - // - 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 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 6f272941d81f..df6ea1b0c03d 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -29,10 +29,8 @@ #include #include - // - 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 e6cee9307343..20e305dc5690 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -27,20 +27,16 @@ #include #include - // - 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 93f2df99c3ce..4183fc7fb5bc 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 b476b74259b8..dcd14e79f2b3 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 b19591022700..93a47109b60f 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 186e4406fac1..ad2968121e49 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 2b5e96f8fa2d..d4b4886f9ccc 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 503e986038d2..1861299f2b0f 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -28,10 +28,8 @@ #include #include - // - 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 bf9e4b4b35ba..d31ac3123003 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -24,10 +24,8 @@ #include - // - KeyboardFocusListener - - class KeyboardFocusListener : public rtl::IReference { public: diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 7feac6e404e6..24fb17f2a3db 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 26eac4db7b81..8e18a7d6f9f7 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 3aa17becf245..7d35a99ac659 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -26,11 +26,8 @@ #include - - // - 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 637362426ef8..91f7d45ba255 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -24,10 +24,8 @@ #include - // - 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 4e5a91a3b711..b751a81c7778 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 a8f4037a0dd5..dcde57c09ee9 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 798f2611dcdc..2fa0862f2034 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 219f0afb127e..2aa3c6b4a370 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 a026b1d8a71f..f0883d03e6dd 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 c96257d5d43b..cd944319f818 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 28999b470c72..7451321ed29d 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 0ef560e92e89..af63756cb4ae 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 199e17486e60..5676329cf9f6 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 8da2d40f3d2a..8ef263845caa 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -31,7 +31,6 @@ #include - 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 d3b70fcadf82..2dfca1f97eaa 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 f0cafe3ea4de..5711534cfd99 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 065eb0de7ffc..afe10e647b77 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 589adfe3e97d..cbd04b028806 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -22,10 +22,8 @@ #include - // - 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 b1044429ecb2..36eab51da2fd 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 5c0120afee1e..6dae9de87400 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 outf 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 2fbaa840e192..7f64bd51757b 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 cf89d02d9759..43c0c914e3b8 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 4466ca6dc155..becc2b3031aa 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 006e29874d28..f6cec547fa7d 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(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 259611112651..ceda30361361 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 56dfe8bfb1cb..1e9cddc7cd9a 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 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 9e7182d9cdd4..1cf47fae20f6 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 9f418848d7bc..d1741eedebb8 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 86138672e5cc..ae9c4ae30a2e 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 f472d51e834f..f6cadaab8145 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 564f78f7286f..9207bee0c5ab 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 8b0d0fa67028..b4f57e9c0146 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 527aa87406b0..7c799f41020a 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 01fbc998cda5..7cc73958f9eb 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 1ec20174160d..dd84c3542fa3 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 14c5e1fa753b..724a65166286 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 c045e90a56f0..0962facb7e0c 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -25,10 +25,8 @@ #include #include - // - SalBitmap - - struct BitmapBuffer; class BitmapColor; class BitmapPalette; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 8d297cd1b98a..6ab16db296c2 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 526b87ab0b57..e2305b70fe8f 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 119bf1dbfc60..bd82312f06ee 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 bbb59ff35868..71f6c6e776d7 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -22,10 +22,8 @@ #include - // - 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 7c15d019de38..1dcbb1342cef 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -22,10 +22,8 @@ #include - // - 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 3c7d3e998e52..546a1f0dda53 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 07e01fad3eef..e92095c95bae 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -22,10 +22,8 @@ #include - // - 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 3bd78ae822f6..089583692f87 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 a98fdbc26a61..bf73412b9414 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 5c243dcf1e61..857e0768daa5 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 f79c018b5c85..65a67c596fc5 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 b971b05e4e7a..1f8fd70ced68 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) { return (theType == getCppuType((Sequence*)0)); @@ -146,9 +142,6 @@ namespace // private } // namespace private - - - /* A base class for other data provider. */ class DataProviderBaseImpl : public DataProvider @@ -176,7 +169,6 @@ DataProviderBaseImpl::DataProviderBaseImpl(id data) : [mSystemData retain]; } - DataProviderBaseImpl::~DataProviderBaseImpl() { if (mSystemData) @@ -185,8 +177,6 @@ DataProviderBaseImpl::~DataProviderBaseImpl() } } - - class UniDataProvider : public DataProviderBaseImpl { public: @@ -238,8 +228,6 @@ Any UniDataProvider::getOOoData() return oOOData; } - - class ByteSequenceDataProvider : public DataProviderBaseImpl { public: @@ -262,7 +250,6 @@ ByteSequenceDataProvider::ByteSequenceDataProvider(NSData* data) : { } - NSData* ByteSequenceDataProvider::getSystemData() { Sequence rawData; @@ -291,9 +278,6 @@ Any ByteSequenceDataProvider::getOOoData() return oOOData; } - - - class HTMLFormatDataProvider : public DataProviderBaseImpl { public: @@ -357,8 +341,6 @@ Any HTMLFormatDataProvider::getOOoData() return oOOData; } - - class PNGDataProvider : public DataProviderBaseImpl { NSBitmapImageFileType meImageType; @@ -423,8 +405,6 @@ Any PNGDataProvider::getOOoData() return oOOData; } - - class FileListDataProvider : public DataProviderBaseImpl { public: @@ -487,8 +467,6 @@ Any FileListDataProvider::getOOoData() return oOOData; } - - DataFlavorMapper::DataFlavorMapper() { Reference xContext = comphelper::getProcessComponentContext(); @@ -727,7 +705,6 @@ com::sun::star::uno::Sequence DataFlav return flavors; } - NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const { NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: SIZE_FLAVOR_MAP]; diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index b22813795e19..f8b09df85f23 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -33,7 +33,6 @@ #include #include - /* An interface to get the clipboard data in either system or OOo format. */ @@ -55,10 +54,6 @@ public: typedef std::auto_ptr DataProviderPtr_t; - - - - class DataFlavorMapper { public: @@ -68,7 +63,6 @@ public: DataFlavorMapper(); ~DataFlavorMapper(); - /* Map a system data flavor to an OpenOffice data flavor. Return an empty string if there is not suiteable mapping from a system data flavor to a OpenOffice data @@ -76,7 +70,6 @@ public: */ com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const; - /* Map an OpenOffice data flavor to a system data flavor. If there is no suiteable mapping available NULL will be returned. @@ -95,18 +88,14 @@ public: DataProviderPtr_t getDataProvider( const NSString* systemFlavor, const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const; - - /* Get a data provider which is able to provide 'systemData' in the OOo expected format. */ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSArray* systemData) const; - /* Get a data provider which is able to provide 'systemData' in the OOo expected format. */ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData* systemData) const; - /* Translate a sequence of DataFlavors into a NSArray of system types. Only those DataFlavors for which a suitable mapping to a system type exist will be contained in the returned types array. diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx index d4bb9e5c3c86..e0c80a09313e 100644 --- a/vcl/osx/DragActionConversion.cxx +++ b/vcl/osx/DragActionConversion.cxx @@ -20,10 +20,8 @@ #include "DragActionConversion.hxx" #include - using namespace com::sun::star::datatransfer::dnd; - /* Convert office drag actions as defined in com::sun::star::datatransfer::dnd::DNDConstants into system conform drag actions. diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx index 8c9b057bff0f..8539a79fc3c6 100644 --- a/vcl/osx/DragActionConversion.hxx +++ b/vcl/osx/DragActionConversion.hxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #import #include - /* Convert office drag actions as defined in com::sun::star::datatransfer::dnd::DNDConstants into system conform drag actions. diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index 10a0b80f0abd..6435041fe5c7 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -37,7 +36,6 @@ #include #include - using namespace cppu; using namespace osl; using namespace com::sun::star; @@ -52,7 +50,6 @@ using namespace com::sun::star::lang; using namespace comphelper; using namespace std; - // For OOo internal D&D we provide the Transferable without NSDragPboard // interference as a shortcut uno::Reference DragSource::g_XTransferable; @@ -60,7 +57,6 @@ NSView* DragSource::g_DragSourceView = nil; bool DragSource::g_DropSuccessSet = false; bool DragSource::g_DropSuccess = false; - OUString dragSource_getImplementationName() { return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 27554975b1d0..491716d87f4c 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -36,7 +36,6 @@ #import #include - class DragSource; class AquaSalFrame; @@ -53,7 +52,6 @@ class AquaSalFrame; -(void)unregisterMouseEventListener:(id)theHandler; @end - @interface DragSourceHelper : NSObject { DragSource* mDragSource; @@ -71,7 +69,6 @@ class AquaSalFrame; @end - class DragSource : public ::cppu::BaseMutex, public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource, com::sun::star::lang::XInitialization, diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx index ff1e98069f2d..ac3b9221d98a 100644 --- a/vcl/osx/DragSourceContext.cxx +++ b/vcl/osx/DragSourceContext.cxx @@ -21,7 +21,6 @@ #include "DragSourceContext.hxx" - using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::uno; @@ -57,5 +56,4 @@ void SAL_CALL DragSourceContext::transferablesFlavorsChanged( ) { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index c7bb86ba8f02..307181cbb904 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star; using namespace comphelper; - OUString dropTarget_getImplementationName() { return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"); @@ -69,10 +68,8 @@ namespace /* private */ } } - @implementation DropTargetHelper - -(DropTargetHelper*)initWithDropTarget:(DropTarget*)pdt { self = [super init]; @@ -85,7 +82,6 @@ namespace /* private */ return self; } - -(NSDragOperation)draggingEntered:(id )sender { return mDropTarget->draggingEntered(sender); diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx index cb7a575c7953..d67b647b7111 100644 --- a/vcl/osx/DropTarget.hxx +++ b/vcl/osx/DropTarget.hxx @@ -56,7 +56,6 @@ class AquaSalFrame; -(void)unregisterDraggingDestinationHandler:(id)theHandler; @end - @interface DropTargetHelper : NSObject { DropTarget* mDropTarget; @@ -73,7 +72,6 @@ class AquaSalFrame; @end - class DropTarget: public cppu::BaseMutex, public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization, com::sun::star::datatransfer::dnd::XDropTarget, diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index 11ef00fdd6d6..aee4863c4836 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; - // converts the openoffice text/html clipboard format to the HTML Format // well known under MS Windows // the MS HTML Format has a header before the real html data @@ -53,7 +52,6 @@ using namespace com::sun::star::uno; // and (no space between !-- and the // text - namespace // private { std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFragment, size_t endFragment) @@ -69,7 +67,6 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr } // namespace private - // the office always writes the start and end html tag in upper cases and // without spaces both tags don't allow parameters const std::string TAG_HTML = std::string(""); diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index d01b4aaf470c..1a4f5d9814ac 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; - namespace // private { bool isValidFlavor( const DataFlavor& aFlavor ) @@ -44,7 +43,6 @@ namespace // private } // namespace private - OSXTransferable::OSXTransferable(const Reference rXMimeCntFactory, DataFlavorMapperPtr_t pDataFlavorMapper, NSPasteboard* pasteboard) : @@ -57,13 +55,11 @@ OSXTransferable::OSXTransferable(const Reference rXMime initClipboardItemList(); } - OSXTransferable::~OSXTransferable() { [mPasteboard release]; } - Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception ) { @@ -100,20 +96,17 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) return dp->getOOoData(); } - bool OSXTransferable::isUnicodeText(const DataFlavor& flavor) { return (flavor.DataType == getCppuType((OUString*)0)); } - Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( ) throw( RuntimeException, std::exception ) { return mFlavorList; } - sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor) throw( RuntimeException, std::exception ) { @@ -124,7 +117,6 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav return false; } - void OSXTransferable::initClipboardItemList() { NSArray* pboardFormats = [mPasteboard types]; @@ -138,7 +130,6 @@ void OSXTransferable::initClipboardItemList() mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats); } - /* Compares two DataFlavors. Returns true if both DataFlavor have the same media type and the number of parameter and all parameter values do match otherwise false is returned. @@ -165,7 +156,6 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor return true; } - bool OSXTransferable::cmpAllContentTypeParameter(const Reference xLhs, const Reference xRhs) const { diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index aa794c8c7def..29a1d98b8641 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _TRANSFERABLE_HXX_ #define _TRANSFERABLE_HXX_ @@ -36,7 +35,6 @@ #include #include - class OSXTransferable : public ::cppu::WeakImplHelper1, private ::boost::noncopyable { @@ -49,10 +47,8 @@ public: virtual ~OSXTransferable(); - // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index 225473069d28..264a51eff719 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "osx/a11yfocustracker.hxx" @@ -28,11 +27,8 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; - rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::theListener; - - rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get() { if ( ! theListener.is() ) @@ -41,14 +37,10 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get() return theListener; } - - AquaA11yFocusListener::AquaA11yFocusListener() : m_focusedObject(nil) { } - - id AquaA11yFocusListener::getFocusedUIElement() { if ( nil == m_focusedObject ) { @@ -67,8 +59,6 @@ id AquaA11yFocusListener::getFocusedUIElement() return m_focusedObject; } - - void SAL_CALL AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible) { @@ -91,16 +81,12 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc } } - - oslInterlockedCount SAL_CALL AquaA11yFocusListener::acquire() SAL_THROW(()) { return ReferenceObject::acquire(); } - - oslInterlockedCount SAL_CALL AquaA11yFocusListener::release() SAL_THROW(()) { diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index cbd634251fab..1ce09a61a89b 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/toolbox.hxx" @@ -36,17 +35,12 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; - - static inline Window * getWindow(const ::VclSimpleEvent *pEvent) { return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow(); } - - - // callback function for Application::addEventListener long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent) @@ -94,8 +88,6 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke return 0; } - - AquaA11yFocusTracker::AquaA11yFocusTracker() : m_aWindowEventLink(this, (PSTUB) WindowEventHandler), m_xDocumentFocusListener(new DocumentFocusListener(*this)) @@ -104,8 +96,6 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() : window_got_focus(Application::GetFocusWindow()); } - - void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible) { if( xAccessible != m_xFocusedObject ) @@ -117,8 +107,6 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc } } - - void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) { Reference< XAccessible > xAccessible( pToolBox->GetAccessible() ); @@ -136,8 +124,6 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) } } - - void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) { bool bToolboxFound = false; @@ -171,8 +157,6 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) } } - - void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) { // Make sure either the toolbox or its parent toolbox has the focus @@ -186,8 +170,6 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) notify_toolbox_item_focus(static_cast (pWindow)); } - - void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) { ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() ); @@ -197,8 +179,6 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) notify_toolbox_item_focus( pToolBoxParent ); } - - void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) { Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); @@ -212,8 +192,6 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) } } - - void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) { Menu * pMenu = pEvent->GetMenu(); @@ -227,8 +205,6 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) } } - - void AquaA11yFocusTracker::window_got_focus(Window *pWindow) { // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index cd1a450d61b4..bc966361633a 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -50,30 +50,22 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent ) return notification; } - - AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) : m_wrapperObject(wrapperObject), m_role(role) { [ m_wrapperObject retain ]; } - - AquaA11yEventListener::~AquaA11yEventListener() { [ m_wrapperObject release ]; } - - void SAL_CALL AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } - - void SAL_CALL AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) { diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index f27f0d37d7a9..8a223f5f3e12 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace std; using namespace comphelper; - @implementation EventListener; -(EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb @@ -131,7 +130,6 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard mPasteboardChangeCount = [mPasteboard changeCount]; } - AquaClipboard::~AquaClipboard() { if (mIsSystemPasteboard) diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index bcacc6348edb..1fd71e623bfc 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -62,7 +62,6 @@ class AquaClipboard; -(void)disposing; @end - class AquaClipboard : public ::cppu::BaseMutex, public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::clipboard::XSystemClipboard, com::sun::star::datatransfer::clipboard::XFlushableClipboard, @@ -86,10 +85,8 @@ public: virtual ~AquaClipboard(); - // XClipboard - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -100,33 +97,25 @@ public: virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XClipboardEx - virtual sal_Int8 SAL_CALL getRenderingCapabilities() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XClipboardNotifier - virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index 4ab3949eaf83..908700383704 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -29,16 +29,11 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - - - DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) : m_aFocusTracker(rTracker) { } - - void SAL_CALL DocumentFocusListener::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) @@ -49,8 +44,6 @@ DocumentFocusListener::disposing( const EventObject& aEvent ) m_aRefList.erase(aEvent.Source); } - - void SAL_CALL DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) @@ -97,8 +90,6 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) } } - - Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -125,8 +116,6 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& return Reference< XAccessible >(); } - - void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { @@ -136,8 +125,6 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc attachRecursive(xAccessible, xContext); } - - void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext @@ -152,8 +139,6 @@ void DocumentFocusListener::attachRecursive( } } - - void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext, @@ -185,8 +170,6 @@ void DocumentFocusListener::attachRecursive( } } - - void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { @@ -196,8 +179,6 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc detachRecursive(xAccessible, xContext); } - - void DocumentFocusListener::detachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext @@ -209,8 +190,6 @@ void DocumentFocusListener::detachRecursive( detachRecursive(xAccessible, xContext, xStateSet); } - - void DocumentFocusListener::detachRecursive( const Reference< XAccessible >&, const Reference< XAccessibleContext >& xContext, diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 82abb5ff67db..05b1fc2331ea 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -28,10 +28,8 @@ #include - // - DocumentFocusListener - - class DocumentFocusListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > { diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index fa4fe5464261..23748fe7fe49 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "rtl/ustrbuf.hxx" @@ -54,12 +53,8 @@ using namespace std; - - AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL; - - AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : mpNSWindow(nil), mpNSView(nil), @@ -99,8 +94,6 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : pSalData->maFrameCheck.insert( this ); } - - AquaSalFrame::~AquaSalFrame() { // if the frame is destroyed and has the current menubar @@ -135,8 +128,6 @@ AquaSalFrame::~AquaSalFrame() [mpNSWindow release]; } - - void AquaSalFrame::initWindowAndView() { // initialize mirroring parameters @@ -227,8 +218,6 @@ void AquaSalFrame::initWindowAndView() [mpNSWindow setContentView: mpNSView]; } - - void AquaSalFrame::CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen ) { if( bRelativeToScreen ) @@ -261,8 +250,6 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen ) io_rPoint.y = maGeometry.nHeight - io_rPoint.y; } - - void AquaSalFrame::screenParametersChanged() { UpdateFrameGeometry(); @@ -272,8 +259,6 @@ void AquaSalFrame::screenParametersChanged() CallCallback( SALEVENT_DISPLAYCHANGED, 0 ); } - - SalGraphics* AquaSalFrame::AcquireGraphics() { if ( mbGraphics ) @@ -289,8 +274,6 @@ SalGraphics* AquaSalFrame::AcquireGraphics() return mpGraphics; } - - void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { (void)pGraphics; @@ -298,15 +281,12 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) mbGraphics = FALSE; } - - bool AquaSalFrame::PostEvent( void *pData ) { GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData ); return TRUE; } - void AquaSalFrame::SetTitle(const OUString& rTitle) { if ( !mpNSWindow ) @@ -343,14 +323,10 @@ void AquaSalFrame::SetTitle(const OUString& rTitle) [pTitle release]; } - - void AquaSalFrame::SetIcon( sal_uInt16 ) { } - - void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) { // #i113170# may not be the main thread if called from UNO API @@ -369,8 +345,6 @@ void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) } } - - void AquaSalFrame::initShow() { mbInitShow = false; @@ -422,8 +396,6 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect ) CallCallback(SALEVENT_PAINT, &aPaintEvt); } - - void AquaSalFrame::Show(bool bVisible, bool bNoActivate) { if ( !mpNSWindow ) @@ -485,14 +457,10 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate) } } - - void AquaSalFrame::Enable( bool ) { } - - void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight ) { // #i113170# may not be the main thread if called from UNO API @@ -516,8 +484,6 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight ) } } - - void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight ) { // #i113170# may not be the main thread if called from UNO API @@ -545,8 +511,6 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight ) } } - - void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight ) { if( mbShown || mbInitShow ) @@ -561,8 +525,6 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight ) } } - - void AquaSalFrame::SetWindowState( const SalFrameState* pState ) { // #i113170# may not be the main thread if called from UNO API @@ -591,7 +553,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) else if( [mpNSWindow isMiniaturized] ) [mpNSWindow deminiaturize: NSApp]; - /* ZOOMED is not really maximized (actually it toggles between a user set size and the program specified one), but comes closest since the default behavior is "maximized" if the user did not intervene @@ -637,8 +598,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) } } - - bool AquaSalFrame::GetWindowState( SalFrameState* pState ) { if ( !mpNSWindow ) @@ -671,8 +630,6 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState ) return TRUE; } - - void AquaSalFrame::SetScreenNumber(unsigned int nScreen) { if ( !mpNSWindow ) @@ -711,8 +668,6 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } - - void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { if ( !mpNSWindow ) @@ -808,8 +763,6 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SendPaintEvent(); } - - #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 class PreventSleepTimer : public AutoTimer { @@ -866,14 +819,10 @@ void AquaSalFrame::StartPresentation( bool bStart ) } } - - void AquaSalFrame::SetAlwaysOnTop( bool ) { } - - void AquaSalFrame::ToTop(sal_uInt16 nFlags) { if ( !mpNSWindow ) @@ -893,8 +842,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags) [mpNSWindow orderFront: NSApp]; } - - NSCursor* AquaSalFrame::getCurrentCursor() const { NSCursor* pCursor = nil; @@ -949,8 +896,6 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle ) [mpNSWindow invalidateCursorRectsForView: mpNSView]; } - - void AquaSalFrame::SetPointerPos( long nX, long nY ) { // FIXME: use Cocoa functions @@ -961,8 +906,6 @@ void AquaSalFrame::SetPointerPos( long nX, long nY ) CGDisplayMoveCursorToPoint( mainDisplayID, aPoint ); } - - void AquaSalFrame::Flush( void ) { if( !(mbGraphics && mpGraphics && mpNSView && mbShown) ) @@ -971,7 +914,6 @@ void AquaSalFrame::Flush( void ) // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); - [mpNSView setNeedsDisplay: YES]; // outside of the application's event loop (e.g. IntroWindow) @@ -983,8 +925,6 @@ void AquaSalFrame::Flush( void ) } } - - void AquaSalFrame::Flush( const Rectangle& rRect ) { if( !(mbGraphics && mpGraphics && mpNSView && mbShown) ) @@ -1006,8 +946,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect ) } } - - void AquaSalFrame::Sync() { if( mbGraphics && mpGraphics && mpNSView && mbShown ) @@ -1020,8 +958,6 @@ void AquaSalFrame::Sync() } } - - void AquaSalFrame::SetInputContext( SalInputContext* pContext ) { if (!pContext) @@ -1036,14 +972,10 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext ) return; } - - void AquaSalFrame::EndExtTextInput( sal_uInt16 ) { } - - OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static std::map< sal_uInt16, OUString > aKeyMap; @@ -1129,8 +1061,6 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return aResult.makeStringAndClear(); } - - static void getAppleScrollBarVariant(StyleSettings &rSettings) { bool bIsScrollbarDoubleMax = true; // default is DoubleMax @@ -1328,22 +1258,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) [mpNSView unlockFocus]; } - - const SystemEnvData* AquaSalFrame::GetSystemData() const { return &maSysData; } - - void AquaSalFrame::Beep() { NSBeep(); } - - void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags) { if ( !mpNSWindow ) @@ -1534,7 +1458,6 @@ SalPointerState AquaSalFrame::GetPointerState() state.mnState |= KEY_MOD1; } - return state; } @@ -1663,8 +1586,6 @@ void AquaSalFrame::UpdateFrameGeometry() maGeometry.nHeight = static_cast(aContentRect.size.height); } - - void AquaSalFrame::CaptureMouse( bool bCapture ) { /* Remark: diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 2c28ac9a915b..fce9e95b1178 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -70,7 +70,6 @@ static NSMenu* pDockMenu = nil; static bool bNoSVMain = true; static bool bLeftMain = false; - class AquaDelayedSettingsChanged : public Timer { bool mbInvalidate; @@ -108,7 +107,6 @@ void AquaSalInstance::delayedSettingsChanged( bool bInvalidate ) pTimer->Start(); } - // the AppEventList must be available before any SalData/SalInst/etc. objects are ready AquaSalInstance::AppEventList AquaSalInstance::aAppEventList; @@ -132,7 +130,6 @@ bool AquaSalInstance::isOnCommandLine( const OUString& rArg ) return false; } - // initialize the cocoa VCL_NSApplication object // returns an NSAutoreleasePool that must be released when the event loop begins static void initNSApp() @@ -210,8 +207,6 @@ bool ImplSVMainHook( int * pnInit ) return TRUE; // indicate that ImplSVMainHook is implemented } - - void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) @@ -225,24 +220,18 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ) _exit(1); } - - void InitSalData() { SalData *pSalData = new SalData; SetSalData( pSalData ); } - - const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; } - - void DeInitSalData() { SalData *pSalData = GetSalData(); @@ -255,20 +244,14 @@ void DeInitSalData() SetSalData( NULL ); } - - extern "C" { #include } - - void InitSalMain() { } - - SalYieldMutex::SalYieldMutex() { mnCount = 0; @@ -305,8 +288,6 @@ bool SalYieldMutex::tryToAcquire() return false; } - - // some convenience functions regarding the yield mutex, aka solar mutex bool ImplSalYieldMutexTryToAcquire() @@ -332,8 +313,6 @@ void ImplSalYieldMutexRelease() pInst->mpSalYieldMutex->release(); } - - SalInstance* CreateSalInstance() { // this is the case for not using SVMain @@ -362,15 +341,11 @@ SalInstance* CreateSalInstance() return pInst; } - - void DestroySalInstance( SalInstance* pInst ) { delete pInst; } - - AquaSalInstance::AquaSalInstance() { mpSalYieldMutex = new SalYieldMutex; @@ -383,8 +358,6 @@ AquaSalInstance::AquaSalInstance() maWaitingYieldCond = osl_createCondition(); } - - AquaSalInstance::~AquaSalInstance() { ::tools::SolarMutex::SetSolarMutex( 0 ); @@ -394,8 +367,6 @@ AquaSalInstance::~AquaSalInstance() osl_destroyCondition( maWaitingYieldCond ); } - - void AquaSalInstance::wakeupYield() { // wakeup :Yield @@ -416,8 +387,6 @@ void AquaSalInstance::wakeupYield() } } - - void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ) { osl_acquireMutex( maUserEventListMutex ); @@ -428,15 +397,11 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi wakeupYield(); } - - comphelper::SolarMutex* AquaSalInstance::GetYieldMutex() { return mpSalYieldMutex; } - - sal_uLong AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; @@ -457,8 +422,6 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex() return 0; } - - void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; @@ -469,8 +432,6 @@ void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) } } - - bool AquaSalInstance::CheckYieldMutex() { bool bRet = true; @@ -484,15 +445,11 @@ bool AquaSalInstance::CheckYieldMutex() return bRet; } - - bool AquaSalInstance::isNSAppThread() const { return osl::Thread::getCurrentIdentifier() == maMainThread; } - - void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) { switch( [pEvent subtype] ) @@ -590,8 +547,6 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) }; } - - class ReleasePoolHolder { NSAutoreleasePool* mpPool; @@ -746,8 +701,6 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) } } - - bool AquaSalInstance::AnyInput( sal_uInt16 nType ) { if( nType & VCL_INPUT_APPEVENT ) @@ -792,15 +745,11 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) return (pEvent != NULL); } - - SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ ) { return NULL; } - - SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { SalData::ensureThreadAutoreleasePool(); @@ -809,15 +758,11 @@ SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSt return pFrame; } - - void AquaSalInstance::DestroyFrame( SalFrame* pFrame ) { delete pFrame; } - - SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, bool /* bShow */ ) { // SystemWindowData is meaningless on Mac OS X @@ -829,29 +774,21 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* / return pObject; } - - void AquaSalInstance::DestroyObject( SalObject* pObject ) { delete ( pObject ); } - - SalPrinter* AquaSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { return new AquaSalPrinter( dynamic_cast(pInfoPrinter) ); } - - void AquaSalInstance::DestroyPrinter( SalPrinter* pPrinter ) { delete pPrinter; } - - void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { NSArray* pNames = [NSPrinter printerNames]; @@ -878,21 +815,15 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) } } - - void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) { } - - void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) { delete pInfo; } - - OUString AquaSalInstance::GetDefaultPrinter() { // #i113170# may not be the main thread if called from UNO API @@ -917,8 +848,6 @@ OUString AquaSalInstance::GetDefaultPrinter() return maDefaultPrinter; } - - SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) { @@ -936,8 +865,6 @@ SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueI return pNewInfoPrinter; } - - void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) { // #i113170# may not be the main thread if called from UNO API @@ -946,8 +873,6 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) delete pPrinter; } - - void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) { rReturnedBytes = 1; @@ -1017,37 +942,26 @@ void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OU } } - - - SalTimer* AquaSalInstance::CreateSalTimer() { return new AquaSalTimer(); } - - SalSystem* AquaSalInstance::CreateSalSystem() { return new AquaSalSystem(); } - - SalBitmap* AquaSalInstance::CreateSalBitmap() { return new QuartzSalBitmap(); } - - SalSession* AquaSalInstance::CreateSalSession() { return NULL; } - - class MacImeStatus : public SalI18NImeStatus { public: @@ -1060,8 +974,6 @@ public: virtual void toggle() SAL_OVERRIDE {} }; - - SalI18NImeStatus* AquaSalInstance::CreateI18NImeStatus() { return new MacImeStatus(); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 30b9a37b5edc..303c1fe21073 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -89,7 +89,6 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; } @end - // FIXME: currently this is leaked static MainMenuSelector* pMainMenuSelector = nil; @@ -203,8 +202,6 @@ static void initAppMenu() } } - - SalMenu* AquaSalInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { initAppMenu(); @@ -235,10 +232,6 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) delete pSalMenuItem; } - - - - /* * AquaSalMenu */ @@ -904,8 +897,6 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame ); } - - /* * SalMenuItem */ @@ -954,6 +945,4 @@ AquaSalMenuItem::~AquaSalMenuItem() [mpMenuItem autorelease]; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 016979ae3d83..7f9df92c739d 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "osx/saldata.hxx" #include "osx/salobj.h" #include "osx/salframe.h" - - AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : mpFrame( pFrame ), mnClipX( -1 ), @@ -56,8 +53,6 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : } } - - AquaSalObject::~AquaSalObject() { if( maSysData.mpNSView ) @@ -93,30 +88,22 @@ AquaSalObject::~AquaSalObject() This is gives us an 80% solution only, though. */ - - void AquaSalObject::ResetClipRegion() { mbClip = false; setClippedPosSize(); } - - sal_uInt16 AquaSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } - - void AquaSalObject::BeginSetClipRegion( sal_uLong ) { mbClip = false; } - - void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { if( mbClip ) @@ -146,15 +133,11 @@ void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight } } - - void AquaSalObject::EndSetClipRegion() { setClippedPosSize(); } - - void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { mnX = nX; @@ -164,8 +147,6 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) setClippedPosSize(); } - - void AquaSalObject::setClippedPosSize() { NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) }; @@ -194,16 +175,12 @@ void AquaSalObject::setClippedPosSize() [mpClipView scrollToPoint: aClipPt]; } - - void AquaSalObject::Show( bool bVisible ) { if( mpClipView ) [mpClipView setHidden: (bVisible ? NO : YES)]; } - - const SystemEnvData* AquaSalObject::GetSystemData() const { return &maSysData; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index dfaaf7eb8bca..a973505bbf5b 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -45,9 +45,6 @@ using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::beans; - - - AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : mpGraphics( 0 ), mbGraphics( false ), @@ -91,8 +88,6 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : } } - - AquaSalInfoPrinter::~AquaSalInfoPrinter() { delete mpGraphics; @@ -102,8 +97,6 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter() CFRelease( mrContext ); } - - void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const { if( mpGraphics ) @@ -147,8 +140,6 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const } } - - SalGraphics* AquaSalInfoPrinter::AcquireGraphics() { SalGraphics* pGraphics = mbGraphics ? NULL : mpGraphics; @@ -156,29 +147,22 @@ SalGraphics* AquaSalInfoPrinter::AcquireGraphics() return pGraphics; } - - void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* ) { mbGraphics = false; } - - bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) { return false; } - - bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) { // FIXME: implement driver data if( io_pSetupData && io_pSetupData->mpDriverData ) return SetData( ~0, io_pSetupData ); - bool bSuccess = true; // set system type @@ -214,12 +198,9 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) else bSuccess = false; - return bSuccess; } - - void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation ) { @@ -240,14 +221,11 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio mePageOrientation = i_eSetOrientation; } - - bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData ) { if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC ) return false; - if( mpPrintInfo ) { if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 ) @@ -280,22 +258,16 @@ bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupDat return mpPrintInfo != nil; } - - sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) { return 0; } - - OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { return OUString(); } - - sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType ) { switch( i_nType ) @@ -328,8 +300,6 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i return 0; } - - void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*, long& o_rOutWidth, long& o_rOutHeight, long& o_rPageOffX, long& o_rPageOffY, @@ -422,7 +392,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // how do I know when that might be ? i_rController.jobStarted(); - int nCopies = i_rController.getPrinter()->GetCopyCount(); int nJobs = 1; if( bSinglePrintJobs ) @@ -506,7 +475,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // is a mystery. [pPrintDict setObject: [NSNumber numberWithInt: mnCurPageRangeCount] forKey: NSPrintLastPage]; - // create print operation NSPrintOperation* pPrintOperation = [NSPrintOperation printOperationWithView: pPrintView printInfo: mpPrintInfo]; @@ -594,28 +562,20 @@ bool AquaSalInfoPrinter::EndPage() return true; } - - sal_uLong AquaSalInfoPrinter::GetErrorCode() const { return 0; } - - AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) : mpInfoPrinter( i_pInfoPrinter ) { } - - AquaSalPrinter::~AquaSalPrinter() { } - - bool AquaSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, @@ -625,8 +585,6 @@ bool AquaSalPrinter::StartJob( const OUString* i_pFileName, return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController ); } - - bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, const OUString& /*i_rJobName*/, const OUString& /*i_rAppName*/, @@ -639,36 +597,26 @@ bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, return false; } - - bool AquaSalPrinter::EndJob() { return mpInfoPrinter->EndJob(); } - - bool AquaSalPrinter::AbortJob() { return mpInfoPrinter->AbortJob(); } - - SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); } - - bool AquaSalPrinter::EndPage() { return mpInfoPrinter->EndPage(); } - - sal_uLong AquaSalPrinter::GetErrorCode() { return mpInfoPrinter->GetErrorCode(); @@ -744,5 +692,4 @@ int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* ) return 900; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx index 5fd29a8b9acb..f10ba61b62e0 100644 --- a/vcl/osx/salsys.cxx +++ b/vcl/osx/salsys.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/ustrbuf.hxx" #include "vcl/button.hxx" @@ -29,9 +28,6 @@ #include "svids.hrc" - - - AquaSalSystem::~AquaSalSystem() { } @@ -154,7 +150,6 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle, } } - int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage ); if( pTitle ) diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 15a960117c93..17c4d80ac3c0 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -17,19 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osx/saltimer.h" #include "osx/salnstimer.h" #include "osx/saldata.hxx" #include "osx/salframe.h" #include "osx/salinst.h" - - NSTimer* AquaSalTimer::pRunningTimer = nil; bool AquaSalTimer::bDispatchTimer = false; - void ImplSalStartTimer( sal_uLong nMS ) { SalData* pSalData = GetSalData(); @@ -121,5 +117,4 @@ void AquaSalTimer::Stop() ImplSalStopTimer(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx index d4fa284c2ddb..63b616b3fb9a 100644 --- a/vcl/osx/service_entry.cxx +++ b/vcl/osx/service_entry.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osl/diagnose.h" #include "vcl/svapp.hxx" @@ -37,7 +36,6 @@ using namespace ::cppu; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; - uno::Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< Any >& i_rArguments ) { if ( Application::IsHeadlessModeEnabled() ) diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx index 77bb2462f84f..723143826574 100644 --- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx @@ -94,7 +94,6 @@ IconThemeInfoTest::DefaultZipIsValid() CPPUNIT_ASSERT_EQUAL_MESSAGE("default.zip is a valid theme name", true, valid); } - void IconThemeInfoTest::ThemeIdIsDetectedFromFileNameWithUnderscore() { diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx index 9da845ba4255..40ff352778fb 100644 --- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx @@ -68,7 +68,6 @@ class IconThemeSelectorTest : public CppUnit::TestFixture // End of test suite definition - CPPUNIT_TEST_SUITE_END(); }; @@ -189,7 +188,6 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal() CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal); } - // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest); diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 10228b591f57..734fbcc8f06c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // bootstrap stuff #include @@ -46,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::vcl::unotools; - namespace com { namespace sun { namespace star { namespace rendering { @@ -61,7 +59,6 @@ bool operator==( const ARGBColor& rLHS, const RGBColor& rRHS ) } } } } - namespace { @@ -683,15 +680,12 @@ public: } }; - - void CanvasBitmapTest::runTest() { static const sal_Int8 lcl_depths[]={1,4,8,16,24}; // Testing VclCanvasBitmap wrapper - for( unsigned int i=0; i { Window * m_pWindow; @@ -86,8 +82,6 @@ public: virtual void SAL_CALL disposing( const EventObject& eo ) throw(RuntimeException); }; - - class MyInfoBox : public InfoBox { @@ -96,8 +90,6 @@ public: MyInfoBox( Window* pParent ); }; - - class MyListBox : public ListBox { @@ -106,8 +98,6 @@ public: MyListBox( Window* pParent ); }; - - class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable > { const OUString m_aData; @@ -129,9 +119,6 @@ public: virtual bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); }; - - - class VclDnDTest : public test::BootstrapFixture { public: @@ -145,8 +132,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - - void VclDnDTest::testDnD() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -167,8 +152,6 @@ void VclDnDTest::testDnD() aListBox.Show(); } - - MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { @@ -186,135 +169,95 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); } - - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - - void MyWin::Resize() { WorkWindow::Resize(); } - - void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException) { Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY ); xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString("TestString") ), this ); } - - void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { dtde.Context->dropComplete( true ); } - - void SAL_CALL MyDragAndDropListener::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException) { dtdee.Context->acceptDrag( dtdee.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dragExit( const DropTargetEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException) { dtde.Context->acceptDrag( dtde.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException) { dtde.Context->acceptDrag( dtde.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dragDropEnd( const DragSourceDropEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragEnter( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragExit( const DragSourceEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragOver( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dropActionChanged( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(RuntimeException) { } - - MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, OUString("dragging over this box should result in another window id in the drag log.") ) { @@ -332,8 +275,6 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); }; - - MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); @@ -350,24 +291,18 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); }; - - Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& ) throw(UnsupportedFlavorException, IOException, RuntimeException) { return makeAny( m_aData ); } - - Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors( ) throw(RuntimeException) { return m_aFlavorList; } - - bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) throw(RuntimeException) { diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index fe672d098438..48b1045f14b7 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -44,7 +44,6 @@ public: void testScaling(); void testExportImport(); - CPPUNIT_TEST_SUITE(VclFiltersTest); CPPUNIT_TEST(testCVEs); CPPUNIT_TEST(testScaling); diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index ce44ca8e1e8e..029caed18702 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -37,8 +37,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" - - inline double toRadian(int nDegree) { return nDegree * (M_PI / 1800.0); @@ -111,16 +109,12 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) #endif } - - CoreTextStyle::~CoreTextStyle( void ) { if( mpStyleDict ) CFRelease( mpStyleDict ); } - - void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const { // get the matching CoreText font handle @@ -141,8 +135,6 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const rMetric.mbKernableFont = true; } - - bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) const { CGGlyph nCGGlyph = aGlyphId & GF_IDXMASK; @@ -159,8 +151,6 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - // callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline() struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; }; @@ -221,8 +211,6 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg return true; } - - void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) { CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() }; @@ -233,29 +221,21 @@ void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) CFRelease( pCGColor); } - - PhysicalFontFace* CoreTextFontData::Clone( void ) const { return new CoreTextFontData( *this); } - - CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern& rFSD ) const { return new CoreTextStyle( rFSD); } - - ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD ) const { return new ImplFontEntry( rFSD); } - - int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf ) const { DBG_ASSERT( pTagName[4]=='\0', "CoreTextFontData::GetFontTable with invalid tagname!\n" ); @@ -289,8 +269,6 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu return (int)nByteLength; } - - ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) { // all CoreText fonts are device fonts that can rotate just fine @@ -424,15 +402,11 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext ) } } - - SystemFontList::SystemFontList() : mpCTFontCollection( NULL ) , mpCTFontArray( NULL ) {} - - SystemFontList::~SystemFontList() { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -446,16 +420,12 @@ SystemFontList::~SystemFontList() CFRelease( mpCTFontCollection ); } - - void SystemFontList::AddFont( CoreTextFontData* pFontData ) { sal_IntPtr nFontId = pFontData->GetFontId(); maFontContainer[ nFontId ] = pFontData; } - - void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) const { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -463,8 +433,6 @@ void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) co rFontCollection.Add( (*it).second->Clone() ); } - - CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const { CTFontContainer::const_iterator it = maFontContainer.find( nFontId ); @@ -473,8 +441,6 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const return (*it).second; } - - bool SystemFontList::Init( void ) { // enumerate available system fonts @@ -493,8 +459,6 @@ bool SystemFontList::Init( void ) return true; } - - SystemFontList* GetCoretextFontList( void ) { SystemFontList* pList = new SystemFontList(); diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index e0a57d3caf59..5ecc507a6780 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -47,15 +46,11 @@ static const unsigned long k32BitRedColorMask = 0x00ff0000; static const unsigned long k32BitGreenColorMask = 0x0000ff00; static const unsigned long k32BitBlueColorMask = 0x000000ff; - - static bool isValidBitCount( sal_uInt16 nBitCount ) { return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32); } - - QuartzSalBitmap::QuartzSalBitmap() : mxGraphicContext( NULL ) , mxCachedImage( NULL ) @@ -66,15 +61,11 @@ QuartzSalBitmap::QuartzSalBitmap() { } - - QuartzSalBitmap::~QuartzSalBitmap() { Destroy(); } - - bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, int nX, int nY, int nWidth, int nHeight ) { @@ -123,22 +114,16 @@ bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapP return AllocateUserData(); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp ) { return Create( rSalBmp, rSalBmp.GetBitCount() ); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) { return Create( rSalBmp, pGraphics ? pGraphics->GetBitCount() : rSalBmp.GetBitCount() ); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) { const QuartzSalBitmap& rSourceBitmap = static_cast(rSalBmp); @@ -159,23 +144,17 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount return false; } - - bool QuartzSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) { return false; } - - void QuartzSalBitmap::Destroy() { DestroyContext(); maUserBuffer.reset(); } - - void QuartzSalBitmap::DestroyContext() { if( mxCachedImage ) @@ -194,8 +173,6 @@ void QuartzSalBitmap::DestroyContext() } } - - bool QuartzSalBitmap::CreateContext() { DestroyContext(); @@ -259,8 +236,6 @@ bool QuartzSalBitmap::CreateContext() return mxGraphicContext != NULL; } - - bool QuartzSalBitmap::AllocateUserData() { Destroy(); @@ -297,8 +272,6 @@ bool QuartzSalBitmap::AllocateUserData() return maUserBuffer.get() != 0; } - - class ImplPixelFormat { protected: @@ -573,22 +546,16 @@ void QuartzSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight, } } - - Size QuartzSalBitmap::GetSize() const { return Size( mnWidth, mnHeight ); } - - sal_uInt16 QuartzSalBitmap::GetBitCount() const { return mnBits; } - - static struct pal_entry { sal_uInt8 mnRed; @@ -716,8 +683,6 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } - - void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { // invalidate graphic context if we have different data @@ -731,8 +696,6 @@ void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) delete pBuffer; } - - CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int nNewHeight ) const { if( !mxCachedImage ) @@ -763,8 +726,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i return xCroppedImage; } - - static void CFRTLFree(void* /*info*/, const void* data, size_t /*size*/) { rtl_freeMemory( const_cast(data) ); @@ -821,8 +782,6 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask, return xMaskedImage; } - - /** creates an image from the given rectangle, replacing all black pixels with nMaskColor and make all other full transparent */ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const { @@ -875,8 +834,6 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHe return xMask; } - - /** QuartzSalBitmap::GetSystemData Get platform native image data from existing image * * @param rData struct BitmapSystemData, defined in vcl/inc/bitmap.hxx diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 1ab0931afb3d..4a346df57e04 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -57,11 +57,8 @@ #include "sallayout.hxx" #include "sft.hxx" - using namespace vcl; - - CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) : PhysicalFontFace( rSrc ) , mnFontId( rSrc.mnFontId ) @@ -74,8 +71,6 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) mpCharMap->AddReference(); } - - CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId ) : PhysicalFontFace( rDFA, 0 ) , mnFontId( nFontId ) @@ -87,23 +82,17 @@ CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPt { } - - CoreTextFontData::~CoreTextFontData() { if( mpCharMap ) mpCharMap->DeReference(); } - - sal_IntPtr CoreTextFontData::GetFontId() const { return (sal_IntPtr)mnFontId; } - - static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} const ImplFontCharMap* CoreTextFontData::GetImplFontCharMap() const @@ -189,8 +178,6 @@ bool CoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapab return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } - - void CoreTextFontData::ReadOs2Table( void ) const { // read this only once per font @@ -337,15 +324,11 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) mpTextStyle->SetTextColor( maTextColor ); } - - void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( *pMetric ); } - - static bool AddTempDevFont(const OUString& rFontFileURL) { OUString aUSytemPath; @@ -444,38 +427,28 @@ void AquaSalGraphics::ClearDevFontCache() pSalData->mpFontList = NULL; } - - bool AquaSalGraphics::AddTempDevFont( PhysicalFontCollection*, const OUString& rFontFileURL, const OUString& /*rFontName*/ ) { return ::AddTempDevFont(rFontFileURL); } - - bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { const bool bRC = mpTextStyle->GetGlyphOutline( aGlyphId, rPolyPoly ); return bRC; } - - bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const bool bRC = mpTextStyle->GetGlyphBoundRect( aGlyphId, rRect ); return bRC; } - - void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) { } - - sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbackLevel*/ ) { // release the text style @@ -510,16 +483,12 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac return 0; } - - SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFallbackLevel*/ ) { SalLayout* pSalLayout = mpTextStyle->GetTextLayout(); return pSalLayout; } - - const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const { if( !mpFontData ) @@ -536,8 +505,6 @@ bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi return mpFontData->GetImplFontCapabilities(rFontCapabilities); } - - // fake a SFNT font directory entry for a font table // see http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html#Directory static void FakeDirEntry( const char aTag[5], ByteCount nOfs, ByteCount nLen, @@ -720,8 +687,6 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, return true; } - - void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical, Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc ) { @@ -791,16 +756,12 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV } } - - const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } - - const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* /*pUnicodes*/, sal_Int32* /*pWidths*/, @@ -810,8 +771,6 @@ const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, return NULL; } - - void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of @@ -820,8 +779,6 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } - - SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { SystemFontData aSysFontData; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index de28d5a67994..71346758cad4 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -619,7 +619,6 @@ bool AquaSalGraphics::drawTransformedBitmap( return true; } - bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) { @@ -1585,7 +1584,6 @@ void AquaSalGraphics::Pattern50Fill() CGContextFillPath( mrContext ); } - void AquaSalGraphics::ResetClipRegion() { // release old path and indicate no clipping @@ -1810,8 +1808,6 @@ void AquaSalGraphics::updateResolution() #endif - - XorEmulation::XorEmulation() : m_xTargetLayer( NULL ) , m_xTargetContext( NULL ) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 229c3437d80c..cd2341386655 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -33,8 +32,6 @@ #include "osx/salframe.h" #include "osx/saldata.hxx" - - void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame ) { mpFrame = pFrame; @@ -76,8 +73,6 @@ void AquaSalGraphics::InvalidateContext() mrContext = 0; } - - void AquaSalGraphics::UnsetState() { if( mrContext ) @@ -205,6 +200,4 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) DBG_ASSERT( mpFrame->mbInitShow, "UpdateWindow called on uneligible graphics" ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 543fc5d60289..5894ce11374f 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -101,8 +101,6 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, } } - - AquaSalVirtualDevice::~AquaSalVirtualDevice() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::~AquaSalVirtualDevice() this=" << this ); @@ -115,8 +113,6 @@ AquaSalVirtualDevice::~AquaSalVirtualDevice() Destroy(); } - - void AquaSalVirtualDevice::Destroy() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::Destroy() this=" << this << " mbForeignContext=" << mbForeignContext ); @@ -146,8 +142,6 @@ void AquaSalVirtualDevice::Destroy() } } - - SalGraphics* AquaSalVirtualDevice::AcquireGraphics() { if( mbGraphicsUsed || !mpGraphics ) @@ -157,15 +151,11 @@ SalGraphics* AquaSalVirtualDevice::AcquireGraphics() return mpGraphics; } - - void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } - - bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::SetSize() this=" << this << " (" << nDX << "x" << nDY << ")" << " mbForeignContext=" << mbForeignContext ); @@ -280,8 +270,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) return (mxLayer != NULL); } - - void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight ) { if( mxLayer ) diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 152dbdca4646..9684bb6d7b0a 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -183,7 +183,6 @@ IconThemeScanner::GetIconThemeInfo(const OUString& themeId) return *info; } - } // end namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 023745bf9bcd..4f8b4e591791 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -22,7 +22,6 @@ IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID("hicontrast"); /*static*/ const OUString IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); - namespace { class SameTheme : diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 29067fb24a23..ae084a7b0cf4 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -225,7 +225,6 @@ private: void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ); }; - class DbgInfoDialog : public ModalDialog { private: @@ -239,7 +238,6 @@ public: void SetInfoText( const OUString& rStr ); }; - class DbgDialog : public ModalDialog { private: diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 05c2f9d12562..7b056828893c 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -89,8 +89,6 @@ void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::sta { } - - vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient ) { mpClient = pClient; @@ -119,7 +117,6 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang mpClient = NULL; } - // ::com::sun::star::datatransfer::dnd::XDragGestureListener void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 77b655ab65d5..b84364e00b24 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -464,7 +464,6 @@ OUString HelpTextWindow::GetText() const return FloatingWindow::CreateAccessible(); } - void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea ) diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 40585a81ed71..6796e6359a72 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "comphelper/processfactory.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" @@ -124,7 +123,6 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL; } - OUString aStr1( filterFormattingChars(rStr1) ); OUString aStr2( filterFormattingChars(rStr2) ); return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); @@ -162,7 +160,6 @@ bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemo return bEqual; } - OUString vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 3c0a0f526eb3..cbde0d4bf038 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -36,8 +35,6 @@ SalFrame::~SalFrame() { } - - // default to full-frame flushes // on ports where partial-flushes are much cheaper this method should be overridden void SalFrame::Flush( const Rectangle& ) @@ -45,15 +42,11 @@ void SalFrame::Flush( const Rectangle& ) Flush(); } - - void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } - - SalInstance::~SalInstance() { } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index cf430b4a08ff..ac6e6c4bb810 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; - SalSession::~SalSession() { } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b175108381c0..ad9bfa11f292 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -78,7 +78,6 @@ struct ImplMouseData sal_uInt16 mnWheelBehavior; }; - struct ImplStyleData { ImplStyleData(); @@ -207,7 +206,6 @@ struct ImplStyleData boost::optional maPersonaMenuBarTextColor; ///< Cache the menubar color. }; - struct ImplMiscData { ImplMiscData(); @@ -217,7 +215,6 @@ struct ImplMiscData TriState mnDisablePrinting; }; - struct ImplHelpData { ImplHelpData(); @@ -430,7 +427,6 @@ MouseSettings::GetMenuDelay() const return mpData->mnMenuDelay; } - void MouseSettings::SetFollow( sal_uLong nFollow ) { @@ -444,7 +440,6 @@ MouseSettings::GetFollow() const return mpData->mnFollow; } - void MouseSettings::SetMiddleButtonAction( sal_uInt16 nAction ) { @@ -482,8 +477,6 @@ MouseSettings::MouseSettings() { } - - MouseSettings::~MouseSettings() { } @@ -1363,7 +1356,6 @@ StyleSettings::GetMonoColor() const return mpData->maMonoColor; } - void StyleSettings::SetActiveTabColor( const Color& rColor ) { @@ -1501,7 +1493,6 @@ StyleSettings::GetPrimaryButtonWarpsSlider() const return mpData->mbPrimaryButtonWarpsSlider; } - void StyleSettings::SetCairoFontOptions( const void *pOptions ) { @@ -1515,7 +1506,6 @@ StyleSettings::GetCairoFontOptions() const return mpData->mpFontOptions; } - void StyleSettings::SetAppFont( const Font& rFont ) { @@ -1794,7 +1784,6 @@ StyleSettings::GetCursorBlinkTime() const return (long) mpData->mnCursorBlinkTime; } - void StyleSettings::SetScreenZoom( sal_uInt16 nPercent ) { @@ -1847,7 +1836,6 @@ StyleSettings::GetSelectionOptions() const return mpData->mnSelectionOptions; } - void StyleSettings::SetDisplayOptions( sal_uLong nOptions ) { @@ -1874,7 +1862,6 @@ StyleSettings::GetAntialiasingMinPixelHeight() const return mpData->mnAntialiasedMin; } - void StyleSettings::SetOptions( sal_uLong nOptions ) { @@ -1895,7 +1882,6 @@ StyleSettings::GetAutoMnemonic() const return mpData->mbAutoMnemonic; } - void StyleSettings::SetFontColor( const Color& rColor ) { @@ -1909,7 +1895,6 @@ StyleSettings::GetFontColor() const return mpData->maFontColor; } - void StyleSettings::SetToolbarIconSize( sal_uLong nSize ) { @@ -1936,7 +1921,6 @@ StyleSettings::SetDialogStyle( const DialogStyle& rStyle ) mpData->maDialogStyle = rStyle; } - const FrameStyle& StyleSettings::GetFrameStyle() const { diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 308f37f8c57f..226d09fb345c 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 4758a2533189..edd115d0befa 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include #include - OUString GetStandardText( sal_uInt16 nStdText ) { ResMgr* pResMgr = ImplGetResMgr(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 21a3d1a7a4e7..b899ec73816d 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -303,8 +303,6 @@ bool ImplInitAccessBridge() return true; } - - Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 2f4ff80eee25..f83f55ceb14e 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -27,7 +26,6 @@ #include #include - #define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) struct ImplTimerData diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index ccaa289219c2..7dc274cffb00 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -25,7 +25,6 @@ #include #include - using namespace ::com::sun::star; namespace vcl { namespace unohelper { diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 50c6b00c9cdd..8d5b69ae96c3 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/vclevent.hxx" #include "svdata.hxx" diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index c584aad08b31..35065ad43975 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osl/mutex.hxx" #include "vcl/svapp.hxx" @@ -207,8 +206,6 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c m_aListeners.remove( listener ); } - - class ClipboardFactory : public ::cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory > @@ -225,8 +222,6 @@ public: virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) SAL_OVERRIDE; }; - - ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory @@ -234,21 +229,15 @@ ClipboardFactory::ClipboardFactory() : { } - - ClipboardFactory::~ClipboardFactory() { } - - Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception) { return createInstanceWithArguments( Sequence< Any >() ); } - - Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception) { SolarMutexGuard aGuard; @@ -345,7 +334,6 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, s { } - Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() { #if defined UNX @@ -498,7 +486,6 @@ Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMu return xResult; } - } // namespace vcl /* diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 7eb2f1f86ff2..4bfba8a3e94e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/font.hxx" @@ -41,8 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; - - namespace vcl { @@ -53,7 +50,6 @@ public: FontIdentificator() {} virtual ~FontIdentificator(); - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -67,8 +63,6 @@ FontIdentificator() {} }; - - FontIdentificator::~FontIdentificator() { } diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 3086de5cbb40..4638bd04a24e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -42,8 +41,6 @@ #include #include - - #define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK | \ WB_LEFT | WB_CENTER | WB_RIGHT | \ WB_TOP | WB_VCENTER | WB_BOTTOM | \ @@ -60,8 +57,6 @@ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_WORDBREAK | WB_NOLABEL) - - class ImplCommonButtonData { public: @@ -79,7 +74,6 @@ public: ~ImplCommonButtonData(); }; - ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0), mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT) { @@ -95,7 +89,6 @@ Button::Button( WindowType nType ) : mpButtonData = new ImplCommonButtonData; } - Button::~Button() { delete mpButtonData; @@ -149,7 +142,6 @@ OUString Button::GetStandardText( StandardButtonType eButton ) return ResId(nResId, *pResMgr).toString(); } - bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) @@ -161,13 +153,11 @@ bool Button::SetModeImage( const Image& rImage ) return true; } - const Image Button::GetModeImage( ) const { return mpButtonData->maImage; } - bool Button::HasImage() const { return !!(mpButtonData->maImage); @@ -1080,8 +1070,6 @@ void PushButton::ImplDrawPushButton( bool bLayout ) } } - - void PushButton::ImplSetDefButton( bool bSet ) { Size aSize( GetSizePixel() ); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8dd8022724c8..521d13ab1d97 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -1362,7 +1361,6 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const return aRect; } - void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) { Window::SetBorderStyle( nBorderStyle ); @@ -1373,7 +1371,6 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) } } - long ComboBox::GetIndexForPoint( const Point& rPoint, sal_Int32& rPos ) const { if( !HasLayoutData() ) diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index e1bfbca514f0..6c9c3bb489d4 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -71,7 +70,6 @@ Control::~Control() delete mpControlData, mpControlData = NULL; } - void Control::EnableRTL( bool bEnable ) { // convenience: for controls also switch layout mode @@ -338,7 +336,6 @@ void Control::SetLayoutDataParent( const Control* pParent ) const mpControlData->mpLayoutData->m_pParent = pParent; } - void Control::ImplClearLayoutData() const { delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 080353239de7..66082155c108 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -36,7 +35,6 @@ #include - #include #include #include @@ -111,7 +109,6 @@ struct DDInfo } }; - struct Impl_IMEInfos { OUString aOldTextAfterStartPos; @@ -128,7 +125,6 @@ struct Impl_IMEInfos void DestroyAttribs(); }; - Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) : aOldTextAfterStartPos(rOldTextAfterStartPos) { @@ -842,7 +838,6 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool aSelection.Min() > 0 && /* first char needs not to be checked */ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rStr, 0 ); - uno::Reference < i18n::XExtendedInputSequenceChecker > xISC; if (bIsInputSequenceChecking && (xISC = ImplGetInputSequenceChecker()).is()) { @@ -2124,7 +2119,6 @@ void Edit::Command( const CommandEvent& rCEvt ) } } - if ( pData->GetTextAttr() ) { mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() ); @@ -2839,7 +2833,6 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra mpDDInfo->bStarterOfDD = true; mpDDInfo->aDndStartSel = aSel; - if ( IsTracking() ) EndTracking(); // Vor D&D Tracking ausschalten diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index b0ae9bb898f8..c70bf09a1f4a 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -39,7 +39,6 @@ #include #include - #include #include #include @@ -1362,7 +1361,6 @@ void DateField::ImplDateSpinArea( bool bUp ) } } - switch( eFormat ) { case XTDATEF_SHORT_MMDDYY: diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a336879f5d7e..7df62f8c606f 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/decoview.hxx" diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index d9fdb2d75c67..97142fb6077b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 4c0ba9dc4642..ee3d2a2733c3 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -76,8 +75,6 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa } } - - void ImplInitDropDownButton( PushButton* pButton ) { if ( pButton->GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN ) @@ -491,7 +488,6 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* = return LISTBOX_ENTRY_NOTFOUND; } - ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) @@ -1635,7 +1631,6 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) return bDone; } - namespace { static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index f143ab13331d..e49af86885e6 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 4bd5e43fba47..ed5558dd045f 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -470,12 +470,10 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : Reformat(); } - LongCurrencyField::~LongCurrencyField() { } - bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -486,7 +484,6 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } - bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) @@ -504,14 +501,12 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) return SpinField::Notify( rNEvt ); } - void LongCurrencyField::Modify() { MarkToBeReformatted( true ); SpinField::Modify(); } - void LongCurrencyField::Up() { BigInt nValue = GetValue(); @@ -534,14 +529,12 @@ void LongCurrencyField::Down() SpinField::Down(); } - void LongCurrencyField::First() { ImplNewLongCurrencyFieldValue( this, mnFirst ); SpinField::First(); } - void LongCurrencyField::Last() { ImplNewLongCurrencyFieldValue( this, mnLast ); @@ -569,7 +562,6 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } - bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 6db3350c50a9..c978fe4d366f 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "tools/debug.hxx" @@ -48,14 +47,12 @@ ListBox::ListBox( WindowType nType ) : Control( nType ) ImplInitListBoxData(); } - ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) { ImplInitListBoxData(); ImplInit( pParent, nStyle ); } - ListBox::ListBox( Window* pParent, const ResId& rResId ) : Control( WINDOW_LISTBOX ) { @@ -69,7 +66,6 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) : Show(); } - ListBox::~ListBox() { ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); @@ -85,7 +81,6 @@ ListBox::~ListBox() delete mpBtn; } - void ListBox::ImplInitListBoxData() { mpFloatWin = NULL; @@ -99,7 +94,6 @@ void ListBox::ImplInitListBoxData() mbEdgeBlending = false; } - void ListBox::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -252,14 +246,12 @@ IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplScrollHdl) { ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); return 1; } - IMPL_LINK_NOARG(ListBox, ImplCancelHdl) { if( IsInDropDown() ) @@ -268,7 +260,6 @@ IMPL_LINK_NOARG(ListBox, ImplCancelHdl) return 1; } - IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) { if ( !mpImplLB->IsTrackingSelect() ) @@ -300,14 +291,12 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl) { DoubleClick(); return 1; } - IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { if( !mpFloatWin->IsInPopupMode() ) @@ -560,7 +549,6 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt ) ImplInitDropDownButton( mpBtn ); } - if ( IsDropDownBox() ) Invalidate(); } @@ -1506,7 +1494,6 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : EnableMultiSelection( true ); } - MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) : ListBox( WINDOW_MULTILISTBOX ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 16955e89e5c0..7f263b685ae6 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -74,7 +73,6 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } - MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { @@ -128,7 +126,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) return 0; } - void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { bool bExecute = true; @@ -162,7 +159,6 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - void MenuButton::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -177,19 +173,16 @@ void MenuButton::KeyInput( const KeyEvent& rKEvt ) PushButton::KeyInput( rKEvt ); } - void MenuButton::Activate() { maActivateHdl.Call( this ); } - void MenuButton::Select() { maSelectHdl.Call( this ); } - void MenuButton::SetMenuMode( sal_uInt16 nMode ) { // FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index c14df7b195df..8bbaafcede8c 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -126,7 +126,6 @@ void ProgressBar::ImplInitSettings( bool bFont, } } - void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) { if ( mbCalcNew ) @@ -161,7 +160,6 @@ void ProgressBar::Paint( const Rectangle& ) ImplDrawProgress( 0, mnPercent ); } - void ProgressBar::Resize() { mbCalcNew = true; diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index d0b72391261f..25d136a0218e 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/quickselectionengine.hxx" #include "vcl/event.hxx" #include "vcl/timer.hxx" diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index fcd035cb27f8..32d977702fde 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" @@ -1368,7 +1367,6 @@ void ScrollBar::SetRangeMin( long nNewRange ) SetRange( Range( nNewRange, GetRangeMax() ) ); } - void ScrollBar::SetRangeMax( long nNewRange ) { SetRange( Range( GetRangeMin(), nNewRange ) ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index a52ede4551ce..f398d02a38e3 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -26,8 +25,6 @@ #include "thumbpos.hxx" - - #define SLIDER_DRAW_THUMB ((sal_uInt16)0x0001) #define SLIDER_DRAW_CHANNEL1 ((sal_uInt16)0x0002) #define SLIDER_DRAW_CHANNEL2 ((sal_uInt16)0x0004) @@ -48,8 +45,6 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) - - void Slider::ImplInit( Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 6ecc05d68671..d920737c3c01 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -169,7 +169,6 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } - void SpinButton::Paint( const Rectangle& ) { HideFocus(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 9091c1d93aa8..325e770e1060 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/event.hxx" @@ -29,8 +28,6 @@ #include "controldata.hxx" #include "svdata.hxx" - - namespace { void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, @@ -74,7 +71,6 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN; } - bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3080f23edf24..1d736a7f3a7a 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/rc.h" @@ -40,8 +39,6 @@ #include #include - - struct ImplTabItem { sal_uInt16 mnId; @@ -63,7 +60,6 @@ struct ImplTabItem {} }; - struct ImplTabCtrlData { boost::unordered_map< int, int > maLayoutPageIdToLine; @@ -74,7 +70,6 @@ struct ImplTabCtrlData ListBox* mpListBox; }; - #define TAB_OFFSET 3 #define TAB_TABOFFSET_X 3 #define TAB_TABOFFSET_Y 3 @@ -137,7 +132,6 @@ const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const return _rStyle.GetAppFont(); } - const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetButtonTextColor(); diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 05375c091c42..c9b3b77a0be5 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -77,8 +77,6 @@ public: bool HasValidSize() const { return nWidth != (-1); } }; - - typedef std::vector TextPortionArray; class TETextPortionList : public TextPortionArray @@ -186,8 +184,6 @@ inline bool TextLine::operator != ( const TextLine& rLine ) const return !( *this == rLine ); } - - class TEParaPortion { private: @@ -197,21 +193,18 @@ private: TETextPortionList maTextPortions; std::vector maWritingDirectionInfos; - sal_uInt16 mnInvalidPosStart; short mnInvalidDiff; bool mbInvalid; bool mbSimple; // nur lineares Tippen - TEParaPortion( const TEParaPortion& ) {;} public: TEParaPortion( TextNode* pNode ); ~TEParaPortion(); - bool IsInvalid() const { return mbInvalid; } bool IsSimpleInvalid() const { return mbSimple; } void SetNotSimpleInvalid() { mbSimple = false; } @@ -228,12 +221,10 @@ public: TETextPortionList& GetTextPortions() { return maTextPortions; } std::vector& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd ); void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ); }; - class TEParaPortions : public ToolsList { public: @@ -242,7 +233,6 @@ public: void Reset(); }; - class TextSelFunctionSet: public FunctionSet { private: @@ -264,7 +254,6 @@ public: virtual void DestroyAnchor() SAL_OVERRIDE; }; - class IdleFormatter : public Timer { private: diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 892ffc1f4dba..f375525e7d4a 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include - TextSelection::TextSelection() { } @@ -48,7 +46,6 @@ void TextSelection::Justify() } } - TETextPortionList::TETextPortionList() { } @@ -95,7 +92,6 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPor return ( size() - 1 ); } - TEParaPortion::TEParaPortion( TextNode* pN ) { mpNode = pN; @@ -181,7 +177,6 @@ sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd ) return ( maLines.size() - 1 ); } - void TEParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ) { sal_uInt16 nLines = maLines.size(); @@ -315,5 +310,4 @@ void TEIMEInfos::DestroyAttribs() nLen = 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 698e521c32b5..e96dacde26fb 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -63,7 +63,6 @@ void TextCharAttribList::Clear( bool bDestroyAttribs ) TextCharAttribs::clear(); } - void TextCharAttribList::InsertAttrib( TextCharAttrib* pAttrib ) { if ( pAttrib->IsEmpty() ) @@ -485,7 +484,6 @@ OUString TextDoc::GetText( sal_uLong nPara ) const return aText; } - sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel ) const { sal_uLong nLen = 0; diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 06623ce218dd..1f42c3a0f7c8 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -66,7 +66,6 @@ public: bool HasBoundingAttrib( sal_uInt16 nBound ); }; - class TextNode { private: @@ -81,7 +80,6 @@ protected: public: TextNode( const OUString& rText ); - const OUString& GetText() const { return maText; } const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; } diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 74fb8bcf045a..c19f5df28648 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; - TextEngine::TextEngine() { mpDoc = 0; @@ -479,7 +478,6 @@ void TextEngine::SetText( const OUString& rText ) DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "SetText: Undo!" ); } - void TextEngine::CursorMoved( sal_uLong nNode ) { // delete empty attribute; but only if paragraph is not empty! @@ -749,7 +747,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, // at this point now we will insert the character 'normally' some lines below... } - if ( IsUndoEnabled() && !IsInUndo() ) { TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); @@ -772,7 +769,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, return aPaM; } - TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& rStr ) { UndoActionStart(); @@ -1153,7 +1149,6 @@ sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nX return nCurIndex; } - sal_uLong TextEngine::GetTextHeight() const { DBG_ASSERT( GetUpdateMode(), "GetTextHeight: GetUpdateMode()" ); @@ -1479,7 +1474,6 @@ void TextEngine::FormatAndUpdate( TextView* pCurView ) } } - void TextEngine::IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts ) { mpIdleFormatter->DoIdleFormat( pCurView, nMaxTimerRestarts ); @@ -2746,7 +2740,6 @@ void TextEngine::SetTextAlign( TxtAlign eAlign ) } } - void TextEngine::ValidateSelection( TextSelection& rSel ) const { ValidatePaM( rSel.GetStart() ); @@ -2767,7 +2760,6 @@ void TextEngine::ValidatePaM( TextPaM& rPaM ) const rPaM.GetIndex() = nMaxIndex; } - // adjust State & Selection void TextEngine::ImpParagraphInserted( sal_uLong nPara ) @@ -2951,7 +2943,6 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) const UBiDiLevel nBidiLevel = IsRightToLeft() ? 1 /*RTL*/ : 0 /*LTR*/; OUString aText( pParaPortion->GetNode()->GetText() ); - // Bidi functions from icu 2.0 UErrorCode nError = U_ZERO_ERROR; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 8a5a917dd3a4..b469a3bad618 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -22,7 +22,6 @@ #include "textundo.hxx" #include - class TextUndoDelPara : public TextUndo { private: @@ -41,7 +40,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoConnectParas : public TextUndo { private: @@ -59,7 +57,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSplitPara : public TextUndo { private: @@ -77,7 +74,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoInsertChars : public TextUndo { private: @@ -96,7 +92,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoRemoveChars : public TextUndo { private: @@ -113,7 +108,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSetAttribs: public TextUndo { private: diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 6cd4f339d642..59781e1d585d 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -36,7 +36,6 @@ TYPEINIT1( TextUndoSplitPara, TextUndo ); TYPEINIT1( TextUndoInsertChars, TextUndo ); TYPEINIT1( TextUndoRemoveChars, TextUndo ); - namespace { @@ -65,7 +64,6 @@ void Shorten (OUString& rString) } // namespace - TextUndoManager::TextUndoManager( TextEngine* p ) { mpTextEngine = p; @@ -96,7 +94,6 @@ bool TextUndoManager::Redo() if ( GetRedoActionCount() == 0 ) return false; - UndoRedoStart(); mpTextEngine->SetIsInUndo( true ); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 6c4f039397ab..c3593f8e8d9e 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -51,12 +51,10 @@ #include - #include #include - using namespace ::com::sun::star; class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, @@ -908,7 +906,6 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) } } - void TextView::MouseMove( const MouseEvent& rMouseEvent ) { mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; @@ -1412,7 +1409,6 @@ TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIterato return aPaM; } - TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1435,7 +1431,6 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) return aPaM; } - TextPaM TextView::CursorWordRight( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1522,8 +1517,6 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ) return mpImpl->mpTextEngine->ImpDeleteText( TextSelection( aStartPaM, aEndPaM ) ); } - - TextPaM TextView::CursorUp( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1705,7 +1698,6 @@ void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpec if ( !mpImpl->mpTextEngine->IsFormatted() ) mpImpl->mpTextEngine->FormatAndUpdate( this ); - TextPaM aPaM( mpImpl->maSelection.GetEnd() ); Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial ); @@ -2003,7 +1995,6 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true ); - /* // D&D of a Hyperlink // TODO: Better would be to store MBDownPaM in MBDown, @@ -2270,8 +2261,6 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const return nLineNo; } - - // (+) class TextSelFunctionSet TextSelFunctionSet::TextSelFunctionSet( TextView* pView ) diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx index a9fe2df06957..c7d0c592a44d 100644 --- a/vcl/source/edit/txtattr.cxx +++ b/vcl/source/edit/txtattr.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include - - - TextAttrib::~TextAttrib() { } @@ -33,7 +29,6 @@ bool TextAttrib::operator==( const TextAttrib& rAttr ) const return mnWhich == rAttr.mnWhich; } - TextAttribFontColor::TextAttribFontColor( const Color& rColor ) : TextAttrib( TEXTATTR_FONTCOLOR ), maColor( rColor ) { @@ -94,7 +89,6 @@ bool TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const ( meWeight == ((const TextAttribFontWeight&)rAttr).meWeight ) ); } - TextAttribHyperLink::TextAttribHyperLink( const TextAttribHyperLink& rAttr ) : TextAttrib( rAttr ), maURL( rAttr.maURL ), maDescription( rAttr.maDescription ) { diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 117082c1b6fd..4e1deac8a0bb 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -34,7 +34,6 @@ #include #include - class TextWindow : public Window { private: @@ -79,7 +78,6 @@ public: void SetTextSelectable( bool bTextSelectable ) { mbTextSelectable = bTextSelectable; } }; - class ImpVclMEdit : public SfxListener { private: @@ -712,7 +710,6 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) return bDone; } - TextWindow::TextWindow( Window* pParent ) : Window( pParent ) { mbInMBDown = false; @@ -1001,7 +998,6 @@ WinBits VclMultiLineEdit::ImplInitStyle( WinBits nStyle ) return nStyle; } - void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1522,7 +1518,6 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) return nDone || Edit::PreNotify( rNEvt ); } - // Internals for derived classes, e.g. TextComponent ExtTextEngine* VclMultiLineEdit::GetTextEngine() const diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 04555e68acf5..6f63ccecb9a0 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -27,7 +26,6 @@ using namespace ::com::sun::star; - ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]")) { } @@ -222,8 +220,6 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea return bFound; } - - // class ExtTextView ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 9d45c268cf94..7f4ed6d42e1c 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -440,8 +440,6 @@ bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } - - OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 88afc3fa0c20..7a2e823f16b9 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -229,7 +229,6 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper return bRetValue; } - // if property is available it returns a pointer, // otherwise the result is null PropertyValue* FilterConfigItem::GetPropertyValue( Sequence< PropertyValue >& rPropSeq, const OUString& rName ) @@ -400,15 +399,11 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } - - Sequence< PropertyValue > FilterConfigItem::GetFilterData() const { return aFilterData; } - - Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { Reference< XStatusIndicator > xStatusIndicator; diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx index 9661d4a67f97..664749790d38 100644 --- a/vcl/source/filter/GraphicNativeTransform.cxx +++ b/vcl/source/filter/GraphicNativeTransform.cxx @@ -24,7 +24,6 @@ #include #include - #include "jpeg/Exif.hxx" #include "jpeg/JpegTransform.hxx" @@ -189,5 +188,4 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 48b88baf99c1..d0e639a012c9 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -181,7 +181,6 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nCom return NULL; } - inline OUString ImpGetExtension( const OUString &rPath ) { OUString aExt; @@ -227,7 +226,6 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen) return false; } - /************************************************************************* * * ImpPeekGraphicFormat() @@ -774,8 +772,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, return bTest && !bSomethingTested; } - - sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ) { // determine or check the filter/format by reading into it @@ -820,8 +816,6 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& return GRFILTER_OK; } - - #ifndef DISABLE_EXPORT static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem ) @@ -844,7 +838,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r nMode = 2; } - Size aOriginalSize; Size aPrefSize( rGraphic.GetPrefSize() ); MapMode aPrefMapMode( rGraphic.GetPrefMapMode() ); @@ -1331,8 +1324,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pExtHeader ); } - - sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, @@ -1867,7 +1858,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString INetURLObject aURL( rPath ); OUString aExt( aURL.GetFileExtension().toAsciiUpperCase() ); - for( sal_uInt16 i = 0; i < nFormatCount; i++ ) { if ( pConfig->GetExportFormatExtension( i ).equalsIgnoreAsciiCase( aExt ) ) @@ -1950,7 +1940,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString // save RLE encoded? WriteDIB(aBmp, rOStm, bRleCoding, true); - if( rOStm.GetError() ) nStatus = GRFILTER_IOERROR; } diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 812c2430fdf7..77da7eb4191b 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -457,7 +456,6 @@ bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ) sal_uInt16 nDPIx; sal_uInt16 nDPIy; - rStm.SeekRel( 1 ); // compression diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index 561bf5c4480a..f53c00572f13 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "decode.hxx" struct GIFLZWTableEntry diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx index 3e1a783eaf0d..542532673359 100644 --- a/vcl/source/filter/igif/decode.hxx +++ b/vcl/source/filter/igif/decode.hxx @@ -46,7 +46,6 @@ class GIFLZWDecompressor void AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); bool ProcessOneCode(); - public: GIFLZWDecompressor( sal_uInt8 cDataSize ); diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index b3168a0194c6..a26a57af8f39 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _GIFPRIVATE #include "decode.hxx" @@ -51,7 +50,6 @@ GIFReader::GIFReader( SvStream& rStm ) : ClearImageExtensions(); } - GIFReader::~GIFReader() { aImGraphic.SetContext( NULL ); @@ -635,7 +633,6 @@ bool GIFReader::ProcessGIF() } break; - // read extension case( EXTENSION_READING ): { @@ -644,7 +641,6 @@ bool GIFReader::ProcessGIF() } break; - // read Image-Descriptor case( LOCAL_HEADER_READING ): { @@ -656,7 +652,6 @@ bool GIFReader::ProcessGIF() } break; - // read first data block case( FIRST_BLOCK_READING ): { diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 89f0d06bfcd4..b2910844843c 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _XBMPRIVATE #include #include diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index dc62ff446045..4f3b52e7e8af 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -57,7 +57,6 @@ class XBMReader : public GraphicReader long ParseDefine( const sal_Char* pDefine ); bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); - public: XBMReader( SvStream& rStm ); diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 5ed2f7425561..e3f48ecbf05b 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include "rgbtable.hxx" @@ -51,8 +50,6 @@ XPMReader::~XPMReader() maBmp.ReleaseAccess( mpAcc ); } - - ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { ReadState eReadState; @@ -208,7 +205,6 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) return eReadState; } - // ImplGetColor returns variouls colour values, // returns TRUE if various colours could be assigned @@ -227,7 +223,6 @@ bool XPMReader::ImplGetColor( sal_uLong nNumb ) return bStatus; } - // ImpGetScanLine reads the string mpBufSize and writes the pixel in the // Bitmap. Parameter nY is the horizontal position. @@ -293,7 +288,6 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY ) return bStatus; } - // tries to determine a colour value from mpStringBuf // if a colour was found the RGB value is written a pDest[1]..pDest[2] // pDest[0] contains 0xFF if the colour is transparent otherwise 0 @@ -361,7 +355,6 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest ) return bColStatus; } - // ImplGetColKey searches string mpStringBuf for a parameter 'nKey' // and returns a boolean. (if TRUE mpPara and mnParaSize will be set) @@ -405,7 +398,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) return ( mnParaSize ) ? true : false; } - // ImplGetRGBHex translates the ASCII-Hexadecimalvalue belonging to mpPara // in a RGB value and writes this to pDest // below formats should be contained in mpPara: @@ -413,7 +405,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) // 2 : '#1234abcd1234' " " " " // 6 : '#12345678abcdefab12345678' " " " " - void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) { sal_uInt8* pPtr = mpPara+1; @@ -435,7 +426,6 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) } } - // ImplGetUlong returns the value of a up to 6-digit long ASCII-decimal number. sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) @@ -458,8 +448,6 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) else return 0; } - - bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode ) { bool bRet = true; @@ -489,7 +477,6 @@ bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSi return bRet; } - // ImplGetPara tries to retrieve nNumb (0...x) parameters from mpStringBuf. // Parameters are separated by spaces or tabs. // If a parameter was found then the return value is TRUE and mpPara + mnParaSize @@ -545,7 +532,6 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) return ( ( nCount == nNumb ) && ( mpPara ) ); } - // The next string is read and stored in mpStringBuf (terminated with 0); // mnStringSize contains the size of the string read. // Comments like '//' and '/*....*/' are skipped. @@ -644,10 +630,8 @@ bool XPMReader::ImplGetString( void ) return mbStatus; } - // - ImportXPM - - bool ImportXPM( SvStream& rStm, Graphic& rGraphic ) { XPMReader* pXPMReader = (XPMReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx index d7ede08a225f..ad9911a06c44 100644 --- a/vcl/source/filter/ixpm/xpmread.hxx +++ b/vcl/source/filter/ixpm/xpmread.hxx @@ -35,7 +35,6 @@ #define XPMEXTENSIONS 0x00000006 #define XPMENDEXT 0x00000007 - #define XPMREMARK 0x00000001 // defines used by mnStatus #define XPMDOUBLE 0x00000002 #define XPMSTRING 0x00000004 diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index 4be2f94e1b1b..c365ec8071bf 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -87,7 +87,6 @@ public : }; - #endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx index 722ddbdb0ac2..a71b816f3f50 100644 --- a/vcl/source/filter/jpeg/JpegTransform.cxx +++ b/vcl/source/filter/jpeg/JpegTransform.cxx @@ -43,5 +43,4 @@ void JpegTransform::setRotate(sal_uInt16 aRotate) maRotate = aRotate; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h index 121fbecdf1ea..edd608deacf4 100644 --- a/vcl/source/filter/jpeg/jinclude.h +++ b/vcl/source/filter/jpeg/jinclude.h @@ -14,7 +14,6 @@ * JPEG library. Most applications need only include jpeglib.h. */ - /* Include auto-config file to find out which system include files we need. */ #include "jconfig.h" /* auto configuration options */ diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h index 69bf46f876af..4448c9fa8272 100644 --- a/vcl/source/filter/jpeg/transupp.h +++ b/vcl/source/filter/jpeg/transupp.h @@ -76,7 +76,6 @@ * be aware of the option to know how many components to work on. */ - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -89,7 +88,6 @@ #define jcopy_markers_execute jCMrkExec #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* * Codes for supported types of image transformations. */ @@ -162,7 +160,6 @@ typedef struct { int iMCU_sample_height; } jpeg_transform_info; - #if TRANSFORMS_SUPPORTED /* Parse a crop specification (written in X11 geometry style) */ @@ -198,7 +195,6 @@ EXTERN(boolean) jtransform_perfect_transform #endif /* TRANSFORMS_SUPPORTED */ - /* * Support for copying optional markers from source to destination file. */ diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 1c691014275c..733b9c01b47a 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -454,7 +453,6 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt return true; } - bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) { sal_uLong nFileStart; // offset of SgfHeaders. Usually 0. diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx index 72f4cec81a7a..501b2f26b635 100644 --- a/vcl/source/filter/sgfbram.hxx +++ b/vcl/source/filter/sgfbram.hxx @@ -37,7 +37,6 @@ #define SgfVectGray 5 /* use greyscale for lines only for */ #define SgfVectWdth 6 /* use line widths for lines SimpVector */ - #define SgfHeaderSize 42 class SgfHeader { diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index d2c42cc6131a..a2e7c14122c6 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -599,7 +598,6 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr } } - void CircType::Draw(OutputDevice& rOut) { Rectangle aRect(Center.x-Radius.x,Center.y-Radius.y,Center.x+Radius.x,Center.y+Radius.y); @@ -696,7 +694,6 @@ void BmapType::Draw(OutputDevice& rOut) } } - sal_uInt32 GrupType::GetSubPtr() { return sal_uInt32(SbLo)+0x00010000*sal_uInt32(SbHi); diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index b95fc50c8f44..f68652843759 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include - #include #include @@ -32,7 +30,6 @@ extern "C" { /*.fe The include file u_const.h should be stored in the directory, */ /*.fe where the compiler searches for include files. */ - /*----------------------- FILE u_const.h ---------------------------*/ #define IEEE @@ -98,7 +95,6 @@ short basis() /* calculate BASE machine independence */ #define MAXEXPON 1023.0 /* largest exponent */ #define MINEXPON -1024.0 /* smallest exponent */ - #define MACH_EPS masch() #define POSMAX pow ((double) BASIS, MAXEXPON) @@ -114,16 +110,11 @@ short basis() /* calculate BASE machine independence */ /*-------------------- END of FILE u_const.h -----------------------*/ - - - - /*.HL appendix: C - programs*/ /*.HR Systems of equations for tridiagonal matrices*/ /*.FE P 3.7 tridiagonal systems of equations */ - /*---------------------- MODULE tridiagonal -----------------------*/ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, @@ -243,23 +234,13 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, /*----------------------- END OF TRIDIAGONAL ------------------------*/ - - - - - - - - /*.HL Appendix: C - Programs*/ /*.HRSystems of equations with cyclic tridiagonal matrices*/ /*.FE P 3.8 Systems with cyclic tridiagonal matrices */ - /*---------------- Module cyclic tridiagonal -----------------------*/ - sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, double* upper, double* lowrow, double* ricol, double* b) /******************************/ @@ -400,10 +381,8 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, /*------------------ END of CYCLIC TRIDIAGONAL ---------------------*/ - } // extern "C" - /************************************************************************* |* |* NaturalSpline() @@ -507,7 +486,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, return 0; } - /************************************************************************* |* |* PeriodicSpline() @@ -517,7 +495,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, |* *************************************************************************/ - sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, double* b, double* c, double* d) { // array dimensions should range from [0..n]! @@ -576,8 +553,6 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, return 0; } - - /************************************************************************* |* |* ParaSpline() @@ -652,8 +627,6 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, return 0; } - - /************************************************************************* |* |* CalcSpline() @@ -737,7 +710,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, return bRet; } - /************************************************************************* |* |* Spline2Poly() diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e942e891bd19..bafcdfa4b442 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -36,7 +36,6 @@ extern SgfFontLst* pSgfFonts; #define abs(x) ((x)<0 ? -(x) : (x)) #endif - // Limitations: only grey shadows, 2D and with fixed distance. // Start of AbsBase.Pas @@ -124,7 +123,6 @@ extern SgfFontLst* pSgfFonts; #define MinChar 32 #define MaxChar 255 - #define CharTopToBase 100 /* due to quotes more as 75% */ #define CharTopToBtm 120 /* line height larger as text angle */ // for Avanti-Bold 'ue' actually even 130% @@ -207,7 +205,6 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) // in spaces, including HardTrenner in minus signs. TextEnde is // always returned as Char(0). - UCHAR ConvertTextChar(UCHAR c) { if (c<32) { @@ -356,7 +353,6 @@ UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index, return c; } // end of ProcessOne - UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& AktAtr, sal_uInt16 Rest, bool ScanEsc) @@ -407,7 +403,6 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, return c; } - // Function GetLineFeed() // // Required line spacing in SGF-Units. ChrVPos is taken into account. @@ -1012,7 +1007,6 @@ void ObjTextType::SetFont(sal_uInt32 FontID) FontHi=sal_uInt16((FontID & 0xFFFF0000)>>16); } - // SGF.Ini lesen SgfFontOne::SgfFontOne() { diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ea0e32c5c32d..e518cddcb692 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -351,7 +351,6 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf .WriteUInt32( (sal_uInt32)0x14 ); // nSizeLast ImplEndRecord(); - // write header const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 6c58c94644d0..7be3492ccfb7 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include #include @@ -154,7 +153,6 @@ using namespace std; #define EMR_SETLINKEDUFIS 119 #define EMR_SETTEXTJUSTIFICATION 120 - #ifdef OSL_BIGENDIAN // little endian <-> big endian switch static float GetSwapFloat( SvStream& rSt ) @@ -326,7 +324,6 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const bool skipFirst) drawer(pOut, aPolygon, skipFirst, bRecordPath); } - /** * Reads polygons from the stream. * The \ parameter is for the type of the points @@ -1488,7 +1485,6 @@ bool EnhWMFReader::ReadEnhWMF() return bStatus; }; - bool EnhWMFReader::ReadHeader() { sal_uInt32 nType, nSignature, nVersion; @@ -1595,7 +1591,6 @@ bool EnhWMFReader::ReadHeader() return true; } - Rectangle EnhWMFReader::ReadRectangle( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) { Point aTL ( Point( x1, y1 ) ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index aca9822e685f..e7f6b200c55a 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -29,7 +29,6 @@ #include #include - #if OSL_DEBUG_LEVEL > 1 #define EMFP_DEBUG(x) x #else @@ -88,7 +87,6 @@ basegfx::B2DPolyPolygon WinMtfClipPath::getClipPath() const return maClip.getClipPoly(); } - void WinMtfPathObj::AddPoint( const Point& rPoint ) { if ( bClosed ) @@ -136,7 +134,6 @@ void WinMtfPathObj::ClosePath() bClosed = true; } - WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { rtl_TextEncoding eCharSet; @@ -405,7 +402,6 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) return Point(); }; - Size WinMtfOutput::ImplMap( const Size& rSz ) { if ( mnWinExtX && mnWinExtY ) @@ -465,13 +461,11 @@ Size WinMtfOutput::ImplMap( const Size& rSz ) return Size(); } - Rectangle WinMtfOutput::ImplMap( const Rectangle& rRect ) { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); } - void WinMtfOutput::ImplMap( Font& rFont ) { // !!! HACK: we now always set the width to zero because the OS width is interpreted differently; @@ -497,7 +491,6 @@ Polygon& WinMtfOutput::ImplMap( Polygon& rPolygon ) return rPolygon; } - Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) { sal_uInt16 nPoints = rPolygon.GetSize(); @@ -508,7 +501,6 @@ Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) return rPolygon; } - PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -519,7 +511,6 @@ PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -527,7 +518,6 @@ PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - void WinMtfOutput::SelectObject( sal_Int32 nIndex ) { GDIObj* pGDIObj = NULL; @@ -619,43 +609,36 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) delete pGDIObj; } - const Font& WinMtfOutput::GetFont() const { return maFont; } - void WinMtfOutput::SetTextLayoutMode( const sal_uInt32 nTextLayoutMode ) { mnTextLayoutMode = nTextLayoutMode; } - void WinMtfOutput::SetBkMode( sal_uInt32 nMode ) { mnBkMode = nMode; } - void WinMtfOutput::SetBkColor( const Color& rColor ) { maBkColor = rColor; } - void WinMtfOutput::SetTextColor( const Color& rColor ) { maTextColor = rColor; } - void WinMtfOutput::SetTextAlign( sal_uInt32 nAlign ) { mnTextAlign = nAlign; } - void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) { sal_uInt32 i = vGDIObj.size(); @@ -664,7 +647,6 @@ void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) vGDIObj[ i ] = NULL; } - void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) { if ( rPolyPoly.Count() ) @@ -815,7 +797,6 @@ void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClip } } - WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mnLatestTextAlign ( 0 ), mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ), diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 73e78a5aa79c..62a9f2aaf3f4 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -71,7 +71,6 @@ #define DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 - #define R2_BLACK 1 #define R2_NOTMERGEPEN 2 #define R2_MASKNOTPEN 3 @@ -99,7 +98,6 @@ #define MM_ISOTROPIC 7 #define MM_ANISOTROPIC 8 - /* Graphics modes */ #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 @@ -220,7 +218,6 @@ struct WMF_EXTERNALHEADER; /*_WIN32_WINNT >= 0x0500*/ #define ETO_PDY 0x2000 - #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 #define VARIABLE_PITCH 0x02 @@ -394,7 +391,6 @@ struct WinMtfFillStyle } }; - struct WinMtfLineStyle { Color aLineColor; @@ -445,7 +441,6 @@ struct WinMtfLineStyle } }; - struct XForm { float eM11; @@ -461,7 +456,6 @@ struct XForm } }; - struct SaveStruct { sal_uInt32 nBkMode, nMapMode, nGfxMode, nTextLayoutMode; @@ -488,7 +482,6 @@ struct SaveStruct typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; - struct BSaveStruct { Bitmap aBmp; @@ -511,7 +504,6 @@ struct BSaveStruct typedef ::std::vector< BSaveStruct* > BSaveStructList_impl; - enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, @@ -565,7 +557,6 @@ struct GDIObj } }; - class WinMtfOutput { WinMtfPathObj aPathObj; @@ -752,7 +743,6 @@ public: virtual ~WinMtfOutput(); }; - class WinMtf { protected: @@ -780,14 +770,12 @@ protected: ~WinMtf(); }; - class EnhWMFReader : public WinMtf { bool bRecordPath; sal_Int32 nRecordCount; bool bEMFPlus; - bool ReadHeader(); // reads and converts the rectangle Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 ); @@ -815,7 +803,6 @@ private: template void ReadAndDrawPolygon(Drawer drawer, const bool skipFirst); }; - class WMFReader : public WinMtf { private: diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 792f48492cd9..fff2f9db0285 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include #include diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 59e26b44a853..3efc5c9d51d8 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include "emfwr.hxx" #include "wmfwr.hxx" diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 62bf6ec094c6..6439b41fc2d2 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -179,55 +179,47 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) } } - void WMFWriter::WritePointXY(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); } - void WMFWriter::WritePointYX(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); } - sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) { Size aSz( pVirDev->LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) ); return aSz.Width(); } - void WMFWriter::WriteSize(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); } - void WMFWriter::WriteHeightWidth(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); } - void WMFWriter::WriteRectangle(const Rectangle & rRect) { WritePointYX(Point(rRect.Right()+1,rRect.Bottom()+1)); WritePointYX(rRect.TopLeft()); } - void WMFWriter::WriteColor(const Color & rColor) { pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 ); } - void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) { nActRecordPos=pWMF->Tell(); @@ -235,7 +227,6 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) pWMF->WriteUInt32( nSizeWords ).WriteUInt16( nType ); } - void WMFWriter::UpdateRecordHeader() { sal_uLong nPos; @@ -253,7 +244,6 @@ void WMFWriter::UpdateRecordHeader() pWMF->Seek(nPos); } - void WMFWriter::WMFRecord_Arc(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt) { WriteRecordHeader(0x0000000b,W_META_ARC); @@ -270,7 +260,6 @@ void WMFWriter::WMFRecord_Chord(const Rectangle & rRect, const Point & rStartPt, WriteRectangle(rRect); } - void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) { WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT); @@ -388,7 +377,6 @@ void WMFWriter::WMFRecord_DeleteObject(sal_uInt16 nObjectHandle) pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_Ellipse(const Rectangle & rRect) { WriteRecordHeader(0x00000007,W_META_ELLIPSE); @@ -619,7 +607,6 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) for (i=0; iWriteInt16( (short)-1 ); } - void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound) { WriteRecordHeader(0x00000009,W_META_ROUNDRECT); @@ -669,20 +653,17 @@ void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, lo WriteRectangle(rRect); } - void WMFWriter::WMFRecord_SaveDC() { WriteRecordHeader(0x00000003,W_META_SAVEDC); } - void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle) { WriteRecordHeader(0x00000004,W_META_SELECTOBJECT); pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_SetBkMode(bool bTransparent) { WriteRecordHeader(0x00000004,W_META_SETBKMODE); @@ -744,7 +725,6 @@ void WMFWriter::WMFRecord_SetWindowExt(const Size & rSize) WriteHeightWidth(rSize); } - void WMFWriter::WMFRecord_SetWindowOrg(const Point & rPoint) { WriteRecordHeader(0x00000005,W_META_SETWINDOWORG); @@ -774,7 +754,6 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, // write bitmap WriteDIB(rBitmap, *pWMF, false, true); - // write the parameters: nPosEnd=pWMF->Tell(); pWMF->Seek(nPosAnf); @@ -825,14 +804,12 @@ void WMFWriter::WMFRecord_EndOfFile() WriteRecordHeader(0x00000003,0x0000); } - void WMFWriter::WMFRecord_IntersectClipRect( const Rectangle& rRect ) { WriteRecordHeader( 0x00000007, W_META_INTERSECTCLIPRECT ); WriteRectangle(rRect); } - sal_uInt16 WMFWriter::AllocHandle() { sal_uInt16 i; @@ -847,13 +824,11 @@ sal_uInt16 WMFWriter::AllocHandle() return 0xffff; } - void WMFWriter::FreeHandle(sal_uInt16 nObjectHandle) { if (nObjectHandleSeek(nPos); } - bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFConfigItem, bool bPlaceable ) { @@ -1816,7 +1784,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, return bStatus; } - sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 5e82cafb14cf..e195065f01a4 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -102,7 +102,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontCollection::PhysicalFontCollection() : mbMatchData( false ) , mbMapNames( false ) diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index c454d3d09970..b79969b498fd 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -25,7 +25,6 @@ #include "PhysicalFontFace.hxx" - PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagic ) : ImplDevFontAttributes( rDFA ) , mnWidth(0) diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index f0f33071b1b3..a98a60df1114 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -89,7 +89,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontFamily::PhysicalFontFamily( const OUString& rSearchName ) : mpFirst( NULL ), maSearchName( rSearchName ), @@ -294,5 +293,4 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 83f68152e798..8880095fb7cc 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -256,7 +255,6 @@ struct TYPE2OP }; }; - struct CffGlobal { explicit CffGlobal(); @@ -285,7 +283,6 @@ struct CffGlobal int mnFamilyNameSID; }; - struct CffLocal { explicit CffLocal(); @@ -317,7 +314,6 @@ struct CffLocal bool mbForceBold; }; - class SubsetterContext { public: @@ -327,12 +323,9 @@ public: GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0; }; - - SubsetterContext::~SubsetterContext( void) {} - class CffSubsetterContext : public SubsetterContext , private CffGlobal @@ -439,8 +432,6 @@ private: ValType maCharWidth; }; - - CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) : mpBasePtr( pBasePtr) , mpBaseEnd( pBasePtr+nBaseLen) @@ -454,15 +445,11 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) mpCffLocal = &maCffLocal[0]; } - - CffSubsetterContext::~CffSubsetterContext( void) { // TODO: delete[] maCffLocal; } - - inline int CffSubsetterContext::popInt( void) { const ValType aVal = popVal(); @@ -471,8 +458,6 @@ inline int CffSubsetterContext::popInt( void) return nInt; } - - inline int CffSubsetterContext::peekInt( void) const { const ValType aVal = peekVal(); @@ -481,8 +466,6 @@ inline int CffSubsetterContext::peekInt( void) const return nInt; } - - inline int CffSubsetterContext::getInt( int nIndex) const { const ValType aVal = getVal( nIndex); @@ -491,8 +474,6 @@ inline int CffSubsetterContext::getInt( int nIndex) const return nInt; } - - inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { #if 1 // TODO: is this still needed? @@ -511,8 +492,6 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) } } - - void CffSubsetterContext::addHints( bool bVerticalHints) { // the first charstring value may a charwidth instead of a charwidth @@ -1456,7 +1435,6 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) assert( mpReadEnd <= mpBaseEnd); } - // initialize FONTDICT specific values CffLocal::CffLocal( void) : mnPrivDictBase( 0) diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 0f11ef7d251d..3be409923c83 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx index 3d5c5d146643..147cba7d735a 100644 --- a/vcl/source/fontsubset/gsub.cxx +++ b/vcl/source/fontsubset/gsub.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sft.hxx" #include "gsub.h" @@ -36,7 +35,6 @@ typedef sal_uInt8 FT_Byte; typedef std::map GlyphSubstitution; - inline sal_uInt32 NEXT_Long( const unsigned char* &p ) { sal_uInt32 nVal = (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index d95715903086..438876e0adfd 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /* * Sun Font Tools * @@ -208,7 +207,6 @@ _inline sal_uInt32 GetUInt32(const sal_uInt8 *ptr, size_t offset, int bigendian) sal_uInt32 t; assert(ptr != 0); - if (bigendian) { t = (ptr+offset)[0] << 24 | (ptr+offset)[1] << 16 | (ptr+offset)[2] << 8 | (ptr+offset)[3]; @@ -258,7 +256,6 @@ _inline F16Dot16 fixedMul(F16Dot16 a, F16Dot16 b) return sign ? -res : res; } - _inline F16Dot16 fixedDiv(F16Dot16 a, F16Dot16 b) { unsigned int f, r; @@ -375,8 +372,6 @@ static void HexFmtBlockWrite(HexFmt *_this, const void *ptr, sal_uInt32 size) } #endif - - /* Outline Extraction functions */ /* fills the aw and lsb entries of the TTGlyphMetrics structure from hmtx table -*/ @@ -812,7 +807,6 @@ static int BSplineToPSPath(ControlPoint *srcA, int srcCount, PSPathElement **pat continue; } - if (cp == EndContour) { cp = StartContour; ecflag = true; @@ -1148,7 +1142,6 @@ static sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSe return (sal_uInt16)lastfound; } - static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) { sal_uInt16 i; int ToReturn; @@ -1216,7 +1209,6 @@ static sal_uInt32 getGlyph12(const sal_uInt8 *pCmap, sal_uInt32 cChar) { return MISSING_GLYPH_INDEX; } - static void FindCmap(TrueTypeFont *ttf) { const sal_uInt8* table = getTable(ttf, O_cmap); @@ -1791,7 +1783,6 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, const char *h41 = "(%s) cvn exch definefont pop\n"; - if (!((nGlyphs > 0) && (nGlyphs <= 256))) return SF_GLYPHNUM; if (!glyphArray) return SF_BADARG; if (!fname) fname = ttf->psname; @@ -1967,7 +1958,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, GetUInt16(p, 46, 1), GetInt16(p, 48, 1)); - /** glyf **/ glyf = TrueTypeTableNew_glyf(); @@ -2034,7 +2024,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_TYPE42 static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP) { @@ -2235,7 +2224,6 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_MAPPERS int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical) { diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index 3dca37ce8f6e..fdc7d1518619 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -35,7 +35,6 @@ #include "list.h" #include "string.h" - namespace vcl { @@ -169,7 +168,6 @@ static int NameRecordCompareF(const void *l, const void *r) return 0; } - static sal_uInt32 CheckSum(sal_uInt32 *ptr, sal_uInt32 length) { sal_uInt32 sum = 0; @@ -259,7 +257,6 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length) n = listCount(_this->tables); numTables = (sal_uInt16) n; - TableEntry* te = (TableEntry*)scalloc(n, sizeof(TableEntry)); listToFirst(_this->tables); @@ -348,8 +345,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) return r; } - - /* * TrueTypeTable private methods */ @@ -358,8 +353,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) #define TABLESIZE_hhea 36 #define TABLESIZE_maxp 32 - - /* Table data points to * -------------------------------------------- * generic tdata_generic struct @@ -373,7 +366,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) * */ - #define CMAP_SUBTABLE_INIT 10 #define CMAP_SUBTABLE_INCR 10 #define CMAP_PAIR_INIT 500 @@ -413,7 +405,6 @@ typedef struct { void *ptr; /* format-specific pointer */ } tdata_post; - /* allocate memory for a TT table */ static sal_uInt8 *ttmalloc(sal_uInt32 nbytes) { @@ -568,7 +559,6 @@ static int GetRawData_generic(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 return TTCR_OK; } - static int GetRawData_head(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { *len = TABLESIZE_head; @@ -701,8 +691,6 @@ static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length) return ptr; } - - /* XXX it only handles Format 0 encoding tables */ static sal_uInt8 *PackCmap(CmapSubTable *s, sal_uInt32 *length) { @@ -762,7 +750,6 @@ static int GetRawData_cmap(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return TTCR_OK; } - static int GetRawData_name(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { list l; @@ -862,10 +849,6 @@ static int GetRawData_post(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return ret; } - - - - static struct { sal_uInt32 tag; int (*f)(TrueTypeTable *, sal_uInt8 **, sal_uInt32 *, sal_uInt32 *); @@ -881,7 +864,6 @@ static struct { {T_name, GetRawData_name}, {T_post, GetRawData_post} - }; /* @@ -934,7 +916,6 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision, TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable)); sal_uInt8* ptr = (sal_uInt8*)ttmalloc(TABLESIZE_head); - PutUInt32(0x00010000, ptr, 0, 1); /* version */ PutUInt32(fontRevision, ptr, 4, 1); PutUInt32(0x5F0F3CF5, ptr, 12, 1); /* magic number */ @@ -1272,7 +1253,6 @@ sal_uInt32 glyfCount(const TrueTypeTable *table) return listCount((list) table->data); } - void nameAdd(TrueTypeTable *table, NameRecord *nr) { list l; @@ -1348,7 +1328,6 @@ static void ProcessTables(TrueTypeCreator *tt) glyfLen += gd->nbytes; /* XXX if (gd->nbytes & 1) glyfLen++; */ - assert(gd->newID == i); gid[i++] = gd->glyphID; /* gd->glyphID = i++; */ @@ -1524,7 +1503,6 @@ extern "C" free(_this); } - /** * Destructor for the TrueTypeTable object. */ @@ -1547,7 +1525,6 @@ extern "C" } } - #ifdef TEST_TTCR _inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) { return (a << 24) | (b << 16) | (c << 8) | d; @@ -1584,7 +1561,6 @@ int main(void) free(t6); free(t7); - StreamToFile(ttcr, "ttcrout.ttf"); TrueTypeCreatorDispose(ttcr); diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index bb94faae1081..e2ee3c4e0cec 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -79,7 +79,6 @@ namespace vcl */ void RemoveTable(TrueTypeCreator *_this, sal_uInt32 tag); - /** * Writes a TrueType font generated by the TrueTypeCreator to a segment of * memory that this method allocates. When it is not needed anymore the caller @@ -94,7 +93,6 @@ namespace vcl */ int StreamToFile(TrueTypeCreator *_this, const char* fname); - /** * This function converts the data of a TrueType table to a raw array of bytes. * It may allocates the memory for it and returns the size of the raw data in bytes. @@ -184,7 +182,6 @@ namespace vcl sal_Int16 underlineThickness, sal_uInt32 isFixedPitch); - // Table manipulation functions /** @@ -217,7 +214,6 @@ namespace vcl } // namespace - extern "C" { /** diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx index 2eb67832aeb5..62317c0d925b 100644 --- a/vcl/source/fontsubset/xlat.hxx +++ b/vcl/source/fontsubset/xlat.hxx @@ -19,7 +19,6 @@ /*| Author: Alexander Gelfenbain |*/ - #ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX #define INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index abc068958353..6236b0c55f53 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -27,7 +26,6 @@ #include #include - #define MIN_TIMEOUT 2L #define INC_TIMEOUT 0L @@ -301,7 +299,6 @@ void Animation::Stop( OutputDevice* pOut, long nExtraData ) for( size_t i = 0; i < maViewList.size(); ) { - ImplAnimView* pView = maViewList[ i ]; if( pView->ImplMatches( pOut, nExtraData ) ) { diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index 52e99a5e262b..1e3dda522817 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pdfwriter_impl.hxx" #include #include using namespace vcl; - OString PDFWriterImpl::BuiltinFont::getNameObject() const { OStringBuffer aBuf( 16 ); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index eed59885bca0..51221ee5873f 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -946,8 +946,6 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nSc return bRetval; } - - bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { const Size aSize( GetSizePixel() ); @@ -965,15 +963,11 @@ bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) return bRet; } - - void Bitmap::AdaptBitCount(Bitmap& rNew) const { ImplAdaptBitCount(rNew); } - - void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const { // aNew is the result of some operation; adapt it's BitCount to the original (this) @@ -2076,8 +2070,6 @@ bool Bitmap::ImplScaleSuper( return bRet; } - - namespace { void ImplCalculateContributions( @@ -2434,8 +2426,6 @@ bool Bitmap::ImplScaleConvolution( return bResult; } - - bool Bitmap::Dither( sal_uLong nDitherFlags ) { bool bRet = false; diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 642d2010342e..f8c987edb0fc 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -1175,7 +1174,6 @@ bool Bitmap::ImplSeparableUnsharpenFilter(const double radius) { return true; } - bool Bitmap::ImplDuotoneFilter( const sal_uLong nColorOne, const sal_uLong nColorTwo ) { const long nWidth = GetSizePixel().Width(); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 8eb46131c23f..0e41be103957 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -323,8 +323,6 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } - - void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { if(GetSizePixel() != rNewSize) @@ -363,8 +361,6 @@ bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } - - bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { bool bRet = false; @@ -387,8 +383,6 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 n return bRet; } - - bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { bool bRet; @@ -828,8 +822,6 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< return false; } - - namespace { Bitmap impTransformBitmap( @@ -921,8 +913,6 @@ BitmapEx BitmapEx::TransformBitmapEx( return BitmapEx(aDestination); } - - BitmapEx BitmapEx::getTransformed( const basegfx::B2DHomMatrix& rTransformation, const basegfx::B2DRange& rVisibleRange, @@ -1005,8 +995,6 @@ BitmapEx BitmapEx::getTransformed( return aRetval; } - - BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { Bitmap aChangedBitmap(GetBitmap()); @@ -1160,8 +1148,6 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } - - BitmapEx VCL_DLLPUBLIC createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 92160da2b990..134764b242f1 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -414,7 +413,6 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc SetPixel( nY, nX, rReadAcc.GetPixel( nY, nX ) ); } - void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ) { diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index 791a75d9329d..65658d07a7eb 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 949e21af0c16..3c668b02c445 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 796036224427..72b11592029d 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -33,7 +32,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - #define SETTINGS_CONFIGNODE "VCL/Settings" SettingsConfigItem* SettingsConfigItem::get() diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 02ca28869cd1..65cc9193292b 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 5d71a46ffe7f..d6f1e4d297f4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -32,7 +32,6 @@ #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) #define DIBV5HEADERSIZE ( sizeof(DIBV5Header) ) - // - Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) @@ -42,7 +41,6 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ - // - DIBInfoHeader and DIBV5Header typedef sal_Int32 FXPT2DOT30; @@ -148,8 +146,6 @@ struct DIBV5Header : public DIBInfoHeader {} }; - - namespace { inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount ) @@ -165,8 +161,6 @@ namespace } } - - bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown) { // BITMAPINFOHEADER or BITMAPCOREHEADER or BITMAPV5HEADER @@ -1329,8 +1323,6 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI return( rOStm.GetError() == 0UL ); } - - bool ImplReadDIB( Bitmap& rTarget, Bitmap* pTargetAlpha, @@ -1438,8 +1430,6 @@ bool ImplWriteDIB( return bRet; } - - bool ReadDIB( Bitmap& rTarget, SvStream& rIStm, @@ -1536,8 +1526,6 @@ bool ReadDIBV5( return ImplReadDIB(rTarget, &rTargetAlpha, rIStm, true); } - - bool WriteDIB( const Bitmap& rSource, SvStream& rOStm, diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index b20286959b9c..489304e7cb9a 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/fontcfg.hxx" #include "tools/stream.hxx" @@ -37,7 +36,6 @@ using namespace vcl; - Impl_Font::Impl_Font() : maColor( COL_TRANSPARENT ), maFillColor( COL_TRANSPARENT ), @@ -614,7 +612,6 @@ void Font::Merge( const Font& rFont ) if ( rFont.mpImplFont->meWidthType != WIDTH_DONTKNOW ) SetWidthType( rFont.GetWidthType() ); - if ( rFont.GetSize().Height() ) SetSize( rFont.GetSize() ); if ( rFont.GetUnderline() != UNDERLINE_DONTKNOW ) diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index e090a7d6f503..04d52cb036c8 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -27,7 +27,6 @@ #include #include - // helpers namespace @@ -256,7 +255,6 @@ namespace } } // end of anonymous namespace - // #i121267# Tooling to internally clip geometry against internal clip regions void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) @@ -480,7 +478,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // geometry actions case META_LINE_ACTION : @@ -706,7 +703,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // bitmap actions, create BitmapEx with alpha channel derived // from clipping @@ -858,7 +854,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle all those 'hacks' which hide data in comments case META_COMMENT_ACTION : @@ -964,10 +959,8 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle gradient fills (hopefully only unroated ones) - case META_GRADIENT_ACTION : { const MetaGradientAction* pA = static_cast< const MetaGradientAction* >(pAction); @@ -990,7 +983,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) aTarget); } - break; } @@ -1065,8 +1057,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } - - bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) { const sal_uLong nObjCount(rSource.GetActionSize()); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 5698066e8ce2..797f14a9ef9b 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2765,7 +2765,6 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { pAction = MetaAction::ReadMetaAction( rIStm, &aReadData ); - if( pAction ) { if (pAction->GetType() == META_COMMENT_ACTION) diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 3d6ba2951f19..2a6f8c88f2c4 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index d8eed8320a27..6b40529d8506 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -23,7 +23,6 @@ #include #include - Impl_Gradient::Impl_Gradient() : maStartColor( COL_BLACK ), maEndColor( COL_WHITE ) diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 447ad966b948..7c913abc1d32 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -121,7 +121,6 @@ void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) maEndArrow = rPoly; } - void SvtGraphicStroke::scale( double fXScale, double fYScale ) { // Clearly scaling stroke-width for fat lines is rather a problem diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index e4d08e08a7f3..c1d0551accf9 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -22,7 +22,6 @@ #include #include - ImplHatch::ImplHatch() : mnRefCount ( 1 ), maColor ( COL_BLACK ), diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 77dd01ee1fdb..163e8ef0e991 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -20,7 +20,6 @@ #include #include - #include #include #include @@ -41,7 +40,6 @@ #include #endif - using namespace ::com::sun::star; Image::Image() : @@ -293,7 +291,6 @@ ImageList::ImageList( const ResId& rResId ) : { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" ); - rResId.SetRT( RSC_IMAGELIST ); ResMgr* pResMgr = rResId.GetResMgr(); @@ -342,7 +339,6 @@ ImageList::ImageList( const ::std::vector< OUString >& rNameVector, { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." ); - ImplInit( sal::static_int_cast< sal_uInt16 >( rNameVector.size() ), Size() ); mpImplData->maPrefix = rPrefix; @@ -642,7 +638,6 @@ void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" ); - rNames = ::std::vector< OUString >(); if( mpImplData ) diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index f83981ecd22e..66398d972328 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index ee34d1fdeefd..394bdd2d0a88 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "impanmvw.hxx" #include #include diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 08ecc18b7a91..005a45e6e9aa 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index e341c813b4a9..31d796855733 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -22,8 +22,6 @@ #include #include - - CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount, const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds ) @@ -35,8 +33,6 @@ CmapResult::CmapResult( bool bSymbolic, , mbRecoded( false) {} - - ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) : mpRangeCodes( rCR.mpRangeCodes ) , mpStartGlyphs( rCR.mpStartGlyphs ) @@ -58,16 +54,12 @@ static ImplFontCharMap* pDefaultImplFontCharMap = NULL; static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0}; static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100}; - - bool ImplFontCharMap::IsDefaultMap() const { const bool bIsDefault = (mpRangeCodes == aDefaultUnicodeRanges) || (mpRangeCodes == aDefaultSymbolRanges); return bIsDefault; } - - ImplFontCharMap::~ImplFontCharMap() { if( IsDefaultMap() ) @@ -77,8 +69,6 @@ ImplFontCharMap::~ImplFontCharMap() delete[] mpGlyphIds; } - - ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) { if( pDefaultImplFontCharMap ) @@ -100,15 +90,11 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) return pDefaultImplFontCharMap; } - - void ImplFontCharMap::AddReference( void) const { ++mnRefCount; } - - void ImplFontCharMap::DeReference( void) const { if( --mnRefCount <= 0 ) @@ -116,15 +102,11 @@ void ImplFontCharMap::DeReference( void) const delete this; } - - int ImplFontCharMap::GetCharCount() const { return mnCharCount; } - - int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { int nLower = 0; @@ -142,8 +124,6 @@ int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const return nMid; } - - bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const { bool bHasChar = false; @@ -161,8 +141,6 @@ bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const return bHasChar; } - - int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const { // return -1 if the object doesn't know the glyph ids @@ -198,8 +176,6 @@ int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const return nGlyphIndex; } - - // returns the number of chars supported by the font, which // are inside the unicode range from cMin to cMax (inclusive) int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const @@ -227,22 +203,16 @@ int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const return nCount; } - - sal_UCS4 ImplFontCharMap::GetFirstChar() const { return mpRangeCodes[0]; } - - sal_UCS4 ImplFontCharMap::GetLastChar() const { return (mpRangeCodes[ 2*mnRangeCount-1 ] - 1); } - - sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const { if( cChar < GetFirstChar() ) @@ -256,8 +226,6 @@ sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const return (cChar + 1); } - - sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const { if( cChar <= GetFirstChar() ) @@ -271,8 +239,6 @@ sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const return (cChar - 1); } - - int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { // TODO: improve linear walk? @@ -293,8 +259,6 @@ int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const return -1; } - - sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const { // TODO: improve linear walk? @@ -312,8 +276,6 @@ sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const return mpRangeCodes[0]; } - - static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned Getsal_uInt16( const unsigned char* p ){ return((p[0]<<8) | p[1]);} static int GetSShort( const unsigned char* p ){ return((static_cast(p[0])<<8)|p[1]);} @@ -602,36 +564,26 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) return true; } - - FontCharMap::FontCharMap() : mpImpl( ImplFontCharMap::GetDefaultMap() ) {} - - FontCharMap::~FontCharMap() { mpImpl->DeReference(); mpImpl = NULL; } - - int FontCharMap::GetCharCount() const { return mpImpl->GetCharCount(); } - - int FontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const { return mpImpl->CountCharsInRange( cMin, cMax ); } - - void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) { if( pNewMap == NULL ) @@ -647,57 +599,41 @@ void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) } } - - bool FontCharMap::IsDefaultMap() const { return mpImpl->IsDefaultMap(); } - - bool FontCharMap::HasChar( sal_UCS4 cChar ) const { return mpImpl->HasChar( cChar ); } - - sal_UCS4 FontCharMap::GetFirstChar() const { return mpImpl->GetFirstChar(); } - - sal_UCS4 FontCharMap::GetNextChar( sal_UCS4 cChar ) const { return mpImpl->GetNextChar( cChar ); } - - sal_UCS4 FontCharMap::GetPrevChar( sal_UCS4 cChar ) const { return mpImpl->GetPrevChar( cChar ); } - - int FontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { return mpImpl->GetIndexFromChar( cChar ); } - - sal_UCS4 FontCharMap::GetCharFromIndex( int nIndex ) const { return mpImpl->GetCharFromIndex( nIndex ); } - - // on some systems we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available // during font enumeration. macStyle bits would be not sufficient anyway @@ -848,6 +784,4 @@ void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 9f1333ff4080..0e1fd7e6a4fc 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index c996456675a2..9ba36dfea7b9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -145,7 +145,6 @@ bool ImplImageTree::loadDefaultImage( style, bitmap, false); } - bool ImplImageTree::doLoadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 317c6c90e7e5..87a15e422048 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index e0d8d4d1a9ef..f903dcdd44c0 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -23,10 +23,8 @@ #include #include - // - Vectorizer - - class BitmapReadAccess; class ImplChain; class ImplVectMap; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 82354f1f14a7..ec1f44f6eb8b 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -26,7 +26,6 @@ #include #include - #define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF) #define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE) diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 91c299177d63..a3c7fdb6bdd0 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -26,11 +26,8 @@ #include #include - - // - ImplLineInfo - - ImplLineInfo::ImplLineInfo() : mnRefCount ( 1 ), meStyle ( LINE_SOLID ), @@ -45,8 +42,6 @@ ImplLineInfo::ImplLineInfo() : { } - - ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : mnRefCount ( 1 ), meStyle ( rImplLineInfo.meStyle ), @@ -61,8 +56,6 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : { } - - inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const { return(meStyle == rB.meStyle @@ -76,10 +69,8 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const && meLineCap == rB.meLineCap); } - // - LineInfo - - LineInfo::LineInfo( LineStyle eStyle, long nWidth ) { mpImplLineInfo = new ImplLineInfo; @@ -87,24 +78,18 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth ) mpImplLineInfo->mnWidth = nWidth; } - - LineInfo::LineInfo( const LineInfo& rLineInfo ) { mpImplLineInfo = rLineInfo.mpImplLineInfo; mpImplLineInfo->mnRefCount++; } - - LineInfo::~LineInfo() { if( !( --mpImplLineInfo->mnRefCount ) ) delete mpImplLineInfo; } - - LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) { @@ -117,8 +102,6 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) return *this; } - - bool LineInfo::operator==( const LineInfo& rLineInfo ) const { @@ -126,8 +109,6 @@ bool LineInfo::operator==( const LineInfo& rLineInfo ) const *mpImplLineInfo == *rLineInfo.mpImplLineInfo ); } - - void LineInfo::ImplMakeUnique() { if( mpImplLineInfo->mnRefCount != 1 ) @@ -139,64 +120,48 @@ void LineInfo::ImplMakeUnique() } } - - void LineInfo::SetStyle( LineStyle eStyle ) { ImplMakeUnique(); mpImplLineInfo->meStyle = eStyle; } - - void LineInfo::SetWidth( long nWidth ) { ImplMakeUnique(); mpImplLineInfo->mnWidth = nWidth; } - - void LineInfo::SetDashCount( sal_uInt16 nDashCount ) { ImplMakeUnique(); mpImplLineInfo->mnDashCount = nDashCount; } - - void LineInfo::SetDashLen( long nDashLen ) { ImplMakeUnique(); mpImplLineInfo->mnDashLen = nDashLen; } - - void LineInfo::SetDotCount( sal_uInt16 nDotCount ) { ImplMakeUnique(); mpImplLineInfo->mnDotCount = nDotCount; } - - void LineInfo::SetDotLen( long nDotLen ) { ImplMakeUnique(); mpImplLineInfo->mnDotLen = nDotLen; } - - void LineInfo::SetDistance( long nDistance ) { ImplMakeUnique(); mpImplLineInfo->mnDistance = nDistance; } - - void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) { @@ -207,8 +172,6 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } - - void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) { if(eLineCap != mpImplLineInfo->meLineCap) @@ -218,8 +181,6 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) } } - - bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth @@ -227,8 +188,6 @@ bool LineInfo::IsDefault() const && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } - - SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -266,8 +225,6 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) return rIStm; } - - SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 4 ); @@ -290,23 +247,17 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo return rOStm; } - - SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) { rLineInfo.ImplMakeUnique(); return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo ); } - - SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) { return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo ); } - - void LineInfo::applyToB2DPolyPolygon( basegfx::B2DPolyPolygon& io_rLinePolyPolygon, basegfx::B2DPolyPolygon& o_rFillPolyPolygon) const diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 2a723a987e70..f48230a225a9 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -22,7 +22,6 @@ #include #include - ImplMapMode::ImplMapMode() : maOrigin( 0, 0 ), maScaleX( 1, 1 ), diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index abd250d78748..e563a37168ac 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -30,16 +30,12 @@ #include #include - - inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { rPt.X() = FRound( fScaleX * rPt.X() ); rPt.Y() = FRound( fScaleY * rPt.Y() ); } - - inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) { Point aTL( rRect.TopLeft() ); @@ -52,16 +48,12 @@ inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) rRect.Justify(); } - - inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) ImplScalePoint( rPoly[ i ], fScaleX, fScaleY ); } - - inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) { if( !rLineInfo.IsDefault() ) @@ -75,83 +67,59 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal } } - - #define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ ); #define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) \ MetaAction::Write( ( _def_rOStm ), _pWriteData ); \ VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) ); - - MetaAction::MetaAction() : mnRefCount( 1 ), mnType( META_NULL_ACTION ) { } - - MetaAction::MetaAction( sal_uInt16 nType ) : mnRefCount( 1 ), mnType( nType ) { } - - MetaAction::~MetaAction() { } - - void MetaAction::Execute( OutputDevice* ) { } - - MetaAction* MetaAction::Clone() { return new MetaAction; } - - void MetaAction::Move( long, long ) { } - - void MetaAction::Scale( double, double ) { } - - bool MetaAction::Compare( const MetaAction& ) const { return true; } - - void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { rOStm.WriteUInt16( mnType ); } - - void MetaAction::Read( SvStream&, ImplMetaReadData* ) { // DO NOT read mnType - ReadMetaAction already did that! } - - MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ) { MetaAction* pAction = NULL; @@ -233,12 +201,8 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } - - IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) - - MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : MetaAction ( META_PIXEL_ACTION ), maPt ( rPt ), @@ -246,15 +210,11 @@ MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : { } - - void MetaPixelAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt, maColor ); } - - MetaAction* MetaPixelAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPixelAction( *this ); @@ -262,30 +222,22 @@ MetaAction* MetaPixelAction::Clone() return pClone; } - - void MetaPixelAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPixelAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaPixelAction&)rMetaAction).maPt ) && ( maColor == ((MetaPixelAction&)rMetaAction).maColor ); } - - void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -293,8 +245,6 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maColor.Write( rOStm, true ); } - - void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -302,27 +252,19 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( Point, META_POINT_ACTION ) - - MetaPointAction::MetaPointAction( const Point& rPt ) : MetaAction ( META_POINT_ACTION ), maPt ( rPt ) { } - - void MetaPointAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt ); } - - MetaAction* MetaPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPointAction( *this ); @@ -330,49 +272,35 @@ MetaAction* MetaPointAction::Clone() return pClone; } - - void MetaPointAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPointAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const { return maPt == ((MetaPointAction&)rMetaAction).maPt; } - - void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WritePair( rOStm, maPt ); } - - void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( Line, META_LINE_ACTION ) - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : MetaAction ( META_LINE_ACTION ), maStartPt ( rStart ), @@ -380,8 +308,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : { } - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ) : MetaAction ( META_LINE_ACTION ), @@ -391,8 +317,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, { } - - void MetaLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -401,8 +325,6 @@ void MetaLineAction::Execute( OutputDevice* pOut ) pOut->DrawLine( maStartPt, maEndPt, maLineInfo ); } - - MetaAction* MetaLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineAction( *this ); @@ -410,16 +332,12 @@ MetaAction* MetaLineAction::Clone() return pClone; } - - void MetaLineAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -427,8 +345,6 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maLineInfo == ((MetaLineAction&)rMetaAction).maLineInfo ) && @@ -436,8 +352,6 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaLineAction&)rMetaAction).maEndPt ); } - - void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -447,8 +361,6 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteLineInfo( rOStm, maLineInfo ); // Version 2 } - - void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -464,27 +376,19 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Rect, META_RECT_ACTION ) - - MetaRectAction::MetaRectAction( const Rectangle& rRect ) : MetaAction ( META_RECT_ACTION ), maRect ( rRect ) { } - - void MetaRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect ); } - - MetaAction* MetaRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRectAction( *this ); @@ -492,49 +396,35 @@ MetaAction* MetaRectAction::Clone() return pClone; } - - void MetaRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaRectAction&)rMetaAction).maRect; } - - void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) - - MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) : MetaAction ( META_ROUNDRECT_ACTION ), @@ -544,15 +434,11 @@ MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, { } - - void MetaRoundRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect, mnHorzRound, mnVertRound ); } - - MetaAction* MetaRoundRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRoundRectAction( *this ); @@ -560,15 +446,11 @@ MetaAction* MetaRoundRectAction::Clone() return pClone; } - - void MetaRoundRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -576,8 +458,6 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = FRound( mnVertRound * fabs(fScaleY) ); } - - bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaRoundRectAction&)rMetaAction).maRect ) && @@ -585,8 +465,6 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const ( mnVertRound == ((MetaRoundRectAction&)rMetaAction).mnVertRound ); } - - void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -594,35 +472,25 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound ); } - - void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound ); } - - IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) - - MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) : MetaAction ( META_ELLIPSE_ACTION ), maRect ( rRect ) { } - - void MetaEllipseAction::Execute( OutputDevice* pOut ) { pOut->DrawEllipse( maRect ); } - - MetaAction* MetaEllipseAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEllipseAction( *this ); @@ -630,49 +498,35 @@ MetaAction* MetaEllipseAction::Clone() return pClone; } - - void MetaEllipseAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaEllipseAction&)rMetaAction).maRect; } - - void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( Arc, META_ARC_ACTION ) - - MetaArcAction::MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_ARC_ACTION ), @@ -682,15 +536,11 @@ MetaArcAction::MetaArcAction( const Rectangle& rRect, { } - - void MetaArcAction::Execute( OutputDevice* pOut ) { pOut->DrawArc( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaArcAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaArcAction( *this ); @@ -698,8 +548,6 @@ MetaAction* MetaArcAction::Clone() return pClone; } - - void MetaArcAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -707,8 +555,6 @@ void MetaArcAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaArcAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -716,8 +562,6 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaArcAction&)rMetaAction).maRect ) && @@ -725,8 +569,6 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaArcAction&)rMetaAction).maEndPt ); } - - void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -735,8 +577,6 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -745,12 +585,8 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Pie, META_PIE_ACTION ) - - MetaPieAction::MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_PIE_ACTION ), @@ -760,15 +596,11 @@ MetaPieAction::MetaPieAction( const Rectangle& rRect, { } - - void MetaPieAction::Execute( OutputDevice* pOut ) { pOut->DrawPie( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaPieAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPieAction( *this ); @@ -776,8 +608,6 @@ MetaAction* MetaPieAction::Clone() return pClone; } - - void MetaPieAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -785,8 +615,6 @@ void MetaPieAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaPieAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -794,8 +622,6 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaPieAction&)rMetaAction).maRect ) && @@ -803,8 +629,6 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaPieAction&)rMetaAction).maEndPt ); } - - void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -813,8 +637,6 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -823,12 +645,8 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Chord, META_CHORD_ACTION ) - - MetaChordAction::MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_CHORD_ACTION ), @@ -838,15 +656,11 @@ MetaChordAction::MetaChordAction( const Rectangle& rRect, { } - - void MetaChordAction::Execute( OutputDevice* pOut ) { pOut->DrawChord( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaChordAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaChordAction( *this ); @@ -854,8 +668,6 @@ MetaAction* MetaChordAction::Clone() return pClone; } - - void MetaChordAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -863,8 +675,6 @@ void MetaChordAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaChordAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -872,8 +682,6 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaChordAction&)rMetaAction).maRect ) && @@ -881,8 +689,6 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaChordAction&)rMetaAction).maEndPt ); } - - void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -891,8 +697,6 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -901,20 +705,14 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) : MetaAction ( META_POLYLINE_ACTION ), maPoly ( rPoly ) { } - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) : MetaAction ( META_POLYLINE_ACTION ), maLineInfo ( rLineInfo ), @@ -922,8 +720,6 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rL { } - - void MetaPolyLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -932,8 +728,6 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut ) pOut->DrawPolyLine( maPoly, maLineInfo ); } - - MetaAction* MetaPolyLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyLineAction( *this ); @@ -941,23 +735,17 @@ MetaAction* MetaPolyLineAction::Clone() return pClone; } - - void MetaPolyLineAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const { bool bIsEqual = true; @@ -969,8 +757,6 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const } - - void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 3, pData ); @@ -987,8 +773,6 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1008,27 +792,19 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) - - MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) : MetaAction ( META_POLYGON_ACTION ), maPoly ( rPoly ) { } - - void MetaPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolygon( maPoly ); } - - MetaAction* MetaPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolygonAction( *this ); @@ -1036,29 +812,21 @@ MetaAction* MetaPolygonAction::Clone() return pClone; } - - void MetaPolygonAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); } - - bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly ); } - - void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1073,8 +841,6 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1090,27 +856,19 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) - - MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), maPolyPoly ( rPolyPoly ) { } - - void MetaPolyPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolyPolygon( maPolyPoly ); } - - MetaAction* MetaPolyPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyPolygonAction( *this ); @@ -1118,30 +876,22 @@ MetaAction* MetaPolyPolygonAction::Clone() return pClone; } - - void MetaPolyPolygonAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly ); } - - void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1174,8 +924,6 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1196,12 +944,8 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Text, META_TEXT_ACTION ) - - MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( META_TEXT_ACTION ), @@ -1212,15 +956,11 @@ MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, { } - - void MetaTextAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maPt, maStr, mnIndex, mnLen ); } - - MetaAction* MetaTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAction( *this ); @@ -1228,22 +968,16 @@ MetaAction* MetaTextAction::Clone() return pClone; } - - void MetaTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaTextAction&)rMetaAction).maPt ) && @@ -1252,8 +986,6 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaTextAction&)rMetaAction).mnLen ); } - - void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1265,8 +997,6 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1283,8 +1013,6 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( META_TEXTARRAY_ACTION ), mpDXAry ( NULL ), @@ -1293,8 +1021,6 @@ MetaTextArrayAction::MetaTextArrayAction() : { } - - MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : MetaAction ( META_TEXTARRAY_ACTION ), maStartPt ( rAction.maStartPt ), @@ -1313,8 +1039,6 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : mpDXAry = NULL; } - - MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, @@ -1337,22 +1061,16 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, mpDXAry = NULL; } - - MetaTextArrayAction::~MetaTextArrayAction() { delete[] mpDXAry; } - - void MetaTextArrayAction::Execute( OutputDevice* pOut ) { pOut->DrawTextArray( maStartPt, maStr, mpDXAry, mnIndex, mnLen ); } - - MetaAction* MetaTextArrayAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextArrayAction( *this ); @@ -1360,15 +1078,11 @@ MetaAction* MetaTextArrayAction::Clone() return pClone; } - - void MetaTextArrayAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); } - - void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -1380,8 +1094,6 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } - - bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const { return ( maStartPt == ((MetaTextArrayAction&)rMetaAction).maStartPt ) && @@ -1391,8 +1103,6 @@ bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpDXAry, ((MetaTextArrayAction&)rMetaAction).mpDXAry, mnLen ) == 0 ); } - - void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { const sal_Int32 nAryLen = mpDXAry ? mnLen : 0; @@ -1410,8 +1120,6 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { sal_Int32 nAryLen; @@ -1476,12 +1184,8 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) } } - - IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) - - MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : @@ -1494,15 +1198,11 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidt { } - - void MetaStretchTextAction::Execute( OutputDevice* pOut ) { pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen ); } - - MetaAction* MetaStretchTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaStretchTextAction( *this ); @@ -1510,23 +1210,17 @@ MetaAction* MetaStretchTextAction::Clone() return pClone; } - - void MetaStretchTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaStretchTextAction&)rMetaAction).maPt ) && @@ -1536,8 +1230,6 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaStretchTextAction&)rMetaAction).mnLen ); } - - void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1550,8 +1242,6 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1569,12 +1259,8 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) - - MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), @@ -1584,15 +1270,11 @@ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, { } - - void MetaTextRectAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maRect, maStr, mnStyle ); } - - MetaAction* MetaTextRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextRectAction( *this ); @@ -1600,22 +1282,16 @@ MetaAction* MetaTextRectAction::Clone() return pClone; } - - void MetaTextRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaTextRectAction&)rMetaAction).maRect ) && @@ -1623,8 +1299,6 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const ( mnStyle == ((MetaTextRectAction&)rMetaAction).mnStyle ); } - - void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1635,8 +1309,6 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1648,12 +1320,8 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) - - MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, @@ -1667,15 +1335,11 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, { } - - void MetaTextLineAction::Execute( OutputDevice* pOut ) { pOut->DrawTextLine( maPos, mnWidth, meStrikeout, meUnderline, meOverline ); } - - MetaAction* MetaTextLineAction::Clone() { MetaAction* pClone = (MetaAction*)new MetaTextLineAction( *this ); @@ -1683,23 +1347,17 @@ MetaAction* MetaTextLineAction::Clone() return pClone; } - - void MetaTextLineAction::Move( long nHorzMove, long nVertMove ) { maPos.Move( nHorzMove, nVertMove ); } - - void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPos, fScaleX, fScaleY ); mnWidth = FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maPos == ((MetaTextLineAction&)rMetaAction).maPos ) && @@ -1709,8 +1367,6 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const ( meOverline == ((MetaTextLineAction&)rMetaAction).meOverline ); } - - void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1724,8 +1380,6 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( static_cast(meOverline) ); } - - void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1748,12 +1402,8 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Bmp, META_BMP_ACTION ) - - MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : MetaAction ( META_BMP_ACTION ), maBmp ( rBmp ), @@ -1761,15 +1411,11 @@ MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : { } - - void MetaBmpAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maBmp ); } - - MetaAction* MetaBmpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpAction( *this ); @@ -1777,30 +1423,22 @@ MetaAction* MetaBmpAction::Clone() return pClone; } - - void MetaBmpAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const { return maBmp.IsEqual(((MetaBmpAction&)rMetaAction).maBmp ) && ( maPt == ((MetaBmpAction&)rMetaAction).maPt ); } - - void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1811,8 +1449,6 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1820,12 +1456,8 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) - - MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ) : MetaAction ( META_BMPSCALE_ACTION ), @@ -1835,15 +1467,11 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maSz, maBmp ); } - - MetaAction* MetaBmpScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScaleAction( *this ); @@ -1851,15 +1479,11 @@ MetaAction* MetaBmpScaleAction::Clone() return pClone; } - - void MetaBmpScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -1868,8 +1492,6 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScaleAction&)rMetaAction).maBmp )) && @@ -1877,8 +1499,6 @@ bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpScaleAction&)rMetaAction).maSz ); } - - void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1890,8 +1510,6 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1900,12 +1518,8 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) - - MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ) : @@ -1918,15 +1532,11 @@ MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& { } - - void MetaBmpScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp ); } - - MetaAction* MetaBmpScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScalePartAction( *this ); @@ -1934,15 +1544,11 @@ MetaAction* MetaBmpScalePartAction::Clone() return pClone; } - - void MetaBmpScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -1951,8 +1557,6 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScalePartAction&)rMetaAction).maBmp )) && @@ -1962,8 +1566,6 @@ bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1977,8 +1579,6 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1989,12 +1589,8 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) - - MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEX_ACTION ), maBmpEx ( rBmpEx ), @@ -2002,15 +1598,11 @@ MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : { } - - void MetaBmpExAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maBmpEx ); } - - MetaAction* MetaBmpExAction::Clone() { MetaBmpExAction* pClone = new MetaBmpExAction( *this ); @@ -2018,30 +1610,22 @@ MetaAction* MetaBmpExAction::Clone() return pClone; } - - void MetaBmpExAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExAction&)rMetaAction).maBmpEx )) && ( maPt == ((MetaBmpExAction&)rMetaAction).maPt ); } - - void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2052,8 +1636,6 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2061,12 +1643,8 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) - - MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEXSCALE_ACTION ), @@ -2076,15 +1654,11 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpExScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maSz, maBmpEx ); } - - MetaAction* MetaBmpExScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScaleAction( *this ); @@ -2092,15 +1666,11 @@ MetaAction* MetaBmpExScaleAction::Clone() return pClone; } - - void MetaBmpExScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2109,8 +1679,6 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScaleAction&)rMetaAction).maBmpEx )) && @@ -2118,8 +1686,6 @@ bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpExScaleAction&)rMetaAction).maSz ); } - - void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2131,8 +1697,6 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2141,12 +1705,8 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) - - MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ) : @@ -2159,15 +1719,11 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const S { } - - void MetaBmpExScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx ); } - - MetaAction* MetaBmpExScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScalePartAction( *this ); @@ -2175,15 +1731,11 @@ MetaAction* MetaBmpExScalePartAction::Clone() return pClone; } - - void MetaBmpExScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2192,8 +1744,6 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScalePartAction&)rMetaAction).maBmpEx )) && @@ -2203,8 +1753,6 @@ bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpExScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2218,8 +1766,6 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData } } - - void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2230,12 +1776,8 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Mask, META_MASK_ACTION ) - - MetaMaskAction::MetaMaskAction( const Point& rPt, const Bitmap& rBmp, const Color& rColor ) : @@ -2246,15 +1788,11 @@ MetaMaskAction::MetaMaskAction( const Point& rPt, { } - - void MetaMaskAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maBmp, maColor ); } - - MetaAction* MetaMaskAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskAction( *this ); @@ -2262,22 +1800,16 @@ MetaAction* MetaMaskAction::Clone() return pClone; } - - void MetaMaskAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskAction&)rMetaAction).maBmp )) && @@ -2285,8 +1817,6 @@ bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaMaskAction&)rMetaAction).maPt ); } - - void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2297,8 +1827,6 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2306,12 +1834,8 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) - - MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp, const Color& rColor ) : @@ -2323,15 +1847,11 @@ MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaMaskScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maSz, maBmp, maColor ); } - - MetaAction* MetaMaskScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScaleAction( *this ); @@ -2339,15 +1859,11 @@ MetaAction* MetaMaskScaleAction::Clone() return pClone; } - - void MetaMaskScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2356,8 +1872,6 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScaleAction&)rMetaAction).maBmp )) && @@ -2366,8 +1880,6 @@ bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaMaskScaleAction&)rMetaAction).maSz ); } - - void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2379,8 +1891,6 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2389,12 +1899,8 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) - - MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, @@ -2409,15 +1915,11 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz { } - - void MetaMaskScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp, maColor ); } - - MetaAction* MetaMaskScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScalePartAction( *this ); @@ -2425,15 +1927,11 @@ MetaAction* MetaMaskScalePartAction::Clone() return pClone; } - - void MetaMaskScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2442,8 +1940,6 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScalePartAction&)rMetaAction).maBmp )) && @@ -2454,8 +1950,6 @@ bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaMaskScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2470,8 +1964,6 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2483,12 +1975,8 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) - - MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) : MetaAction ( META_GRADIENT_ACTION ), maRect ( rRect ), @@ -2496,15 +1984,11 @@ MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& { } - - void MetaGradientAction::Execute( OutputDevice* pOut ) { pOut->DrawGradient( maRect, maGradient ); } - - MetaAction* MetaGradientAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientAction( *this ); @@ -2512,30 +1996,22 @@ MetaAction* MetaGradientAction::Clone() return pClone; } - - void MetaGradientAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaGradientAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaGradientAction&)rMetaAction).maRect ) && ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient ); } - - void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2543,8 +2019,6 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2552,15 +2026,11 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) { } - - MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2568,14 +2038,10 @@ MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const { } - - MetaGradientExAction::~MetaGradientExAction() { } - - void MetaGradientExAction::Execute( OutputDevice* pOut ) { if( pOut->GetConnectMetaFile() ) @@ -2585,8 +2051,6 @@ void MetaGradientExAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaGradientExAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientExAction( *this ); @@ -2594,31 +2058,23 @@ MetaAction* MetaGradientExAction::Clone() return pClone; } - - void MetaGradientExAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaGradientExAction&)rMetaAction).maPolyPoly ) && ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient ); } - - void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2631,8 +2087,6 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2640,12 +2094,8 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) - - MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2653,15 +2103,11 @@ MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHa { } - - void MetaHatchAction::Execute( OutputDevice* pOut ) { pOut->DrawHatch( maPolyPoly, maHatch ); } - - MetaAction* MetaHatchAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaHatchAction( *this ); @@ -2669,31 +2115,23 @@ MetaAction* MetaHatchAction::Clone() return pClone; } - - void MetaHatchAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaHatchAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaHatchAction&)rMetaAction).maPolyPoly ) && ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch ); } - - void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2706,8 +2144,6 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteHatch( rOStm, maHatch ); } - - void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2715,12 +2151,8 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadHatch( rIStm, maHatch ); } - - IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) - - MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ) : MetaAction ( META_WALLPAPER_ACTION ), @@ -2729,15 +2161,11 @@ MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, { } - - void MetaWallpaperAction::Execute( OutputDevice* pOut ) { pOut->DrawWallpaper( maRect, maWallpaper ); } - - MetaAction* MetaWallpaperAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaWallpaperAction( *this ); @@ -2745,50 +2173,36 @@ MetaAction* MetaWallpaperAction::Clone() return pClone; } - - void MetaWallpaperAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaWallpaperAction&)rMetaAction).maRect ) && ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper ); } - - void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteWallpaper( rOStm, maWallpaper ); } - - void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadWallpaper( rIStm, maWallpaper ); } - - IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) - - MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), maRegion ( rRegion ), @@ -2796,8 +2210,6 @@ MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) { } - - void MetaClipRegionAction::Execute( OutputDevice* pOut ) { if( mbClip ) @@ -2806,8 +2218,6 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut ) pOut->SetClipRegion(); } - - MetaAction* MetaClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaClipRegionAction( *this ); @@ -2815,30 +2225,22 @@ MetaAction* MetaClipRegionAction::Clone() return pClone; } - - void MetaClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( maRegion == ((MetaClipRegionAction&)rMetaAction).maRegion ) && ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip ); } - - void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2846,8 +2248,6 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbClip ); } - - void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2855,27 +2255,19 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbClip ); } - - IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) - - MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) : MetaAction ( META_ISECTRECTCLIPREGION_ACTION ), maRect ( rRect ) { } - - void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRect ); } - - MetaAction* MetaISectRectClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRectClipRegionAction( *this ); @@ -2883,64 +2275,46 @@ MetaAction* MetaISectRectClipRegionAction::Clone() return pClone; } - - void MetaISectRectClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect; } - - void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) - - MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) : MetaAction ( META_ISECTREGIONCLIPREGION_ACTION ), maRegion ( rRegion ) { } - - void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRegion ); } - - MetaAction* MetaISectRegionClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRegionClipRegionAction( *this ); @@ -2948,49 +2322,35 @@ MetaAction* MetaISectRegionClipRegionAction::Clone() return pClone; } - - void MetaISectRegionClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion; } - - void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRegion( rOStm, maRegion ); } - - void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRegion( rIStm, maRegion ); } - - IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) - - MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) : MetaAction ( META_MOVECLIPREGION_ACTION ), mnHorzMove ( nHorzMove ), @@ -2998,15 +2358,11 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMo { } - - void MetaMoveClipRegionAction::Execute( OutputDevice* pOut ) { pOut->MoveClipRegion( mnHorzMove, mnVertMove ); } - - MetaAction* MetaMoveClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMoveClipRegionAction( *this ); @@ -3014,24 +2370,18 @@ MetaAction* MetaMoveClipRegionAction::Clone() return pClone; } - - void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) { mnHorzMove = FRound( mnHorzMove * fScaleX ); mnVertMove = FRound( mnVertMove * fScaleY ); } - - bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( mnHorzMove == ((MetaMoveClipRegionAction&)rMetaAction).mnHorzMove ) && ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove ); } - - void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3039,8 +2389,6 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData rOStm.WriteInt32( sal::static_int_cast(mnHorzMove) ).WriteInt32( sal::static_int_cast(mnVertMove) ); } - - void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3051,12 +2399,8 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) mnVertMove = nTmpVM; } - - IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) - - MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_LINECOLOR_ACTION ), maColor ( rColor ), @@ -3064,8 +2408,6 @@ MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : { } - - void MetaLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3074,8 +2416,6 @@ void MetaLineColorAction::Execute( OutputDevice* pOut ) pOut->SetLineColor(); } - - MetaAction* MetaLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineColorAction( *this ); @@ -3083,16 +2423,12 @@ MetaAction* MetaLineColorAction::Clone() return pClone; } - - bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet ); } - - void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3100,8 +2436,6 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3109,12 +2443,8 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) - - MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_FILLCOLOR_ACTION ), maColor ( rColor ), @@ -3122,8 +2452,6 @@ MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : { } - - void MetaFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3132,8 +2460,6 @@ void MetaFillColorAction::Execute( OutputDevice* pOut ) pOut->SetFillColor(); } - - MetaAction* MetaFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFillColorAction( *this ); @@ -3141,16 +2467,12 @@ MetaAction* MetaFillColorAction::Clone() return pClone; } - - bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet ); } - - void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3158,36 +2480,26 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); rIStm.ReadCharAsBool( mbSet ); -} - - +} IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) - - MetaTextColorAction::MetaTextColorAction( const Color& rColor ) : MetaAction ( META_TEXTCOLOR_ACTION ), maColor ( rColor ) { } - - void MetaTextColorAction::Execute( OutputDevice* pOut ) { pOut->SetTextColor( maColor ); } - - MetaAction* MetaTextColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextColorAction( *this ); @@ -3195,35 +2507,25 @@ MetaAction* MetaTextColorAction::Clone() return pClone; } - - bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const { return maColor == ((MetaTextColorAction&)rMetaAction).maColor; } - - void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, true ); } - - void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) - - MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTFILLCOLOR_ACTION ), maColor ( rColor ), @@ -3231,8 +2533,6 @@ MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet { } - - void MetaTextFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3241,8 +2541,6 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut ) pOut->SetTextFillColor(); } - - MetaAction* MetaTextFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextFillColorAction( *this ); @@ -3250,16 +2548,12 @@ MetaAction* MetaTextFillColorAction::Clone() return pClone; } - - bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet ); } - - void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3267,8 +2561,6 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3276,12 +2568,8 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) - - MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTLINECOLOR_ACTION ), maColor ( rColor ), @@ -3289,8 +2577,6 @@ MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet { } - - void MetaTextLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3299,8 +2585,6 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut ) pOut->SetTextLineColor(); } - - MetaAction* MetaTextLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLineColorAction( *this ); @@ -3308,16 +2592,12 @@ MetaAction* MetaTextLineColorAction::Clone() return pClone; } - - bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet ); } - - void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3325,8 +2605,6 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3334,12 +2612,8 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) - - MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_OVERLINECOLOR_ACTION ), maColor ( rColor ), @@ -3347,8 +2621,6 @@ MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet { } - - void MetaOverlineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3357,8 +2629,6 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut ) pOut->SetOverlineColor(); } - - MetaAction* MetaOverlineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaOverlineColorAction( *this ); @@ -3366,16 +2636,12 @@ MetaAction* MetaOverlineColorAction::Clone() return pClone; } - - bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaOverlineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet ); } - - void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3383,8 +2649,6 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3392,27 +2656,19 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) - - MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) : MetaAction ( META_TEXTALIGN_ACTION ), maAlign ( aAlign ) { } - - void MetaTextAlignAction::Execute( OutputDevice* pOut ) { pOut->SetTextAlign( maAlign ); } - - MetaAction* MetaTextAlignAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAlignAction( *this ); @@ -3420,23 +2676,17 @@ MetaAction* MetaTextAlignAction::Clone() return pClone; } - - bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const { return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign; } - - void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) maAlign ); } - - void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3445,27 +2695,19 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; } - - IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) - - MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) : MetaAction ( META_MAPMODE_ACTION ), maMapMode ( rMapMode ) { } - - void MetaMapModeAction::Execute( OutputDevice* pOut ) { pOut->SetMapMode( maMapMode ); } - - MetaAction* MetaMapModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMapModeAction( *this ); @@ -3473,8 +2715,6 @@ MetaAction* MetaMapModeAction::Clone() return pClone; } - - void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) { Point aPoint( maMapMode.GetOrigin() ); @@ -3483,35 +2723,25 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } - - bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const { return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode; } - - void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteMapMode( rOStm, maMapMode ); } - - void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadMapMode( rIStm, maMapMode ); } - - IMPL_META_ACTION( Font, META_FONT_ACTION ) - - MetaFontAction::MetaFontAction( const Font& rFont ) : MetaAction ( META_FONT_ACTION ), maFont ( rFont ) @@ -3527,15 +2757,11 @@ MetaFontAction::MetaFontAction( const Font& rFont ) : } } - - void MetaFontAction::Execute( OutputDevice* pOut ) { pOut->SetFont( maFont ); } - - MetaAction* MetaFontAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFontAction( *this ); @@ -3543,8 +2769,6 @@ MetaAction* MetaFontAction::Clone() return pClone; } - - void MetaFontAction::Scale( double fScaleX, double fScaleY ) { const Size aSize( @@ -3553,15 +2777,11 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetSize( aSize ); } - - bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const { return maFont == ((MetaFontAction&)rMetaAction).maFont; } - - void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3571,8 +2791,6 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -3582,27 +2800,19 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - IMPL_META_ACTION( Push, META_PUSH_ACTION ) - - MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) : MetaAction ( META_PUSH_ACTION ), mnFlags ( nFlags ) { } - - void MetaPushAction::Execute( OutputDevice* pOut ) { pOut->Push( mnFlags ); } - - MetaAction* MetaPushAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPushAction( *this ); @@ -3610,42 +2820,30 @@ MetaAction* MetaPushAction::Clone() return pClone; } - - bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const { return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags; } - - void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( mnFlags ); } - - void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt16( mnFlags ); } - - IMPL_META_ACTION( Pop, META_POP_ACTION ) - - void MetaPopAction::Execute( OutputDevice* pOut ) { pOut->Pop(); } - - MetaAction* MetaPopAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPopAction( *this ); @@ -3653,41 +2851,29 @@ MetaAction* MetaPopAction::Clone() return pClone; } - - void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); } - - void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); } - - IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) - - MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) : MetaAction ( META_RASTEROP_ACTION ), meRasterOp ( eRasterOp ) { } - - void MetaRasterOpAction::Execute( OutputDevice* pOut ) { pOut->SetRasterOp( meRasterOp ); } - - MetaAction* MetaRasterOpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRasterOpAction( *this ); @@ -3695,23 +2881,17 @@ MetaAction* MetaRasterOpAction::Clone() return pClone; } - - bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const { return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp; } - - void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); } - - void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3720,12 +2900,8 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; } - - IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) - - MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), maPolyPoly ( rPolyPoly ), @@ -3733,15 +2909,11 @@ MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_ { } - - void MetaTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maPolyPoly, mnTransPercent ); } - - MetaAction* MetaTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTransparentAction( *this ); @@ -3749,31 +2921,23 @@ MetaAction* MetaTransparentAction::Clone() return pClone; } - - void MetaTransparentAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaTransparentAction&)rMetaAction).maPolyPoly ) && ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent ); } - - void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3794,8 +2958,6 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( mnTransPercent ); } - - void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3803,12 +2965,8 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnTransPercent ); } - - IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) - - MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ) : MetaAction ( META_FLOATTRANSPARENT_ACTION ), @@ -3819,15 +2977,11 @@ MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, { } - - void MetaFloatTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maMtf, maPoint, maSize, maGradient ); } - - MetaAction* MetaFloatTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFloatTransparentAction( *this ); @@ -3835,15 +2989,11 @@ MetaAction* MetaFloatTransparentAction::Clone() return pClone; } - - void MetaFloatTransparentAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3852,8 +3002,6 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maMtf == ((MetaFloatTransparentAction&)rMetaAction).maMtf ) && @@ -3862,8 +3010,6 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaFloatTransparentAction&)rMetaAction).maGradient ); } - - void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3874,8 +3020,6 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat WriteGradient( rOStm, maGradient ); } - - void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3885,12 +3029,8 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( EPS, META_EPS_ACTION ) - - MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) : MetaAction ( META_EPS_ACTION ), @@ -3901,15 +3041,11 @@ MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, { } - - void MetaEPSAction::Execute( OutputDevice* pOut ) { pOut->DrawEPS( maPoint, maSize, maGfxLink, &maSubst ); } - - MetaAction* MetaEPSAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEPSAction( *this ); @@ -3917,15 +3053,11 @@ MetaAction* MetaEPSAction::Clone() return pClone; } - - void MetaEPSAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaEPSAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3934,8 +3066,6 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const { return ( maGfxLink.IsEqual(((MetaEPSAction&)rMetaAction).maGfxLink )) && @@ -3944,8 +3074,6 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const ( maSize == ((MetaEPSAction&)rMetaAction).maSize ); } - - void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3955,8 +3083,6 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maSubst.Write( rOStm ); } - - void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3966,12 +3092,8 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGDIMetaFile( rIStm, maSubst ); } - - IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) - - MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : MetaAction ( META_REFPOINT_ACTION ), maRefPoint ( rRefPoint ), @@ -3979,8 +3101,6 @@ MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : { } - - void MetaRefPointAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3989,8 +3109,6 @@ void MetaRefPointAction::Execute( OutputDevice* pOut ) pOut->SetRefPoint(); } - - MetaAction* MetaRefPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRefPointAction( *this ); @@ -3998,16 +3116,12 @@ MetaAction* MetaRefPointAction::Clone() return pClone; } - - bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const { return ( maRefPoint == ((MetaRefPointAction&)rMetaAction).maRefPoint ) && ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet ); } - - void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4015,16 +3129,12 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } - - MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : MetaAction ( META_COMMENT_ACTION ), mnValue ( nValue ) @@ -4032,8 +3142,6 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : ImplInitDynamicData( NULL, 0UL ); } - - MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rAct.maComment ), @@ -4042,8 +3150,6 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : ImplInitDynamicData( rAct.mpData, rAct.mnDataSize ); } - - MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), @@ -4052,16 +3158,12 @@ MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, ImplInitDynamicData( pData, nDataSize ); } - - MetaCommentAction::~MetaCommentAction() { if ( mpData ) delete[] mpData; } - - void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ) { if ( nDataSize && pData ) @@ -4076,8 +3178,6 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 } } - - void MetaCommentAction::Execute( OutputDevice* pOut ) { if ( pOut->GetConnectMetaFile() ) @@ -4087,8 +3187,6 @@ void MetaCommentAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaCommentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaCommentAction( *this ); @@ -4148,7 +3246,6 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) } } - // SJ: 25.07.06 #i56656# we are not able to mirrorcertain kind of // comments properly, especially the XPATHSTROKE and XPATHFILL lead to // problems, so it is better to remove these comments when mirroring @@ -4214,8 +3311,6 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } - - bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const { return ( maComment == ((MetaCommentAction&)rMetaAction).maComment ) && @@ -4224,8 +3319,6 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpData, ((MetaCommentAction&)rMetaAction).mpData, mnDataSize ) == 0 ); } - - void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4236,8 +3329,6 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.Write( mpData, mnDataSize ); } - - void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -4257,27 +3348,19 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) mpData = NULL; } - - IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) - - MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) : MetaAction ( META_LAYOUTMODE_ACTION ), mnLayoutMode( nLayoutMode ) { } - - void MetaLayoutModeAction::Execute( OutputDevice* pOut ) { pOut->SetLayoutMode( mnLayoutMode ); } - - MetaAction* MetaLayoutModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLayoutModeAction( *this ); @@ -4285,50 +3368,36 @@ MetaAction* MetaLayoutModeAction::Clone() return pClone; } - - bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const { return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode; } - - void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt32( mnLayoutMode ); } - - void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt32( mnLayoutMode ); } - - IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) - - MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) : MetaAction ( META_TEXTLANGUAGE_ACTION ), meTextLanguage( eTextLanguage ) { } - - void MetaTextLanguageAction::Execute( OutputDevice* pOut ) { pOut->SetDigitLanguage( meTextLanguage ); } - - MetaAction* MetaTextLanguageAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLanguageAction( *this ); @@ -4336,23 +3405,17 @@ MetaAction* MetaTextLanguageAction::Clone() return pClone; } - - bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const { return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage; } - - void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( meTextLanguage ); } - - void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index b1b0e8b568ac..f4b786c044b9 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -26,8 +25,6 @@ #include - - ImplFontMetric::ImplFontMetric() : mnAscent( 0 ), mnDescent( 0 ), @@ -39,16 +36,12 @@ ImplFontMetric::ImplFontMetric() mnRefCount( 1 ) {} - - inline void ImplFontMetric::AddReference() { // TODO: disable refcounting on the default maps? ++mnRefCount; } - - inline void ImplFontMetric::DeReference() { // TODO: disable refcounting on the default maps? @@ -56,8 +49,6 @@ inline void ImplFontMetric::DeReference() delete this; } - - bool ImplFontMetric::operator==( const ImplFontMetric& r ) const { if( mnMiscFlags != r.mnMiscFlags ) @@ -76,14 +67,10 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } - - FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} - - FontInfo::FontInfo( const FontInfo& rInfo ) : Font( rInfo ) { @@ -91,15 +78,11 @@ FontInfo::FontInfo( const FontInfo& rInfo ) mpImplMetric->AddReference(); } - - FontInfo::~FontInfo() { mpImplMetric->DeReference(); } - - FontInfo& FontInfo::operator=( const FontInfo& rInfo ) { Font::operator=( rInfo ); @@ -114,8 +97,6 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) return *this; } - - bool FontInfo::operator==( const FontInfo& rInfo ) const { if( !Font::operator==( rInfo ) ) @@ -127,8 +108,6 @@ bool FontInfo::operator==( const FontInfo& rInfo ) const return false; } - - FontType FontInfo::GetType() const { return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER); @@ -138,63 +117,45 @@ FontMetric::FontMetric( const FontMetric& rMetric ) : FontInfo( rMetric ) {} - - long FontMetric::GetAscent() const { return mpImplMetric->GetAscent(); } - - long FontMetric::GetDescent() const { return mpImplMetric->GetDescent(); } - - long FontMetric::GetIntLeading() const { return mpImplMetric->GetIntLeading(); } - - long FontMetric::GetExtLeading() const { return mpImplMetric->GetExtLeading(); } - - long FontMetric::GetLineHeight() const { return mpImplMetric->GetLineHeight(); } - - long FontMetric::GetSlant() const { return mpImplMetric->GetSlant(); } - - FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { FontInfo::operator=( rMetric ); return *this; } - - bool FontMetric::operator==( const FontMetric& rMetric ) const { return FontInfo::operator==( rMetric ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 4e7222cdb2f5..21c0a4265e90 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -25,16 +25,12 @@ #include "octree.hxx" - // - pMask - - static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - // - NodeCache - - ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : pActNode( NULL ) { @@ -49,8 +45,6 @@ ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : } } - - ImpNodeCache::~ImpNodeCache() { while( pActNode ) @@ -62,10 +56,8 @@ ImpNodeCache::~ImpNodeCache() } } - // - Octree - - Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), @@ -77,16 +69,12 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : ImplCreateOctree(); } - - Octree::~Octree() { ImplDeleteOctree( &pTree ); delete pNodeCache; } - - void Octree::ImplCreateOctree() { if( !!*pAcc ) @@ -131,8 +119,6 @@ void Octree::ImplCreateOctree() } } - - void Octree::ImplDeleteOctree( PPNODE ppNode ) { for ( sal_uLong i = 0UL; i < 8UL; i++ ) @@ -145,8 +131,6 @@ void Octree::ImplDeleteOctree( PPNODE ppNode ) *ppNode = NULL; } - - void Octree::ImplAdd( PPNODE ppNode ) { // ggf. neuen Knoten erzeugen @@ -184,8 +168,6 @@ void Octree::ImplAdd( PPNODE ppNode ) } } - - void Octree::ImplReduce() { sal_uLong i; @@ -224,8 +206,6 @@ void Octree::ImplReduce() nLeafCount -= --nChildren; } - - void Octree::CreatePalette( PNODE pNode ) { if( pNode->bLeaf ) @@ -241,8 +221,6 @@ void Octree::CreatePalette( PNODE pNode ) } - - void Octree::GetPalIndex( PNODE pNode ) { if ( pNode->bLeaf ) @@ -259,10 +237,8 @@ void Octree::GetPalIndex( PNODE pNode ) } } - // - InverseColorMap - - InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : nBits( 8 - OCTREE_BITS ) { @@ -315,16 +291,12 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : } } - - InverseColorMap::~InverseColorMap() { rtl_freeMemory( pBuffer ); rtl_freeMemory( pMap ); } - - void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) { const sal_uLong nCount = nMax * nMax * nMax; diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 9ac3839b9238..3270f75bcdfe 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/oldprintadaptor.hxx" #include "vcl/gdimtf.hxx" diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 2b7a088d0d6c..1ee437b962dc 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -955,7 +955,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const return aColor; } - void OutputDevice::SetLineColor( const Color& rColor ) { diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 6e22bd3ad52d..c2825d89bc6b 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -95,8 +95,6 @@ #include #include - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; @@ -645,7 +643,6 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, return aFont; } - ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) : maFontSelData( rFontSelData ) , maMetric( rFontSelData ) @@ -704,7 +701,6 @@ void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight mpUnicodeFallbackList->erase( it ); } - FontSelectPatternAttributes::FontSelectPatternAttributes( const Font& rFont, const OUString& rSearchName, const Size& rSize, float fExactHeight ) : maSearchName( rSearchName ) @@ -1120,7 +1116,6 @@ ImplMultiTextLineInfo::ImplMultiTextLineInfo() mnSize = MULTITEXTLINEINFO_RESIZE; } - ImplMultiTextLineInfo::~ImplMultiTextLineInfo() { for( sal_Int32 i = 0; i < mnLines; i++ ) @@ -3749,7 +3744,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, " OutputDevice::DrawText(\"%s\")\n", OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -4606,7 +4600,6 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r aPos.X() = rRect.Left(); } - // If there still is a last line, we output it left-aligned as the line would be clipped if ( !aLastLine.isEmpty() ) _rLayout.DrawText( aPos, aLastLine, 0, aLastLine.getLength(), pVector, pDisplayText ); @@ -4744,7 +4737,6 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - bool bDecomposeTextRectAction = ( _pTextLayout != NULL ) && _pTextLayout->DecomposeTextRectAction(); if ( mpMetaFile && !bDecomposeTextRectAction ) mpMetaFile->AddAction( new MetaTextRectAction( rRect, rOrigStr, nStyle ) ); @@ -5963,7 +5955,6 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, } } - // ignore "empty" glyphs: if( aPolyPoly.Count() > 0 ) { diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 0810e6b32f66..a8dc07d1a65e 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -59,7 +58,6 @@ extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } - void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 5e6fa7f8fa3b..f16beae8ad95 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -31,11 +30,6 @@ #include #include - - - - - void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) { @@ -92,8 +86,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect, mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound ); } - - void OutputDevice::DrawEllipse( const Rectangle& rRect ) { @@ -140,8 +132,6 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) mpAlphaVDev->DrawEllipse( rRect ); } - - void OutputDevice::DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -185,8 +175,6 @@ void OutputDevice::DrawArc( const Rectangle& rRect, mpAlphaVDev->DrawArc( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -237,8 +225,6 @@ void OutputDevice::DrawPie( const Rectangle& rRect, mpAlphaVDev->DrawPie( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index ea606450fea3..49a51bf2000c 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -176,7 +176,6 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon mpAlphaVDev->DrawGrid( rRect, rDist, nFlags ); } - // Caution: This method is nearly the same as // void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly ) // so when changes are made here do not forget to make changes there, too @@ -593,8 +592,6 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, } } - - void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ) { @@ -746,8 +743,6 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, } } - - void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -765,8 +760,6 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, EnableMapMode( bMap ); } - - void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1008,8 +1001,6 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1053,8 +1044,6 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1067,8 +1056,6 @@ void OutputDevice::ImplDrawWallpaper( long nX, long nY, ImplDrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); } - - void OutputDevice::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ) { @@ -1094,8 +1081,6 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect, mpAlphaVDev->DrawWallpaper( rRect, rWallpaper ); } - - void OutputDevice::Erase() { if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) @@ -1134,8 +1119,6 @@ void OutputDevice::Erase() mpAlphaVDev->Erase(); } - - bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, GDIMetaFile* pSubst ) { @@ -1192,8 +1175,6 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, return bDrawn; } - - void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd) { const sal_uInt32 nMaxX(rPos.X() + rSize.Width()); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index bef50d8d4ec1..e521ae7524a8 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/outdev.hxx" #include "vcl/window.hxx" #include "vcl/salnativewidgets.hxx" @@ -25,8 +24,6 @@ #include "salgdi.hxx" - - static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) { const OutDevType eType( i_rDevice.GetOutDevType() ); @@ -140,13 +137,9 @@ PushButtonValue* PushButtonValue::clone() const return new PushButtonValue( *this ); } - // These functions are mainly passthrough functions that allow access to // the SalFrame behind a Window object for native widget rendering purposes. - - - bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { if( !lcl_enableNativeWidget( *this ) ) @@ -159,9 +152,6 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar return( mpGraphics->IsNativeControlSupported(nType, nPart) ); } - - - bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -183,8 +173,6 @@ bool OutputDevice::HitTestNativeControl( ControlType nType, rIsInside, this ) ); } - - static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev ) { boost::shared_ptr< ImplControlValue > aResult; @@ -303,8 +291,6 @@ bool OutputDevice::DrawNativeControl( ControlType nType, return bRet; } - - bool OutputDevice::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -339,5 +325,4 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType, return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 57146b4ed212..1d5ffdbe9b90 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -42,19 +41,12 @@ #include #include - - - - - static int const s_ImplArySize = MAP_PIXEL+1; static const long aImplNumeratorAry[s_ImplArySize] = { 1, 1, 5, 50, 1, 1, 1, 1, 1, 1, 1 }; static const long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; - - /* Reduces accuracy until it is a fraction (should become ctor fraction once); we could also do this with BigInts @@ -97,8 +89,6 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) return aF; } - - // Fraction.GetNumerator() // Fraction.GetDenominator() > 0 // rOutRes.nPixPerInch? > 0 @@ -165,8 +155,6 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, rThresRes.mnThresPixToLogY /= 2; } - - static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes ) { @@ -348,8 +336,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } } - - inline void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes, @@ -359,8 +345,6 @@ inline void ImplCalcMapResolution( const MapMode& rMapMode, ImplCalcBigIntThreshold( nDPIX, nDPIY, rMapRes, rThresRes ); } - - static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { @@ -395,8 +379,6 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, return n; } - - static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { @@ -417,8 +399,6 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, return (n / 2); } - - long OutputDevice::ImplLogicXToDevicePixel( long nX ) const { if ( !mbMap ) @@ -429,8 +409,6 @@ long OutputDevice::ImplLogicXToDevicePixel( long nX ) const maThresRes.mnThresLogToPixX )+mnOutOffX+mnOutOffOrigX; } - - long OutputDevice::ImplLogicYToDevicePixel( long nY ) const { if ( !mbMap ) @@ -441,8 +419,6 @@ long OutputDevice::ImplLogicYToDevicePixel( long nY ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY; } - - long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const { if ( !mbMap ) @@ -453,8 +429,6 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const maThresRes.mnThresLogToPixX ); } - - long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const { if ( !mbMap ) @@ -473,8 +447,6 @@ float OutputDevice::ImplFloatLogicHeightToDevicePixel( float fLogicHeight) const return fPixelHeight; } - - long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const { if ( !mbMap ) @@ -485,8 +457,6 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const maThresRes.mnThresPixToLogX ); } - - long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const { if ( !mbMap ) @@ -497,8 +467,6 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const maThresRes.mnThresPixToLogY ); } - - Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const { if ( !mbMap ) @@ -512,8 +480,6 @@ Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const { if ( !mbMap ) @@ -527,8 +493,6 @@ Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const { if ( rLogicRect.IsEmpty() ) @@ -554,8 +518,6 @@ Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) co maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -597,8 +559,6 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -614,8 +574,6 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP return aPolyPoly; } - - LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const { LineInfo aInfo( rLineInfo ); @@ -643,8 +601,6 @@ LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const return aInfo; } - - Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const { if ( rPixelRect.IsEmpty() ) @@ -670,8 +626,6 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } - - Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const { if ( !mnOutOffX && !mnOutOffY ) @@ -682,8 +636,6 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const return aRegion; } - - void OutputDevice::EnableMapMode( bool bEnable ) { mbMap = bEnable; @@ -692,8 +644,6 @@ void OutputDevice::EnableMapMode( bool bEnable ) mpAlphaVDev->EnableMapMode( bEnable ); } - - void OutputDevice::SetMapMode() { @@ -726,8 +676,6 @@ void OutputDevice::SetMapMode() mpAlphaVDev->SetMapMode(); } - - void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { @@ -826,8 +774,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) ImplInvalidateViewTransform(); } - - void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { // do nothing if MapMode did not change @@ -899,8 +845,6 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const { @@ -935,8 +879,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const { @@ -963,8 +905,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const { @@ -988,8 +928,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMo return aTransform; } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& rMapMode ) const { @@ -998,8 +936,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& return aMatrix; } - - basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const { basegfx::B2DHomMatrix aTransformation = GetViewTransformation(); @@ -1009,8 +945,6 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const return aTransformation; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const { @@ -1025,8 +959,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const { @@ -1041,8 +973,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const { @@ -1063,8 +993,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const { @@ -1094,8 +1022,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -1112,8 +1038,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const { basegfx::B2DPolygon aTransformedPoly = rLogicPoly; @@ -1122,8 +1046,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { basegfx::B2DPolyPolygon aTransformedPoly = rLogicPolyPoly; @@ -1132,8 +1054,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const { @@ -1168,8 +1088,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return aRegion; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const { @@ -1190,8 +1108,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const { @@ -1212,8 +1128,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize, aThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, const MapMode& rMapMode ) const { @@ -1240,8 +1154,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1277,8 +1189,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1296,8 +1206,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, return aPolyPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1307,8 +1215,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1318,8 +1224,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const { @@ -1354,8 +1258,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1370,8 +1272,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const { @@ -1386,8 +1286,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const maThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const { @@ -1408,8 +1306,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const { @@ -1439,8 +1335,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const { @@ -1465,8 +1359,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const { @@ -1501,8 +1393,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const { @@ -1524,8 +1414,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const { @@ -1547,8 +1435,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize, aThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, const MapMode& rMapMode ) const { @@ -1576,8 +1462,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, const MapMode& rMapMode ) const { @@ -1614,8 +1498,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const { @@ -1633,8 +1515,6 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly, const MapMode& rMapMode ) const { @@ -1644,8 +1524,6 @@ basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixe return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly, const MapMode& rMapMode ) const { @@ -1655,8 +1533,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const { @@ -1691,8 +1567,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return aRegion; } - - #define ENTER0( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ pMapModeSource = &maMapMode; \ @@ -1701,8 +1575,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r if ( *pMapModeSource == *pMapModeDest ) \ return rSource - - #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ ENTER0( rSource, pMapModeSource, pMapModeDest ); \ \ @@ -1734,8 +1606,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else \ aMapResDest = maMapRes - - #define ENTER2( eUnitSource, eUnitDest ) \ DBG_ASSERT( eUnitSource != MAP_SYSFONT \ && eUnitSource != MAP_APPFONT \ @@ -1750,8 +1620,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, \ "MAP_PIXEL mit 72dpi angenaehert" ) - - #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ long nDenominator = 1; \ @@ -1769,8 +1637,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else if( eUnitDest == MAP_PIXEL ) \ nNumerator *= 72 - - #define ENTER4( rMapModeSource, rMapModeDest ) \ ImplMapRes aMapResSource; \ aMapResSource.mnMapOfsX = 0; \ @@ -1784,8 +1650,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \ ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest ) - - // return (n1 * n2 * n3) / (n4 * n5) static long fn5( const long n1, const long n2, @@ -1904,8 +1768,6 @@ static long fn5( const long n1, } // of else } - - // return (n1 * n2) / n3 static long fn3( const long n1, const long n2, const long n3 ) { @@ -1941,8 +1803,6 @@ static long fn3( const long n1, const long n2, const long n3 ) } // of else } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1959,8 +1819,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, aMapResDest.mnMapOfsY ); } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1975,8 +1833,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, aMapResSource.mnMapScDenomY, aMapResDest.mnMapScNumY ) ); } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -2001,8 +1857,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, aMapResDest.mnMapOfsY ); } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2037,8 +1891,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, } } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2071,8 +1923,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, } } - - basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2089,8 +1939,6 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2107,8 +1955,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo return aPoly; } - - basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { basegfx::B2DHomMatrix aTransform; @@ -2148,8 +1994,6 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, return aTransform; } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2194,8 +2038,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, } } - - long OutputDevice::LogicToLogic( long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ) { @@ -2208,8 +2050,6 @@ long OutputDevice::LogicToLogic( long nLongSource, return fn3( nLongSource, nNumerator, nDenominator ); } - - void OutputDevice::SetPixelOffset( const Size& rOffset ) { mnOutOffOrigX = rOffset.Width(); @@ -2226,15 +2066,11 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } - - Size OutputDevice::GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY); } - - long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) @@ -2260,8 +2096,6 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) return nX; } - - long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 327c46bc6ba6..7a1f437f53f8 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -25,7 +25,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" - #include #include #include diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index de00ac33c87a..1249d6c0653c 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 6646c7b994fe..c37f416b09cc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -66,7 +66,6 @@ #include "pdfwriter_impl.hxx" - #if !defined(ANDROID) && !defined(IOS) // NSS header files for PDF signing support #include "nss.h" @@ -294,7 +293,6 @@ void doTestCode() BitmapEx aBmpEx( aImageBmp, AlphaMask( aTransMask ) ); aWriter.DrawBitmapEx( Point( 1500, 19500 ), Size( 4800, 3000 ), aBmpEx ); - aWriter.EndStructureElement(); aWriter.EndStructureElement(); @@ -3430,7 +3428,6 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical endCompression(); disableStreamEncryption(); - sal_uInt64 nEndStreamPos = 0; osl_getFilePos( m_aFile, &nEndStreamPos ); @@ -4285,7 +4282,6 @@ bool PDFWriterImpl::appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ) return false; } - const PDFDest& rDest = m_aDests[ nDestID ]; const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -7960,7 +7956,6 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, aPos.X() = rRect.Left(); } - // output last line left adjusted since it was shortened if (!aLastLine.isEmpty()) drawText( aPos, aLastLine, 0, aLastLine.getLength(), bTextLines ); @@ -10700,7 +10695,6 @@ bool PDFWriterImpl::intersectClipRegion( const Rectangle& rRect ) return intersectClipRegion( aRect ); } - bool PDFWriterImpl::intersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ) { basegfx::B2DPolyPolygon aRegion( getReferenceDevice()->LogicToPixel( rRegion, m_aGraphicsStack.front().m_aMapMode ) ); @@ -11649,7 +11643,6 @@ void PDFWriterImpl::setStructureBoundingBox( const Rectangle& rRect ) if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() || !m_aContext.Tagged ) return; - if( m_nCurrentStructElement > 0 && m_bEmitStructure ) { PDFWriter::StructElement eType = m_aStructure[ m_nCurrentStructElement ].m_eType; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b94e4f404608..07fab7f384ee 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -93,7 +93,6 @@ public: OString getNameObject() const; }; - enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict @@ -550,7 +549,6 @@ public: PDFAddStream() : m_pStream( NULL ), m_nStreamObject( 0 ), m_bCompress( true ) {} }; - // helper structure for drawLayout and friends struct PDFGlyph { @@ -570,7 +568,6 @@ public: {} }; - static const sal_Char* getStructureTag( PDFWriter::StructElement ); static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr ); static const sal_Char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal ); @@ -679,7 +676,6 @@ private: oslFileHandle m_aFile; bool m_bOpen; - /* output redirection; e.g. to accumulate content streams for XObjects */ @@ -1097,7 +1093,6 @@ public: void setDocumentLocale( const com::sun::star::lang::Locale& rLoc ) { m_aContext.DocumentLocale = rLoc; } - /* graphics state */ void push( sal_uInt16 nFlags ); void pop(); @@ -1106,7 +1101,6 @@ public: void setMapMode( const MapMode& rMapMode ); - const MapMode& getMapMode() { return m_aGraphicsStack.front().m_aMapMode; } void setLineColor( const Color& rColor ) @@ -1302,5 +1296,4 @@ public: #endif //_VCL_PDFEXPORT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index d64d68a59a4d..30b4b6cc4067 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -50,8 +50,6 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); - - void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -65,8 +63,6 @@ void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gra m_rOuterFace.Pop(); } - - void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSize, const BitmapEx& i_rBitmapEx, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -243,9 +239,6 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz } } - - - void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevData* i_pOutDevData, const vcl::PDFWriter::PlayMetafileContext& i_rContext, VirtualDevice* pDummyVDev ) { bool bAssertionFired( false ); @@ -868,7 +861,6 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( META_TEXTLINE_ACTION ): { const MetaTextLineAction* pA = (const MetaTextLineAction*) pAction; @@ -1937,7 +1929,6 @@ static const PixelCode BlackPixelCodes[] = { 2560, 12, 0x1F } // 0000 0001 1111 }; - void PDFWriterImpl::putG4Span( long i_nSpan, bool i_bWhitePixel, BitStreamState& io_rState ) { const PixelCode* pTable = i_bWhitePixel ? WhitePixelCodes : BlackPixelCodes; @@ -2066,5 +2057,4 @@ static bool lcl_canUsePDFAxialShading(const Gradient& rGradient) { return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index d6eb73f59274..c5009d8586ca 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -1646,7 +1645,6 @@ void PNGReader::SetIgnoreGammaChunk( bool b ) mpImpl->SetIgnoreGammaChunk( b ); } - } // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 6ee397751cd9..ff836c59578d 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index f6ebc67f3bc0..7adfcdef8bce 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -78,7 +77,6 @@ namespace } } - void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ) { const ImplJobSetup* pConstData = rJobSetup.ImplGetConstData(); @@ -117,7 +115,6 @@ PrinterOptions::PrinterOptions() : { } - PrinterOptions::~PrinterOptions() { } @@ -250,7 +247,6 @@ void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, } } - void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { @@ -328,7 +324,6 @@ void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, mpAlphaVDev = pOldAlphaVDev; } - void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ ) { @@ -367,7 +362,6 @@ QueueInfo::QueueInfo() mnJobs = 0; } - QueueInfo::QueueInfo( const QueueInfo& rInfo ) : maPrinterName( rInfo.maPrinterName ), maDriver( rInfo.maDriver ), @@ -378,12 +372,10 @@ QueueInfo::QueueInfo( const QueueInfo& rInfo ) : { } - QueueInfo::~QueueInfo() { } - bool QueueInfo::operator==( const QueueInfo& rInfo ) const { return @@ -395,7 +387,6 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const mnJobs == rInfo.mnJobs; } - SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); @@ -410,7 +401,6 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) return rOStream; } - SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); @@ -425,7 +415,6 @@ SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) return rIStream; } - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = 0; @@ -433,12 +422,10 @@ SalPrinterQueueInfo::SalPrinterQueueInfo() mpSysData = NULL; } - SalPrinterQueueInfo::~SalPrinterQueueInfo() { } - ImplPrnQueueList::~ImplPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -449,7 +436,6 @@ ImplPrnQueueList::~ImplPrnQueueList() } } - void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = @@ -472,7 +458,6 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) } } - ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; @@ -483,7 +468,6 @@ ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) return pData; } - static void ImplInitPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -495,7 +479,6 @@ static void ImplInitPrnQueueList() pSVData->mpDefInst->GetPrinterQueueInfo( pSVData->maGDIData.mpPrinterQueueList ); } - void ImplDeletePrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -508,7 +491,6 @@ void ImplDeletePrnQueueList() } } - const std::vector& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); @@ -547,7 +529,6 @@ const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStat return NULL; } - OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); @@ -560,7 +541,6 @@ OUString Printer::GetDefaultPrinterName() return OUString(); } - void Printer::ImplInitData() { mbDevOutput = false; @@ -803,7 +783,6 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) mpGraphics->GetDevFontList( mpFontCollection ); } - void Printer::ImplInitDisplay( const Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -955,7 +934,6 @@ SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, return NULL; } - void Printer::ImplUpdatePageData() { // we need a graphics @@ -969,7 +947,6 @@ void Printer::ImplUpdatePageData() maPaperSize.Width(), maPaperSize.Height() ); } - void Printer::ImplUpdateFontList() { ImplUpdateFontData( true ); @@ -997,7 +974,6 @@ Printer::Printer() ImplInitDisplay( NULL ); } - Printer::Printer( const JobSetup& rJobSetup ) : maJobSetup( rJobSetup ) { @@ -1016,7 +992,6 @@ Printer::Printer( const JobSetup& rJobSetup ) : } } - Printer::Printer( const QueueInfo& rQueueInfo ) { ImplInitData(); @@ -1028,7 +1003,6 @@ Printer::Printer( const QueueInfo& rQueueInfo ) ImplInitDisplay( NULL ); } - Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); @@ -1039,7 +1013,6 @@ Printer::Printer( const OUString& rPrinterName ) ImplInitDisplay( NULL ); } - Printer::~Printer() { DBG_ASSERT( !IsPrinting(), "Printer::~Printer() - Job is printing" ); @@ -1100,7 +1073,6 @@ sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const return 0; } - bool Printer::HasSupport( PrinterSupport eFeature ) const { switch ( eFeature ) @@ -1128,7 +1100,6 @@ bool Printer::HasSupport( PrinterSupport eFeature ) const return true; } - bool Printer::SetJobSetup( const JobSetup& rSetup ) { if ( IsDisplayPrinter() || mbInPrintPage ) @@ -1150,8 +1121,6 @@ bool Printer::SetJobSetup( const JobSetup& rSetup ) return false; } - - bool Printer::Setup( Window* pWindow ) { if ( IsDisplayPrinter() ) @@ -1187,7 +1156,6 @@ bool Printer::Setup( Window* pWindow ) return false; } - bool Printer::SetPrinterProps( const Printer* pPrinter ) { if ( IsJobActive() || IsPrinting() ) @@ -1295,7 +1263,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) return false; } - bool Printer::SetOrientation( Orientation eOrientation ) { if ( mbInPrintPage ) @@ -1331,13 +1298,11 @@ bool Printer::SetOrientation( Orientation eOrientation ) return true; } - Orientation Printer::GetOrientation() const { return maJobSetup.ImplGetConstData()->meOrientation; } - bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) { if ( mbInPrintPage ) @@ -1374,13 +1339,11 @@ bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) return true; } - sal_uInt16 Printer::GetPaperBin() const { return maJobSetup.ImplGetConstData()->mnPaperBin; } - // Map user paper format to a available printer paper formats void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNearest ) { @@ -1470,7 +1433,6 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe } } - bool Printer::SetPaper( Paper ePaper ) { if ( mbInPrintPage ) @@ -1514,7 +1476,6 @@ bool Printer::SetPaper( Paper ePaper ) return true; } - bool Printer::SetPaperSizeUser( const Size& rSize ) { return SetPaperSizeUser( rSize, false ); @@ -1578,7 +1539,6 @@ bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) return true; } - int Printer::GetPaperInfoCount() const { if( ! mpInfoPrinter ) @@ -1588,7 +1548,6 @@ int Printer::GetPaperInfoCount() const return mpInfoPrinter->m_aPaperFormats.size(); } - OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1619,7 +1578,6 @@ OUString Printer::GetPaperName( Paper ePaper ) return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } - OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); @@ -1629,7 +1587,6 @@ OUString Printer::GetPaperName( bool i_bPaperUser ) const return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } - const PaperInfo& Printer::GetPaperInfo( int nPaper ) const { if( ! mpInfoPrinter ) @@ -1641,7 +1598,6 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const return mpInfoPrinter->m_aPaperFormats[nPaper]; } - bool Printer::SetDuplexMode( DuplexMode eDuplex ) { if ( mbInPrintPage ) @@ -1677,19 +1633,16 @@ bool Printer::SetDuplexMode( DuplexMode eDuplex ) return true; } - int Printer::GetLandscapeAngle() const { return mpInfoPrinter ? mpInfoPrinter->GetLandscapeAngle( maJobSetup.ImplGetConstData() ) : 900; } - Paper Printer::GetPaper() const { return maJobSetup.ImplGetConstData()->mePaperFormat; } - sal_uInt16 Printer::GetPaperBinCount() const { if ( IsDisplayPrinter() ) @@ -1698,7 +1651,6 @@ sal_uInt16 Printer::GetPaperBinCount() const return (sal_uInt16)mpInfoPrinter->GetPaperBinCount( maJobSetup.ImplGetConstData() ); } - OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) @@ -1710,7 +1662,6 @@ OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const return OUString(); } - bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; @@ -1718,14 +1669,11 @@ bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) return true; } - void Printer::Error() { maErrorHdl.Call( this ); } - - sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) { sal_uLong nVCLError; @@ -1745,7 +1693,6 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) return nVCLError; } - bool Printer::EndJob() { bool bRet = false; @@ -1778,7 +1725,6 @@ bool Printer::EndJob() return bRet; } - void Printer::ImplStartPage() { if ( !IsJobActive() ) @@ -1804,7 +1750,6 @@ void Printer::ImplStartPage() } } - void Printer::ImplEndPage() { if ( !IsJobActive() ) @@ -1823,7 +1768,6 @@ void Printer::ImplEndPage() } } - void Printer::updatePrinters() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 098deabe588e..c16e702c6121 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -713,12 +713,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // regions of rectangle-bounded connected components. This // algorithm was designed by AF. - - // STAGE 1: Detect background - - // Receives uniform background content, and is _not_ merged // nor checked for intersection against other aCCList elements ConnectedComponents aBackgroundComponent; @@ -860,11 +856,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } - // STAGE 2: Generate connected components list - - // iterate over all actions (start where background action // search left off) for( ; @@ -888,11 +881,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bool bTreatSpecial( false ); ConnectedComponents aTotalComponents; - // STAGE 2.1: Search for intersecting cc entries - - // if aBBCurrAct is empty, it will intersect with no // aCCList member. Thus, we can save the check. // Furthermore, this ensures that non-output-generating @@ -983,11 +973,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( bSomeComponentsChanged ); } - // STAGE 2.2: Determine special state for cc element - - // now test whether the whole connected component must be // treated specially (i.e. rendered as a bitmap): if the // added action is the very first action, or all actions @@ -1053,12 +1040,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - - // STAGE 2.3: Add newly generated CC list element - - // set new bounds and add action to list aTotalComponents.aBounds = aTotalBounds; aTotalComponents.aComponentList.push_back( @@ -1104,11 +1087,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - // STAGE 3.1: Output background mtf actions (if there are any) - - ComponentList::iterator aCurrAct( aBackgroundComponent.aComponentList.begin() ); const ComponentList::iterator aLastAct( aBackgroundComponent.aComponentList.end() ); for( ; aCurrAct != aLastAct; ++aCurrAct ) @@ -1118,12 +1098,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, rOutMtf.AddAction( ( aCurrAct->first->Duplicate(), aCurrAct->first ) ); } - - // STAGE 3.2: Generate banded bitmaps for special regions - - Point aPageOffset; Size aTmpSize( GetOutputSizePixel() ); if( mpPDFWriter ) @@ -1296,11 +1272,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( nCount-- ) aMapModeVDev.Pop(); - // STAGE 4: Copy actions to output metafile - - // iterate over all actions and duplicate the ones not in a // special aCCList member into rOutMtf for( pCurrAct=const_cast(rInMtf).FirstAction(), nActionNum=0; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index be3dc9c3c8f4..d64213e7f709 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -553,7 +553,6 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptrmpDefInst->CreatePrinter( mpInfoPrinter ); @@ -1202,7 +1201,6 @@ sal_uLong PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFi static const sal_Int32 OPTIMAL_BMP_RESOLUTION = 300; static const sal_Int32 NORMAL_BMP_RESOLUTION = 200; - if( rPrinterOptions.IsReduceBitmaps() ) { // calculate maximum resolution for bitmap graphics diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index c54d22ced48f..4268f9fc72c2 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -25,8 +25,6 @@ #include "regband.hxx" - - // ImplRegionBand // Each band contains all rectangles between upper and lower border. @@ -41,9 +39,6 @@ // points in a list). After registration of these points they are // converted to rectangles and the points in the list are deleted. - - - ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) { // save boundaries @@ -58,8 +53,6 @@ ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) mbTouched = false; } - - ImplRegionBand::ImplRegionBand( const ImplRegionBand& rRegionBand, const bool bIgnorePoints) @@ -120,8 +113,6 @@ ImplRegionBand::ImplRegionBand( } } - - ImplRegionBand::~ImplRegionBand() { DBG_ASSERT( mpFirstBandPoint == NULL, "ImplRegionBand::~ImplRegionBand -> pointlist not empty" ); @@ -145,8 +136,6 @@ ImplRegionBand::~ImplRegionBand() } } - - // generate separations from lines and process union with existing // separations @@ -198,8 +187,6 @@ void ImplRegionBand::ProcessPoints() mpFirstBandPoint = NULL; } - - // generate separations from lines and process union with existing // separations @@ -311,8 +298,6 @@ bool ImplRegionBand::InsertPoint( long nX, long nLineId, return true; } - - void ImplRegionBand::MoveX( long nHorzMove ) { // move all x-separations @@ -325,8 +310,6 @@ void ImplRegionBand::MoveX( long nHorzMove ) } } - - void ImplRegionBand::ScaleX( double fHorzScale ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -338,8 +321,6 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } } - - // combine overlapping separations bool ImplRegionBand::OptimizeBand() @@ -383,8 +364,6 @@ bool ImplRegionBand::OptimizeBand() return true; } - - void ImplRegionBand::Union( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Union(): nxLeft > nXRight" ); @@ -457,8 +436,6 @@ void ImplRegionBand::Union( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Intersect( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Intersect(): nxLeft > nXRight" ); @@ -504,8 +481,6 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Exclude( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Exclude(): nxLeft > nXRight" ); @@ -584,8 +559,6 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::XOr( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::XOr(): nxLeft > nXRight" ); @@ -623,7 +596,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // #9 inside-left == < The new is fully inside the old, coincides on the left intersect Yes - // Then, to correctly perform XOr, the segment that's switched off // (i.e. the overlapping part of the old and the new segment) must // be extended by one pixel value at each border: @@ -635,7 +607,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // trailing band sep from 11 to 14. This mimicks the xor look of a // bitmap operation. - // band empty? -> add element if ( !mpFirstSep ) { @@ -831,8 +802,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) OptimizeBand(); } - - bool ImplRegionBand::IsInside( long nX ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -847,8 +816,6 @@ bool ImplRegionBand::IsInside( long nX ) return false; } - - long ImplRegionBand::GetXLeftBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XLeftBoundary -> no separation in band!" ); @@ -856,8 +823,6 @@ long ImplRegionBand::GetXLeftBoundary() const return mpFirstSep->mnXLeft; } - - long ImplRegionBand::GetXRightBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XRightBoundary -> no separation in band!" ); @@ -869,8 +834,6 @@ long ImplRegionBand::GetXRightBoundary() const return pSep->mnXRight; } - - bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const { ImplRegionBandSep* pOwnRectBandSep = mpFirstSep; @@ -902,8 +865,6 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const return true; } - - ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY) { OSL_ASSERT(nY>mnYTop); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index ff8314c61d57..a6cfb65ec782 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,11 +32,6 @@ #include #include - - - - - namespace { /** Return when the given polygon is rectiliner and oriented so that @@ -226,8 +221,6 @@ namespace } } // end of anonymous namespace - - bool Region::IsEmpty() const { return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get(); @@ -1419,8 +1412,6 @@ bool Region::IsInside( const Rectangle& rRect ) const return aRegion.IsEmpty(); } - - bool Region::IsOver( const Rectangle& rRect ) const { if(IsEmpty()) diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index b74a780cff67..fa767433d0f9 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -21,11 +21,6 @@ #include #include - - - - - RegionBand::RegionBand() : mpFirstBand(0), mpLastCheckedBand(0) @@ -62,7 +57,6 @@ RegionBand& RegionBand::operator=(const RegionBand& rRef) pBand = pBand->mpNextBand; } - return *this; } diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index f22568e87479..faac7782b899 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -71,7 +71,6 @@ FILE * mslLog() } #endif - std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) { #ifndef SAL_LOG_INFO @@ -185,8 +184,6 @@ bool IsDiacritic( sal_UCS4 nChar ) return false; } - - int GetVerticalFlags( sal_UCS4 nChar ) { if( (nChar >= 0x1100 && nChar <= 0x11f9) // Hangul Jamo @@ -215,23 +212,17 @@ int GetVerticalFlags( sal_UCS4 nChar ) return GF_NONE; // not rotated as default } - - sal_UCS4 GetVerticalChar( sal_UCS4 ) { return 0; // #i14788# input method is responsible vertical char changes } - - VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) { nChar = u_charMirror( nChar ); return nChar; } - - VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) { // currently only conversion from ASCII digits is interesting @@ -324,8 +315,6 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) return nChar; } - - inline bool IsControlChar( sal_UCS4 cChar ) { // C0 control characters @@ -347,8 +336,6 @@ inline bool IsControlChar( sal_UCS4 cChar ) return false; } - - bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) { // check if charpos could extend current run @@ -376,8 +363,6 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) return true; } - - bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { if( nCharPos0 == nCharPos1 ) @@ -397,8 +382,6 @@ bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) return true; } - - bool ImplLayoutRuns::PosIsInRun( int nCharPos ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -440,9 +423,6 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const return bRet; } - - - bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) { // negative nCharPos => reset to first run @@ -487,8 +467,6 @@ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) return true; } - - bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLeft ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -510,8 +488,6 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef return true; } - - ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ) : @@ -583,8 +559,6 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, maRuns.ResetPos(); } - - // add a run after splitting it up to get rid of control chars void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { @@ -616,8 +590,6 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) maRuns.AddRun( nCharPos0, nCharPos1, bRTL ); } - - bool ImplLayoutArgs::PrepareFallback() { // short circuit if no fallback is needed @@ -665,8 +637,6 @@ bool ImplLayoutArgs::PrepareFallback() return true; } - - bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) { bool bValid = maRuns.GetRun( nMinRunPos, nEndRunPos, bRTL ); @@ -674,8 +644,6 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) return bValid; } - - SalLayout::SalLayout() : mnMinCharPos( -1 ), mnEndCharPos( -1 ), @@ -686,13 +654,9 @@ SalLayout::SalLayout() maDrawOffset( 0, 0 ) {} - - SalLayout::~SalLayout() {} - - void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { mnMinCharPos = rArgs.mnMinCharPos; @@ -701,8 +665,6 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mnOrientation = rArgs.mnOrientation; } - - void SalLayout::Release() const { // TODO: protect when multiple threads can access this @@ -712,8 +674,6 @@ void SalLayout::Release() const delete const_cast(this); } - - Point SalLayout::GetDrawPosition( const Point& rRelative ) const { Point aPos = maDrawBase; @@ -744,8 +704,6 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const return aPos; } - - // returns asian kerning values in quarter of character width units // to enable automatic halfwidth substitution for fullwidth punctuation // return value is negative for l, positive for r, zero for neutral @@ -787,8 +745,6 @@ int SalLayout::CalcAsianKerning( sal_UCS4 c, bool bLeft, bool /*TODO:? bVertical return nResult; } - - bool SalLayout::GetOutline( SalGraphics& rSalGraphics, ::basegfx::B2DPolyPolygonVector& rVector ) const { @@ -823,8 +779,6 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics, return (bAllOk && bOneOk); } - - bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) const { bool bRet = false; @@ -854,8 +808,6 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons return bRet; } - - bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const { bool bRet = false; @@ -872,25 +824,17 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const return bRet; } - - GenericSalLayout::GenericSalLayout() {} - - GenericSalLayout::~GenericSalLayout() {} - - void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem ) { m_GlyphItems.push_back(rGlyphItem); } - - bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const { // initialize character extents buffer @@ -965,8 +909,6 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const return true; } - - long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { if( pCharWidths ) @@ -977,8 +919,6 @@ long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nWidth; } - - // the text width is the maximum logical extent of all glyphs long GenericSalLayout::GetTextWidth() const { @@ -1004,8 +944,6 @@ long GenericSalLayout::GetTextWidth() const return nWidth; } - - void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1016,8 +954,6 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } - - // This DXArray thing is one of the stupidest ideas I have ever seen (I've been // told that it probably a one-to-one mapping of some Windows 3.1 API, which is // telling). To justify a text string, Writer calls OutputDevice::GetTextArray() @@ -1144,8 +1080,6 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs ) } } - - void GenericSalLayout::Justify( long nNewWidth ) { nNewWidth *= mnUnitsPerPixel; @@ -1222,8 +1156,6 @@ void GenericSalLayout::Justify( long nNewWidth ) } } - - void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) { long nOffset = 0; @@ -1264,8 +1196,6 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) } } - - void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) { // TODO: reimplement method when container type for GlyphItems changes @@ -1317,8 +1247,6 @@ void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) } } - - void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { // initialize result array @@ -1349,8 +1277,6 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray } } - - sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { int nCharCapacity = mnEndCharPos - mnMinCharPos; @@ -1370,8 +1296,6 @@ sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int n return -1; } - - int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** /*pFallbackFonts*/ ) const @@ -1458,8 +1382,6 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos return nCount; } - - void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) { if( nStart >= (int)m_GlyphItems.size() ) @@ -1485,8 +1407,6 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) } } - - void GenericSalLayout::DropGlyph( int nStart ) { if( nStart >= (int)m_GlyphItems.size()) @@ -1498,8 +1418,6 @@ void GenericSalLayout::DropGlyph( int nStart ) pG->mnCharPos = -1; } - - void GenericSalLayout::Simplify( bool bIsBase ) { const sal_GlyphId nDropMarker = bIsBase ? GF_DROPPED : 0; @@ -1520,8 +1438,6 @@ void GenericSalLayout::Simplify( bool bIsBase ) m_GlyphItems.erase(m_GlyphItems.begin() + j, m_GlyphItems.end()); } - - // make sure GlyphItems are sorted left to right void GenericSalLayout::SortGlyphItems() { @@ -1557,8 +1473,6 @@ void GenericSalLayout::SortGlyphItems() } } - - MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont ) : SalLayout() , mnLevel( 1 ) @@ -1576,16 +1490,12 @@ void MultiSalLayout::SetInComplete(bool bInComplete) maFallbackRuns[mnLevel-1] = ImplLayoutRuns(); } - - MultiSalLayout::~MultiSalLayout() { for( int i = 0; i < mnLevel; ++i ) mpLayouts[ i ]->Release(); } - - bool MultiSalLayout::AddFallback( SalLayout& rFallback, ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont ) { @@ -1599,8 +1509,6 @@ bool MultiSalLayout::AddFallback( SalLayout& rFallback, return true; } - - bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { if( mnLevel <= 1 ) @@ -1610,8 +1518,6 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } - - void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1979,16 +1885,12 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mpLayouts[n]->DisableGlyphInjection( false ); } - - void MultiSalLayout::InitFont() const { if( mnLevel > 0 ) mpLayouts[0]->InitFont(); } - - void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const { for( int i = mnLevel; --i >= 0; ) @@ -2004,8 +1906,6 @@ void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const // NOTE: now the baselevel font is active again } - - sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { if( mnLevel <= 0 ) @@ -2043,8 +1943,6 @@ sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFa return -1; } - - long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { long nMaxWidth = 0; @@ -2091,8 +1989,6 @@ long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nMaxWidth; } - - void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { SalLayout& rLayout = *mpLayouts[ 0 ]; @@ -2117,8 +2013,6 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) } } - - int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** pFallbackFonts ) const @@ -2167,8 +2061,6 @@ int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& r return 0; } - - bool MultiSalLayout::GetOutline( SalGraphics& rGraphics, ::basegfx::B2DPolyPolygonVector& rPPV ) const { diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index bdb9fb3ea09a..baa2cb398930 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include - /**************************************************************** * Placeholder for no native widgets ***************************************************************/ - /* * IsNativeControlSupported() * @@ -37,7 +34,6 @@ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) return false; } - /* * HitTestNativeControl() * @@ -54,7 +50,6 @@ bool SalGraphics::hitTestNativeControl( ControlType, return false; } - /* * DrawNativeControl() * diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index fa3ebdf1e1d5..4080f5d36d67 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -29,12 +29,8 @@ #include #include - - using namespace ::com::sun::star; - - BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, const basegfx::B2DRange& rTargetRange, @@ -91,8 +87,6 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( return aRetval; } - - void SvgData::ensureReplacement() { ensureSequenceAndRange(); @@ -103,8 +97,6 @@ void SvgData::ensureReplacement() } } - - void SvgData::ensureSequenceAndRange() { if(!maSequence.hasElements() && mnSvgDataArrayLength) @@ -160,8 +152,6 @@ void SvgData::ensureSequenceAndRange() } } - - SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), @@ -172,7 +162,6 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng { } - SvgData::SvgData(const OUString& rPath): maSvgDataArray(), mnSvgDataArrayLength(0), @@ -200,8 +189,6 @@ SvgData::SvgData(const OUString& rPath): } } - - const basegfx::B2DRange& SvgData::getRange() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -209,8 +196,6 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } - - const Primitive2DSequence& SvgData::getPrimitive2DSequence() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -218,8 +203,6 @@ const Primitive2DSequence& SvgData::getPrimitive2DSequence() const return maSequence; } - - const BitmapEx& SvgData::getReplacement() const { const_cast< SvgData* >(this)->ensureReplacement(); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index b54a0421bfd7..35010b17ae97 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/ctrl.hxx" #include "vcl/outdev.hxx" diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 1b3fba203211..856a35893dd5 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -368,8 +367,6 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra return bRet; } - - // #i32109#: Fill opaque areas correctly (without relying on // fill/linecolor state) void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) @@ -384,8 +381,6 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) Pop(); } - - bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) ) diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index af7a3a0f20b6..8891165fc966 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -28,8 +28,6 @@ #include #include - - ImplWallpaper::ImplWallpaper() : maColor( COL_TRANSPARENT ) { @@ -41,8 +39,6 @@ ImplWallpaper::ImplWallpaper() : meStyle = WALLPAPER_NULL; } - - ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : maColor( rImplWallpaper.maColor ) { @@ -67,8 +63,6 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : mpRect = NULL; } - - ImplWallpaper::~ImplWallpaper() { delete mpBitmap; @@ -77,8 +71,6 @@ ImplWallpaper::~ImplWallpaper() delete mpRect; } - - void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) { if( !mpCache ) @@ -87,16 +79,12 @@ void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) *mpCache = rBmp; } - - void ImplWallpaper::ImplReleaseCachedBitmap() { delete mpCache; mpCache = NULL; } - - SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -150,8 +138,6 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) return rIStm; } - - SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); @@ -182,8 +168,6 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap return rOStm; } - - inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) { // copy them if other references exist @@ -198,8 +182,6 @@ inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) mpImplWallpaper->ImplReleaseCachedBitmap(); } - - Wallpaper::Wallpaper() { @@ -209,8 +191,6 @@ Wallpaper::Wallpaper() mpImplWallpaper = &aStaticImplWallpaper; } - - Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -222,8 +202,6 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) mpImplWallpaper->mnRefCount++; } - - Wallpaper::Wallpaper( const Color& rColor ) { @@ -232,8 +210,6 @@ Wallpaper::Wallpaper( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) { @@ -242,8 +218,6 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const Gradient& rGradient ) { @@ -252,8 +226,6 @@ Wallpaper::Wallpaper( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::~Wallpaper() { // if ImpData are not static then delete them if it is the last reference, @@ -267,8 +239,6 @@ Wallpaper::~Wallpaper() } } - - void Wallpaper::SetColor( const Color& rColor ) { @@ -279,16 +249,12 @@ void Wallpaper::SetColor( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - const Color& Wallpaper::GetColor() const { return mpImplWallpaper->maColor; } - - void Wallpaper::SetStyle( WallpaperStyle eStyle ) { @@ -302,16 +268,12 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle ) mpImplWallpaper->meStyle = eStyle; } - - WallpaperStyle Wallpaper::GetStyle() const { return mpImplWallpaper->meStyle; } - - void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) { @@ -337,8 +299,6 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - BitmapEx Wallpaper::GetBitmap() const { @@ -351,17 +311,12 @@ BitmapEx Wallpaper::GetBitmap() const } } - - bool Wallpaper::IsBitmap() const { return (mpImplWallpaper->mpBitmap != 0); } - - - void Wallpaper::SetGradient( const Gradient& rGradient ) { @@ -376,8 +331,6 @@ void Wallpaper::SetGradient( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Gradient Wallpaper::GetGradient() const { @@ -392,17 +345,12 @@ Gradient Wallpaper::GetGradient() const } } - - bool Wallpaper::IsGradient() const { return (mpImplWallpaper->mpGradient != 0); } - - - Gradient Wallpaper::ImplGetApplicationGradient() const { Gradient g; @@ -417,8 +365,6 @@ Gradient Wallpaper::ImplGetApplicationGradient() const return g; } - - void Wallpaper::SetRect( const Rectangle& rRect ) { @@ -441,8 +387,6 @@ void Wallpaper::SetRect( const Rectangle& rRect ) } } - - Rectangle Wallpaper::GetRect() const { @@ -455,17 +399,12 @@ Rectangle Wallpaper::GetRect() const } } - - bool Wallpaper::IsRect() const { return (mpImplWallpaper->mpRect != 0); } - - - bool Wallpaper::IsFixed() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -474,8 +413,6 @@ bool Wallpaper::IsFixed() const return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient); } - - bool Wallpaper::IsScrollable() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -488,8 +425,6 @@ bool Wallpaper::IsScrollable() const return false; } - - Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -513,8 +448,6 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) return *this; } - - bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const { @@ -546,16 +479,12 @@ bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const return true; } - - SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { rWallpaper.ImplMakeUnique(); return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } - - SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ) { return WriteImplWallpaper( rOStm, *rWallpaper.mpImplWallpaper ); diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 2e999b4aa66f..83a240508e46 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -22,7 +22,6 @@ // e.g. // 1001=1&2002=2&fav1=0 - #include #include diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index e3a293c970c5..7983ae3d7e1b 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -63,7 +63,6 @@ // Module private names. - #ifdef GRLAYOUT_DEBUG static FILE * grLog() { @@ -488,7 +487,6 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs &rArgs, return cOrigin; } - // An implementation of the SalLayout interface to enable Graphite enabled fonts to be used. GraphiteLayout::GraphiteLayout(const gr_face * face, gr_font * font, @@ -548,7 +546,6 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs) return success; } - gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) { assert(rArgs.mnLength >= 0); diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 82af07a555f3..938a9769a738 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -34,7 +33,6 @@ #include - using namespace ::vcl::unotools; using namespace ::com::sun::star; diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index c35548823895..f402e7f45b8d 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -62,7 +61,6 @@ #include #include - using namespace ::com::sun::star; namespace vcl @@ -330,7 +328,6 @@ namespace vcl return ::BitmapEx(); } - geometry::RealSize2D size2DFromSize( const Size& rSize ) { return geometry::RealSize2D( rSize.Width(), @@ -574,7 +571,6 @@ namespace vcl return new StandardColorSpace(); } - uno::Sequence< double > colorToStdColorSpaceSequence( const Color& rColor ) { uno::Sequence< double > aRet(4); @@ -633,7 +629,6 @@ namespace vcl toByteColor(aARGBColor.Blue) ); } - } // namespace vcltools } // namespace canvas diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index 53fd5b084429..16698d00034c 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/strhelper.hxx" #include "sal/alloca.h" diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index 2a91d59ebbec..570bd7150e4a 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "xconnection.hxx" @@ -29,7 +28,6 @@ using namespace vcl; using namespace com::sun::star::uno; using namespace com::sun::star::awt; - DisplayConnection::DisplayConnection() { SalInstance::ConnectionIdentifierType eType; diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 560ff0366f9b..2b47d3921977 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -465,7 +465,6 @@ bool OpenGLContext::initWindow() winData.nSize = sizeof(winData); m_pChildWindow.reset(new SystemChildWindow(m_pWindow.get(), 0, &winData, sal_False)); - if( m_pChildWindow ) { m_pChildWindow->SetMouseTransparent( sal_True ); diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 8c70510b111e..f331d80b3068 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -27,15 +26,11 @@ #include #include - - typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap; typedef ::std::vector< ImplAccelEntry* > ImplAccelList; #define ACCELENTRY_NOTFOUND ((sal_uInt16)0xFFFF) - - class ImplAccelData { public: @@ -43,11 +38,6 @@ public: ImplAccelList maIdList; // Id-List }; - - - - - sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, sal_uInt16* pIndex = NULL ) { @@ -95,8 +85,6 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, return ACCELENTRY_NOTFOUND; } - - static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) { sal_uInt16 nInsIndex; @@ -134,8 +122,6 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) } } - - static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId ) { sal_uInt16 nIndex = ImplAccelEntryGetIndex( pList, nId ); @@ -155,8 +141,6 @@ static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nI return nIndex; } - - void Accelerator::ImplInit() { mnCurId = 0; @@ -165,8 +149,6 @@ void Accelerator::ImplInit() mpDel = NULL; } - - ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const { ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() ); @@ -176,8 +158,6 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const return NULL; } - - void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) { // copy table @@ -199,8 +179,6 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) } } - - void Accelerator::ImplDeleteData() { // delete accelerator-entries using the id-table @@ -214,8 +192,6 @@ void Accelerator::ImplDeleteData() mpData->maIdList.clear(); } - - void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, bool bEnable, Accelerator* pAutoAccel ) { @@ -269,8 +245,6 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, ImplAccelEntryInsert( &(mpData->maIdList), pEntry ); } - - Accelerator::Accelerator() { @@ -278,8 +252,6 @@ Accelerator::Accelerator() mpData = new ImplAccelData; } - - Accelerator::Accelerator( const Accelerator& rAccel ) : Resource(), maHelpStr( rAccel.maHelpStr ), @@ -291,8 +263,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) : ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) ); } - - Accelerator::Accelerator( const ResId& rResId ) { @@ -302,8 +272,6 @@ Accelerator::Accelerator( const ResId& rResId ) ImplLoadRes( rResId ); } - - void Accelerator::ImplLoadRes( const ResId& rResId ) { GetRes( rResId ); @@ -318,8 +286,6 @@ void Accelerator::ImplLoadRes( const ResId& rResId ) } } - - Accelerator::~Accelerator() { @@ -331,36 +297,26 @@ Accelerator::~Accelerator() delete mpData; } - - void Accelerator::Activate() { maActivateHdl.Call( this ); } - - void Accelerator::Deactivate() { maDeactivateHdl.Call( this ); } - - void Accelerator::Select() { maSelectHdl.Call( this ); } - - void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ) { ImplInsertAccel( nItemId, rKeyCode, true, NULL ); } - - void Accelerator::InsertItem( const ResId& rResId ) { @@ -393,16 +349,12 @@ void Accelerator::InsertItem( const ResId& rResId ) ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel ); } - - sal_uInt16 Accelerator::GetItemCount() const { return (sal_uInt16)mpData->maIdList.size(); } - - KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const { @@ -413,8 +365,6 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const return KeyCode(); } - - sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const { @@ -425,8 +375,6 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const return 0; } - - Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const { @@ -437,8 +385,6 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const return NULL; } - - Accelerator& Accelerator::operator=( const Accelerator& rAccel ) { diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index e3bccd74ca41..a5dfaba99e5b 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -17,26 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include #include - - - - - ImplAccelManager::~ImplAccelManager() { delete mpAccelList; delete mpSequenceList; } - - bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) { if ( !mpAccelList ) { @@ -53,8 +45,6 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) return true; } - - void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) { // do we have a list ? @@ -90,8 +80,6 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) } } - - void ImplAccelManager::EndSequence( bool bCancel ) { // are we in a list ? @@ -118,8 +106,6 @@ void ImplAccelManager::EndSequence( bool bCancel ) mpSequenceList = NULL; } - - bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) { Accelerator* pAccel; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index aca945654858..4ec9579a9465 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::uno; // useful caption height for title bar buttons #define MIN_CAPTION_HEIGHT 18 - - static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) { // load ImageList if not available yet @@ -79,8 +77,6 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId ); } - - void Window::ImplCalcSymbolRect( Rectangle& rRect ) { // Add border, not shown in the non-default representation, @@ -99,8 +95,6 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect ) rRect.Bottom() -= nExtraHeight; } - - static void ImplDrawBrdWinSymbol( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol ) { @@ -112,8 +106,6 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev, pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 ); } - - static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol, sal_uInt16 nState ) @@ -148,54 +140,37 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, ImplDrawBrdWinSymbol( pDev, aTempRect, eSymbol ); } - - - - // - ImplBorderWindowView - - ImplBorderWindowView::~ImplBorderWindowView() { } - - bool ImplBorderWindowView::MouseMove( const MouseEvent& ) { return false; } - - bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& ) { return false; } - - bool ImplBorderWindowView::Tracking( const TrackingEvent& ) { return false; } - - OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& ) { return OUString(); } - - Rectangle ImplBorderWindowView::GetMenuRect() const { return Rectangle(); } - - void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -230,8 +205,6 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) } } - - sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -309,8 +282,6 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const return 0; } - - bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { sal_uInt16 oldCloseState = pData->mnCloseState; @@ -351,8 +322,6 @@ bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous return true; } - - bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -471,8 +440,6 @@ bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons return true; } - - bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -924,8 +891,6 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track return true; } - - OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ) @@ -995,8 +960,6 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, return aHelpStr; } - - long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const { // title is not visible therefore no width @@ -1016,24 +979,16 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData return nTitleWidth; } - - - // - ImplNoBorderWindowView - - ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* ) { } - - void ImplNoBorderWindowView::Init( OutputDevice*, long, long ) { } - - void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1043,27 +998,17 @@ void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopB rBottomBorder = 0; } - - long ImplNoBorderWindowView::CalcTitleWidth() const { return 0; } - - void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* ) { } - - - // - ImplSmallBorderWindowView - - - - ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ) : mpBorderWindow(pBorderWindow) , mnLeftBorder(0) @@ -1073,8 +1018,6 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW { } - - void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { mpOutDev = pDev; @@ -1234,8 +1177,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei } } - - void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1245,15 +1186,11 @@ void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rT rBottomBorder = mnBottomBorder; } - - long ImplSmallBorderWindowView::CalcTitleWidth() const { return 0; } - - void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* ) { sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle(); @@ -1414,12 +1351,8 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* } } - - - // - ImplStdBorderWindowView - - ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ) { maFrameData.mpBorderWindow = pBorderWindow; @@ -1438,51 +1371,37 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo mpDTitleVirDev = NULL; } - - ImplStdBorderWindowView::~ImplStdBorderWindowView() { delete mpATitleVirDev; delete mpDTitleVirDev; } - - bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt ) { return ImplMouseMove( &maFrameData, rMEvt ); } - - bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) { return ImplMouseButtonDown( &maFrameData, rMEvt ); } - - bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) { return ImplTracking( &maFrameData, rTEvt ); } - - OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect ) { return ImplRequestHelp( &maFrameData, rPos, rHelpRect ); } - - Rectangle ImplStdBorderWindowView::GetMenuRect() const { return maFrameData.maMenuRect; } - - void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { ImplBorderFrameData* pData = &maFrameData; @@ -1629,8 +1548,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh } } - - void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -1640,15 +1557,11 @@ void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTop rBottomBorder = maFrameData.mnBottomBorder; } - - long ImplStdBorderWindowView::CalcTitleWidth() const { return ImplCalcTitleWidth( &maFrameData ); } - - void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) { ImplBorderFrameData* pData = &maFrameData; @@ -1734,7 +1647,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p aTitleRect.Move( pOffset->X(), pOffset->Y() ); pDev->DrawRect( aTitleRect ); - if ( pData->mnTitleType != BORDERWINDOW_TITLE_TEAROFF ) { aInRect.Left() += 2; @@ -1846,8 +1758,6 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p } } - - void ImplBorderWindow::ImplInit( Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ) @@ -1933,8 +1843,6 @@ void ImplBorderWindow::ImplInit( Window* pParent, InitView(); } - - ImplBorderWindow::ImplBorderWindow( Window* pParent, SystemParentData* pSystemParentData, WinBits nStyle, sal_uInt16 nTypeStyle @@ -1943,8 +1851,6 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData ); } - - ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) @@ -1952,36 +1858,26 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); } - - ImplBorderWindow::~ImplBorderWindow() { delete mpBorderView; } - - void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt ) { mpBorderView->MouseMove( rMEvt ); } - - void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt ) { mpBorderView->MouseButtonDown( rMEvt ); } - - void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt ) { mpBorderView->Tracking( rTEvt ); } - - void ImplBorderWindow::Paint( const Rectangle& ) { mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL ); @@ -1992,16 +1888,12 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL, pOutDev, &rPos ); } - - void ImplBorderWindow::Activate() { SetDisplayActive( true ); Window::Activate(); } - - void ImplBorderWindow::Deactivate() { // remove active windows from the ruler, also ignore the Deactivate @@ -2011,8 +1903,6 @@ void ImplBorderWindow::Deactivate() Window::Deactivate(); } - - void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) { // no keyboard help for border window @@ -2037,8 +1927,6 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } - - void ImplBorderWindow::Resize() { Size aSize = GetOutputSizePixel(); @@ -2091,8 +1979,6 @@ void ImplBorderWindow::Resize() Window::Resize(); } - - void ImplBorderWindow::StateChanged( StateChangedType nType ) { if ( (nType == STATE_CHANGE_TEXT) || @@ -2111,8 +1997,6 @@ void ImplBorderWindow::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } - - void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_FONTS) || @@ -2127,8 +2011,6 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - - void ImplBorderWindow::InitView() { if ( mbSmallOutBorder ) @@ -2148,8 +2030,6 @@ void ImplBorderWindow::InitView() mpBorderView->Init( this, aSize.Width(), aSize.Height() ); } - - void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) { sal_Int32 nLeftBorder; @@ -2191,8 +2071,6 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) } } - - void ImplBorderWindow::InvalidateBorder() { if ( IsReallyVisible() ) @@ -2224,8 +2102,6 @@ void ImplBorderWindow::InvalidateBorder() } } - - void ImplBorderWindow::SetDisplayActive( bool bActive ) { if ( mbDisplayActive != bActive ) @@ -2236,16 +2112,12 @@ void ImplBorderWindow::SetDisplayActive( bool bActive ) } } - - void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) { mnTitleType = nTitleType; UpdateView( false, rSize ); } - - void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) { if ( !mbFrameBorder && (mnBorderStyle != nStyle) ) @@ -2255,16 +2127,12 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) } } - - void ImplBorderWindow::SetPin( bool bPin ) { mbPinned = bPin; InvalidateBorder(); } - - void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) { mbRollUp = bRollUp; @@ -2272,8 +2140,6 @@ void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) UpdateView( false, rSize ); } - - void ImplBorderWindow::SetCloser() { SetStyle( GetStyle() | WB_CLOSEABLE ); @@ -2282,8 +2148,6 @@ void ImplBorderWindow::SetCloser() InvalidateBorder(); } - - void ImplBorderWindow::SetDockButton( bool bDockButton ) { mbDockBtn = bDockButton; @@ -2292,8 +2156,6 @@ void ImplBorderWindow::SetDockButton( bool bDockButton ) InvalidateBorder(); } - - void ImplBorderWindow::SetHideButton( bool bHideButton ) { mbHideBtn = bHideButton; @@ -2302,8 +2164,6 @@ void ImplBorderWindow::SetHideButton( bool bHideButton ) InvalidateBorder(); } - - void ImplBorderWindow::SetMenuButton( bool bMenuButton ) { mbMenuBtn = bMenuButton; @@ -2312,15 +2172,11 @@ void ImplBorderWindow::SetMenuButton( bool bMenuButton ) InvalidateBorder(); } - - void ImplBorderWindow::UpdateMenuHeight() { Resize(); } - - void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) { mpMenuBarWindow = pWindow; @@ -2329,16 +2185,12 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) pWindow->Show(); } - - void ImplBorderWindow::SetMenuBarMode( bool bHide ) { mbMenuHide = bHide; UpdateMenuHeight(); } - - void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { @@ -2347,8 +2199,6 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, rTopBorder += mpMenuBarWindow->GetSizePixel().Height(); } - - long ImplBorderWindow::CalcTitleWidth() const { return mpBorderView->CalcTitleWidth(); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 9bc6a3eedccf..21e909f8765b 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 6ba769d5864d..91a2b9769186 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2879,7 +2879,6 @@ void VclBuilder::handleActionWidget(xmlreader::XmlReader &reader) set_response(sID, sResponse.toInt32()); } - void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMap) { xmlreader::Span name; diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 9c7f010931c7..803d7e24f64a 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -39,8 +38,6 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, mbOnlyCursor = bOnlyCursor; } - - CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& rData ) : maText( rData.maText ) { @@ -56,8 +53,6 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& mbOnlyCursor = rData.mbOnlyCursor; } - - CommandExtTextInputData::~CommandExtTextInputData() { delete [] mpTextAttr; diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 669b05406070..3ccf0601bdca 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -27,9 +27,6 @@ #include - - - struct ImplCursorData { AutoTimer maTimer; // Timer @@ -44,8 +41,6 @@ struct ImplCursorData Window* mpWindow; // Zugeordnetes Windows }; - - static void ImplCursorInvert( ImplCursorData* pData ) { Window* pWindow = pData->mpWindow; @@ -120,8 +115,6 @@ static void ImplCursorInvert( ImplCursorData* pData ) pWindow->EnableMapMode( bMapMode ); } - - void Cursor::ImplDraw() { if ( mpData && mpData->mpWindow && !mpData->mbCurVisible ) @@ -147,8 +140,6 @@ void Cursor::ImplDraw() } } - - void Cursor::ImplRestore() { if ( mpData && mpData->mbCurVisible ) @@ -257,8 +248,6 @@ void Cursor::ImplNew() } } - - IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { if ( mpData->mbCurVisible ) @@ -268,8 +257,6 @@ IMPL_LINK_NOARG(Cursor, ImplTimerHdl) return 0; } - - Cursor::Cursor() { mpData = NULL; @@ -281,8 +268,6 @@ Cursor::Cursor() mbVisible = false; } - - Cursor::Cursor( const Cursor& rCursor ) : maSize( rCursor.maSize ), maPos( rCursor.maPos ) @@ -296,8 +281,6 @@ Cursor::Cursor( const Cursor& rCursor ) : mbVisible = rCursor.mbVisible; } - - Cursor::~Cursor() { if ( mpData ) @@ -309,8 +292,6 @@ Cursor::~Cursor() } } - - void Cursor::SetStyle( sal_uInt16 nStyle ) { if ( mnStyle != nStyle ) @@ -320,8 +301,6 @@ void Cursor::SetStyle( sal_uInt16 nStyle ) } } - - void Cursor::Show() { if ( !mbVisible ) @@ -331,8 +310,6 @@ void Cursor::Show() } } - - void Cursor::Hide() { if ( mbVisible ) @@ -342,8 +319,6 @@ void Cursor::Hide() } } - - void Cursor::SetWindow( Window* pWindow ) { if ( mpWindow != pWindow ) @@ -353,8 +328,6 @@ void Cursor::SetWindow( Window* pWindow ) } } - - void Cursor::SetPos( const Point& rPoint ) { if ( maPos != rPoint ) @@ -364,8 +337,6 @@ void Cursor::SetPos( const Point& rPoint ) } } - - void Cursor::SetSize( const Size& rSize ) { if ( maSize != rSize ) @@ -375,8 +346,6 @@ void Cursor::SetSize( const Size& rSize ) } } - - void Cursor::SetWidth( long nNewWidth ) { if ( maSize.Width() != nNewWidth ) @@ -386,8 +355,6 @@ void Cursor::SetWidth( long nNewWidth ) } } - - void Cursor::SetOrientation( short nNewOrientation ) { if ( mnOrientation != nNewOrientation ) @@ -397,8 +364,6 @@ void Cursor::SetOrientation( short nNewOrientation ) } } - - void Cursor::SetDirection( unsigned char nNewDirection ) { if ( mnDirection != nNewDirection ) @@ -408,8 +373,6 @@ void Cursor::SetDirection( unsigned char nNewDirection ) } } - - Cursor& Cursor::operator=( const Cursor& rCursor ) { maPos = rCursor.maPos; @@ -423,8 +386,6 @@ Cursor& Cursor::operator=( const Cursor& rCursor ) return *this; } - - bool Cursor::operator==( const Cursor& rCursor ) const { return diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index df13ce4b8358..d16295e71a4c 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -23,15 +23,11 @@ #include #include - - #define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \ BUTTON_DRAW_PRESSED | \ BUTTON_DRAW_CHECKED | \ BUTTON_DRAW_HIGHLIGHT) - - namespace { long AdjustRectToSquare( Rectangle &rRect ) @@ -122,7 +118,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType nRect.Right()-1, aCenter.Y()+n8 ) ); break; - case SYMBOL_SPIN_UP: nRect.Top() += n4; pDev->DrawPixel( Point( aCenter.X(), nRect.Top() ) ); @@ -423,7 +418,6 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType } } - void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect, const Color *const pColor, const bool bRound = false ) { @@ -473,7 +467,6 @@ void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect, rRect.Bottom() -= nLineHeight; } - void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ) { @@ -491,7 +484,6 @@ void ImplDraw2ColorFrame( OutputDevice *const pDev, Rectangle& rRect, --rRect.Bottom(); } - void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect, const sal_uInt16 nStyle ) { @@ -829,9 +821,6 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, } - - - void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, const Color& rColor, sal_uInt16 nStyle ) { @@ -875,8 +864,6 @@ void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, mpOutDev->EnableMapMode( bOldMapMode ); } - - void DecorationView::DrawFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ) @@ -890,8 +877,6 @@ void DecorationView::DrawFrame( const Rectangle& rRect, mpOutDev->EnableMapMode( bOldMapMode ); } - - void DecorationView::DrawHighlightFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { @@ -940,8 +925,6 @@ void DecorationView::DrawHighlightFrame( const Rectangle& rRect, DrawFrame( rRect, aLightColor, aShadowColor ); } - - Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { Rectangle aRect = rRect; @@ -975,8 +958,6 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) return aRect; } - - Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle ) { if ( rRect.IsEmpty() ) @@ -1056,8 +1037,6 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle return aRect; } - - void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical ) { Point aStart( rStart ), aStop( rStop ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index c8ea35aade49..a341a8326f70 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -367,7 +367,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) // Now, all Dialogs are per default system windows !!! nStyle |= WB_SYSTEMWINDOW; - // parent is NULL: get the default Dialog parent if ( !pParent ) { @@ -400,7 +399,6 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) else if( pParent == DIALOG_NO_PARENT ) pParent = NULL; - if ( !pParent || (nStyle & WB_SYSTEMWINDOW) || (pParent->mpWindowImpl->mpFrameData->mbNeedSysWindow && !(nSysWinMode & SYSTEMWINDOW_MODE_NOAUTOMODE)) || (nSysWinMode & SYSTEMWINDOW_MODE_DIALOG) ) @@ -1083,7 +1081,6 @@ void Dialog::SetModalInputMode( bool bModal ) // ensure continued modality of prev dialog // do not change modality counter - // #i119994# need find the last modal dialog before reactive it Dialog * pPrevModalDlg = mpPrevExecuteDlg; diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index cb43d3431b70..2ff228b5f773 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -38,8 +37,6 @@ using namespace ::com::sun::star; - - static bool ImplHasIndirectTabParent( Window* pWindow ) { // The window has inderect tab parent if it is included in tab hierarchy @@ -50,8 +47,6 @@ static bool ImplHasIndirectTabParent( Window* pWindow ) && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) ); } - - static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) { // The method allows to find the most close parent containing all the @@ -73,8 +68,6 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) return pResult; } - - static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex ) { Window* pTabPage = NULL; @@ -144,8 +137,6 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& return pFoundWindow; } - - static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { pParent = ImplGetTopParentOfTabHierarchy( pParent ); @@ -178,8 +169,6 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI return pWindow; } - - static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable ); @@ -191,8 +180,6 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn return pWindow; } - - Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, sal_uInt16* pIndex ) @@ -297,8 +284,6 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, return pWindow; } - - static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd ) { @@ -393,8 +378,6 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt return pSWindow; } - - static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ) { @@ -485,8 +468,6 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni return NULL; } - - void Window::ImplControlFocus( sal_uInt16 nFlags ) { if ( nFlags & GETFOCUS_MNEMONIC ) @@ -528,8 +509,6 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) } } - - namespace { bool isSuitableDestination(Window *pWindow) @@ -962,8 +941,6 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) return false; } - - // checks if this window has dialog control bool Window::ImplHasDlgCtrl() { @@ -1013,8 +990,6 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G pWindow->ImplControlFocus(); } - - static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, bool bGetFocus ) { @@ -1072,8 +1047,6 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, } } - - void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus ) @@ -1085,8 +1058,6 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus ); } - - Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) { sal_uInt16 nIndex; @@ -1097,23 +1068,16 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd ); } - - - Window* Window::GetParentLabelFor( const Window* ) const { return NULL; } - - Window* Window::GetParentLabeledBy( const Window* ) const { return NULL; } - - static sal_Unicode getAccel( const OUString& rStr ) { sal_Unicode nChar = 0; @@ -1215,8 +1179,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const return pWindow; } - - static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled ) { Window* pWindow = NULL; @@ -1357,8 +1319,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const return pWindow; } - - KeyEvent Window::GetActivationKey() const { KeyEvent aKeyEvent; diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index 0e433ec165e4..449af42c0bc3 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -33,20 +32,16 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; - // DNDEventDispatcher::DNDEventDispatcher - DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ): m_pTopWindow( pTopWindow ), m_pCurrentWindow( NULL ) { } - // DNDEventDispatcher::~DNDEventDispatcher - DNDEventDispatcher::~DNDEventDispatcher() { } @@ -76,10 +71,8 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) return pChildWindow; } - // DNDEventDispatcher::drop - void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException, std::exception) { @@ -116,10 +109,8 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) m_aDataFlavorList.realloc( 0 ); } - // DNDEventDispatcher::dragEnter - void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException, std::exception) { @@ -144,10 +135,8 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd } - // DNDEventDispatcher::dragExit - void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) throw(RuntimeException, std::exception) { @@ -160,10 +149,8 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) m_aDataFlavorList.realloc( 0 ); } - // DNDEventDispatcher::dragOver - void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException, std::exception) { @@ -201,10 +188,8 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) } } - // DNDEventDispatcher::dropActionChanged - void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException, std::exception) { @@ -242,11 +227,8 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& } } - - // DNDEventDispatcher::dragGestureRecognized - void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException, std::exception) { @@ -259,35 +241,27 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction ); } - // DNDEventDispatcher::disposing - void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::acceptDrag - void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::rejectDrag - void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception) { } - // DNDEventDispatcher::fireDragEnterEvent - sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList @@ -320,10 +294,8 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragOverEvent - sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions @@ -353,10 +325,8 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragExitEvent - sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(RuntimeException) { sal_Int32 n = 0; @@ -380,10 +350,8 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime return n; } - // DNDEventDispatcher::fireDropActionChangedEvent - sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions @@ -413,10 +381,8 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDropEvent - sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable @@ -458,10 +424,8 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, return n; } - // DNDEventDispatcher::fireDragGestureRecognized - sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, const Reference< XDragSource >& xSource, const Any event, const Point& rOrigin, const sal_Int8 nDragAction diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index fee57ec8cb79..1f3459c371c4 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include using namespace ::cppu; @@ -25,10 +24,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; - - - - DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex()) { @@ -36,107 +31,83 @@ DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) m_nDefaultActions = nDefaultActions; } - - - - DNDListenerContainer::~DNDListenerContainer() { } - // DNDListenerContainer::addDragGestureListener - void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } - // DNDListenerContainer::removeDragGestureListener - void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } - // DNDListenerContainer::resetRecognizer - void SAL_CALL DNDListenerContainer::resetRecognizer( ) throw(RuntimeException, std::exception) { } - // DNDListenerContainer::addDropTargetListener - void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } - // DNDListenerContainer::removeDropTargetListener - void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException, std::exception) { rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } - // DNDListenerContainer::isActive - sal_Bool SAL_CALL DNDListenerContainer::isActive( ) throw(RuntimeException, std::exception) { return m_bActive; } - // DNDListenerContainer::setActive - void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) throw(RuntimeException, std::exception) { m_bActive = active; } - // DNDListenerContainer::getDefaultActions - sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) throw(RuntimeException, std::exception) { return m_nDefaultActions; } - // DNDListenerContainer::setDefaultActions - void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) throw(RuntimeException, std::exception) { m_nDefaultActions = actions; } - // DNDListenerContainer::fireDropEvent - sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, const Reference< XTransferable >& transferable ) @@ -206,10 +177,8 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop return nRet; } - // DNDListenerContainer::fireDragExitEvent - sal_uInt32 DNDListenerContainer::fireDragExitEvent() { sal_uInt32 nRet = 0; @@ -250,10 +219,8 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent() return nRet; } - // DNDListenerContainer::fireDragOverEvent - sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) { @@ -315,10 +282,8 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget return nRet; } - // DNDListenerContainer::fireDragEnterEvent - sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, const Sequence< DataFlavor >& dataFlavors ) @@ -381,10 +346,8 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge return nRet; } - // DNDListenerContainer::fireDropActionChangedEvent - sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) { @@ -446,10 +409,8 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD return nRet; } - // DNDListenerContainer::fireDragGestureEvent - sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent ) { @@ -492,10 +453,8 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ return nRet; } - // DNDListenerContainer::acceptDrag - void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDragContext.is() ) @@ -505,38 +464,30 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw ( } } - // DNDListenerContainer::rejectDrag - void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException, std::exception) { // nothing to do here } - // DNDListenerContainer::acceptDrop - void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) m_xDropTargetDropContext->acceptDrop( dropOperation ); } - // DNDListenerContainer::rejectDrop - void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException, std::exception) { // nothing to do here } - // DNDListenerContainer::dropComplete - void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception) { if( m_xDropTargetDropContext.is() ) diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index e7c6d92a2fa1..6cdc73e08f9c 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -27,8 +26,6 @@ #include - - class DockingAreaWindow::ImplData { public: @@ -47,8 +44,6 @@ DockingAreaWindow::ImplData::~ImplData() { } - - static void ImplInitBackground( DockingAreaWindow* pThis ) { const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader(); @@ -96,8 +91,6 @@ DockingAreaWindow::~DockingAreaWindow() delete mpImplData; } - - void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -109,8 +102,6 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } - - static void ImplInvalidateMenubar( DockingAreaWindow* pThis ) { // due to a possible comon gradient covering menubar and top dockingarea @@ -138,8 +129,6 @@ void DockingAreaWindow::StateChanged( StateChangedType nType ) ImplInvalidateMenubar( this ); } - - bool DockingAreaWindow::IsHorizontal() const { return ( mpImplData->meAlign == WINDOWALIGN_TOP || mpImplData->meAlign == WINDOWALIGN_BOTTOM ); @@ -160,8 +149,6 @@ WindowAlign DockingAreaWindow::GetAlign() const return mpImplData->meAlign; } - - void DockingAreaWindow::Paint( const Rectangle& ) { EnableNativeWidget( true ); // only required because the toolkit curently switches this flag off @@ -229,7 +216,6 @@ void DockingAreaWindow::Paint( const Rectangle& ) ranges[ aPos.X() ] = aSize.Width(); } - // draw multiple toolbar backgrounds, i.e., one for each toolbar line for( std::map::const_iterator it = ranges.begin(); it != ranges.end(); ++it ) { @@ -263,6 +249,4 @@ void DockingAreaWindow::Resize() Invalidate(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index c4f369d9e667..a382e809b595 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -36,7 +35,6 @@ #include #include - #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) class ImplDockFloatWin2 : public FloatingWindow @@ -154,7 +152,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) return 0; } - IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) { // called during move of a floating window @@ -228,7 +225,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) return 0; } - void ImplDockFloatWin2::Move() { if( mbInMove ) @@ -461,11 +457,9 @@ Rectangle DockingManager::GetPosSizePixel( const Window *pWindow ) return aRect; } - // special floating window for popup mode // main purpose: provides tear-off area for undocking - // if TEAROFF_DASHED defined a single dashed line is used // otherwise multiple smaller lines will be painted //#define TEAROFF_DASHED @@ -555,7 +549,6 @@ Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() return FloatingWindow::GetPreferredKeyInputWindow(); } - void ImplPopupFloatWin::ImplSetBorder() { // although we have no border in the sense of a borderwindow @@ -803,7 +796,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt ) } } - ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow ) { ImplInitData(); @@ -1220,7 +1212,6 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) return 0; } - bool ImplDockingWindowWrapper::IsInPopupMode() const { if( GetFloatingWindow() ) @@ -1377,10 +1368,8 @@ Size ImplDockingWindowWrapper::GetSizePixel() const return mpDockingWindow->GetSizePixel(); } - // old inlines from DockingWindow - void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize ) { if ( mpFloatWin ) @@ -1400,7 +1389,6 @@ bool ImplDockingWindowWrapper::IsFloatingMode() const return (mpFloatWin != NULL); } - void ImplDockingWindowWrapper::SetDragArea( const Rectangle& rRect ) { maDragArea = rRect; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 36887e816f39..b8bc4988fd23 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -33,7 +32,6 @@ #include #include - #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) class DockingWindow::ImplData @@ -86,7 +84,6 @@ public: sal_uLong GetLastTicks() const { return mnLastTicks; } }; - ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ) : FloatingWindow( pParent, nWinBits ), @@ -184,7 +181,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) return 0; } - void ImplDockFloatWin::Move() { if( mbInMove ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 41e9bcdc022a..56bd19a08963 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -33,7 +32,6 @@ #include #include - class FloatingWindow::ImplData { public: @@ -248,7 +246,6 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, aScreenRect = Application::GetScreenPosSizePixel( Application::GetBestScreen( bRTL ? devRectRTL : devRect ) ); - sal_uInt16 nArrangeAry[5]; sal_uInt16 nArrangeIndex; bool bBreak; @@ -747,7 +744,6 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this ) pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); - // delete window from the list pSVData->maWinData.mpFirstFloat = mpNextFloat; mpNextFloat = NULL; diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index f49f8601a21d..fa311d3129b5 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -26,18 +25,12 @@ #include #include - - - - void IntroWindow::ImplInitIntroWindowData() { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpIntroWindow = this; } - - IntroWindow::IntroWindow( ) : WorkWindow( WINDOW_INTROWINDOW ) { @@ -45,8 +38,6 @@ IntroWindow::IntroWindow( ) : WorkWindow::ImplInit( 0, WB_INTROWIN, NULL ); } - - IntroWindow::~IntroWindow() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index a31ba0a2b61d..78f9b863ca10 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -27,8 +26,6 @@ #include - - static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = { 0, 0, 0, 0, // KEYFUNC_DONTKNOW @@ -52,8 +49,6 @@ static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = 0, 0, 0, 0 // KEYFUNC_FRONT }; - - void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ) { sal_uInt16 nIndex = (sal_uInt16)eFunc; @@ -64,8 +59,6 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, rCode4 = aImplKeyFuncTab[nIndex+3]; } - - KeyCode::KeyCode( KeyFuncType eFunction ) { sal_uInt16 nDummy; @@ -73,8 +66,6 @@ KeyCode::KeyCode( KeyFuncType eFunction ) eFunc = eFunction; } - - KeyCode::KeyCode( const ResId& rResId ) : nCode(0) , eFunc(KEYFUNC_DONTKNOW) @@ -101,8 +92,6 @@ KeyCode::KeyCode( const ResId& rResId ) } } - - OUString KeyCode::GetName( Window* pWindow ) const { if ( !pWindow ) @@ -110,8 +99,6 @@ OUString KeyCode::GetName( Window* pWindow ) const return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; } - - KeyFuncType KeyCode::GetFunction() const { if ( eFunc != KEYFUNC_DONTKNOW ) diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index bc84e210c550..c133d1d37d95 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -64,9 +63,6 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const return aClone; } - - - const Point& HelpEvent::GetMousePosPixel() const { //DBG_ASSERT( !mbKeyboardActivated, "Keyboard help has no mouse position !"); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 4c8a77694635..5ae34120ad43 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2047,7 +2047,6 @@ void MessageDialog::SetMessagesWidths(Window *pParent, pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 60); } - short MessageDialog::Execute() { setDeferredProperties(); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 6cd7e7c218bc..fb6f98203366 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/diagnose_ex.h" #include "tools/rc.h" @@ -50,7 +49,6 @@ #include "salmenu.hxx" #include "salframe.hxx" - #include #include #include @@ -81,7 +79,6 @@ struct MenuLayoutData : public ControlLayoutData using namespace ::com::sun::star; using namespace vcl; - #define ITEMPOS_INVALID 0xFFFF #define EXTRASPACEY 2 @@ -213,7 +210,6 @@ public: void InsertSeparator(const OString &rIdent, size_t nPos); void Remove( size_t nPos ); - MenuItemData* GetData( sal_uInt16 nSVId, size_t& rPos ) const; MenuItemData* GetData( sal_uInt16 nSVId ) const { @@ -240,8 +236,6 @@ public: } }; - - MenuItemList::~MenuItemList() { for( size_t i = 0, n = maItemList.size(); i < n; ++i ) @@ -477,11 +471,8 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const return nItems; } - - // - MenuFloatingWindow - - class MenuFloatingWindow : public FloatingWindow { friend void Menu::ImplFillLayoutData() const; @@ -671,13 +662,11 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) (lastSize - maImage.GetSizePixel().Height())/2 ), maImage.GetSizePixel() ); - aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc ); SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) ); } } - // a basic class for both (due to pActivePopup, Timer,...) would be nice, // but a container class should have been created then, as they // would be derived from different windows @@ -1555,7 +1544,6 @@ sal_uInt16 Menu::GetItemId(const OString &rIdent) const return MENU_ITEM_NOTFOUND; } - sal_uInt16 Menu::GetItemPos( sal_uInt16 nItemId ) const { size_t nPos; @@ -2336,8 +2324,6 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& return false; } - - void Menu::ImplAddDel( ImplMenuDelData& rDel ) { DBG_ASSERT( !rDel.mpMenu, "Menu::ImplAddDel(): cannot add ImplMenuDelData twice !" ); @@ -2349,8 +2335,6 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel ) } } - - void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) { rDel.mpMenu = NULL; @@ -2370,8 +2354,6 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) } } - - Size Menu::ImplCalcSize( const Window* pWin ) { // | Check/Radio/Image| Text| Accel/Popup| @@ -3137,7 +3119,6 @@ Rectangle Menu::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const return (mpLayoutData && nItemIndex != -1) ? mpLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle(); } - long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const { long nIndex = -1; @@ -3250,11 +3231,8 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } } - - // - MenuBar - - MenuBar::MenuBar() : Menu( true ) { mbDisplayable = true; @@ -3355,8 +3333,6 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; } - - void MenuBar::SelectEntry( sal_uInt16 nId ) { MenuBarWindow* pMenuWin = (MenuBarWindow*) ImplGetWindow(); @@ -3378,8 +3354,6 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) } } - - // handler for native menu selection and command events bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const @@ -3479,8 +3453,6 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const return static_cast(pWindow)->HandleMenuButtonEvent( i_nButtonId ); } - - // bool PopupMenu::bAnyPopupInExecute = false; PopupMenu::PopupMenu() @@ -3662,7 +3634,6 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong // #102790# context menus shall never show disabled entries nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES; - sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount(); if ( !nVisibleEntries ) { @@ -3895,7 +3866,6 @@ long PopupMenu::ImplCalcHeight( sal_uInt16 nEntries ) const return nHeight; } - static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -4537,7 +4507,6 @@ void MenuFloatingWindow::ImplScroll( bool bUp ) nFirstEntry = pMenu->ImplGetNextVisible( nFirstEntry ); DBG_ASSERT( nFirstEntry != ITEMPOS_INVALID, "Scroll?!" ); - if ( !bScrollUp ) { bScrollUp = true; @@ -4791,7 +4760,6 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos ) return aRect; } - void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd ) { if( ! pMenu ) @@ -5374,7 +5342,6 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) } } - void MenuBarWindow::KillActivePopup() { if ( pActivePopup ) diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index e42cadaac73b..730e6a2af554 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -29,16 +28,11 @@ using namespace ::com::sun::star; - - - MnemonicGenerator::MnemonicGenerator() { memset( maMnemonics, 1, sizeof( maMnemonics ) ); } - - sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) { static sal_uInt16 const aImplMnemonicRangeTab[MNEMONIC_RANGES*2] = @@ -62,8 +56,6 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) return MNEMONIC_INDEX_NOTFOUND; } - - sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) { sal_Int32 nIndex = 0; @@ -78,8 +70,6 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) return 0; } - - void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) { const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); @@ -121,8 +111,6 @@ void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) } } - - OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) { if ( _rKey.isEmpty() || ImplFindMnemonic( _rKey ) ) @@ -345,8 +333,6 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) return rKey; } - - uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass() { if ( !mxCharClass.is() ) @@ -354,8 +340,6 @@ uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass return mxCharClass; } - - OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr ) { OUString aStr = rStr; diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx index 2a8d25315cc4..b23b9c037b68 100644 --- a/vcl/source/window/mouseevent.cxx +++ b/vcl/source/window/mouseevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 9efff517e601..7a3c597c40a0 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -35,9 +34,6 @@ #include #include - - - static void ImplInitMsgBoxImageList() { ImplSVData* pSVData = ImplGetSVData(); @@ -54,8 +50,6 @@ static void ImplInitMsgBoxImageList() } } - - void MessBox::ImplInitMessBoxData() { mpVCLMultiLineEdit = NULL; @@ -65,8 +59,6 @@ void MessBox::ImplInitMessBoxData() mbCheck = false; } - - void MessBox::ImplInitButtons() { WinBits nStyle = GetStyle(); @@ -144,8 +136,6 @@ void MessBox::ImplInitButtons() } } - - MessBox::MessBox( Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ) : ButtonDialog( WINDOW_MESSBOX ), @@ -159,8 +149,6 @@ MessBox::MessBox( Window* pParent, WinBits nStyle, SetText( rTitle ); } - - MessBox::MessBox( Window* pParent, const ResId& rResId ) : ButtonDialog( WINDOW_MESSBOX ) { @@ -182,8 +170,6 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : ImplInitButtons(); } - - void MessBox::ImplLoadRes( const ResId& ) { SetText( ReadStringRes() ); @@ -191,8 +177,6 @@ void MessBox::ImplLoadRes( const ResId& ) SetHelpText( ReadStringRes() ); } - - MessBox::~MessBox() { delete mpVCLMultiLineEdit; @@ -200,8 +184,6 @@ MessBox::~MessBox() delete mpCheckBox; } - - void MessBox::ImplPosControls() { if ( !GetHelpId().isEmpty() ) @@ -397,8 +379,6 @@ void MessBox::ImplPosControls() SetPageSizePixel( aPageSize ); } - - void MessBox::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -408,31 +388,23 @@ void MessBox::StateChanged( StateChangedType nType ) ButtonDialog::StateChanged( nType ); } - - bool MessBox::GetCheckBoxState() const { return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck; } - - void MessBox::SetCheckBoxState( bool bCheck ) { if( mpCheckBox ) mpCheckBox->Check( bCheck ); mbCheck = bCheck; } - - Size MessBox::GetOptimalSize() const { // FIXME: base me on the font size ? return Size( 250, 100 ); } - - void InfoBox::ImplInitInfoBoxData() { // Default Text is the display title from the application @@ -442,40 +414,30 @@ void InfoBox::ImplInitInfoBoxData() SetImage( InfoBox::GetStandardImage() ); } - - InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage ) { ImplInitInfoBoxData(); } - - InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) ) { ImplInitInfoBoxData(); } - - InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitInfoBoxData(); } - - Image InfoBox::GetStandardImage() { ImplInitMsgBoxImageList(); return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 ); } - - void WarningBox::ImplInitWarningBoxData() { // Default Text is the display title from the application @@ -485,8 +447,6 @@ void WarningBox::ImplInitWarningBoxData() SetImage( WarningBox::GetStandardImage() ); } - - WarningBox::WarningBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -494,16 +454,12 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle, ImplInitWarningBoxData(); } - - WarningBox::WarningBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) ) { ImplInitWarningBoxData(); } - - void WarningBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); @@ -511,16 +467,12 @@ void WarningBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString(); } - - Image WarningBox::GetStandardImage() { ImplInitMsgBoxImageList(); return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 ); } - - void ErrorBox::ImplInitErrorBoxData() { // Default Text is the display title from the application @@ -530,8 +482,6 @@ void ErrorBox::ImplInitErrorBoxData() SetImage( ErrorBox::GetStandardImage() ); } - - ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -539,16 +489,12 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, ImplInitErrorBoxData(); } - - ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) ) { ImplInitErrorBoxData(); } - - Image ErrorBox::GetStandardImage() { try @@ -564,8 +510,6 @@ Image ErrorBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 ); } - - void QueryBox::ImplInitQueryBoxData() { // Default Text is the display title from the application @@ -575,24 +519,18 @@ void QueryBox::ImplInitQueryBoxData() SetImage( QueryBox::GetStandardImage() ); } - - QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitQueryBoxData(); } - - QueryBox::QueryBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) ) { ImplInitQueryBoxData(); } - - void QueryBox::SetDefaultCheckBoxText() { ResMgr* pResMgr = ImplGetResMgr(); @@ -600,8 +538,6 @@ void QueryBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString(); } - - Image QueryBox::GetStandardImage() { ImplInitMsgBoxImageList(); diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx index 2cf4c059a15c..9ce03cea4f0b 100644 --- a/vcl/source/window/popupmenuwindow.cxx +++ b/vcl/source/window/popupmenuwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/popupmenuwindow.hxx" #include @@ -39,8 +38,6 @@ PopupMenuFloatingWindow::ImplData::~ImplData() { } - - PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) : FloatingWindow(pParent, nStyle), mpImplData(new ImplData) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 7f7cbd8468ea..e7a4284b12b7 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -267,7 +267,6 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() aOrigSize.Height() = aLogicSize.Height(); double fScale = double(aLogicSize.Width())/double(aOrigSize.Width()); - maPageVDev.Erase(); maPageVDev.Push(); maPageVDev.SetMapMode( MAP_100TH_MM ); @@ -1249,7 +1248,6 @@ void PrintDialog::checkOptionalControlDependencies() } } - bool bIsEnabled = it->first->IsEnabled(); // Enable does not do a change check first, so can be less cheap than expected if( bShouldbeEnabled != bIsEnabled ) @@ -1861,12 +1859,8 @@ void PrintDialog::previewBackward() mpPageEdit->Down(); } - - // PrintProgressDialog - - PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax) : ModelessDialog(i_pParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui") diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 6796d0a6711a..6a44ee41777b 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index fc5e257a247b..c1fcbe938ce9 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -26,16 +25,13 @@ FunctionSet::~FunctionSet() { } - inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const { return eSelMode != MULTIPLE_SELECTION || !bModifierKey1; } - // TODO: throw out FunctionSet::SelectAtPoint - SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet, sal_uLong nAutoRepeatInterval ) : pWin( pWindow ), @@ -50,13 +46,11 @@ SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet, aWTimer.SetTimeout( nUpdateInterval ); } - SelectionEngine::~SelectionEngine() { aWTimer.Stop(); } - IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) @@ -64,13 +58,11 @@ IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) return 0; } - void SelectionEngine::SetSelectionMode( SelectionMode eMode ) { eSelMode = eMode; } - void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) { if ( !pFunctionSet ) @@ -119,7 +111,6 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) } } - bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_CMDEVT); @@ -242,7 +233,6 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) return false; } - bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) { aWTimer.Stop(); @@ -286,7 +276,6 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) return true; } - bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) { @@ -319,7 +308,6 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) return true; } - void SelectionEngine::SetWindow( Window* pNewWin ) { if( pNewWin != pWin ) @@ -332,7 +320,6 @@ void SelectionEngine::SetWindow( Window* pNewWin ) } } - void SelectionEngine::Reset() { aWTimer.Stop(); @@ -342,7 +329,6 @@ void SelectionEngine::Reset() nLockedMods = 0; } - void SelectionEngine::Command( const CommandEvent& rCEvt ) { // Timer aWTimer is active during enlarging a selection diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 05d7d4b62c03..1fa4e6ee37e1 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -49,8 +49,6 @@ namespace }; } - - void Splitter::ImplInitSplitterData() { ImplGetWindowImpl()->mbSplitter = true; @@ -64,8 +62,6 @@ void Splitter::ImplInitSplitterData() mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE; } - - // Should only be called from a ImplInit method for initialization or // after checking bNew is different from the current mbHorzSplit value. // The public method that does that check is Splitter::SetHorizontal(). @@ -90,8 +86,6 @@ void Splitter::ImplInitHorVer(bool bNew) SetPointer( Pointer( ePointerStyle ) ); } - - void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) { Window::ImplInit( pParent, nWinStyle, NULL ); @@ -109,8 +103,6 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) pTList->AddWindow( this ); } - - void Splitter::ImplSplitMousePos( Point& rPos ) { if ( mbHorzSplit ) @@ -129,8 +121,6 @@ void Splitter::ImplSplitMousePos( Point& rPos ) } } - - void Splitter::ImplDrawSplitter() { Rectangle aInvRect( maDragRect ); @@ -149,8 +139,6 @@ void Splitter::ImplDrawSplitter() mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT ); } - - Splitter::Splitter( Window* pParent, WinBits nStyle ) : Window( WINDOW_SPLITTER ) { @@ -161,8 +149,6 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) : SetFillColor(); } - - Splitter::Splitter( Window* pParent, const ResId& rResId ) : Window( WINDOW_SPLITTER ) { @@ -179,16 +165,12 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) : Show(); } - - Splitter::~Splitter() { TaskPaneList *pTList = GetSystemWindow()->GetTaskPaneList(); pTList->RemoveWindow( this ); } - - void Splitter::SetHorizontal(bool bNew) { if(bNew != (bool)mbHorzSplit) @@ -197,15 +179,11 @@ void Splitter::SetHorizontal(bool bNew) } } - - void Splitter::SetKeyboardStepSize( long nStepSize ) { mnKeyboardStepSize = nStepSize; } - - Splitter* Splitter::ImplFindSibling() { // look for another splitter with the same parent but different orientation @@ -224,8 +202,6 @@ Splitter* Splitter::ImplFindSibling() return NULL; } - - bool Splitter::ImplSplitterActive() { // is splitter in document or at scrollbar handle ? @@ -249,8 +225,6 @@ bool Splitter::ImplSplitterActive() return bActive; } - - void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.GetClicks() == 2 ) @@ -280,8 +254,6 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) StartDrag(); } - - void Splitter::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) @@ -356,8 +328,6 @@ void Splitter::Tracking( const TrackingEvent& rTEvt ) } } - - void Splitter::ImplKbdTracking( KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); @@ -473,36 +443,26 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode ) } } - - void Splitter::StartSplit() { maStartSplitHdl.Call( this ); } - - void Splitter::Split() { maSplitHdl.Call( this ); } - - void Splitter::EndSplit() { if ( maEndSplitHdl.IsSet() ) maEndSplitHdl.Call( this ); } - - void Splitter::Splitting( Point& /* rSplitPos */ ) { } - - void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) { maDragRect = rDragRect; @@ -512,15 +472,11 @@ void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) mpRefWin = _pRefWin; } - - void Splitter::SetSplitPosPixel( long nNewPos ) { mnSplitPos = nNewPos; } - - void Splitter::StartDrag() { if ( IsTracking() ) @@ -546,9 +502,6 @@ void Splitter::StartDrag() ImplDrawSplitter(); } - - - void Splitter::ImplStartKbdSplitting() { if( mbKbdSplitting ) @@ -577,8 +530,6 @@ void Splitter::ImplStartKbdSplitting() mnStartSplitPos = maDragPos.Y(); } - - void Splitter::ImplRestoreSplitter() { // set splitter in the center of the ref window @@ -607,9 +558,6 @@ void Splitter::ImplRestoreSplitter() EndSplit(); } - - - void Splitter::GetFocus() { if( !ImplSplitterActive() ) @@ -618,8 +566,6 @@ void Splitter::GetFocus() Invalidate(); } - - void Splitter::LoseFocus() { if( mbKbdSplitting ) @@ -631,8 +577,6 @@ void Splitter::LoseFocus() Invalidate(); } - - void Splitter::KeyInput( const KeyEvent& rKEvt ) { if( mbInKeyEvent ) @@ -732,15 +676,11 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) mbInKeyEvent = 0; } - - bool Splitter::Notify( NotifyEvent& rNEvt ) { return Window::Notify( rNEvt ); } - - void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -762,8 +702,6 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void Splitter::Paint( const Rectangle& rPaintRect ) { DrawRect( rPaintRect ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index cabfb25ac7a0..b2882202aff9 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index e492500e0c2b..0b8502e3af08 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -32,8 +31,6 @@ #include #include - - #define STATUSBAR_OFFSET_X STATUSBAR_OFFSET #define STATUSBAR_OFFSET_Y 2 #define STATUSBAR_OFFSET_TEXTY 3 @@ -42,8 +39,6 @@ #define STATUSBAR_PRGS_COUNT 100 #define STATUSBAR_PRGS_MIN 5 - - class StatusBar::ImplData { public: @@ -84,15 +79,11 @@ struct ImplStatusItem OUString maCommand; }; - - inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize ) { return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2)); } - - static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, sal_uInt16 nStyle ) { @@ -112,8 +103,6 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, return Point( nX, nY ); } - - bool StatusBar::ImplIsItemUpdate() { if ( !mbProgressMode && mbVisibleItems && IsReallyVisible() && IsUpdateMode() ) @@ -122,8 +111,6 @@ bool StatusBar::ImplIsItemUpdate() return false; } - - void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) { mpImplData = new ImplData; @@ -155,16 +142,12 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) SetOutputSizePixel( CalcWindowSizePixel() ); } - - StatusBar::StatusBar( Window* pParent, WinBits nStyle ) : Window( WINDOW_STATUSBAR ) { ImplInit( pParent, nStyle ); } - - StatusBar::~StatusBar() { // delete all items @@ -178,8 +161,6 @@ StatusBar::~StatusBar() delete mpImplData; } - - void StatusBar::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -233,8 +214,6 @@ void StatusBar::ImplInitSettings( bool bFont, } } - - void StatusBar::ImplFormat() { ImplStatusItem* pItem; @@ -309,8 +288,6 @@ void StatusBar::ImplFormat() mbFormat = false; } - - Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const { Rectangle aRect; @@ -330,8 +307,6 @@ Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const return aRect; } - - sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const { ImplStatusItem* pItem; @@ -349,8 +324,6 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const return ~0; } - - void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) { // prevent item box from being overwritten @@ -386,8 +359,6 @@ void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) } } - - void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame ) { Rectangle aRect = ImplGetItemRectPos( nPos ); @@ -487,8 +458,6 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) ); } - - void DrawProgress( Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, @@ -605,8 +574,6 @@ void DrawProgress( Window* pWindow, const Point& rPos, } } - - void StatusBar::ImplDrawProgress( bool bPaint, sal_uInt16 nPercent1, sal_uInt16 nPercent2 ) { @@ -634,8 +601,6 @@ void StatusBar::ImplDrawProgress( bool bPaint, nPercent1*100, nPercent2*100, mnPercentCount, maPrgsFrameRect ); } - - void StatusBar::ImplCalcProgressRect() { // calculate text size @@ -688,8 +653,6 @@ void StatusBar::ImplCalcProgressRect() maPrgsTxtPos.Y() = mnTextY; } - - void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { // trigger toolbox only for left mouse button @@ -727,8 +690,6 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) } } - - void StatusBar::Paint( const Rectangle& ) { if ( mbFormat ) @@ -759,15 +720,11 @@ void StatusBar::Paint( const Rectangle& ) DrawLine( Point( 0, 0 ), Point( mnDX-1, 0 ) ); } - - void StatusBar::Move() { Window::Move(); } - - void StatusBar::Resize() { // save width and height @@ -788,8 +745,6 @@ void StatusBar::Resize() Invalidate(); } - - void StatusBar::RequestHelp( const HelpEvent& rHEvt ) { // no keyboard help in status bar @@ -855,8 +810,6 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } - - void StatusBar::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -884,8 +837,6 @@ void StatusBar::StateChanged( StateChangedType nType ) } } - - void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -917,30 +868,22 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void StatusBar::Click() { ImplCallEventListeners( VCLEVENT_STATUSBAR_CLICK ); maClickHdl.Call( this ); } - - void StatusBar::DoubleClick() { ImplCallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK ); maDoubleClickHdl.Call( this ); } - - void StatusBar::UserDraw( const UserDrawEvent& ) { } - - void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits, long nOffset, sal_uInt16 nPos ) @@ -979,8 +922,6 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, (void*) sal_IntPtr(nItemId) ); } - - void StatusBar::RemoveItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -997,8 +938,6 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId ) } } - - void StatusBar::ShowItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1019,8 +958,6 @@ void StatusBar::ShowItem( sal_uInt16 nItemId ) } } - - void StatusBar::HideItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1041,8 +978,6 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) } } - - bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1068,15 +1003,11 @@ void StatusBar::Clear() ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED ); } - - sal_uInt16 StatusBar::GetItemCount() const { return (sal_uInt16)mpItemList->size(); } - - sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const { if ( nPos < mpItemList->size() ) @@ -1084,8 +1015,6 @@ sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const return 0; } - - sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const { for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) { @@ -1097,8 +1026,6 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const return STATUSBAR_ITEM_NOTFOUND; } - - sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const { if ( AreItemsVisible() && !mbFormat ) @@ -1117,8 +1044,6 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const return 0; } - - Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const { Rectangle aRect; @@ -1142,8 +1067,6 @@ Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const return aRect; } - - Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const { if ( !mbFormat ) @@ -1172,8 +1095,6 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const return Point(); } - - sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1184,8 +1105,6 @@ sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const return 0; } - - StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1196,8 +1115,6 @@ StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const return 0; } - - long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1208,8 +1125,6 @@ long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const return 0; } - - void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1244,8 +1159,6 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } } - - const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1255,8 +1168,6 @@ const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maText; } - - void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1270,8 +1181,6 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) } } - - const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1282,8 +1191,6 @@ const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) return OUString(); } - - void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1333,8 +1240,6 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId ) } } - - void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1343,8 +1248,6 @@ void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maHelpText = rText; } - - const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1367,8 +1270,6 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } - - void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1377,8 +1278,6 @@ void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maQuickHelpText = rText; } - - const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1389,8 +1288,6 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const return pItem->maQuickHelpText; } - - void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1399,8 +1296,6 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) (*mpItemList)[ nPos ]->maHelpId = rHelpId; } - - OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1444,8 +1339,6 @@ void StatusBar::StartProgressMode( const OUString& rText ) } } - - void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) { DBG_ASSERT( mbProgressMode, "StatusBar::SetProgressValue(): no progrss mode" ); @@ -1463,8 +1356,6 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) mnPercent = nNewPercent; } - - void StatusBar::EndProgressMode() { DBG_ASSERT( mbProgressMode, "StatusBar::EndProgressMode(): no progress mode" ); @@ -1482,8 +1373,6 @@ void StatusBar::EndProgressMode() } } - - void StatusBar::SetText( const OUString& rText ) { if ( (!mbVisibleItems || (GetStyle() & WB_RIGHT)) && !mbProgressMode && @@ -1517,8 +1406,6 @@ void StatusBar::SetText( const OUString& rText ) Window::SetText( rText ); } - - Size StatusBar::CalcWindowSizePixel() const { size_t i = 0; @@ -1573,9 +1460,6 @@ Size StatusBar::CalcWindowSizePixel() const return Size( nCalcWidth, nCalcHeight ); } - - - void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1592,8 +1476,6 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) } } - - const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1603,6 +1485,4 @@ const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maAccessibleName; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 32c26c097a48..f70d25c67886 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -52,8 +52,6 @@ using namespace ::com::sun::star; - - long ImplSysChildProc( void* pInst, SalObject* /* pObject */, sal_uInt16 nEvent, const void* /* pEvent */ ) { @@ -109,8 +107,6 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, return nRet; } - - void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow ); @@ -126,24 +122,18 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste } } - - SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, NULL ); } - - SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, pData, bShow ); } - - SystemChildWindow::~SystemChildWindow() { Hide(); @@ -154,8 +144,6 @@ SystemChildWindow::~SystemChildWindow() } } - - const SystemEnvData* SystemChildWindow::GetSystemData() const { if ( mpWindowImpl->mpSysObj ) @@ -164,16 +152,12 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const return NULL; } - - void SystemChildWindow::EnableEraseBackground( bool bEnable ) { if ( mpWindowImpl->mpSysObj ) mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable ); } - - void SystemChildWindow::ImplTestJavaException( void* pEnv ) { #if HAVE_FEATURE_JAVA @@ -212,8 +196,6 @@ void SystemChildWindow::SetForwardKey( bool bEnable ) mpWindowImpl->mpSysObj->SetForwardKey( bEnable ); } - - sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) { sal_IntPtr nRet = 0; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 06635c8e7bb9..d24f76bbdfbb 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - class SystemWindow::ImplData { public: @@ -65,8 +64,6 @@ SystemWindow::ImplData::~ImplData() delete mpTaskPaneList; } - - SystemWindow::SystemWindow( WindowType nType ) : Window( nType ) { @@ -91,8 +88,6 @@ SystemWindow::~SystemWindow() mpImplData = NULL; } - - bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling @@ -112,8 +107,6 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } - - bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // capture KeyEvents for taskpane cycling @@ -156,8 +149,6 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) return Window::PreNotify( rNEvt ); } - - TaskPaneList* SystemWindow::GetTaskPaneList() { if( mpImplData->mpTaskPaneList ) @@ -178,8 +169,6 @@ TaskPaneList* SystemWindow::GetTaskPaneList() } } - - bool SystemWindow::Close() { ImplDelData aDelData; @@ -207,32 +196,22 @@ bool SystemWindow::Close() return true; } - - void SystemWindow::TitleButtonClick( sal_uInt16 ) { } - - void SystemWindow::Pin() { } - - void SystemWindow::Roll() { } - - void SystemWindow::Resizing( Size& ) { } - - void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) { bool bChanged = (i_rURL != mpImplData->maRepresentedURL); @@ -248,8 +227,6 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) } } - - void SystemWindow::SetIcon( sal_uInt16 nIcon ) { if ( mnIcon == nIcon ) @@ -268,8 +245,6 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon ) } } - - void SystemWindow::EnableSaveBackground( bool bSave ) { if( ImplGetSVData()->maWinData.mbNoSaveBackground ) @@ -286,8 +261,6 @@ void SystemWindow::EnableSaveBackground( bool bSave ) } } - - bool SystemWindow::IsSaveBackgroundEnabled() const { const Window* pWindow = this; @@ -299,8 +272,6 @@ bool SystemWindow::IsSaveBackgroundEnabled() const return false; } - - void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { if ( nButton == TITLE_BUTTON_DOCKING ) @@ -330,8 +301,6 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) return; } - - bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const { if ( nButton == TITLE_BUTTON_DOCKING ) @@ -340,8 +309,6 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const return mbHideBtn; } - - void SystemWindow::SetPin( bool bPin ) { if ( bPin != mbPinned ) @@ -352,8 +319,6 @@ void SystemWindow::SetPin( bool bPin ) } } - - void SystemWindow::RollUp() { if ( !mbRollUp ) @@ -372,8 +337,6 @@ void SystemWindow::RollUp() } } - - void SystemWindow::RollDown() { if ( mbRollUp ) @@ -386,8 +349,6 @@ void SystemWindow::RollDown() } } - - void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) { maMinOutSize = rSize; @@ -401,8 +362,6 @@ void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) mpWindowImpl->mpFrame->SetMinClientSize( rSize.Width(), rSize.Height() ); } - - void SystemWindow::SetMaxOutputSizePixel( const Size& rSize ) { Size aSize( rSize ); @@ -427,7 +386,6 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const return mpImplData->maMaxOutSize; } - Size SystemWindow::GetResizeOutputSizePixel() const { Size aSize = GetOutputSizePixel(); @@ -438,8 +396,6 @@ Size SystemWindow::GetResizeOutputSizePixel() const return aSize; } - - static void ImplWindowStateFromStr(WindowStateData& rData, const OString& rStr) { @@ -554,8 +510,6 @@ static void ImplWindowStateFromStr(WindowStateData& rData, rData.SetMask( nValidMask ); } - - static OString ImplWindowStateToStr(const WindowStateData& rData) { sal_uLong nValidMask = rData.GetMask(); @@ -600,8 +554,6 @@ static OString ImplWindowStateToStr(const WindowStateData& rData) return rStrBuf.makeStringAndClear(); } - - void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ) { Rectangle aScreenRect; @@ -810,8 +762,6 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) } } - - void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { sal_uLong nValidMask = rData.GetMask(); @@ -897,8 +847,6 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const } } - - void SystemWindow::SetWindowState(const OString& rStr) { if (rStr.isEmpty()) @@ -909,8 +857,6 @@ void SystemWindow::SetWindowState(const OString& rStr) SetWindowStateData( aData ); } - - OString SystemWindow::GetWindowState( sal_uLong nMask ) const { WindowStateData aData; @@ -920,8 +866,6 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const return ImplWindowStateToStr(aData); } - - void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) { if ( mpMenuBar != pMenuBar ) @@ -984,8 +928,6 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) } } - - void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) { if ( mnMenuBarMode != nMode ) @@ -1001,8 +943,6 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) } } - - bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) { if( mpImplData && mpImplData->mpTaskPaneList ) diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index b5c6b8df2719..68bfa0d6beba 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -23,10 +23,6 @@ #include #include - - - - void TabDialog::ImplInitTabDialogData() { mpFixedLine = NULL; @@ -35,8 +31,6 @@ void TabDialog::ImplInitTabDialogData() mbPosControls = true; } - - void TabDialog::ImplPosControls() { if (isLayoutEnabled()) @@ -212,8 +206,6 @@ void TabDialog::ImplPosControls() mbPosControls = false; } - - TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : Dialog( WINDOW_TABDIALOG ) { @@ -221,8 +213,6 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } - - TabDialog::TabDialog( Window* pParent, const ResId& rResId ) : Dialog( WINDOW_TABDIALOG ) { @@ -237,15 +227,11 @@ TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXM ImplInitTabDialogData(); } - - TabDialog::~TabDialog() { delete mpFixedLine; } - - void TabDialog::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -257,8 +243,6 @@ void TabDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } - - void TabDialog::AdjustLayout() { SAL_WARN_IF(isLayoutEnabled(), "vcl.layout", "unnecessary to call TabDialog::AdjustLayout when layout enabled"); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 2ec86723ff37..a733824ece12 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -32,8 +31,6 @@ #include - - void TabPage::ImplInit( Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NODIALOGCONTROL) ) @@ -49,8 +46,6 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) EnableChildTransparentMode( true ); } - - void TabPage::ImplInitSettings() { Window* pParent = GetParent(); @@ -74,16 +69,12 @@ void TabPage::ImplInitSettings() } } - - TabPage::TabPage( Window* pParent, WinBits nStyle ) : Window( WINDOW_TABPAGE ) { ImplInit( pParent, nStyle ); } - - TabPage::TabPage( Window* pParent, const ResId& rResId ) : Window( WINDOW_TABPAGE ) { @@ -103,8 +94,6 @@ TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDesc m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); } - - void TabPage::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -123,8 +112,6 @@ void TabPage::StateChanged( StateChangedType nType ) } } - - void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -137,8 +124,6 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } - - void TabPage::Paint( const Rectangle& ) { // draw native tabpage only inside tabcontrols, standalone tabpages look ugly (due to bad dialog design) @@ -161,7 +146,6 @@ void TabPage::Paint( const Rectangle& ) } } - void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong ) { Point aPos = pDev->LogicToPixel( rPos ); @@ -189,14 +173,10 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa pDev->Pop(); } - - void TabPage::ActivatePage() { } - - void TabPage::DeactivatePage() { } diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 47ed31576464..c70056d7e221 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -75,8 +74,6 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win } }; - - static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) { // put focus in child of floating windows which is typically a toolbar @@ -86,8 +83,6 @@ static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD)); } - - TaskPaneList::TaskPaneList() { } @@ -96,8 +91,6 @@ TaskPaneList::~TaskPaneList() { } - - void TaskPaneList::AddWindow( Window *pWindow ) { if( pWindow ) @@ -136,8 +129,6 @@ void TaskPaneList::AddWindow( Window *pWindow ) } } - - void TaskPaneList::RemoveWindow( Window *pWindow ) { ::std::vector< Window* >::iterator p; @@ -149,8 +140,6 @@ void TaskPaneList::RemoveWindow( Window *pWindow ) } } - - bool TaskPaneList::IsInList( Window *pWindow ) { ::std::vector< Window* >::iterator p; @@ -161,8 +150,6 @@ bool TaskPaneList::IsInList( Window *pWindow ) return false; } - - bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) { @@ -249,8 +236,6 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) return false; } - - // returns next splitter Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) { @@ -288,8 +273,6 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) return pWindow; } - - // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) { @@ -332,6 +315,4 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) return pWindow; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 61204c9bac0d..b8d4841e0b4f 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include #include #include @@ -50,19 +48,12 @@ #include #include - - - - - #define SMALLBUTTON_HSIZE 7 #define SMALLBUTTON_VSIZE 7 #define SMALLBUTTON_OFF_NORMAL_X 3 #define SMALLBUTTON_OFF_NORMAL_Y 3 - - #define TB_TEXTOFFSET 2 #define TB_IMAGETEXTOFFSET 3 #define TB_LINESPACING 3 @@ -91,11 +82,8 @@ #define DOCK_LINETOP ((sal_uInt16)0x8000) #define DOCK_LINEOFFSET 3 - - static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ); - typedef ::std::vector< ToolBox* > ImplTBList; class ImplTBDragMgr @@ -150,8 +138,6 @@ public: bool IsResizeMode() { return mbResizeMode; } }; - - static ImplTBDragMgr* ImplGetTBDragMgr() { ImplSVData* pSVData = ImplGetSVData(); @@ -160,8 +146,6 @@ static ImplTBDragMgr* ImplGetTBDragMgr() return pSVData->maCtrlData.mpTBDragMgr; } - - int ToolBox::ImplGetDragWidth( ToolBox* pThis ) { #define TB_DRAGWIDTH 8 // the default width of the grip @@ -199,8 +183,6 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType ) return tmpButtonType; } - - void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); @@ -218,8 +200,6 @@ void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) } } - - void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, long& rRight, long& rBottom, const ToolBox *pThis ) { @@ -268,8 +248,6 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, } } - - static void ImplCheckUpdate( ToolBox *pThis ) { // remove any pending invalidates to avoid @@ -282,8 +260,6 @@ static void ImplCheckUpdate( ToolBox *pThis ) pThis->Update(); } - - void ToolBox::ImplDrawGrip( ToolBox* pThis ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); @@ -519,7 +495,6 @@ void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, } } - void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) { // execute pending paint requests @@ -537,7 +512,6 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) pThis->Push( PUSH_CLIPREGION ); pThis->IntersectClipRegion( aPaintRegion ); - if( !pWrapper /*|| bIsInPopupMode*/ ) { // no gradient for ordinary toolbars (not dockable) @@ -653,7 +627,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin ) } } - if ( pWin->meAlign == WINDOWALIGN_BOTTOM || pWin->meAlign == WINDOWALIGN_TOP ) { // draw right border @@ -664,8 +637,6 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin ) } } - - static bool ImplIsFixedControl( const ImplToolItem *pItem ) { return ( pItem->mpWindow && @@ -674,8 +645,6 @@ static bool ImplIsFixedControl( const ImplToolItem *pItem ) pItem->mpWindow->GetType() == WINDOW_GROUPBOX) ); } - - const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) { std::vector< ImplToolItem >::const_iterator it; @@ -689,8 +658,6 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) return NULL; } - - Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode ) { long nMax; @@ -807,8 +774,6 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn return aSize; } - - void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) { if ( !pThis->maFloatSizes.empty() ) @@ -874,8 +839,6 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) } } - - Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) { ImplCalcFloatSizes( pThis ); @@ -901,8 +864,6 @@ Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) return aSize; } - - void ToolBox::ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize ) { ImplCalcFloatSizes( pThis ); @@ -943,9 +904,6 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis ) } } - - - sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) { long nLineHeight; @@ -977,8 +935,6 @@ sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) return static_cast(nLines); } - - sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) { if ( !pThis->ImplIsFloatingMode() && @@ -1011,8 +967,6 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) return 0; } - - void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) { @@ -1107,8 +1061,6 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec pThis->mnDockLines = i; } - - sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos ) { sal_uInt16 nPos = 0; @@ -1193,8 +1145,6 @@ ImplTBDragMgr::~ImplTBDragMgr() delete mpBoxList; } - - ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) { for ( size_t i = 0, n = mpBoxList->size(); i < n; ++i ) @@ -1224,8 +1174,6 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) return NULL; } - - void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, const Point& rPos, const Rectangle& rRect, sal_uInt16 nDragLineMode, bool bResizeItem, @@ -1269,8 +1217,6 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, pToolBox->ShowTracking( maRect ); } - - void ImplTBDragMgr::Dragging( const Point& rPos ) { if ( mnLineMode ) @@ -1303,8 +1249,6 @@ void ImplTBDragMgr::Dragging( const Point& rPos ) } } - - void ImplTBDragMgr::EndDragging( bool bOK ) { mpDragBox->HideTracking(); @@ -1391,8 +1335,6 @@ void ImplTBDragMgr::EndDragging( bool bOK ) mpDragBox = NULL; } - - void ImplTBDragMgr::UpdateDragRect() { // Only update if we're already dragging @@ -1402,8 +1344,6 @@ void ImplTBDragMgr::UpdateDragRect() mpDragBox->ShowTracking( maRect ); } - - IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) { if ( pAccel->GetCurItemId() == KEY_ESCAPE ) @@ -1414,8 +1354,6 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) return (long) true; } - - void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) { @@ -1483,7 +1421,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) DockingWindow::ImplInit( pParent, nStyle & ~(WB_BORDER) ); - // always set WB_TABSTOP for ToolBars !!! if( mnWinStyle & WB_TABSTOP ) { // dockingwindow's ImplInit removes some bits, so restore them here @@ -1495,8 +1432,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } - - void ToolBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -1562,8 +1497,6 @@ void ToolBox::ImplInitSettings( bool bFont, } } - - void ToolBox::ImplLoadRes( const ResId& rResId ) { ResMgr* pMgr = rResId.GetResMgr(); @@ -1619,16 +1552,12 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) } } - - ToolBox::ToolBox( Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_TOOLBOX ) { ImplInit( pParent, nStyle ); } - - ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : DockingWindow( WINDOW_TOOLBOX ) { @@ -1650,8 +1579,6 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : Show(); } - - ToolBox::~ToolBox() { // custom menu event still running? @@ -1687,8 +1614,6 @@ ToolBox::~ToolBox() } } - - ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const { std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin(); @@ -1702,7 +1627,6 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const return NULL; } - static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons ) { rWidth += SMALLBUTTON_HSIZE; @@ -1716,8 +1640,6 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton } } - - bool ToolBox::ImplCalcItem() { @@ -2004,8 +1926,6 @@ bool ToolBox::ImplCalcItem() return false; } - - sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) { sal_uLong nLineStart = 0; @@ -2136,7 +2056,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc ++it; } - if ( pMaxLineWidth ) { if ( nLineWidth > nMaxLineWidth ) @@ -2155,8 +2074,6 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc return nLines; } - - Size ToolBox::ImplGetOptimalFloatingSize() { if( !ImplIsFloatingMode() ) @@ -2290,7 +2207,6 @@ void ToolBox::ImplFormat( bool bResize ) else bMustFullPaint = false; - // calculate new size during interactive resize or // set computed size when formatting only if ( ImplIsFloatingMode() ) @@ -2620,7 +2536,6 @@ void ToolBox::ImplFormat( bool bResize ) // we have no toolbox items mnCurLines = 1; - if( IsMenuEnabled() && ImplIsFloatingMode() && !ImplHasExternalMenubutton() && !bIsInPopupMode ) { // custom menu will be the last button in floating mode @@ -2644,7 +2559,6 @@ void ToolBox::ImplFormat( bool bResize ) } } - // if toolbox visible trigger paint for changed regions if ( IsVisible() && !mbFullPaint ) { @@ -2705,8 +2619,6 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } - - IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && @@ -2736,8 +2648,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) return 0; } - - IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { @@ -2747,7 +2657,6 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) return 0; } - static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate ) { Color aOldFillColor = pBox->GetFillColor(); @@ -2875,8 +2784,6 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect pBox->SetLineColor( ); } - - void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) { if( !pThis->mpData->maMenubuttonItem.maRect.IsEmpty() ) @@ -2917,8 +2824,6 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) } } - - void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) { @@ -2948,8 +2853,6 @@ void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz ); } - - void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) { bool bNativeOk = false; @@ -2997,8 +2900,6 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) } } - - static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ) { // draws toolbar button background either native or using a coloured selection @@ -3016,7 +2917,6 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h aControlValue.setTristateVal( bChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF ); - bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, rRect, nState, aControlValue, OUString() ); } @@ -3353,8 +3253,6 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, pMgr->UpdateDragRect(); } - - void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem ) { if ( !pItem->maRect.IsEmpty() ) @@ -3412,7 +3310,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) // draw current item with highlight and keep old state bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard; - if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND ) ImplDrawItem( mnCurPos, bWasKeyboardActivate ? 2 : 0 ); Deactivate(); @@ -3428,8 +3325,6 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) } } - - void ToolBox::ShowLine( bool bNext ) { @@ -3463,8 +3358,6 @@ void ToolBox::ShowLine( bool bNext ) ImplFormat(); } - - bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { Point aMousePos = rMEvt.GetPosPixel(); @@ -3525,8 +3418,6 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) return false; } - - bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) { ImplDisableFlatButtons(); @@ -3643,8 +3534,6 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) return false; } - - void ToolBox::MouseMove( const MouseEvent& rMEvt ) { // pressing a modifier generates synthetic mouse moves @@ -3864,8 +3753,6 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) DockingWindow::MouseMove( rMEvt ); } - - void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) { // only trigger toolbox for left mouse button and when @@ -3937,7 +3824,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) return; } - // update actual data sal_uInt16 nTrackFlags = 0; mnCurPos = i; @@ -3948,7 +3834,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( it->mnBits & TIB_REPEAT ) nTrackFlags |= STARTTRACK_BUTTONREPEAT; - if ( mbSelection ) { ImplDrawItem( mnCurPos, 1 ); @@ -3965,7 +3850,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 2 ) DoubleClick(); - if ( mbDrag ) { ImplDrawItem( mnCurPos, 1 ); @@ -4004,7 +3888,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) mpData->maDropdownTimer.Start(); } - // call Click handler if ( rMEvt.GetClicks() != 2 ) Click(); @@ -4090,8 +3973,6 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) DockingWindow::MouseButtonDown( rMEvt ); } - - void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) { if ( ImplHandleMouseButtonUp( rMEvt ) ) @@ -4108,8 +3989,6 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) DockingWindow::MouseButtonUp( rMEvt ); } - - void ToolBox::Tracking( const TrackingEvent& rTEvt ) { ImplDelData aDelData; @@ -4127,8 +4006,6 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt ) DockingWindow::Tracking( rTEvt ); } - - void ToolBox::Paint( const Rectangle& rPaintRect ) { if( mpData->mbIsPaintLocked ) @@ -4138,7 +4015,6 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) ImplFormat(); mbFullPaint = false; - ImplDrawBackground( this, rPaintRect ); if ( (mnWinStyle & WB_BORDER) && !ImplIsFloatingMode() ) @@ -4182,15 +4058,11 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) ImplShowFocus(); } - - void ToolBox::Move() { DockingWindow::Move(); } - - void ToolBox::Resize() { Size aSize = GetOutputSizePixel(); @@ -4299,7 +4171,6 @@ void ToolBox::Resize() } } - const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -4321,8 +4192,6 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } - - void ToolBox::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nItemId; @@ -4398,8 +4267,6 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) DockingWindow::RequestHelp( rHEvt ); } - - bool ToolBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -4483,8 +4350,6 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) return DockingWindow::Notify( rNEvt ); } - - void ToolBox::Command( const CommandEvent& rCEvt ) { if ( maCommandHandler.IsSet() ) @@ -4549,8 +4414,6 @@ void ToolBox::Command( const CommandEvent& rCEvt ) DockingWindow::Command( rCEvt ); } - - void ToolBox::StateChanged( StateChangedType nType ) { DockingWindow::StateChanged( nType ); @@ -4587,8 +4450,6 @@ void ToolBox::StateChanged( StateChangedType nType ) maStateChangedHandler.Call( &nType ); } - - void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { DockingWindow::DataChanged( rDCEvt ); @@ -4609,15 +4470,11 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) maDataChangedHandler.Call( (void*)&rDCEvt ); } - - bool ToolBox::PrepareToggleFloatingMode() { return DockingWindow::PrepareToggleFloatingMode(); } - - void ToolBox::ToggleFloatingMode() { DockingWindow::ToggleFloatingMode(); @@ -4660,8 +4517,6 @@ void ToolBox::ToggleFloatingMode() ImplFormat(); } - - void ToolBox::StartDocking() { meDockAlign = meAlign; @@ -4670,8 +4525,6 @@ void ToolBox::StartDocking() DockingWindow::StartDocking(); } - - bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) { // do nothing during dragging, it was calculated before @@ -4796,8 +4649,6 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) return bFloatMode; } - - void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode ) { if ( !IsDockingCanceled() ) @@ -4811,8 +4662,6 @@ void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode ) DockingWindow::EndDocking( rRect, bFloatMode ); } - - void ToolBox::Resizing( Size& rSize ) { sal_uInt16 nCalcLines; @@ -4957,8 +4806,6 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const return aSize; } - - Size ToolBox::CalcMinimumWindowSizePixel() const { if( ImplIsFloatingMode() ) @@ -5000,8 +4847,6 @@ Size ToolBox::CalcMinimumWindowSizePixel() const } } - - void ToolBox::EnableCustomize( bool bEnable ) { if ( bEnable != mbCustomize ) @@ -5016,15 +4861,11 @@ void ToolBox::EnableCustomize( bool bEnable ) } } - - void ToolBox::GetFocus() { DockingWindow::GetFocus(); } - - void ToolBox::LoseFocus() { ImplChangeHighlight( NULL, true ); @@ -5032,8 +4873,6 @@ void ToolBox::LoseFocus() DockingWindow::LoseFocus(); } - - // performs the action associated with an item, ie simulates clicking the item void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) { @@ -5047,8 +4886,6 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) ImplActivateItem( aKeyCode ); } - - // calls the button's action handler // returns true if action was called bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) @@ -5111,8 +4948,6 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) return bRet; } - - bool ImplCloseLastPopup( Window *pParent ) { // close last popup toolbox (see also: @@ -5178,8 +5013,6 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) return bRet; } - - void ToolBox::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -5368,8 +5201,6 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) DockingWindow::KeyInput( rKEvt ); } - - // returns the current toolbox line of the item sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem ) { @@ -5418,8 +5249,6 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine ) return (it == mpData->m_aItems.end()) ? NULL : &(*it); } - - sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ) { if( pItem ) @@ -5516,8 +5345,6 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) mbChangingHighlight = false; } - - // check for keyboard accessible items static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) { @@ -5527,8 +5354,6 @@ static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) return bValid; } - - bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) { ImplToolItem* pToolItem = ImplGetItem( mnHighItemId ); @@ -5690,8 +5515,6 @@ bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) return true; } - - void ToolBox::ImplShowFocus() { if( mnHighItemId && HasFocus() ) @@ -5706,8 +5529,6 @@ void ToolBox::ImplShowFocus() } } - - void ToolBox::ImplHideFocus() { if( mnHighItemId ) @@ -5728,8 +5549,6 @@ void ToolBox::ImplHideFocus() } } - - void ToolBox::ImplDisableFlatButtons() { #ifdef WNT // Check in the Windows registry if an AT tool wants no flat toolboxes diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c62016ec728b..5f433848f65e 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -72,7 +72,6 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() : maMenubuttonItem.meState = TRISTATE_FALSE; mnMenuButtonWidth = TB_MENUBUTTON_SIZE; - mbIsLocked = false; mbNativeButtons = false; mbIsPaintLocked = false; @@ -93,7 +92,6 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData() delete mpMenu; } - void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn) { @@ -658,7 +656,6 @@ static OUString getCommandLabel(const OUString& rCommand, const uno::Reference& rContext, const uno::Reference& rFrame, @@ -1114,7 +1111,6 @@ Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) return aPos; } - Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const { return ImplGetPopupPosition( GetItemRect( nItemId ), rSize ); @@ -1166,7 +1162,6 @@ bool ToolBox::ImplHasExternalMenubutton() return bRet; } - void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) { sal_uInt16 nPos = GetItemPos( nItemId ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5bed7e135b94..787d153ba266 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -138,7 +138,6 @@ ImplAccessibleInfos::~ImplAccessibleInfos() delete pAccessibleDescription; } - WindowImpl::WindowImpl( WindowType nType ) { maZoom = Fraction( 1, 1 ); @@ -524,14 +523,11 @@ void Window::ImplInitAppFontData( Window* pWindow ) } } - pSVData->maGDIData.mnRealAppFontX = pSVData->maGDIData.mnAppFontX; if ( pSVData->maAppData.mnDialogScaleX ) pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100; } - - bool Window::ImplCheckUIFont( const Font& rFont ) { if( ImplGetSVData()->maGDIData.mbNativeFontConfig ) @@ -573,8 +569,6 @@ bool Window::ImplCheckUIFont( const Font& rFont ) return bUIFontOk; } - - void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) { StyleSettings aTmpSt( rSettings.GetStyleSettings() ); @@ -815,8 +809,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) GetpApp()->OverrideSystemSettings( rSettings ); } - - MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest ) { Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() ); @@ -824,8 +816,6 @@ MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Windo return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() ); } - - CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest ) { if ( !rCEvt.IsMouseEvent() ) @@ -836,8 +826,6 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSour return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); } - - void Window::ImplInitWindowData( WindowType nType ) { // We will eventually being removing the inheritance of OutputDevice from Window. @@ -845,17 +833,13 @@ void Window::ImplInitWindowData( WindowType nType ) // it will not *be* an OutputDevice mpOutputDevice = (OutputDevice*)this; - mpWindowImpl = new WindowImpl( nType ); meOutDevType = OUTDEV_WINDOW; - mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active } - - static bool ImplDoTiledRendering() { #if !HAVE_FEATURE_DESKTOP @@ -1157,8 +1141,6 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this ); } - - void Window::ImplSetFrameParent( const Window* pParent ) { Window* pFrameWindow = ImplGetSVData()->maWinData.mpFirstFrame; @@ -1177,8 +1159,6 @@ void Window::ImplSetFrameParent( const Window* pParent ) } } - - void Window::ImplInsertWindow( Window* pParent ) { mpWindowImpl->mpParent = pParent; @@ -1228,8 +1208,6 @@ void Window::ImplInsertWindow( Window* pParent ) } } - - void Window::ImplRemoveWindow( bool bRemoveFrameData ) { // remove window from the lists @@ -1312,8 +1290,6 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition) mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild = this; } - - void Window::ImplCallResize() { mpWindowImpl->mbCallResize = false; @@ -1328,8 +1304,6 @@ void Window::ImplCallResize() ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE ); } - - void Window::ImplCallMove() { mpWindowImpl->mbCallMove = false; @@ -1372,8 +1346,6 @@ void Window::ImplCallMove() ImplCallEventListeners( VCLEVENT_WINDOW_MOVE ); } - - static OString ImplAutoHelpID( ResMgr* pResMgr ) { OString aRet; @@ -1384,8 +1356,6 @@ static OString ImplAutoHelpID( ResMgr* pResMgr ) return aRet; } - - WinBits Window::ImplInitRes( const ResId& rResId ) { GetRes( rResId ); @@ -1397,8 +1367,6 @@ WinBits Window::ImplInitRes( const ResId& rResId ) return nStyle; } - - WindowResHeader Window::ImplLoadResHeader( const ResId& rResId ) { WindowResHeader aHeader; @@ -1509,8 +1477,6 @@ void Window::ImplLoadRes( const ResId& rResId ) } } - - ImplWinData* Window::ImplGetWinData() const { if ( !mpWindowImpl->mpWinData ) @@ -1535,8 +1501,6 @@ ImplWinData* Window::ImplGetWinData() const return mpWindowImpl->mpWinData; } - - SalGraphics* Window::ImplGetFrameGraphics() const { if ( mpWindowImpl->mpFrameWindow->mpGraphics ) @@ -1552,8 +1516,6 @@ SalGraphics* Window::ImplGetFrameGraphics() const return mpWindowImpl->mpFrameWindow->mpGraphics; } - - Window* Window::ImplFindWindow( const Point& rFramePos ) { Window* pTempWindow; @@ -1595,8 +1557,6 @@ Window* Window::ImplFindWindow( const Point& rFramePos ) return NULL; } - - sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) { Point aFramePos( rFramePos ); @@ -1624,8 +1584,6 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) return nHitTest; } - - bool Window::ImplIsRealParentPath( const Window* pWindow ) const { pWindow = pWindow->GetParent(); @@ -1639,8 +1597,6 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const return false; } - - bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const { do @@ -1658,8 +1614,6 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const return false; } - - bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) @@ -1667,8 +1621,6 @@ bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) co return ImplIsChild( pWindow, bSystemWindow ); } - - int Window::ImplTestMousePointerSet() { // as soon as mouse is captured, switch mouse-pointer @@ -1683,8 +1635,6 @@ int Window::ImplTestMousePointerSet() return sal_False; } - - PointerStyle Window::ImplGetMousePointer() const { PointerStyle ePointerStyle; @@ -1727,8 +1677,6 @@ PointerStyle Window::ImplGetMousePointer() const return ePointerStyle; } - - void Window::ImplResetReallyVisible() { bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible; @@ -1762,8 +1710,6 @@ void Window::ImplResetReallyVisible() } } - - void Window::ImplSetReallyVisible() { // #i43594# it is possible that INITSHOW was never send, because the visibility state changed between @@ -1804,8 +1750,6 @@ void Window::ImplSetReallyVisible() } } - - void Window::ImplCallInitShow() { mpWindowImpl->mbReallyShown = true; @@ -1830,8 +1774,6 @@ void Window::ImplCallInitShow() } } - - void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { DBG_ASSERT( !pDel->mpWindow, "Window::ImplAddDel(): cannot add ImplDelData twice !" ); @@ -1843,8 +1785,6 @@ void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompat } } - - void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { pDel->mpWindow = NULL; // #112873# pDel is not associated with a Window anymore @@ -1859,8 +1799,6 @@ void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incom } } - - void Window::ImplInitResolutionSettings() { // recalculate AppFont-resolution and DPI-resolution @@ -1896,8 +1834,6 @@ void Window::ImplInitResolutionSettings() } } - - void Window::ImplPointToLogic( Font& rFont ) const { Size aSize = rFont.GetSize(); @@ -1923,8 +1859,6 @@ void Window::ImplPointToLogic( Font& rFont ) const rFont.SetSize( aSize ); } - - void Window::ImplLogicToPoint( Font& rFont ) const { Size aSize = rFont.GetSize(); @@ -1950,8 +1884,6 @@ void Window::ImplLogicToPoint( Font& rFont ) const rFont.SetSize( aSize ); } - - bool Window::ImplSysObjClip( const Region* pOldRegion ) { bool bUpdate = true; @@ -2039,8 +1971,6 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) return bUpdate; } - - void Window::ImplUpdateSysObjChildrenClip() { if ( mpWindowImpl->mpSysObj && mpWindowImpl->mbInitWinClipRegion ) @@ -2054,8 +1984,6 @@ void Window::ImplUpdateSysObjChildrenClip() } } - - void Window::ImplUpdateSysObjOverlapsClip() { ImplUpdateSysObjChildrenClip(); @@ -2068,8 +1996,6 @@ void Window::ImplUpdateSysObjOverlapsClip() } } - - void Window::ImplUpdateSysObjClip() { if ( !ImplIsOverlapWindow() ) @@ -2091,8 +2017,6 @@ void Window::ImplUpdateSysObjClip() mpWindowImpl->mpFrameWindow->ImplUpdateSysObjOverlapsClip(); } - - bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) { bool bUpdate = true; @@ -2138,8 +2062,6 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) return bUpdate; } - - bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) { bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); @@ -2155,8 +2077,6 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) return bUpdate; } - - bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) { if ( !ImplIsOverlapWindow() ) @@ -2189,8 +2109,6 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ); } - - void Window::ImplIntersectWindowClipRegion( Region& rRegion ) { if ( mpWindowImpl->mbInitWinClipRegion ) @@ -2199,8 +2117,6 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion ) rRegion.Intersect( mpWindowImpl->maWinClipRegion ); } - - void Window::ImplIntersectWindowRegion( Region& rRegion ) { rRegion.Intersect( Rectangle( Point( mnOutOffX, mnOutOffY ), @@ -2209,8 +2125,6 @@ void Window::ImplIntersectWindowRegion( Region& rRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); } - - void Window::ImplExcludeWindowRegion( Region& rRegion ) { if ( mpWindowImpl->mbWinRegion ) @@ -2229,8 +2143,6 @@ void Window::ImplExcludeWindowRegion( Region& rRegion ) } } - - void Window::ImplExcludeOverlapWindows( Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstOverlap; @@ -2246,8 +2158,6 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion ) } } - - void Window::ImplExcludeOverlapWindows2( Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) @@ -2256,8 +2166,6 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) ImplExcludeOverlapWindows( rRegion ); } - - void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) { if ( bThis ) @@ -2291,8 +2199,6 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) ImplGetParent()->ImplIntersectWindowClipRegion( rRegion ); } - - bool Window::ImplClipChildren( Region& rRegion ) { bool bOtherClip = false; @@ -2316,8 +2222,6 @@ bool Window::ImplClipChildren( Region& rRegion ) return bOtherClip; } - - void Window::ImplClipAllChildren( Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstChild; @@ -2329,8 +2233,6 @@ void Window::ImplClipAllChildren( Region& rRegion ) } } - - void Window::ImplClipSiblings( Region& rRegion ) { Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; @@ -2346,8 +2248,6 @@ void Window::ImplClipSiblings( Region& rRegion ) } } - - void Window::ImplInitWinClipRegion() { // Build Window Region @@ -2370,8 +2270,6 @@ void Window::ImplInitWinClipRegion() mpWindowImpl->mbInitWinClipRegion = false; } - - void Window::ImplInitWinChildClipRegion() { if ( !mpWindowImpl->mpFirstChild ) @@ -2395,8 +2293,6 @@ void Window::ImplInitWinChildClipRegion() mpWindowImpl->mbInitChildRegion = false; } - - Region* Window::ImplGetWinChildClipRegion() { if ( mpWindowImpl->mbInitWinClipRegion ) @@ -2409,8 +2305,6 @@ Region* Window::ImplGetWinChildClipRegion() return &mpWindowImpl->maWinClipRegion; } - - void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstOverlap; @@ -2428,8 +2322,6 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re } } - - void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) @@ -2442,8 +2334,6 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } - - void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ) { // Clip Overlap Siblings @@ -2470,8 +2360,6 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } - - void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, bool bChildren, bool bParent, bool bSiblings ) { @@ -2542,8 +2430,6 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio } } - - void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { Exception aException; @@ -2702,8 +2588,6 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) } } - - void Window::ImplCallOverlapPaint() { // emit overlapping windows first @@ -2724,16 +2608,12 @@ void Window::ImplCallOverlapPaint() } } - - void Window::ImplPostPaint() { if ( !ImplDoTiledRendering() && !mpWindowImpl->mpFrameData->maPaintTimer.IsActive() ) mpWindowImpl->mpFrameData->maPaintTimer.Start(); } - - IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { // save paint events until layout is done @@ -2752,8 +2632,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) return 0; } - - IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { if( mpWindowImpl->mbReallyVisible ) @@ -2773,8 +2651,6 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) return 0; } - - void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { // set PAINTCHILDREN for all parent windows till the first OverlapWindow @@ -2832,8 +2708,6 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ImplPostPaint(); } - - void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) { Region aRegion = rRegion; @@ -2853,8 +2727,6 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) } } - - void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) { if ( mpWindowImpl->mbOverlapWin ) @@ -2866,8 +2738,6 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) } } - - void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2954,8 +2824,6 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) pOpaqueWindow->Update(); // start painting at the opaque parent } - - void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ) @@ -2979,8 +2847,6 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, } } - - void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ) @@ -3018,8 +2884,6 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, } } - - void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { if ( !pRegion ) @@ -3062,8 +2926,6 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) } } - - void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) { // assemble region @@ -3103,8 +2965,6 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) } } - - void Window::ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { @@ -3284,8 +3144,6 @@ void Window::ImplScroll( const Rectangle& rRect, mpWindowImpl->mpCursor->ImplResume(); } - - void Window::ImplUpdateAll( bool bOverlapWindows ) { if ( !mpWindowImpl->mbReallyVisible ) @@ -3316,8 +3174,6 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) Flush(); } - - void Window::ImplUpdateWindowPtr( Window* pWindow ) { if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow ) @@ -3343,8 +3199,6 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) } } - - void Window::ImplUpdateWindowPtr() { Window* pChild = mpWindowImpl->mpFirstChild; @@ -3355,8 +3209,6 @@ void Window::ImplUpdateWindowPtr() } } - - void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) { bool bVisible = IsVisible(); @@ -3384,8 +3236,6 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) Show( true ); } - - bool Window::ImplUpdatePos() { bool bSysChild = false; @@ -3417,8 +3267,6 @@ bool Window::ImplUpdatePos() return bSysChild; } - - void Window::ImplUpdateSysObjPos() { if ( mpWindowImpl->mpSysObj ) @@ -3432,7 +3280,6 @@ void Window::ImplUpdateSysObjPos() } } - void Window::ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -3737,8 +3584,6 @@ void Window::ImplPosSizeWindow( long nX, long nY, delete pOldRegion; } - - void Window::ImplToBottomChild() { if ( !ImplIsOverlapWindow() && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) ) @@ -3756,8 +3601,6 @@ void Window::ImplToBottomChild() } } - - void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); @@ -3785,8 +3628,6 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) } } - - void Window::ImplToTop( sal_uInt16 nFlags ) { DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" ); @@ -3877,8 +3718,6 @@ void Window::ImplToTop( sal_uInt16 nFlags ) } } - - void Window::ImplStartToTop( sal_uInt16 nFlags ) { ImplCalcToTopData aStartData; @@ -3932,8 +3771,6 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) } } - - void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) { // do we need to fetch the focus? @@ -3961,8 +3798,6 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) ImplGenerateMouseMove(); } - - void Window::ImplShowAllOverlaps() { Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; @@ -3978,8 +3813,6 @@ void Window::ImplShowAllOverlaps() } } - - void Window::ImplHideAllOverlaps() { Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; @@ -3995,8 +3828,6 @@ void Window::ImplHideAllOverlaps() } } - - void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) @@ -4022,16 +3853,12 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) } } - - void Window::ImplGenerateMouseMove() { if ( !mpWindowImpl->mpFrameData->mnMouseMoveId ) Application::PostUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId, LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ) ); } - - IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; @@ -4045,15 +3872,11 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) return 0; } - - void Window::ImplInvertFocus( const Rectangle& rRect ) { InvertTracking( rRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } - - void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ) { @@ -4145,7 +3968,6 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl) return false; } - void Window::ImplGrabFocus( sal_uInt16 nFlags ) { // #143570# no focus for destructing windows @@ -4234,7 +4056,6 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pParent = pParent->mpWindowImpl->mpParent; } - if ( ( pSVData->maWinData.mpFocusWin != this && ! mpWindowImpl->mbInDtor ) || ( bAsyncFocusWaiting && !bHasFocus && !bMustNotGrabFocus ) ) { // EndExtTextInput if it is not the same window @@ -4364,8 +4185,6 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) } } - - void Window::ImplNewInputContext() { ImplSVData* pSVData = ImplGetSVData(); @@ -4411,15 +4230,11 @@ void Window::ImplNewInputContext() pFocusWin->mpFontCache->Release( pFontEntry ); } - - Window::Window( WindowType nType ) { ImplInitWindowData( nType ); } - - Window::Window( Window* pParent, WinBits nStyle ) { @@ -4427,8 +4242,6 @@ Window::Window( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle, NULL ); } - - Window::Window( Window* pParent, const ResId& rResId ) : mpWindowImpl(NULL) { @@ -4442,7 +4255,6 @@ Window::Window( Window* pParent, const ResId& rResId ) Show(); } - #if OSL_DEBUG_LEVEL > 0 namespace { @@ -4466,14 +4278,12 @@ namespace } #endif - Window::~Window() { vcl::LazyDeletor::Undelete( this ); DBG_ASSERT( !mpWindowImpl->mbInDtor, "~Window - already in DTOR!" ); - // remove Key and Mouse events issued by Application::PostKey/MouseEvent Application::RemoveMouseAndKeyEvents( this ); @@ -4500,7 +4310,6 @@ Window::~Window() // remove associated data structures from dockingmanager ImplGetDockingManager()->RemoveWindow( this ); - // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { @@ -4797,7 +4606,6 @@ Window::~Window() } } - if ( pOverlapWindow != 0 && pOverlapWindow->mpWindowImpl->mpLastFocusWindow == this ) pOverlapWindow->mpWindowImpl->mpLastFocusWindow = NULL; @@ -4907,7 +4715,6 @@ Window::~Window() delete mpWindowImpl; mpWindowImpl = NULL; } - void Window::doLazyDelete() { SystemWindow* pSysWin = dynamic_cast(this); @@ -4930,8 +4737,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const mpWindowImpl->mpFrame->SimulateKeyPress(nKeyCode); } - - void Window::MouseMove( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt ); @@ -4939,8 +4744,6 @@ void Window::MouseMove( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseMove = true; } - - void Window::MouseButtonDown( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt ); @@ -4948,8 +4751,6 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonDown = true; } - - void Window::MouseButtonUp( const MouseEvent& rMEvt ) { NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt ); @@ -4957,8 +4758,6 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonUp = true; } - - void Window::KeyInput( const KeyEvent& rKEvt ) { NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt ); @@ -4966,8 +4765,6 @@ void Window::KeyInput( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyInput = true; } - - void Window::KeyUp( const KeyEvent& rKEvt ) { NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt ); @@ -4975,27 +4772,19 @@ void Window::KeyUp( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyUp = true; } - - void Window::PrePaint() { } - - void Window::Paint( const Rectangle& rRect ) { ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect ); } - - void Window::PostPaint() { } - - void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { } @@ -5022,16 +4811,12 @@ void Window::GetFocus() Notify( aNEvt ); } - - void Window::LoseFocus() { NotifyEvent aNEvt( EVENT_LOSEFOCUS, this ); Notify( aNEvt ); } - - void Window::RequestHelp( const HelpEvent& rHEvt ) { // if Balloon-Help is requested, show the balloon @@ -5082,8 +4867,6 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } } - - void Window::Command( const CommandEvent& rCEvt ) { ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt ); @@ -5093,8 +4876,6 @@ void Window::Command( const CommandEvent& rCEvt ) mpWindowImpl->mbCommand = true; } - - void Window::Tracking( const TrackingEvent& rTEvt ) { @@ -5103,14 +4884,10 @@ void Window::Tracking( const TrackingEvent& rTEvt ) pWrapper->Tracking( rTEvt ); } - - void Window::UserEvent( sal_uLong, void* ) { } - - void Window::StateChanged( StateChangedType eType ) { switch (eType) @@ -5134,14 +4911,10 @@ void Window::StateChanged( StateChangedType eType ) } } - - void Window::DataChanged( const DataChangedEvent& ) { } - - void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_COMMAND ) @@ -5241,8 +5014,6 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } - - bool Window::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -5284,8 +5055,6 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) return bDone; } - - bool Window::Notify( NotifyEvent& rNEvt ) { bool nRet = false; @@ -5393,8 +5162,6 @@ bool Window::Notify( NotifyEvent& rNEvt ) return nRet; } - - void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) { // The implementation was moved to CallEventListeners(), @@ -5406,8 +5173,6 @@ void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) CallEventListeners( nEvent, pData ); } - - void Window::CallEventListeners( sal_uLong nEvent, void* pData ) { VclWindowEvent aEvent( this, nEvent, pData ); @@ -5448,36 +5213,26 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent ) ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent); } - - void Window::AddEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.addListener( rEventListener ); } - - void Window::RemoveEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.removeListener( rEventListener ); } - - void Window::AddChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.addListener( rEventListener ); } - - void Window::RemoveChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.removeListener( rEventListener ); } - - sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -5485,10 +5240,6 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) return nEventId; } - - - - bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { @@ -5511,8 +5262,6 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle } } - - void Window::RemoveUserEvent( sal_uLong nUserEvent ) { @@ -5532,8 +5281,6 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent ) pSVEvent->mbCall = false; } - - bool Window::IsLocked( bool bChildren ) const { if ( mpWindowImpl->mnLockCount != 0 ) @@ -5553,8 +5300,6 @@ bool Window::IsLocked( bool bChildren ) const return false; } - - void Window::SetStyle( WinBits nStyle ) { @@ -5566,8 +5311,6 @@ void Window::SetStyle( WinBits nStyle ) } } - - void Window::SetExtendedStyle( WinBits nExtendedStyle ) { @@ -5592,8 +5335,6 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) } } - - SystemWindow* Window::GetSystemWindow() const { @@ -5603,8 +5344,6 @@ SystemWindow* Window::GetSystemWindow() const return (SystemWindow*)pWin; } - - void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) { @@ -5645,8 +5384,6 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) } } - - sal_uInt16 Window::GetBorderStyle() const { @@ -5661,8 +5398,6 @@ sal_uInt16 Window::GetBorderStyle() const return 0; } - - long Window::CalcTitleWidth() const { @@ -5691,8 +5426,6 @@ long Window::CalcTitleWidth() const return 0; } - - void Window::EnableClipSiblings( bool bClipSiblings ) { @@ -5702,8 +5435,6 @@ void Window::EnableClipSiblings( bool bClipSiblings ) mpWindowImpl->mbClipSiblings = bClipSiblings; } - - void Window::SetMouseTransparent( bool bTransparent ) { @@ -5716,8 +5447,6 @@ void Window::SetMouseTransparent( bool bTransparent ) mpWindowImpl->mbMouseTransparent = bTransparent; } - - void Window::SetPaintTransparent( bool bTransparent ) { @@ -5731,8 +5460,6 @@ void Window::SetPaintTransparent( bool bTransparent ) mpWindowImpl->mbPaintTransparent = bTransparent; } - - void Window::SetInputContext( const InputContext& rInputContext ) { @@ -5741,8 +5468,6 @@ void Window::SetInputContext( const InputContext& rInputContext ) ImplNewInputContext(); } - - void Window::EndExtTextInput( sal_uInt16 nFlags ) { @@ -5750,8 +5475,6 @@ void Window::EndExtTextInput( sal_uInt16 nFlags ) ImplGetFrame()->EndExtTextInput( nFlags ); } - - void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) { @@ -5776,8 +5499,6 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) } - - const Rectangle* Window::GetCursorRect() const { @@ -5785,8 +5506,6 @@ const Rectangle* Window::GetCursorRect() const return pWinData->mpCursorRect; } - - long Window::GetCursorExtTextInputWidth() const { @@ -5794,8 +5513,6 @@ long Window::GetCursorExtTextInputWidth() const return pWinData->mnCursorExtWidth; } - - void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) { ImplWinData* pWinData = ImplGetWinData(); @@ -5811,7 +5528,6 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe } } - void Window::SetSettings( const AllSettings& rSettings ) { SetSettings( rSettings, sal_False ); @@ -5852,8 +5568,6 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild ) } } - - void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) { @@ -5922,8 +5636,6 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } } - - void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) { @@ -5937,8 +5649,6 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) } } - - void Window::SetPointFont( const Font& rFont ) { @@ -5947,8 +5657,6 @@ void Window::SetPointFont( const Font& rFont ) SetFont( aFont ); } - - Font Window::GetPointFont() const { @@ -5957,8 +5665,6 @@ Font Window::GetPointFont() const return aFont; } - - void Window::SetParentClipMode( sal_uInt16 nMode ) { @@ -5975,8 +5681,6 @@ void Window::SetParentClipMode( sal_uInt16 nMode ) } } - - sal_uInt16 Window::GetParentClipMode() const { @@ -5986,8 +5690,6 @@ sal_uInt16 Window::GetParentClipMode() const return mpWindowImpl->mnParentClipMode; } - - void Window::SetWindowRegionPixel() { @@ -6022,8 +5724,6 @@ void Window::SetWindowRegionPixel() } } - - void Window::SetWindowRegionPixel( const Region& rRegion ) { @@ -6110,8 +5810,6 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) } } - - const Region& Window::GetWindowRegionPixel() const { @@ -6121,8 +5819,6 @@ const Region& Window::GetWindowRegionPixel() const return mpWindowImpl->maWinRegion; } - - bool Window::IsWindowRegionPixel() const { @@ -6132,8 +5828,6 @@ bool Window::IsWindowRegionPixel() const return mpWindowImpl->mbWinRegion; } - - Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const { @@ -6171,8 +5865,6 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const return aWinClipRegion; } - - Region Window::GetPaintRegion() const { @@ -6189,8 +5881,6 @@ Region Window::GetPaintRegion() const } } - - void Window::ExpandPaintClipRegion( const Region& rRegion ) { if( mpWindowImpl->mpPaintRegion ) @@ -6215,8 +5905,6 @@ void Window::ExpandPaintClipRegion( const Region& rRegion ) } } - - static SystemWindow *ImplGetLastSystemWindow( Window *pWin ) { // get the most top-level system window, the one that contains the taskpanelist @@ -6399,8 +6087,6 @@ void Window::SetParent( Window* pNewParent ) Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } - - void Window::Show( bool bVisible, sal_uInt16 nFlags ) { @@ -6651,8 +6337,6 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) */ } - - Size Window::GetSizePixel() const { if (!mpWindowImpl) @@ -6684,9 +6368,6 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, rBottomBorder = mpWindowImpl->mnBottomBorder; } - - - void Window::Enable( bool bEnable, bool bChild ) { @@ -6747,8 +6428,6 @@ void Window::Enable( bool bEnable, bool bChild ) ImplGenerateMouseMove(); } - - void Window::SetCallHandlersOnInputDisabled( bool bCall ) { mpWindowImpl->mbCallHandlersDuringInputDisabled = bCall ? sal_True : sal_False; @@ -6761,15 +6440,11 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall ) } } - - bool Window::IsCallHandlersOnInputDisabled() const { return mpWindowImpl->mbCallHandlersDuringInputDisabled ? true : false; } - - void Window::EnableInput( bool bEnable, bool bChild ) { @@ -6833,8 +6508,6 @@ void Window::EnableInput( bool bEnable, bool bChild ) } } - - void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, const Window* pExcludeWindow ) { @@ -6899,8 +6572,6 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, } } - - void Window::AlwaysEnableInput( bool bAlways, bool bChild ) { @@ -6930,8 +6601,6 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild ) } } - - void Window::AlwaysDisableInput( bool bAlways, bool bChild ) { @@ -6961,8 +6630,6 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild ) } } - - void Window::SetActivateMode( sal_uInt16 nMode ) { @@ -6994,8 +6661,6 @@ void Window::SetActivateMode( sal_uInt16 nMode ) } } - - void Window::ToTop( sal_uInt16 nFlags ) { @@ -7003,8 +6668,6 @@ void Window::ToTop( sal_uInt16 nFlags ) ImplFocusToTop( nFlags, IsReallyVisible() ); } - - void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { @@ -7178,8 +6841,6 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) } } - - void Window::EnableAlwaysOnTop( bool bEnable ) { @@ -7194,8 +6855,6 @@ void Window::EnableAlwaysOnTop( bool bEnable ) mpWindowImpl->mpFrame->SetAlwaysOnTop( bEnable ); } - - void Window::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -7224,7 +6883,6 @@ void Window::setPosSizePixel( long nX, long nY, if ( !(nFlags & WINDOW_POSSIZE_HEIGHT) ) nHeight = pWindow->mnOutHeight; - sal_uInt16 nSysFlags=0; Window *pParent = GetParent(); @@ -7325,15 +6983,11 @@ void Window::setPosSizePixel( long nX, long nY, } } - - Point Window::GetPosPixel() const { return mpWindowImpl->maPos; } - - Rectangle Window::GetDesktopRectPixel() const { Rectangle rRect; @@ -7341,24 +6995,18 @@ Rectangle Window::GetDesktopRectPixel() const return rRect; } - - Point Window::OutputToScreenPixel( const Point& rPos ) const { // relative to top level parent return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY ); } - - Point Window::ScreenToOutputPixel( const Point& rPos ) const { // relative to top level parent return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); } - - long Window::ImplGetUnmirroredOutOffX() { // revert mnOutOffX changes that were potentially made in ImplPosSizeWindow @@ -7396,8 +7044,6 @@ Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const return Point( rPos.X()-offx, rPos.Y()-mnOutOffY ); } - - Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const { // relative to the screen @@ -7408,8 +7054,6 @@ Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const return p; } - - Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const { // relative to the screen @@ -7420,8 +7064,6 @@ Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const return p; } - - Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rRect ) const { // this method creates unmirrored screen coordinates to be compared with the desktop @@ -7439,9 +7081,6 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR return Rectangle( p1, p2 ); } - - - Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const { // with decoration @@ -7454,8 +7093,6 @@ Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) cons return ImplGetWindowExtentsRelative( pRelativeWindow, true ); } - - Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const { SalFrameGeometry g = mpWindowImpl->mpFrame->GetGeometry(); @@ -7484,8 +7121,6 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC return Rectangle( aPos, aSize ); } - - void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { @@ -7494,8 +7129,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) nHorzScroll, nVertScroll, nFlags & ~SCROLL_CLIP ); } - - void Window::Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -7507,8 +7140,6 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags ); } - - void Window::Invalidate( sal_uInt16 nFlags ) { @@ -7518,15 +7149,12 @@ void Window::Invalidate( sal_uInt16 nFlags ) ImplInvalidate( NULL, nFlags ); } - - void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) return; - OutputDevice *pOutDev = GetOutDev(); Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect ); if ( !aRect.IsEmpty() ) @@ -7536,8 +7164,6 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) } } - - void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) { @@ -7554,8 +7180,6 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) } } - - void Window::Validate( sal_uInt16 nFlags ) { @@ -7565,8 +7189,6 @@ void Window::Validate( sal_uInt16 nFlags ) ImplValidate( NULL, nFlags ); } - - bool Window::HasPaintEvent() const { @@ -7594,8 +7216,6 @@ bool Window::HasPaintEvent() const return false; } - - void Window::Update() { @@ -7668,8 +7288,6 @@ void Window::Update() Flush(); } - - void Window::Flush() { @@ -7677,16 +7295,12 @@ void Window::Flush() mpWindowImpl->mpFrame->Flush( aWinRect ); } - - void Window::Sync() { mpWindowImpl->mpFrame->Sync(); } - - void Window::SetUpdateMode( bool bUpdate ) { @@ -7694,16 +7308,12 @@ void Window::SetUpdateMode( bool bUpdate ) StateChanged( STATE_CHANGE_UPDATEMODE ); } - - void Window::GrabFocus() { ImplGrabFocus( 0 ); } - - bool Window::HasFocus() const { @@ -7722,8 +7332,6 @@ bool Window::HasFocus() const return (this == ImplGetSVData()->maWinData.mpFocusWin); } - - void Window::GrabFocusToDocument() { ImplGrabFocusToDocument(0); @@ -7734,8 +7342,6 @@ void Window::SetFakeFocus( bool bFocus ) ImplGetWindowImpl()->mbFakeFocusSet = bFocus; } - - bool Window::HasChildPathFocus( bool bSystemWindow ) const { @@ -7754,8 +7360,6 @@ bool Window::HasChildPathFocus( bool bSystemWindow ) const return false; } - - void Window::CaptureMouse() { @@ -7775,8 +7379,6 @@ void Window::CaptureMouse() } } - - void Window::ReleaseMouse() { @@ -7793,16 +7395,12 @@ void Window::ReleaseMouse() } } - - bool Window::IsMouseCaptured() const { return (this == ImplGetSVData()->maWinData.mpCaptureWin); } - - void Window::SetPointer( const Pointer& rPointer ) { @@ -7816,8 +7414,6 @@ void Window::SetPointer( const Pointer& rPointer ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } - - void Window::EnableChildPointerOverwrite( bool bOverwrite ) { @@ -7831,8 +7427,6 @@ void Window::EnableChildPointerOverwrite( bool bOverwrite ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } - - void Window::SetPointerPosPixel( const Point& rPos ) { Point aPos = ImplOutputToFrame( rPos ); @@ -7854,8 +7448,6 @@ void Window::SetPointerPosPixel( const Point& rPos ) mpWindowImpl->mpFrame->SetPointerPos( aPos.X(), aPos.Y() ); } - - Point Window::GetPointerPosPixel() { @@ -7869,8 +7461,6 @@ Point Window::GetPointerPosPixel() return ImplFrameToOutput( aPos ); } - - Point Window::GetLastPointerPosPixel() { @@ -7884,8 +7474,6 @@ Point Window::GetLastPointerPosPixel() return ImplFrameToOutput( aPos ); } - - void Window::ShowPointer( bool bVisible ) { @@ -7899,8 +7487,6 @@ void Window::ShowPointer( bool bVisible ) } } - - Window::PointerState Window::GetPointerState() { PointerState aState; @@ -7923,15 +7509,11 @@ Window::PointerState Window::GetPointerState() return aState; } - - bool Window::IsMouseOver() { return ImplGetWinData()->mbMouseOver; } - - void Window::EnterWait() { @@ -7945,8 +7527,6 @@ void Window::EnterWait() } } - - void Window::LeaveWait() { @@ -7963,8 +7543,6 @@ void Window::LeaveWait() } } - - void Window::SetCursor( Cursor* pCursor ) { @@ -7978,14 +7556,11 @@ void Window::SetCursor( Cursor* pCursor ) } } - - void Window::SetText( const OUString& rStr ) { if (rStr == mpWindowImpl->maText) return; - OUString oldTitle( mpWindowImpl->maText ); mpWindowImpl->maText = rStr; @@ -8010,24 +7585,18 @@ void Window::SetText( const OUString& rStr ) StateChanged( STATE_CHANGE_TEXT ); } - - OUString Window::GetText() const { return mpWindowImpl->maText; } - - OUString Window::GetDisplayText() const { return GetText(); } - - const Wallpaper& Window::GetDisplayBackground() const { // FIXME: fix issue 52349, need to fix this really in @@ -8054,8 +7623,6 @@ const Wallpaper& Window::GetDisplayBackground() const return rBack; } - - const OUString& Window::GetHelpText() const { @@ -8091,8 +7658,6 @@ const OUString& Window::GetHelpText() const return mpWindowImpl->maHelpText; } - - Window* Window::FindWindow( const Point& rPos ) const { @@ -8100,8 +7665,6 @@ Window* Window::FindWindow( const Point& rPos ) const return ((Window*)this)->ImplFindWindow( aPos ); } - - sal_uInt16 Window::GetChildCount() const { @@ -8116,8 +7679,6 @@ sal_uInt16 Window::GetChildCount() const return nChildCount; } - - Window* Window::GetChild( sal_uInt16 nChild ) const { @@ -8134,8 +7695,6 @@ Window* Window::GetChild( sal_uInt16 nChild ) const return NULL; } - - Window* Window::GetWindow( sal_uInt16 nType ) const { @@ -8225,8 +7784,6 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return NULL; } - - bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8245,8 +7802,6 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const return false; } - - bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8255,8 +7810,6 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const return ImplIsChild( pWindow, bSystemWindow ); } - - const SystemEnvData* Window::GetSystemData() const { @@ -8275,8 +7828,6 @@ const SystemEnvData* Window::GetSystemData() const return aRet; } - - void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ) { // be safe against re-entrance: first clear the old ref, then assign the new one @@ -8287,8 +7838,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: mpWindowImpl->mpVCLXWindow = pVCLXWindow; } - - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate ) { if ( !mpWindowImpl->mxWindowPeer.is() && bCreate ) @@ -8300,8 +7849,6 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: return mpWindowImpl->mxWindowPeer; } - - void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); @@ -8310,8 +7857,6 @@ void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun pWrapper->SetWindowInterface( this, xIFace ); } - - void Window::ImplCallDeactivateListeners( Window *pNew ) { // no deactivation if the newly activated window is my child @@ -8329,8 +7874,6 @@ void Window::ImplCallDeactivateListeners( Window *pNew ) } } - - void Window::ImplCallActivateListeners( Window *pOld ) { // no activation if the old active window is my child @@ -8361,8 +7904,6 @@ void Window::ImplCallActivateListeners( Window *pOld ) } } - - bool Window::ImplStopDnd() { bool bRet = false; @@ -8377,15 +7918,11 @@ bool Window::ImplStopDnd() return bRet; } - - void Window::ImplStartDnd() { GetDropTarget(); } - - uno::Reference< XDropTarget > Window::GetDropTarget() { @@ -8444,8 +7981,6 @@ uno::Reference< XDropTarget > Window::GetDropTarget() return uno::Reference< XDropTarget > ( mpWindowImpl->mxDNDListenerContainer, UNO_QUERY ); } - - uno::Reference< XDragSource > Window::GetDragSource() { @@ -8511,15 +8046,11 @@ uno::Reference< XDragSource > Window::GetDragSource() return uno::Reference< XDragSource > (); } - - uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer() { return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY ); } - - uno::Reference< XClipboard > Window::GetClipboard() { @@ -8547,8 +8078,6 @@ uno::Reference< XClipboard > Window::GetClipboard() return static_cast < XClipboard * > (0); } - - uno::Reference< XClipboard > Window::GetPrimarySelection() { @@ -8592,10 +8121,8 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() return static_cast < XClipboard * > (0); } - // Accessibility - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) @@ -8831,7 +8358,6 @@ Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) return pChild; } - void Window::SetAccessibleRole( sal_uInt16 nRole ) { if ( !mpWindowImpl->mpAccessibleInfos ) @@ -8943,7 +8469,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const case WINDOW_WORKWINDOW: nRole = accessibility::AccessibleRole::ROOT_PANE; break; - case WINDOW_SCROLLBARBOX: nRole = accessibility::AccessibleRole::FILLER; break; case WINDOW_HELPTEXTWINDOW: nRole = accessibility::AccessibleRole::TOOL_TIP; break; @@ -9213,8 +8738,6 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& mpOutDevData->mpRecordLayout = NULL; } - - void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ) { DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, NULL, NULL ); @@ -9242,7 +8765,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, const StyleSettings& rStyles = GetSettings().GetStyleSettings(); - // colors used for item highlighting Color aSelectionBorderCol( pPaintColor ? *pPaintColor : rStyles.GetHighlightColor() ); Color aSelectionFillCol( aSelectionBorderCol ); @@ -9361,7 +8883,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, } } - if( bDark ) { DrawRect( aRect ); @@ -9393,7 +8914,6 @@ Window* Window::GetPreferredKeyInputWindow() return this; } - bool Window::IsScrollable() const { // check for scrollbars @@ -9579,7 +9099,6 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr // Feed any with operating system's window handle - // common: first any is VCL pointer to window (for VCL canvas) aArg[ 0 ] = makeAny( reinterpret_cast(this) ); @@ -9769,7 +9288,6 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP // get rid of virtual device now so they don't pile up during recursive calls delete pMaskedDevice, pMaskedDevice = NULL; - for( Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext ) { if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 73fe6749c3a1..6b5b558a04b2 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -48,20 +47,14 @@ using namespace com::sun::star; - - #define IMPL_MAXSAVEBACKSIZE (640*480) #define IMPL_MAXALLSAVEBACKSIZE (800*600*2) - - struct ImplFocusDelData : public ImplDelData { Window* mpFocusWin; }; - - bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const { // check for overlapping window @@ -148,8 +141,6 @@ bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const return false; } - - void Window::ImplSaveOverlapBackground() { DBG_ASSERT( !mpWindowImpl->mpOverlapData->mpSaveBackDev, "Window::ImplSaveOverlapBackground() - Background already saved" ); @@ -191,8 +182,6 @@ void Window::ImplSaveOverlapBackground() } } - - bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) @@ -232,8 +221,6 @@ bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) return false; } - - void Window::ImplDeleteOverlapBackground() { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) @@ -261,8 +248,6 @@ void Window::ImplDeleteOverlapBackground() } } - - void Window::ImplInvalidateAllOverlapBackgrounds() { Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; @@ -294,8 +279,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } - - void Window::ShowFocus( const Rectangle& rRect ) { if( mpWindowImpl->mbInShowFocus ) @@ -341,8 +324,6 @@ void Window::ShowFocus( const Rectangle& rRect ) mpWindowImpl->mbInShowFocus = false; } - - void Window::HideFocus() { @@ -376,8 +357,6 @@ void Window::HideFocus() mpWindowImpl->mbInHideFocus = false; } - - void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() ) @@ -411,8 +390,6 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this ); } - - void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() ) @@ -448,8 +425,6 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this ); } - - void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { ImplWinData* pWinData = ImplGetWinData(); @@ -476,8 +451,6 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) mpWindowImpl->mbTrackVisible = true; } - - void Window::HideTracking() { if ( mpWindowImpl->mbTrackVisible ) @@ -489,8 +462,6 @@ void Window::HideTracking() } } - - void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { OutputDevice *pOutDev = GetOutDev(); @@ -553,8 +524,6 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) } } - - void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) { sal_uInt16 nPoints = rPoly.GetSize(); @@ -606,8 +575,6 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this ); } - - IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) { ImplSVData* pSVData = ImplGetSVData(); @@ -633,8 +600,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) return 0; } - - void Window::StartTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -662,8 +627,6 @@ void Window::StartTracking( sal_uInt16 nFlags ) CaptureMouse(); } - - void Window::EndTracking( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -705,15 +668,11 @@ void Window::EndTracking( sal_uInt16 nFlags ) } } - - bool Window::IsTracking() const { return (ImplGetSVData()->maWinData.mpTrackWin == this); } - - void Window::StartAutoScroll( sal_uInt16 nFlags ) { ImplSVData* pSVData = ImplGetSVData(); @@ -729,8 +688,6 @@ void Window::StartAutoScroll( sal_uInt16 nFlags ) pSVData->maAppData.mpWheelWindow = new ImplWheelWindow( this ); } - - void Window::EndAutoScroll() { ImplSVData* pSVData = ImplGetSVData(); @@ -745,8 +702,6 @@ void Window::EndAutoScroll() } } - - void Window::SaveBackground( const Point& rPos, const Size& rSize, const Point& rDestOff, VirtualDevice& rSaveDevice ) { @@ -779,8 +734,6 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this ); } - - sal_uIntPtr Window::SaveFocus() { ImplSVData* pSVData = ImplGetSVData(); @@ -795,8 +748,6 @@ sal_uIntPtr Window::SaveFocus() return 0; } - - bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) { if ( !nSaveId ) @@ -818,8 +769,6 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) } } - - void Window::SetZoom( const Fraction& rZoom ) { if ( mpWindowImpl->maZoom != rZoom ) @@ -829,15 +778,11 @@ void Window::SetZoom( const Fraction& rZoom ) } } - - inline long WinFloatRound( double fVal ) { return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) ); } - - void Window::SetZoomedPointFont( const Font& rFont ) { const Fraction& rZoom = GetZoom(); @@ -876,8 +821,6 @@ void Window::SetZoomedPointFont( const Font& rFont ) SetPointFont( rFont ); } - - long Window::CalcZoom( long nCalc ) const { @@ -892,8 +835,6 @@ long Window::CalcZoom( long nCalc ) const return nCalc; } - - void Window::SetControlFont() { if ( mpWindowImpl->mpControlFont ) @@ -904,8 +845,6 @@ void Window::SetControlFont() } } - - void Window::SetControlFont( const Font& rFont ) { if ( rFont == Font() ) @@ -926,8 +865,6 @@ void Window::SetControlFont( const Font& rFont ) StateChanged( STATE_CHANGE_CONTROLFONT ); } - - Font Window::GetControlFont() const { if ( mpWindowImpl->mpControlFont ) @@ -939,8 +876,6 @@ Font Window::GetControlFont() const } } - - void Window::SetControlForeground() { if ( mpWindowImpl->mbControlForeground ) @@ -951,8 +886,6 @@ void Window::SetControlForeground() } } - - void Window::SetControlForeground( const Color& rColor ) { if ( rColor.GetTransparency() ) @@ -975,8 +908,6 @@ void Window::SetControlForeground( const Color& rColor ) } } - - void Window::SetControlBackground() { if ( mpWindowImpl->mbControlBackground ) @@ -987,8 +918,6 @@ void Window::SetControlBackground() } } - - void Window::SetControlBackground( const Color& rColor ) { if ( rColor.GetTransparency() ) @@ -1011,8 +940,6 @@ void Window::SetControlBackground( const Color& rColor ) } } - - Size Window::CalcWindowSize( const Size& rOutSz ) const { Size aSz = rOutSz; @@ -1021,8 +948,6 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const return aSz; } - - Size Window::CalcOutputSize( const Size& rWinSz ) const { Size aSz = rWinSz; @@ -1031,8 +956,6 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const return aSz; } - - Font Window::GetDrawPixelFont( OutputDevice* pDev ) const { Font aFont = GetPointFont(); @@ -1043,8 +966,6 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const return aFont; } - - long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const { long nP = nPixels; @@ -1059,8 +980,6 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const return nP; } - - static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyByLineSize ) { if ( pScrl && nN && pScrl->IsEnabled() && pScrl->IsInputEnabled() && ! pScrl->IsInModalMode() ) @@ -1251,10 +1170,6 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, return bRet; } - - - - // Note that when called for COMMAND_WHEEL above, despite its name, // pVScrl isn't necessarily the vertical scroll bar. Depending on // whether the scroll is horizontal or vertical, it is either the @@ -1282,7 +1197,6 @@ void Window::EnableDocking( bool bEnable ) ImplGetDockingManager()->RemoveWindow( this ); } - // retrieves the list of owner draw decorated windows for this window hiearchy ::std::vector& Window::ImplGetOwnerDrawList() { @@ -1879,7 +1793,6 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue) return true; } - bool Window::set_property(const OString &rKey, const OString &rValue) { if ((rKey == "label") || (rKey == "title") || (rKey == "text") ) diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 88430780f077..6774a022ad4f 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -17,28 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/window.hxx" #include "vcl/waitobj.hxx" #include "vcl/button.hxx" - - WaitObject::~WaitObject() { if ( mpWindow ) mpWindow->LeaveWait(); } - - Size Window::GetOptimalSize() const { return Size(); } - - void Window::ImplAdjustNWFSizes() { switch( GetType() ) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 17f745d291c0..8a061b5821e4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -52,12 +52,8 @@ #include #include - - #define IMPL_MIN_NEEDSYSWIN 49 - - bool ImplCallPreNotify( NotifyEvent& rEvt ) { return Application::CallEventHooks( rEvt ) @@ -168,8 +164,6 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, return false; } - - static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) { ImplSVData* pSVData = ImplGetSVData(); @@ -200,8 +194,6 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) } } - - static void ImplSetMousePointer( Window* pChild ) { ImplSVData* pSVData = ImplGetSVData(); @@ -211,8 +203,6 @@ static void ImplSetMousePointer( Window* pChild ) pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() ); } - - static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, bool bMouse = false, Point* pPos = NULL ) { @@ -254,8 +244,6 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL return false; } - - /* #i34277# delayed context menu activation; * necessary if there already was a popup menu running. */ @@ -767,7 +755,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav if ( aDelData.IsDead() ) return true; - if ( nSVEvent == EVENT_MOUSEMOVE ) pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false; @@ -850,8 +837,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav return bRet; } - - static Window* ImplGetKeyInputWindow( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -893,8 +878,6 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) return pChild; } - - static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { @@ -1183,8 +1166,6 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, return nRet; } - - static bool ImplHandleExtTextInput( Window* pWindow, const OUString& rText, const sal_uInt16* pTextAttr, @@ -1278,8 +1259,6 @@ static bool ImplHandleExtTextInput( Window* pWindow, return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData ); } - - static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1307,8 +1286,6 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) return nRet; } - - static void ImplHandleExtTextInputPos( Window* pWindow, Rectangle& rRect, long& rInputWidth, bool * pVertical ) @@ -1355,8 +1332,6 @@ static void ImplHandleExtTextInputPos( Window* pWindow, = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical(); } - - static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -1364,8 +1339,6 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData ); } - - static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) { @@ -1388,8 +1361,6 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, return false; } - - static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) { ImplDelData aDogTag( pWindow ); @@ -1495,7 +1466,6 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv return !bRet; } - #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) @@ -1528,8 +1498,6 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool } } - - static void KillOwnPopups( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1542,8 +1510,6 @@ static void KillOwnPopups( Window* pWindow ) } } - - void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) { if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) ) @@ -1611,8 +1577,6 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; } - - static void ImplHandleMove( Window* pWindow ) { if( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplIsFloatingWindow() && pWindow->IsReallyVisible() ) @@ -1638,16 +1602,12 @@ static void ImplHandleMove( Window* pWindow ) } - - static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight ) { ImplHandleMove( pWindow ); ImplHandleResize( pWindow, nNewWidth, nNewHeight ); } - - static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) { // First check all overlapping windows @@ -1666,9 +1626,6 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) } } - - - IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; @@ -1777,13 +1734,10 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) return 0; } - - static void ImplHandleGetFocus( Window* pWindow ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true; - // execute Focus-Events after a delay, such that SystemChildWindows // do not blink when they receive focus if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId ) @@ -1796,8 +1750,6 @@ static void ImplHandleGetFocus( Window* pWindow ) } } - - static void ImplHandleLoseFocus( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1836,7 +1788,6 @@ static void ImplHandleLoseFocus( Window* pWindow ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); } - struct DelayedCloseEvent { Window* pWindow; @@ -1916,8 +1867,6 @@ void ImplHandleClose( Window* pWindow ) } } - - static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) { if ( pSVEvent ) @@ -1946,8 +1895,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) } } - - static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1960,8 +1907,6 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) return nMode; } - - static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1978,8 +1923,6 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) return nMode; } - - inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, @@ -1988,8 +1931,6 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, @@ -1998,8 +1939,6 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, @@ -2013,8 +1952,6 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ImplGetMouseButtonMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, @@ -2028,15 +1965,11 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseButtonMode( pEvent ) ); } - - static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) { return false; } - - static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) { // Find SystemWindow and its Menubar and let it dispatch the command @@ -2078,8 +2011,6 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt return nRet; } - - static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) { ImplSVData* pSVData = ImplGetSVData(); @@ -2117,8 +2048,6 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) } } - - static void ImplHandleInputLanguageChange( Window* pWindow ) { // find window @@ -2129,8 +2058,6 @@ static void ImplHandleInputLanguageChange( Window* pWindow ) ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE ); } - - static void ImplHandleSalSettings( sal_uInt16 nEvent ) { Application* pApp = GetpApp(); @@ -2183,8 +2110,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) } } - - static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt ) { Rectangle aCursorRect; @@ -2205,8 +2130,6 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve } } - - static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) { if( ! pWindow ) @@ -2222,8 +2145,6 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData ); } - - static void ImplHandleSurroundingTextRequest( Window *pWindow, OUString& rText, Selection &rSelRange ) @@ -2245,8 +2166,6 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow, } } - - static void ImplHandleSalSurroundingTextRequest( Window *pWindow, SalSurroundingTextRequestEvent *pEvt ) { @@ -2270,8 +2189,6 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, pEvt->mnEnd = aSelRange.Max(); } - - static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, sal_uLong nStart, sal_uLong nEnd ) @@ -2284,8 +2201,6 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, } } - - static void ImplHandleStartReconversion( Window *pWindow ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -2293,8 +2208,6 @@ static void ImplHandleStartReconversion( Window *pWindow ) ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION ); } - - static void ImplHandleSalQueryCharPosition( Window *pWindow, SalQueryCharPositionEvent *pEvt ) { @@ -2338,8 +2251,6 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, } } - - bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, sal_uInt16 nEvent, const void* pEvent ) { diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 9c2060c77a50..d1cd7f35f6e9 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -34,8 +33,6 @@ #include #include - - void WorkWindow::ImplInitWorkWindowData() { mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow @@ -47,8 +44,6 @@ void WorkWindow::ImplInitWorkWindowData() mbFullScreenMode = false; } - - void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { sal_uInt16 nFrameStyle = BORDERWINDOW_STYLE_FRAME; @@ -73,8 +68,6 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS SetActivateMode( ACTIVATE_MODE_GRABFOCUS ); } - - void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) { if( aSystemWorkWindowToken.hasValue() ) @@ -90,16 +83,12 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::st ImplInit( pParent, nStyle, NULL ); } - - WorkWindow::WorkWindow( WindowType nType ) : SystemWindow( nType ) { ImplInitWorkWindowData(); } - - WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -107,8 +96,6 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle, NULL ); } - - WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -117,8 +104,6 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst ImplInit( pParent, nStyle, aSystemWorkWindowToken ); } - - WorkWindow::WorkWindow( SystemParentData* pParent ) : SystemWindow( WINDOW_WORKWINDOW ) { @@ -127,8 +112,6 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) : ImplInit( NULL, 0, pParent ); } - - WorkWindow::~WorkWindow() { ImplSVData* pSVData = ImplGetSVData(); @@ -139,8 +122,6 @@ WorkWindow::~WorkWindow() } } - - void WorkWindow::ShowFullScreenMode( bool bFullScreenMode ) { return ShowFullScreenMode( bFullScreenMode, GetScreenNumber()); @@ -171,8 +152,6 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr } } - - void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags ) { return StartPresentationMode( bPresentation, nFlags, GetScreenNumber()); @@ -222,8 +201,6 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s } } - - bool WorkWindow::IsMinimized() const { //return mpWindowImpl->mpFrameData->mbMinimized; @@ -232,8 +209,6 @@ bool WorkWindow::IsMinimized() const return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0); } - - bool WorkWindow::SetPluginParent( SystemParentData* pParent ) { DBG_ASSERT( ! mbPresentationMode && ! mbFullScreenMode, "SetPluginParent in fullscreen or presentation mode !" ); @@ -259,7 +234,6 @@ void WorkWindow::ImplSetFrameState( sal_uLong aFrameState ) mpWindowImpl->mpFrame->SetWindowState( &aState ); } - void WorkWindow::Minimize() { ImplSetFrameState( WINDOWSTATE_STATE_MINIMIZED ); diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index ac62b621275d..015f226ed8fb 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -38,12 +37,8 @@ #include "unx/i18n_im.hxx" #include "salframe.hxx" - - // i. preedit start callback - - int PreeditStartCallback ( XIC, XPointer client_data, XPointer ) { @@ -58,12 +53,8 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) return -1; } - - // ii. preedit done callback - - void PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) { @@ -76,17 +67,11 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) pPreeditData->eState = ePreeditStatusStartPending; } - - // iii. preedit draw callback - - - // Handle deletion of text in a preedit_draw_callback // from and howmuch are guaranteed to be nonnegative - void Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) { @@ -148,11 +133,9 @@ enlarge_buffer ( preedit_text_t *ptext, int nnewlimit ) nnewsize * sizeof(XIMFeedback)); } - // Handle insertion of text in a preedit_draw_callback // string field of XIMText struct is guaranteed to be != NULL - void Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) { @@ -241,7 +224,6 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) pText->pUnicodeBuffer[pText->nLength] = (sal_Unicode)0; } - // Handle the change of attributes in a preedit_draw_callback void @@ -376,7 +358,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data, } } - // build the SalExtTextInputEvent and send it up pPreeditData->aInputEv.mnTime = 0; @@ -423,12 +404,8 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) return; } - - // iv. preedit caret callback - - #if OSL_DEBUG_LEVEL > 1 void PreeditCaretCallback ( XIC ic, XPointer client_data, @@ -472,13 +449,9 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* ) #endif } - - // v. commit string callback: convert an extended text input (iiimp ... ) // into an ordinary key-event - - Bool IsControlCode(sal_Unicode nChar) { @@ -488,12 +461,8 @@ IsControlCode(sal_Unicode nChar) return False; } - - // vi. status callbacks: for now these are empty, they are just needed for turbo linux - - void StatusStartCallback (XIC, XPointer, XPointer) { @@ -557,12 +526,8 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data) ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) ); } - - // vii. destroy callbacks: internally disable all IC/IM calls - - void IC_IMDestroyCallback (XIM, XPointer client_data, XPointer) { diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 4430caaef58b..8c429d50ac39 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -56,13 +55,9 @@ static void sendEmptyCommit( SalFrame* pFrame ) pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL ); } - - // Constructor / Destructor, the InputContext is bound to the SalFrame, as it // needs the shell window as a focus window - - SalI18N_InputContext::~SalI18N_InputContext() { if ( maContext != NULL ) @@ -80,10 +75,8 @@ SalI18N_InputContext::~SalI18N_InputContext() free(maClientData.aText.pCharStyle); } - // convenience routine to add items to a XVaNestedList - static XVaNestedList XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value ) { @@ -111,10 +104,8 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value ) return a_dstlist != NULL ? a_dstlist : a_srclist ; } - // convenience routine to create a fontset - static XFontSet get_font_set( Display *p_display ) { @@ -133,12 +124,8 @@ get_font_set( Display *p_display ) return p_font_set; } - - // Constructor for a InputContext (IC) - - SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : mbUseable( True ), maContext( (XIC)NULL ), @@ -196,10 +183,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; - // Status attributes - switch ( mnStatusStyle ) { case XIMStatusCallbacks: @@ -236,10 +221,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : break; } - // set preedit attributes - switch ( mnPreeditStyle ) { case XIMPreeditCallbacks: @@ -373,13 +356,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : } } - - // In Solaris 8 the status window does not unmap if the frame unmapps, so // unmap it the hard way - - void SalI18N_InputContext::Unmap( SalFrame* pFrame ) { @@ -419,13 +398,9 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) } } - - // Handle DestroyCallbacks // in fact this is a callback called from the XNDestroyCallback - - void SalI18N_InputContext::HandleDestroyIM() { @@ -433,13 +408,9 @@ SalI18N_InputContext::HandleDestroyIM() mbUseable = False; } - - // make sure, the input method gets all the X-Events it needs, this is only // called once on each frame, it relys on a valid maContext - - void SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) { @@ -460,12 +431,8 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) } } - - // tune the styles provided by the input method with the supported one - - unsigned int SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const { @@ -547,12 +514,8 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ; } - - // handle extended and normal key input - - int SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) { @@ -603,14 +566,10 @@ SalI18N_InputContext::UpdateSpotLocation() return 0; } - - // set and unset the focus for the Input Context // the context may be NULL despite it is useable if the framewindow is // in unmapped state - - void SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame ) { @@ -655,12 +614,8 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) } } - - // multi byte input method only - - void SalI18N_InputContext::SetLanguage(LanguageType) { @@ -689,5 +644,4 @@ SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 04c88e0c8deb..e08ea6aae38b 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -48,13 +47,9 @@ using namespace vcl; extern "C" char * XSetIMValues(XIM im, ...); #endif - - // kinput2 IME needs special key handling since key release events are filtered in // preeditmode and XmbResetIC does not work - - bool IMServerKinput2 () { @@ -143,12 +138,8 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const && same_screen == rEvent.same_screen; } - - // locale handling - - // Locale handling of the operating system layer static char* @@ -262,12 +253,8 @@ SalI18N_InputMethod::PosixLocale() return False; } - - // Constructor / Destructor / Initialisation - - SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ), maMethod( (XIM)NULL ), mpStyles( (XIMStyles*)NULL ) @@ -286,11 +273,9 @@ SalI18N_InputMethod::~SalI18N_InputMethod() XCloseIM ( maMethod ); } - // XXX // debug routine: lets have a look at the provided method styles - #if OSL_DEBUG_LEVEL > 1 extern "C" char* @@ -352,11 +337,9 @@ PrintInputStyle( XIMStyles *pStyle ) #endif - // this is the real constructing routine, since locale setting has to be done // prior to xopendisplay, the xopenim call has to be delayed - bool SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) { @@ -401,10 +384,8 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) return mbUseable; } - // give IM the opportunity to look at the event, and possibly hide it - bool SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window ) { @@ -446,8 +427,6 @@ SalI18N_InputMethod::HandleDestroyIM() maMethod = NULL; } - - // add a connection watch into the SalXLib yieldTable to allow iiimp // connection processing: soffice waits in select() not in XNextEvent(), so // there may be requests pending on the iiimp internal connection that will @@ -455,8 +434,6 @@ SalI18N_InputMethod::HandleDestroyIM() // have the focus because the atok12 lookup choice aux window has it we stay // deaf and dump otherwise. - - int InputMethod_HasPendingEvent(int nFileDescriptor, void *pData) { diff --git a/vcl/unx/generic/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx index a720658335a2..2ce0e08ef439 100644 --- a/vcl/unx/generic/app/i18n_keysym.cxx +++ b/vcl/unx/generic/app/i18n_keysym.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index b6b2bbd8e08c..b5a286a46c96 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include #endif @@ -75,8 +74,6 @@ void StatusWindow::setPosition( SalFrame* ) { } - - namespace vcl { class XIMStatusWindow : public StatusWindow @@ -301,8 +298,6 @@ OUString XIMStatusWindow::getText() const return m_aStatusText.GetText(); } - - namespace vcl { class IIIMPStatusWindow : public StatusWindow @@ -470,8 +465,6 @@ void IIIMPStatusWindow::GetFocus() } } - - IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn ) { if( pBtn == & m_aStatusBtn ) @@ -516,31 +509,23 @@ I18NStatus& I18NStatus::get() return *pInstance; } - - bool I18NStatus::exists() { return pInstance != NULL; } - - void I18NStatus::free() { if( pInstance ) delete pInstance, pInstance = NULL; } - - I18NStatus::I18NStatus() : m_pParent( NULL ), m_pStatusWindow( NULL ) { } - - I18NStatus::~I18NStatus() { if( m_pStatusWindow ) @@ -549,8 +534,6 @@ I18NStatus::~I18NStatus() pInstance = NULL; } - - void I18NStatus::setParent( SalFrame* pParent ) { m_pParent = pParent; @@ -567,8 +550,6 @@ void I18NStatus::setParent( SalFrame* pParent ) m_pStatusWindow->setPosition( m_pParent ); } - - void I18NStatus::show( bool bShow, ShowReason eReason ) { if( m_pStatusWindow ) @@ -578,8 +559,6 @@ void I18NStatus::show( bool bShow, ShowReason eReason ) } } - - void I18NStatus::setStatusText( const OUString& rText ) { if( m_pStatusWindow ) @@ -615,15 +594,11 @@ void I18NStatus::setStatusText( const OUString& rText ) } } - - void I18NStatus::changeIM( const OUString& rIM ) { m_aCurrentIM = rIM; } - - SalFrame* I18NStatus::getStatusFrame() const { SalFrame* pRet = NULL; diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index a2d411786c28..27efa557b141 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -52,14 +52,10 @@ namespace vcl_sal { int nReplacements; }; - - // CAUTION CAUTION CAUTION // every string value in the replacements tables must be in UTF8 // be careful with your editor ! - - static const struct KeysymNameReplacement aImplReplacements_English[] = { { XK_Control_L, "Ctrl" }, diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 49933496f349..bcb04d0bcd51 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -316,7 +316,6 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError ) return err; } - void X11SalData::PushXErrorLevel( bool bIgnore ) { m_aXErrorHandlerStack.push_back( XErrorStackEntry() ); @@ -545,7 +544,6 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) ) return; - if( pDisplay != GetGenericData()->GetSalDisplay()->GetDisplay() ) return; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 51063cba3ffb..d96fd205fd41 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -81,7 +81,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); using namespace vcl_sal; - #define SALCOLOR_WHITE MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) #define SALCOLOR_BLACK MAKE_SALCOLOR( 0x00, 0x00, 0x00 ) @@ -147,7 +146,6 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) return true; } - extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display ) { @@ -2267,7 +2265,6 @@ void SalDisplay::InitXinerama() #endif } - extern "C" { static Bool timestamp_predicate( Display*, XEvent* i_pEvent, XPointer i_pArg ) diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 02066a6b074e..fd11d1d1377b 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -77,8 +76,6 @@ X11SalInstance::~X11SalInstance() GetGenericData()->Dispose(); } - - // AnyInput from sv/mow/source/app/svapp.cxx struct PredicateReturn @@ -235,8 +232,6 @@ static void getServerDirectories( std::list< OString >& o_rFontPaths ) #endif } - - void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths ) { Display *pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay(); diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index c337510daafe..19b44955cfe0 100644 --- a/vcl/unx/generic/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 223bdef545f0..51a1bc392bef 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -165,7 +165,6 @@ static SmProp** ppSmProps = NULL; static int nSmProps = 0; static unsigned char *pSmRestartHint = NULL; - static void BuildSmPropertyList() { if( ! pSmProps ) @@ -413,7 +412,6 @@ void SessionManagerClient::saveDone() } } - void SessionManagerClient::open(SalSession * pSession) { assert(!m_pSession && !m_pICEConnectionObserver && !m_pSmcConnection); @@ -527,7 +525,6 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown ) } } - OUString SessionManagerClient::getExecName() { OUString aExec, aSysExec; @@ -539,7 +536,6 @@ OUString SessionManagerClient::getExecName() return aSysExec; } - OString SessionManagerClient::getPreviousSessionID() { OString aPrevId; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index a89e21a42cf1..787bb3c7162c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -98,7 +97,6 @@ struct WMAdaptorProtocol int nProtocol; }; - /* * table must be sorted ascending in strings * since it is use with bsearch @@ -218,7 +216,6 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay ) return pAdaptor; } - /* * WMAdaptor constructor */ diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 1d5d223fee29..aa1c84a30846 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -36,7 +35,6 @@ #include #include - static bool is_gnome_desktop( Display* pDisplay ) { bool ret = false; diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index 2e2cc9071eb8..4e6b953e1728 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -45,7 +44,6 @@ using namespace cppu; using namespace osl; using namespace x11; - X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : ::cppu::WeakComponentImplHelper2< ::com::sun::star::datatransfer::clipboard::XSystemClipboard, @@ -71,8 +69,6 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) : } } - - X11Clipboard::~X11Clipboard() { MutexGuard aGuard( *Mutex::getGlobalMutex() ); @@ -89,9 +85,6 @@ X11Clipboard::~X11Clipboard() } } - - - void X11Clipboard::fireChangedContentsEvent() { ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() ); @@ -111,8 +104,6 @@ void X11Clipboard::fireChangedContentsEvent() } } - - void X11Clipboard::clearContents() { ClearableMutexGuard aGuard(m_rSelectionManager.getMutex()); @@ -134,8 +125,6 @@ void X11Clipboard::clearContents() xOwner->lostOwnership(xThis, m_aContents); } - - Reference< XTransferable > SAL_CALL X11Clipboard::getContents() throw(RuntimeException, std::exception) { @@ -146,8 +135,6 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents() return m_aContents; } - - void SAL_CALL X11Clipboard::setContents( const Reference< XTransferable >& xTrans, const Reference< XClipboardOwner >& xClipboardOwner ) @@ -181,24 +168,18 @@ void SAL_CALL X11Clipboard::setContents( fireChangedContentsEvent(); } - - OUString SAL_CALL X11Clipboard::getName() throw(RuntimeException, std::exception) { return m_rSelectionManager.getString( m_aSelection ); } - - sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities() throw(RuntimeException, std::exception) { return RenderingCapabilities::Delayed; } - - void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -206,8 +187,6 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis m_aListeners.push_back( listener ); } - - void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) throw(RuntimeException, std::exception) { @@ -215,37 +194,26 @@ void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboard m_aListeners.remove( listener ); } - - - Reference< XTransferable > X11Clipboard::getTransferable() { return getContents(); } - - void X11Clipboard::clearTransferable() { clearContents(); } - - void X11Clipboard::fireContentsChanged() { fireChangedContentsEvent(); } - - Reference< XInterface > X11Clipboard::getReference() throw() { return Reference< XInterface >( static_cast< OWeakObject* >(this) ); } - - OUString SAL_CALL X11Clipboard::getImplementationName( ) throw(RuntimeException, std::exception) { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index f2758222c9f2..5852321dbb24 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -27,8 +27,6 @@ #include #include - - #define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport" namespace x11 { @@ -50,7 +48,6 @@ namespace x11 { protected: - friend class SelectionManager; void fireChangedContentsEvent(); @@ -118,14 +115,10 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw() SAL_OVERRIDE; }; - - Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - - } // namepspace #endif diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 5b77bd7e2824..19df17212532 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -58,7 +57,6 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exceptio m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp ); } - /* * DropTargetDragContext */ diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx index d90e8a58ad84..51bd3c0a352a 100644 --- a/vcl/unx/generic/dtrans/X11_droptarget.cxx +++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; - DropTarget::DropTarget() : ::cppu::WeakComponentImplHelper3< XDropTarget, @@ -46,8 +45,6 @@ DropTarget::~DropTarget() m_pSelectionManager->deregisterDropTarget( m_aTargetWindow ); } - - void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { if( arguments.getLength() > 1 ) @@ -76,8 +73,6 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su } } - - void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -85,8 +80,6 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& m_aListeners.push_back( xListener ); } - - void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -94,15 +87,11 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener m_aListeners.remove( xListener ); } - - sal_Bool DropTarget::isActive() throw(std::exception) { return m_bActive; } - - void DropTarget::setActive( sal_Bool active ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -110,15 +99,11 @@ void DropTarget::setActive( sal_Bool active ) throw(std::exception) m_bActive = active; } - - sal_Int8 DropTarget::getDefaultActions() throw(std::exception) { return m_nDefaultActions; } - - void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -126,8 +111,6 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception) m_nDefaultActions = actions; } - - void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -140,8 +123,6 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() } } - - void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -154,8 +135,6 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() } } - - void DropTarget::dragExit( const DropTargetEvent& dte ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); @@ -168,8 +147,6 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw() } } - - void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() { osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 396f49619a90..9922696d8b7b 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -87,7 +87,6 @@ using namespace cppu; using namespace x11; - // stubs to satisfy solaris compiler's rather rigid linking warning extern "C" { @@ -102,7 +101,6 @@ extern "C" } } - static const long nXdndProtocolRevision = 5; // mapping between mime types (or what the office thinks of mime types) @@ -202,16 +200,12 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType ) return aEncoding; } - - ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances() { static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances; return aInstances; } - - SelectionManager::SelectionManager() : m_nIncrementalThreshold( 15*1024 ), m_pDisplay( NULL ), @@ -436,9 +430,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c nodrop_curs_x_hot, nodrop_curs_y_hot ); - - - // just interested in SelectionClear/Notify/Request and PropertyChange XSelectInput( m_pDisplay, m_aWindow, PropertyChangeMask ); // create the transferable for Drag operations @@ -464,8 +455,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c } } - - SelectionManager::~SelectionManager() { #if OSL_DEBUG_LEVEL > 1 @@ -529,8 +518,6 @@ SelectionManager::~SelectionManager() } } - - SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) { ::boost::unordered_map< Atom, Selection* >::iterator it = @@ -538,8 +525,6 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL; } - - OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) { osl::MutexGuard aGuard( m_aMutex ); @@ -569,8 +554,6 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) return aRet; } - - OString SelectionManager::convertToCompound( const OUString& rText ) { osl::MutexGuard aGuard( m_aMutex ); @@ -609,8 +592,6 @@ OString SelectionManager::convertToCompound( const OUString& rText ) return aRet; } - - bool SelectionManager::convertData( const css::uno::Reference< XTransferable >& xTransferable, Atom nType, @@ -689,8 +670,6 @@ bool SelectionManager::convertData( return bSuccess; } - - SelectionManager& SelectionManager::get( const OUString& rDisplayName ) { osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); @@ -708,8 +687,6 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) return *pInstance; } - - const OUString& SelectionManager::getString( Atom aAtom ) { osl::MutexGuard aGuard(m_aMutex); @@ -729,8 +706,6 @@ const OUString& SelectionManager::getString( Atom aAtom ) return m_aAtomToString[ aAtom ]; } - - Atom SelectionManager::getAtom( const OUString& rString ) { osl::MutexGuard aGuard(m_aMutex); @@ -746,8 +721,6 @@ Atom SelectionManager::getAtom( const OUString& rString ) return m_aStringToAtom[ rString ]; } - - bool SelectionManager::requestOwnership( Atom selection ) { bool bSuccess = false; @@ -790,8 +763,6 @@ bool SelectionManager::requestOwnership( Atom selection ) return bSuccess; } - - void SelectionManager::convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront ) { NativeTypeEntry* pTab = selection == m_nXdndSelection ? aXdndConversionTab : aNativeConversionTab; @@ -833,8 +804,6 @@ void SelectionManager::convertTypeToNative( const OUString& rType, Atom selectio rConversions.push_back( getAtom( rType ) ); }; - - void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection ) { rOutTypeList.clear(); @@ -864,8 +833,6 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, rOutTypeList.push_back( m_nMULTIPLEAtom ); } - - OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, int& rFormat ) { NativeTypeEntry* pTab = (selection == m_nXdndSelection) ? aXdndConversionTab : aNativeConversionTab; @@ -885,8 +852,6 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in return getString( nType ); } - - bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -1023,8 +988,6 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In return bSuccess; } - - bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData ) { bool bSuccess = false; @@ -1238,8 +1201,6 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ return bSuccess; } - - bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes ) { ::boost::unordered_map< Atom, Selection* >::iterator it; @@ -1443,8 +1404,6 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > return bSuccess; } - - PixmapHolder* SelectionManager::getPixmapHolder( Atom selection ) { boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection ); @@ -1603,8 +1562,6 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, return bConverted; } - - bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -1812,8 +1769,6 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest return true; } - - bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1931,8 +1886,6 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2031,8 +1984,6 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) { osl::MutexGuard aGuard( m_aMutex ); @@ -2124,8 +2075,6 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) return bHandled; } - - bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2374,8 +2323,6 @@ void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLI * methods for XDropTargetDragContext */ - - void SelectionManager::sendDragStatus( Atom nDropAction ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2443,15 +2390,11 @@ void SelectionManager::sendDragStatus( Atom nDropAction ) } } - - sal_Int8 SelectionManager::getUserDragAction() const { return (m_nTargetAcceptAction != DNDConstants::ACTION_DEFAULT) ? m_nTargetAcceptAction : m_nUserDragAction; } - - bool SelectionManager::updateDragAction( int modifierState ) { bool bRet = false; @@ -2503,8 +2446,6 @@ bool SelectionManager::updateDragAction( int modifierState ) return bRet; } - - void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2563,8 +2504,6 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) } } - - bool SelectionManager::handleDragEvent( XEvent& rMessage ) { if( ! m_xDragSourceListener.is() ) @@ -2884,8 +2823,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) return bHandled; } - - void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2906,8 +2843,6 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, } } - - void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) @@ -2940,8 +2875,6 @@ sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) return false; } - - sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { XLIB_Cursor aCursor = m_aNoneCursor; @@ -2954,8 +2887,6 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::e return aCursor; } - - int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) { Atom* pProperties = NULL; @@ -3025,8 +2956,6 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) return nVersion; } - - void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -3071,7 +3000,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - DragSourceDragEvent dsde; dsde.Source = static_cast< OWeakObject* >(this); dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); @@ -3184,8 +3112,6 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) } } - - void SelectionManager::startDrag( const DragGestureEvent& trigger, sal_Int8 sourceActions, @@ -3280,7 +3206,6 @@ void SelectionManager::startDrag( aParent = aChild; } while( aChild != None ); - #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "try to grab pointer ... " ); #endif @@ -3534,8 +3459,6 @@ sal_Int32 SelectionManager::getCurrentCursor() return m_aCurrentCursor; } - - void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) { osl::MutexGuard aGuard( m_aMutex ); @@ -3550,14 +3473,10 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI } } - - void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time ) { } - - void SelectionManager::transferablesFlavorsChanged() { osl::MutexGuard aGuard(m_aMutex); @@ -3609,8 +3528,6 @@ void SelectionManager::transferablesFlavorsChanged() * dispatch loop */ - - bool SelectionManager::handleXEvent( XEvent& rEvent ) { /* @@ -3695,8 +3612,6 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) return bHandled; } - - void SelectionManager::dispatchEvent( int millisec ) { // acquire the mutex to prevent other threads @@ -3737,8 +3652,6 @@ void SelectionManager::dispatchEvent( int millisec ) } } - - void SelectionManager::run( void* pThis ) { #if OSL_DEBUG_LEVEL > 1 @@ -3862,8 +3775,6 @@ void SelectionManager::shutdown() throw() m_xDropTransferable.clear(); } - - sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) { Sequence< sal_Int8 > aSeq; @@ -3922,8 +3833,6 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang: disposing(rEvent); } - - void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor ) { osl::MutexGuard aGuard(m_aMutex); @@ -3934,8 +3843,6 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt m_aSelections[ selection ] = pNewSelection; } - - void SelectionManager::deregisterHandler( Atom selection ) { osl::MutexGuard aGuard(m_aMutex); @@ -3950,8 +3857,6 @@ void SelectionManager::deregisterHandler( Atom selection ) } } - - static bool bWasError = false; extern "C" @@ -4006,8 +3911,6 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar OSL_FAIL( "attempt to register None as drop target" ); } - - void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -4062,28 +3965,20 @@ css::uno::Reference< XTransferable > SelectionManager::getTransferable() throw() return m_xDragSourceTransferable; } - - void SelectionManager::clearTransferable() throw() { m_xDragSourceTransferable.clear(); } - - void SelectionManager::fireContentsChanged() throw() { } - - css::uno::Reference< XInterface > SelectionManager::getReference() throw() { return css::uno::Reference< XInterface >( static_cast(this) ); } - - /* * SelectionManagerHolder */ @@ -4096,14 +3991,10 @@ SelectionManagerHolder::SelectionManagerHolder() : { } - - SelectionManagerHolder::~SelectionManagerHolder() { } - - void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) { OUString aDisplayName; @@ -4133,15 +4024,11 @@ sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false; } - - sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) { return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0; } - - void SelectionManagerHolder::startDrag( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image, @@ -4153,14 +4040,10 @@ void SelectionManagerHolder::startDrag( m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener ); } - - /* * XServiceInfo */ - - OUString SelectionManagerHolder::getImplementationName() throw(std::exception) { return OUString(XDND_IMPLEMENTATION_NAME); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 4f0aa4e429c7..2bfc632f8113 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -49,7 +49,6 @@ namespace x11 { class PixmapHolder; // in bmp.hxx - rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor @@ -146,7 +145,6 @@ namespace x11 { }; - class SelectionManager : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::dnd::XDragSource, @@ -259,7 +257,6 @@ namespace x11 { sal_Int32 m_nSelectionTimeout; XLIB_Time m_nSelectionTimestamp; - // members used for Xdnd // drop only @@ -324,14 +321,12 @@ namespace x11 { XLIB_Cursor m_aNoneCursor; XLIB_Cursor m_aCurrentCursor; - // drag and drop int m_nCurrentProtocolVersion; ::boost::unordered_map< XLIB_Window, DropTargetEntry > m_aDropTargets; - // some special atoms that are needed often Atom m_nCLIPBOARDAtom; Atom m_nTARGETSAtom; @@ -435,7 +430,6 @@ namespace x11 { Display * getDisplay() { return m_pDisplay; }; XLIB_Window getWindow() { return m_aWindow; }; - void registerHandler( Atom selection, SelectionAdaptor& rAdaptor ); void deregisterHandler( Atom selection ); bool requestOwnership( Atom selection ); @@ -443,7 +437,6 @@ namespace x11 { // allow for synchronization over one mutex for XClipboard osl::Mutex& getMutex() { return m_aMutex; } - Atom getAtom( const OUString& rString ); const OUString& getString( Atom nAtom ); @@ -507,8 +500,6 @@ namespace x11 { throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - - ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); @@ -517,8 +508,6 @@ namespace x11 { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); - - } #endif diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index 0ed55666cd97..36b1b9cbf2d4 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unx/salinst.h" #include @@ -35,7 +34,6 @@ using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::awt; using namespace x11; - Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames() { Sequence< OUString > aRet(1); @@ -57,8 +55,6 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames() return aRet; } - - css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments ) { SelectionManager& rManager = SelectionManager::get(); @@ -86,19 +82,14 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc return static_cast(pClipboard); } - - css::uno::Reference< XInterface > X11SalInstance::CreateDragSource() { return css::uno::Reference < XInterface >( ( OWeakObject * ) new SelectionManagerHolder() ); } - - css::uno::Reference< XInterface > X11SalInstance::CreateDropTarget() { return css::uno::Reference < XInterface >( ( OWeakObject * ) new DropTarget() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index e913e8d83821..29493126884f 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include #endif @@ -35,8 +34,6 @@ using namespace osl; using namespace x11; - - X11Transferable::X11Transferable( SelectionManager& rManager, Atom selection @@ -46,14 +43,10 @@ X11Transferable::X11Transferable( { } - - X11Transferable::~X11Transferable() { } - - Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { @@ -85,8 +78,6 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) return aRet; } - - Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() throw(RuntimeException, std::exception) { @@ -98,8 +89,6 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() return aFlavorList; } - - sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException, std::exception) { diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index a6a7f43370e3..0e8a2e52426d 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index d4a4633f0976..92f672b3359c 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -48,7 +47,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace x11; - sal_Int32 SelectionManager::getSelectionTimeout() { if( m_nSelectionTimeout < 1 ) @@ -128,5 +126,4 @@ void DtransX11ConfigItem::Notify( const Sequence< OUString >& /*rPropertyNames*/ { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 51dd9b58ed29..6148912b8652 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/ustring.hxx" #include "osl/module.h" #include "osl/thread.h" @@ -29,14 +28,10 @@ #include "gcach_xpeer.hxx" #include "xrender_peer.hxx" - - X11GlyphPeer::X11GlyphPeer() { } - - X11GlyphPeer::~X11GlyphPeer() { if( !ImplGetSVData() ) @@ -62,15 +57,11 @@ X11GlyphPeer::~X11GlyphPeer() } } - - X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer ) : GlyphCache( rPeer ) { } - - namespace { struct GlyphCacheHolder @@ -111,20 +102,14 @@ X11GlyphCache& X11GlyphCache::GetInstance() return theGlyphCacheHolder::get().getGlyphCache(); } - - void X11GlyphCache::KillInstance() { return theGlyphCacheHolder::get().release(); } - - void X11SalGraphics::releaseGlyphPeer() { X11GlyphCache::KillInstance(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 7e7aef3cf911..0b1c5bd0df6f 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -52,7 +51,6 @@ // - SalBitmap - - SalBitmap* X11SalInstance::CreateSalBitmap() { return new X11SalBitmap(); @@ -61,8 +59,6 @@ SalBitmap* X11SalInstance::CreateSalBitmap() ImplSalBitmapCache* X11SalBitmap::mpCache = NULL; sal_uLong X11SalBitmap::mnCacheInstCount = 0; - - X11SalBitmap::X11SalBitmap() : mpDIB( NULL ) , mpDDB( NULL ) @@ -70,23 +66,17 @@ X11SalBitmap::X11SalBitmap() { } - - X11SalBitmap::~X11SalBitmap() { Destroy(); } - - void X11SalBitmap::ImplCreateCache() { if( !mnCacheInstCount++ ) mpCache = new ImplSalBitmapCache; } - - void X11SalBitmap::ImplDestroyCache() { DBG_ASSERT( mnCacheInstCount, "X11SalBitmap::ImplDestroyCache(): underflow" ); @@ -95,8 +85,6 @@ void X11SalBitmap::ImplDestroyCache() delete mpCache, mpCache = NULL; } - - void X11SalBitmap::ImplRemovedFromCache() { if( mpDDB ) @@ -121,8 +109,6 @@ namespace } #endif - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, @@ -212,8 +198,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, SalX11Screen nScreen, @@ -387,8 +371,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( return pDIB; } - - XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, SalX11Screen nScreen, @@ -563,7 +545,6 @@ XImage* X11SalBitmap::ImplCreateXImage( return pImage; } - bool X11SalBitmap::ImplCreateFromDrawable( Drawable aDrawable, SalX11Screen nScreen, @@ -581,7 +562,6 @@ bool X11SalBitmap::ImplCreateFromDrawable( return( mpDDB != NULL ); } - ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -679,8 +659,6 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( return mpDDB; } - - void X11SalBitmap::ImplDraw( Drawable aDrawable, SalX11Screen nXScreen, @@ -694,8 +672,6 @@ void X11SalBitmap::ImplDraw( mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC ); } - - bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { Destroy(); @@ -704,8 +680,6 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return( mpDIB != NULL ); } - - bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) { Destroy(); @@ -745,22 +719,16 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp ) ( rSalBmp.mpDDB && ( mpDDB != NULL ) ) ); } - - bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* ) { return false; } - - bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 ) { return false; } - - bool X11SalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& rSize, @@ -800,8 +768,6 @@ bool X11SalBitmap::Create( return false; } - - void X11SalBitmap::Destroy() { if( mpDIB ) @@ -817,8 +783,6 @@ void X11SalBitmap::Destroy() mpCache->ImplRemove( this ); } - - Size X11SalBitmap::GetSize() const { Size aSize; @@ -831,8 +795,6 @@ Size X11SalBitmap::GetSize() const return aSize; } - - sal_uInt16 X11SalBitmap::GetBitCount() const { sal_uInt16 nBitCount; @@ -847,8 +809,6 @@ sal_uInt16 X11SalBitmap::GetBitCount() const return nBitCount; } - - BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) { if( !mpDIB && mpDDB ) @@ -867,8 +827,6 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool ) return mpDIB; } - - void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) { if( !bReadOnly ) @@ -881,8 +839,6 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly ) } } - - bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) { if( mpDDB ) @@ -899,10 +855,8 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) return false; } - // - ImplSalDDB - - ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, SalX11Screen nXScreen, const SalTwoRect& rTwoRect ) : maPixmap ( 0 ) @@ -933,8 +887,6 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable, } } - - ImplSalDDB::ImplSalDDB( Drawable aDrawable, SalX11Screen nXScreen, @@ -974,16 +926,12 @@ ImplSalDDB::ImplSalDDB( } } - - ImplSalDDB::~ImplSalDDB() { if( maPixmap && ImplGetSVData() ) XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap ); } - - bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const { bool bRet = false; @@ -1018,8 +966,6 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe return bRet; } - - void ImplSalDDB::ImplDraw( Drawable aDrawable, long nDrawableDepth, @@ -1033,8 +979,6 @@ void ImplSalDDB::ImplDraw( rTwoRect.mnDestX, rTwoRect.mnDestY, rGC ); } - - void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth, @@ -1063,10 +1007,8 @@ void ImplSalDDB::ImplDraw( } } - // - ImplSalBitmapCache - - struct ImplBmpObj { X11SalBitmap* mpBmp; @@ -1077,22 +1019,16 @@ struct ImplBmpObj mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {} }; - - ImplSalBitmapCache::ImplSalBitmapCache() : mnTotalSize( 0UL ) { } - - ImplSalBitmapCache::~ImplSalBitmapCache() { ImplClear(); } - - void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags ) { ImplBmpObj* pObj = NULL; @@ -1119,8 +1055,6 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) ); } - - void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) { for( @@ -1139,8 +1073,6 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) } } - - void ImplSalBitmapCache::ImplClear() { for( diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 66eecb4a389e..ef76996c8c27 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -236,7 +235,6 @@ extern "C" } } - void X11SalGraphics::YieldGraphicsExpose() { // get frame if necessary @@ -422,8 +420,6 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry, } } - - void X11SalGraphics::copyArea ( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 05e9de371c15..841aeef8a2ee 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -83,12 +83,8 @@ struct _XRegion BOX extents; }; - - // X11SalGraphics - - GC X11SalGraphics::GetFontGC() { @@ -116,8 +112,6 @@ X11SalGraphics::GetFontGC() return pFontGC_; } - - bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel ) { // release all no longer needed font resources @@ -184,8 +178,6 @@ void ImplServerFontEntry::HandleFontOptions( void ) mpServerFont->SetFontOptions( mpFontOptions ); } - - CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts; int CairoFontsCache::mnRefCount = 0; @@ -439,8 +431,6 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) cairo_destroy(cr); } - - const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const { if( !mpServerFont[0] ) @@ -457,12 +447,8 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities); } - - // SalGraphics - - sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) { sal_uInt16 nRetVal = 0; @@ -473,8 +459,6 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve return nRetVal; } - - void X11SalGraphics::SetTextColor( SalColor nSalColor ) { @@ -486,8 +470,6 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) } } - - bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, const OUString& rFileURL, const OUString& rFontName ) @@ -566,8 +548,6 @@ void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) ImplGetSVData()->maGDIData.mbNativeFontConfig = true; } - - void cairosubcallback(void* pPattern) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -591,8 +571,6 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in return rPFM.getFontOptions(aInfo, nSize, cairosubcallback); } - - void X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) { @@ -606,8 +584,6 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel ) } } - - bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const int nLevel = aGlyphId >> GF_FONTSHIFT; @@ -638,8 +614,6 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rPolyPoly ) { @@ -658,8 +632,6 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return false; } - - SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) { SalLayout* pLayout = NULL; @@ -682,8 +654,6 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pLayout; } - - SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const { SystemFontData aSysFontData; @@ -707,8 +677,6 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const return aSysFontData; } - - bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, @@ -737,8 +705,6 @@ bool X11SalGraphics::CreateFontSubset( return bSuccess; } - - const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ) { // in this context the pFont->GetFontId() is a valid PSP @@ -750,15 +716,11 @@ const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, con return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen ); } - - void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen ) { GenPspGraphics::DoFreeEmbedFontData( pData, nLen ); } - - const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { // in this context the pFont->GetFontId() is a valid PSP @@ -770,8 +732,6 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } - - void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, Int32Vector& rWidths, diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index a858223c939b..56aa036c8266 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index 03974a859caf..111b20a8e161 100644 --- a/vcl/unx/generic/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -29,8 +28,6 @@ using namespace rtl; - - XRenderPeer::XRenderPeer() : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() ) , mpStandardFormatA8( NULL ) @@ -38,16 +35,12 @@ XRenderPeer::XRenderPeer() InitRenderLib(); } - - XRenderPeer& XRenderPeer::GetInstance() { static XRenderPeer aPeer; return aPeer; } - - void XRenderPeer::InitRenderLib() { int nDummy; diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 172fb1fb35a6..cb71889bb7f9 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -76,8 +76,6 @@ public: const _XTrap*, int nCount ) const; }; - - inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const { return mpStandardFormatA8; @@ -174,7 +172,6 @@ inline void XRenderPeer::FillRectangle( int a, Picture b, const XRenderColor* c, XRenderFillRectangle( mpDisplay, a, b, c, d, e, f, g ); } - inline void XRenderPeer::CompositeTrapezoids( int nOp, Picture aSrc, Picture aDst, const XRenderPictFormat* pXRPF, int nXSrc, int nYSrc, const XTrapezoid* pXT, int nCount ) const @@ -189,8 +186,6 @@ inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs, XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount ); } - - inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 ) { XRenderColor aRetVal; @@ -214,8 +209,6 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar return aRetVal; } - - #endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index de8a5606be27..d39196e15cf0 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -44,7 +43,6 @@ using namespace psp; using namespace osl; - struct GetPPDAttribs { osl::Condition m_aCondition; @@ -322,7 +320,6 @@ void CUPSManager::initialize() aPrinter.m_aInfo.m_aLocation=OStringToOUString(pDest->options[k].value, aEncoding); } - OUStringBuffer aBuf( 256 ); aBuf.appendAscii( "CUPS:" ); aBuf.append( aPrinterName ); @@ -686,7 +683,6 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi return nJobID != 0; } - void CUPSManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { PrinterInfoManager::changePrinterInfo( rPrinter, rNewInfo ); diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx index 4ee83c5aadc1..389f74dc8be8 100644 --- a/vcl/unx/generic/printer/jobdata.cxx +++ b/vcl/unx/generic/printer/jobdata.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "vcl/jobdata.hxx" #include "vcl/printerinfomanager.hxx" diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 42eeffc2e3a0..471649c6e155 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -79,7 +78,6 @@ namespace psp PPDTranslator() {} ~PPDTranslator() {} - void insertValue( const OUString& i_rKey, const OUString& i_rOption, @@ -264,7 +262,6 @@ namespace psp using namespace psp; - namespace { struct thePPDCache : public rtl::Static {}; @@ -1482,29 +1479,21 @@ PPDKey::PPDKey( const OUString& rKey ) : { } - - PPDKey::~PPDKey() { } - - const PPDValue* PPDKey::getValue( int n ) const { return ((unsigned int)n < m_aOrderedValues.size() && n >= 0) ? m_aOrderedValues[n] : NULL; } - - const PPDValue* PPDKey::getValue( const OUString& rOption ) const { PPDKey::hash_type::const_iterator it = m_aValues.find( rOption ); return it != m_aValues.end() ? &it->second : NULL; } - - const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const { const PPDValue* pValue = getValue( rOption ); @@ -1518,8 +1507,6 @@ const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const return pValue; } - - void PPDKey::eraseValue( const OUString& rOption ) { PPDKey::hash_type::iterator it = m_aValues.find( rOption ); @@ -1561,8 +1548,6 @@ PPDContext::PPDContext( const PPDParser* pParser ) : { } - - PPDContext& PPDContext::operator=( const PPDContext& rCopy ) { m_pParser = rCopy.m_pParser; @@ -1570,14 +1555,10 @@ PPDContext& PPDContext::operator=( const PPDContext& rCopy ) return *this; } - - PPDContext::~PPDContext() { } - - const PPDKey* PPDContext::getModifiedKey( int n ) const { hash_type::const_iterator it; @@ -1586,8 +1567,6 @@ const PPDKey* PPDContext::getModifiedKey( int n ) const return it != m_aCurrentValues.end() ? it->first : NULL; } - - void PPDContext::setParser( const PPDParser* pParser ) { if( pParser != m_pParser ) @@ -1597,8 +1576,6 @@ void PPDContext::setParser( const PPDParser* pParser ) } } - - const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const { if( ! m_pParser ) @@ -1619,8 +1596,6 @@ const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const return pValue; } - - const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue, bool bDontCareForConstraints ) { if( ! m_pParser || ! pKey ) @@ -1669,8 +1644,6 @@ const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue return pValue; } - - bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue ) { if( ! m_pParser || ! pKey || ! pValue ) @@ -1693,8 +1666,6 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue ) return bRet; } - - bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable ) { if( ! pKey || ! m_pParser || ! m_pParser->hasKey( pKey ) ) @@ -1711,8 +1682,6 @@ bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable ) return bRet; } - - bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue, bool bDoReset ) { if( ! pNewValue ) @@ -1799,8 +1768,6 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue return true; } - - char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const { rBytes = 0; @@ -1845,8 +1812,6 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const return pBuffer; } - - void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) { if( ! m_pParser ) @@ -1881,8 +1846,6 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes ) } } - - int PPDContext::getRenderResolution() const { // initialize to reasonable default, if parser is not set @@ -1907,8 +1870,6 @@ int PPDContext::getRenderResolution() const return nDPI; } - - void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const { // initialize to reasonable default, if parser is not set diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index a38627f7216f..8c05206206f2 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -53,7 +52,6 @@ using namespace psp; using namespace osl; - namespace psp { class SystemQueueInfo : public Thread @@ -82,8 +80,6 @@ namespace psp * class PrinterInfoManager */ - - PrinterInfoManager& PrinterInfoManager::get() { SalData* pSalData = GetSalData(); @@ -110,8 +106,6 @@ void PrinterInfoManager::release() pSalData->m_pPIManager = NULL; } - - PrinterInfoManager::PrinterInfoManager( Type eType ) : m_pQueueInfo( NULL ), m_eType( eType ), @@ -139,8 +133,6 @@ void PrinterInfoManager::initSystemDefaultPaper() RTL_TEXTENCODING_UTF8); } - - bool PrinterInfoManager::checkPrintersChanged( bool bWait ) { // check if files were created, deleted or modified since initialize() @@ -189,8 +181,6 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait ) return bChanged; } - - void PrinterInfoManager::initialize() { m_bUseIncludeFeature = false; @@ -303,7 +293,6 @@ void PrinterInfoManager::initialize() continue; aDirectory.close(); - FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aUniPath ); FileStatus aStatus( osl_FileStatus_Mask_ModifyTime ); DirectoryItem aItem; @@ -550,8 +539,6 @@ void PrinterInfoManager::initialize() } } - - void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const { ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it; @@ -560,8 +547,6 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const rList.push_back( it->first ); } - - const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const { static PrinterInfo aEmptyInfo; @@ -572,8 +557,6 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter return it != m_aPrinters.end() ? it->second.m_aInfo : aEmptyInfo; } - - void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) { ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter ); @@ -588,8 +571,6 @@ void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const Prin } } - - // need to check writeability / creatability of config files static bool checkWriteability( const OUString& rUniPath ) { @@ -737,8 +718,6 @@ bool PrinterInfoManager::writePrinterConfig() return true; } - - bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) { bool bSuccess = false; @@ -793,8 +772,6 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin return bSuccess; } - - bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly ) { bool bSuccess = true; @@ -806,7 +783,6 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec { // this printer already exists in a config file - // check writeability of config file(s) if( ! checkWriteability( it->second.m_aFile ) ) bSuccess = false; @@ -847,8 +823,6 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec return bSuccess; } - - bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName ) { bool bSuccess = false; @@ -985,8 +959,6 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const } } - - SystemQueueInfo::SystemQueueInfo() : m_bChanged( false ) { diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index 43f1130c68e3..b6887dae7a67 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -116,7 +115,6 @@ WMSupportsFWS (Display *display, int screen) #endif XFree (propData); - if (XGetWindowProperty (display, DefaultRootWindow (display), FWS_PROTOCOLS, 0, 10, False, AnyPropertyType, &propType, diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a292449b66db..3a60c1ff6a35 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -893,7 +892,6 @@ X11SalFrame::~X11SalFrame() delete pFreeGraphics_; } - XDestroyWindow( GetXDisplay(), mhWindow ); /* @@ -1807,7 +1805,6 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; - if (! maRestorePosSize.IsEmpty() ) { GetPosSize( aPosSize ); @@ -2287,7 +2284,6 @@ void X11SalFrame::StartPresentation( bool bStart ) doReparentPresentationDialogues( GetDisplay() ); hPresentationWindow = (bStart && IsOverrideRedirect() ) ? GetWindow() : None; - // needs static here to save DPMS settings int dummy; static bool DPMSExtensionAvailable = @@ -2304,7 +2300,6 @@ void X11SalFrame::StartPresentation( bool bStart ) static CARD16 dpms_suspend_timeout=0; static CARD16 dpms_off_timeout=0; - if( bStart || nScreenSaversTimeout_ || DPMSEnabled) { if( hPresentationWindow ) @@ -2322,7 +2317,6 @@ void X11SalFrame::StartPresentation( bool bStart ) &prefer_blanking, &allow_exposures ); - // get the DPMS state right before the start if (DPMSExtensionAvailable) { @@ -2460,15 +2454,11 @@ void X11SalFrame::SetTitle( const OUString& rTitle ) } } - - void X11SalFrame::Flush() { XFlush( GetDisplay()->GetDisplay() ); } - - void X11SalFrame::Sync() { XSync( GetDisplay()->GetDisplay(), False ); @@ -2513,16 +2503,12 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) return; } - - void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) { if (mpInputContext != NULL) mpInputContext->EndExtTextInput( nFlags ); } - - OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) { return GetDisplay()->GetKeyName( nKeyCode ); @@ -2779,7 +2765,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) } } - if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type ) { /* @@ -3386,7 +3371,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) } } - // update the spot location for PreeditPosition IME style if (! aDeleteWatch.isDeleted()) @@ -3430,7 +3414,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) } } - if ( pEvent->mode == NotifyNormal || pEvent->mode == NotifyWhileGrabbed || ( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) ) @@ -3444,8 +3427,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) mbInputFocus = True; ImplSVData* pSVData = ImplGetSVData(); - - long nRet = CallCallback( SALEVENT_GETFOCUS, 0 ); if ((mpParent != NULL && nStyle_ == 0) && pSVData->maWinData.mpFirstFloat ) @@ -3613,7 +3594,6 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } - if( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) { // just update the children's positions @@ -4133,7 +4113,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) CurrentTime ); } - RestackChildren(); mbInShow = false; m_bSetFocusOnMap = false; diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 4588321affc1..7a61bd1c92bd 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if OSL_DEBUG_LEVEL > 1 #include #endif @@ -38,8 +37,6 @@ #include - - // SalInstance member to create and destroy a SalObject SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) @@ -173,18 +170,14 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p return pObject; } - void X11SalInstance::DestroyObject( SalObject* pObject ) { delete pObject; } - - // SalClipRegion is a member of SalObject // definition of SalClipRegion my be found in unx/inc/salobj.h - SalClipRegion::SalClipRegion() { ClipRectangleList = NULL; @@ -193,14 +186,12 @@ SalClipRegion::SalClipRegion() nClipRegionType = SAL_OBJECT_CLIP_INCLUDERECTS; } - SalClipRegion::~SalClipRegion() { if ( ClipRectangleList ) delete [] ClipRectangleList; } - void SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) { @@ -212,7 +203,6 @@ SalClipRegion::BeginSetClipRegion( sal_uLong nRects ) maxClipRectangles = nRects; } - void SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { @@ -269,7 +259,6 @@ X11SalObject::~X11SalObject() GetGenericData()->ErrorTrapPop(); } - void X11SalObject::ResetClipRegion() { @@ -302,21 +291,18 @@ X11SalObject::ResetClipRegion() op, ordering ); } - void X11SalObject::BeginSetClipRegion( sal_uLong nRectCount ) { maClipRegion.BeginSetClipRegion ( nRectCount ); } - void X11SalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { maClipRegion.UnionClipRegion ( nX, nY, nWidth, nHeight ); } - void X11SalObject::EndSetClipRegion() { @@ -354,15 +340,12 @@ X11SalObject::EndSetClipRegion() op, ordering ); } - sal_uInt16 X11SalObject::GetClipRegionType() { return maClipRegion.GetClipRegionType(); } - - void X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { @@ -377,7 +360,6 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) } } - void X11SalObject::Show( bool bVisible ) { @@ -407,8 +389,6 @@ void X11SalObject::GrabFocus() CurrentTime ); } - - const SystemEnvData* X11SalObject::GetSystemData() const { return &maSystemChildData; diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index fb613daffc68..01f2365c365c 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include @@ -209,7 +208,6 @@ appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& } } - static G_CONST_RETURN gchar * action_wrapper_get_keybinding (AtkAction *action, gint i) diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index c63ef828444b..c82b1e18ddb2 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index 53797f3350a3..222f4b609e65 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d72988f09f89..2918da6496e6 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" @@ -48,7 +47,6 @@ static accessibility::XAccessibleEditableText* return NULL; } - /*****************************************************************************/ extern "C" { diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 2b05c763a55b..01a55a72ac8f 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include "atkwrapper.hxx" diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index f1fac6be1889..c4c5a5383bed 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include @@ -26,7 +25,6 @@ using namespace ::com::sun::star; - // ---------------------- AtkHyperlink ---------------------- typedef struct { @@ -212,7 +210,6 @@ static accessibility::XAccessibleHypertext* return NULL; } - static AtkHyperlink * hypertext_get_link( AtkHypertext *hypertext, gint link_index) diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index d9f93edc4a9d..524a26895c59 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index ebdac0053ed6..3349be84925f 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include @@ -40,7 +39,6 @@ using namespace com::sun::star; - AtkListener::AtkListener( AtkObjectWrapper* pWrapper ) : mpWrapper( pWrapper ) { if( mpWrapper ) diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx index 1d0994131cef..016cb03447ec 100644 --- a/vcl/unx/gtk/a11y/atkselection.cxx +++ b/vcl/unx/gtk/a11y/atkselection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index 7094a7caf4b9..12b598bf9fa3 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include @@ -638,7 +637,6 @@ table_wrapper_set_column_description( AtkTable *, gint, const gchar * ) { // meaningless helper } - /*****************************************************************************/ static void @@ -646,7 +644,6 @@ table_wrapper_set_column_header( AtkTable *, gint, AtkObject * ) { // meaningless helper } - /*****************************************************************************/ static void diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index c90a9447c78d..b3ee4f21c6f8 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" #include diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 54e8f8f0a542..0d7cdc0e7785 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atktextattributes.hxx" #include @@ -50,7 +49,6 @@ typedef bool (* TextPropertyValueFunc) ( uno::Any& rAny, const gchar * value ) #define STRNCMP_PARAM( s ) s,sizeof( s )-1 - /*****************************************************************************/ static AtkTextAttribute atk_text_attribute_paragraph_style = ATK_TEXT_ATTR_INVALID; @@ -147,7 +145,6 @@ static const char * ExportedTextAttributes[TEXT_ATTRIBUTE_LAST] = "WritingMode" // TEXT_ATTRIBUTE_WRITING_MODE }; - /*****************************************************************************/ static gchar* @@ -180,7 +177,6 @@ double toPoint(sal_Int16 n) return (double) (n * 72) / 2540; } - /*****************************************************************************/ static bool @@ -380,7 +376,6 @@ String2Weight( uno::Any& rAny, const gchar * value ) return true; } - /*****************************************************************************/ static gchar* @@ -770,7 +765,6 @@ get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList, // @see http://www.w3.org/TR/REC-CSS2/text.html#lining-striking-props - enum { DECORATION_NONE = 0, @@ -779,7 +773,6 @@ enum DECORATION_LINE_THROUGH }; - static const gchar * decorations[] = { "none", "blink", "underline", "line-through" }; static gchar * @@ -818,7 +811,6 @@ get_text_decoration(const uno::Sequence< beans::PropertyValue >& rAttributeList, return g_strjoinv(" ", value_list); } - /*****************************************************************************/ // @see http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-shadow @@ -1219,7 +1211,6 @@ attribute_set_new_from_property_values( return attribute_set; } - AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_set ) { if( ATK_TEXT_ATTR_INVALID == atk_text_attribute_misspelled ) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index e9309aa40fc8..f662bbdc7bdd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include @@ -494,7 +493,6 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) } } - /*****************************************************************************/ static std::set< Window * > g_aWindowList; @@ -758,5 +756,4 @@ ooo_atk_util_get_type (void) return type; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx index 44416fa19982..7e1256e334c3 100644 --- a/vcl/unx/gtk/a11y/atkvalue.cxx +++ b/vcl/unx/gtk/a11y/atkvalue.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index e60ef0bbe491..92b89509ffb6 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index b01abcdc575e..a4125fa53e9f 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -121,7 +120,6 @@ static AtkRelationType mapRelationType( sal_Int16 nRelation ) return type; } - AtkStateType mapAtkState( sal_Int16 nState ) { AtkStateType type = ATK_STATE_INVALID; @@ -321,7 +319,6 @@ static AtkRole mapToAtkRole( sal_Int16 nRole ) return role; } - /*****************************************************************************/ extern "C" { @@ -558,7 +555,6 @@ wrapper_ref_state_set( AtkObject *atk_obj ) /*****************************************************************************/ - static void atk_object_wrapper_finalize (GObject *obj) { @@ -777,7 +773,6 @@ atk_object_wrapper_ref( const uno::Reference< accessibility::XAccessible > &rxAc return NULL; } - AtkObject * atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, AtkObject* parent ) @@ -847,7 +842,6 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star } } - /*****************************************************************************/ void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, gint index) diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 02126cbc541f..5886674f1d1d 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleValue; } } } } - struct _AtkObjectWrapper { AtkObject aParent; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 5787caf45367..bef0510da4a4 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -48,7 +48,6 @@ using namespace vcl_sal; - /*************************************************************** * class GtkSalDisplay * ***************************************************************/ @@ -493,7 +492,6 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) return 1; } - /********************************************************************** * class GtkData * **********************************************************************/ diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 83e0d1f801a8..6389cf06febd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -293,7 +292,6 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) #endif } - GtkYieldMutex::GtkYieldMutex() { } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 2365565ce614..1f3dfb65980c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -50,10 +50,8 @@ #include "gtk/fpicker/SalGtkFilePicker.hxx" - // namespace directives - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; @@ -312,10 +310,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); } - // XFilePickerNotifier - void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference& xListener ) throw( uno::RuntimeException, std::exception ) { @@ -334,10 +330,8 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference no mutex needed @@ -348,10 +342,8 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr removeFilePickerListener( xFilePickerListener ); } - // FilePicker Event functions - void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent ) { OSL_TRACE( "file selection changed"); @@ -370,8 +362,6 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } - - struct FilterEntry { protected: @@ -406,22 +396,17 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; - - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { } - bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } - sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) { _rSubFilterList = m_aSubFilters; @@ -504,7 +489,6 @@ dialog_remove_buttons( GtkDialog *pDialog ) g_list_free( pChildren ); } - namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > @@ -515,7 +499,6 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -542,8 +525,6 @@ namespace { }; } - - bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { bool bRet = false; @@ -559,7 +540,6 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) return bRet; } - bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { bool bRet = false; @@ -581,7 +561,6 @@ bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) return bRet; } - void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) @@ -594,11 +573,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter } } - - - - - void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -616,10 +590,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) ); } - - - - void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -642,10 +612,6 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) // TODO m_pImpl->setCurrentFilter( aTitle ); } - - - - void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) { OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8); @@ -703,10 +669,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept return m_aCurrentFilter; } - // XFilterGroupManager functions - void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -735,10 +699,8 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle } - // XFilePicker functions - void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -956,10 +918,8 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno return aSelectedFiles; } - // XExecutableDialog functions - void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1128,8 +1088,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std return retVal; } - - // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) { @@ -1181,9 +1139,6 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) return pWidget; } - - - // XFilePickerControlAccess functions static void HackWidthToFirst(GtkComboBox *pWidget) @@ -1469,10 +1424,8 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } - // XFilePreview functions - uno::Sequence SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1655,10 +1608,8 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, return mbPreviewState; } - // XInitialization - void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence& aArguments ) throw( uno::Exception, uno::RuntimeException, std::exception ) { @@ -1820,10 +1771,8 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP pobjFP->setShowState( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( cb ) ) ); } - // XCancellable - void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1833,7 +1782,6 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exce // TODO m_pImpl->cancel(); } - // Misc void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 94634ca7dd7a..b4f4dbd09ac5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,10 +33,8 @@ #include "gtk/fpicker/SalGtkPicker.hxx" - // Implementation class for the XFilePicker Interface - struct FilterEntry; struct ElementEntry_Impl; @@ -45,11 +43,8 @@ typedef ::std::list < ElementEntry_Impl > ElementList; typedef ::com::sun::star::beans::StringPair UnoFilterEntry; typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively - - // class declaration - typedef cppu::WeakComponentImplHelper5< ::com::sun::star::ui::dialogs::XFilePickerControlAccess, ::com::sun::star::ui::dialogs::XFilePreview, @@ -65,29 +60,23 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // constructor SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -104,17 +93,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -124,17 +109,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -150,10 +131,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -175,32 +154,24 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - // FilePicker Event functions - private: // prevent copy and assignment SalGtkFilePicker( const SalGtkFilePicker& ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index b30334408c5c..a77d1c9512f2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - // constructor SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentContext >& xContext ) : @@ -65,10 +64,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } - // XEventListener - void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) { @@ -128,10 +125,8 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription { } - // XExecutableDialog functions - void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -177,10 +172,8 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s return retVal; } - // XCancellable - void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index a7081c382be4..1acdd66c4abf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,20 +37,16 @@ class SalGtkFolderPicker : // constructor SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFolderPicker functions - virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -63,17 +59,13 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 209343526218..50ad540887be 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,7 +23,6 @@ #include #include - // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications @@ -31,7 +30,6 @@ // this is an application of the // "command" pattern see GoF - class CEventNotification { public: diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index f4e144a9b118..9727a9cf9654 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - // translate control ids to resource ids static const struct diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index be7b35e53c5b..a2b332620088 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -61,7 +61,6 @@ GtkSalGraphics::~GtkSalGraphics() { } - /************************************* * Cached native widget objects *************************************/ @@ -172,7 +171,6 @@ static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 }; #define BTN_CHILD_SPACING 1 #define MIN_SPIN_ARROW_WIDTH 6 - static void NWEnsureGTKRadio ( SalX11Screen nScreen ); static void NWEnsureGTKButton ( SalX11Screen nScreen ); static void NWEnsureGTKCheck ( SalX11Screen nScreen ); @@ -205,13 +203,11 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ); * */ - static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ); - static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -230,7 +226,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, Cont static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -247,10 +242,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen, static int getFrameWidth(GtkWidget* widget); - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ); - /********************************************************* * PixmapCache *********************************************************/ @@ -317,7 +310,6 @@ void NWPixmapCacheData::SetPixmap( GdkPixmap* pPixmap ) g_object_ref( m_pixmap ); } - NWPixmapCache::NWPixmapCache( SalX11Screen nScreen ) { m_idx = 0; @@ -373,7 +365,6 @@ void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangl pData[m_idx].SetPixmap( pPixmap ); } - void NWPixmapCacheList::AddCache( NWPixmapCache* pCache ) { mCaches.push_back( pCache ); @@ -395,7 +386,6 @@ void NWPixmapCacheList::ThemeChanged( ) } } - /********************************************************* * Make border manipulation easier *********************************************************/ @@ -407,7 +397,6 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS aDst.bottom = pSrc->bottom; } - /********************************************************* * Initialize GTK and local stuff *********************************************************/ @@ -474,7 +463,6 @@ void GtkData::initNWF( void ) #endif } - /********************************************************* * Release GTK and local stuff *********************************************************/ @@ -502,7 +490,6 @@ void GtkData::deInitNWF( void ) } } - /********************************************************** * track clip region **********************************************************/ @@ -654,7 +641,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return false; } - /* * HitTestNativeControl() * @@ -766,7 +752,6 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, } } - /* * DrawNativeControl() * @@ -1622,8 +1607,6 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) return Rectangle( Point( x, y ), Size( w, h ) ); } - - bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1680,8 +1663,6 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, return true; } - - bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1727,7 +1708,6 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, return true; } - static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ) { // Size the arrow appropriately @@ -2068,8 +2048,6 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, return true; } - - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ) { gint slider_width; @@ -2151,8 +2129,6 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa return( buttonRect ); } - - bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2181,7 +2157,6 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, return true; } - /* Take interior/exterior focus into account and return * the bounding rectangle of the edit box including * any focus requirements. @@ -2215,7 +2190,6 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, return( pixmapRect ); } - /* Paint a GTK Entry widget into the specified GdkPixmap. * All coordinates should be local to the Pixmap, NOT * screen/window coordinates. @@ -2288,10 +2262,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, } - - - - bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, @@ -2340,7 +2310,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, else pixmapRect = rControlRectangle; - pixmap = NWGetPixmapFromScreen( pixmapRect ); if ( !pixmap ) return false; @@ -2396,8 +2365,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, return true; } - - static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2487,9 +2454,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, arrowRect.GetWidth(), arrowRect.GetHeight() ); } - - - bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2568,8 +2532,6 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, return true; } - - static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2626,10 +2588,6 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, return( aButtonRect ); } - - - - bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, const Rectangle& rControlRectangle, const clipList&, @@ -2781,8 +2739,6 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, return bSuccess; } - - bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3032,8 +2988,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar( return true; } - - bool GtkSalGraphics::NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, @@ -3528,15 +3482,12 @@ bool GtkSalGraphics::NWPaintGTKSlider( eOri ); } - bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; } - - static int getFrameWidth(GtkWidget* widget) { return widget->style->xthickness; @@ -3605,8 +3556,6 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, return( aPartRect ); } - - static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, ControlType, ControlPart, @@ -4104,7 +4053,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( aStyleSet ); } - /************************************************************************ * Create a GdkPixmap filled with the contents of an area of an Xlib window ************************************************************************/ @@ -4138,9 +4086,6 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect ) return( pPixmap ); } - - - /************************************************************************ * Copy an alpha pixmap to screen using a gc with clipping ************************************************************************/ @@ -4170,7 +4115,6 @@ bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRe return true; } - /************************************************************************ * State conversion ************************************************************************/ @@ -4224,8 +4168,6 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy * Widget ensure functions - make sure cached objects are valid ************************************************************************/ - - static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) { NWFWidgetData& rData = gWidgetData[nScreen]; @@ -4257,8 +4199,6 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget ); } - - static void NWEnsureGTKButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gBtnWidget ) @@ -4268,8 +4208,6 @@ static void NWEnsureGTKButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKRadio( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gRadioWidget || !gWidgetData[nScreen].gRadioWidgetSibling ) @@ -4281,8 +4219,6 @@ static void NWEnsureGTKRadio( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCheck( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gCheckWidget ) @@ -4292,8 +4228,6 @@ static void NWEnsureGTKCheck( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrollHorizWidget ) @@ -4309,8 +4243,6 @@ static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) } } - - static void NWEnsureGTKArrow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gArrowWidget || !gWidgetData[nScreen].gDropdownWidget ) @@ -4324,8 +4256,6 @@ static void NWEnsureGTKArrow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKEditBox( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gEditBoxWidget ) @@ -4335,8 +4265,6 @@ static void NWEnsureGTKEditBox( SalX11Screen nScreen ) } } - - static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gSpinButtonWidget ) @@ -4352,8 +4280,6 @@ static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKNotebook( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gNotebookWidget ) @@ -4363,8 +4289,6 @@ static void NWEnsureGTKNotebook( SalX11Screen nScreen ) } } - - static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gOptionMenuWidget ) @@ -4374,8 +4298,6 @@ static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCombo( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gComboWidget ) @@ -4394,8 +4316,6 @@ static void NWEnsureGTKCombo( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrolledWindowWidget ) @@ -4408,8 +4328,6 @@ static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKToolbar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gToolbarWidget ) @@ -4439,8 +4357,6 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen ) } } - - static void NWEnsureGTKMenubar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gMenubarWidget ) diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index eb6609098960..0251ffd29841 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -114,7 +114,6 @@ private: boost::shared_ptr m_pWrapper; }; - struct GtkSalPrinter_Impl { OString m_sSpoolFile; @@ -126,14 +125,12 @@ struct GtkSalPrinter_Impl ~GtkSalPrinter_Impl(); }; - GtkSalPrinter_Impl::GtkSalPrinter_Impl() : m_pPrinter(0) , m_pSettings(0) { } - GtkSalPrinter_Impl::~GtkSalPrinter_Impl() { if (m_pPrinter) @@ -173,7 +170,6 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter) { } - bool GtkSalPrinter::impl_doJob( const OUString* const i_pFileName, @@ -207,7 +203,6 @@ GtkSalPrinter::impl_doJob( return bJobStarted; } - bool GtkSalPrinter::StartJob( const OUString* const i_pFileName, @@ -266,7 +261,6 @@ GtkSalPrinter::StartJob( return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, nCopies, bCollate, io_rController); } - bool GtkSalPrinter::EndJob() { @@ -316,7 +310,6 @@ GtkSalPrinter::EndJob() return bRet; } - namespace { @@ -337,7 +330,6 @@ lcl_setHelpText( #endif } - static GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, @@ -415,7 +407,6 @@ GtkPrintDialog::GtkPrintDialog(vcl::PrinterController& io_rController) impl_readFromSettings(); } - void GtkPrintDialog::impl_initDialog() { @@ -448,7 +439,6 @@ GtkPrintDialog::impl_initDialog() )); } - void GtkPrintDialog::impl_initCustomTab() { @@ -761,7 +751,6 @@ GtkPrintDialog::impl_initCustomTab() } } - void GtkPrintDialog::impl_initPrintContent(uno::Sequence const& i_rDisabled) { @@ -815,7 +804,6 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence const& i_rDisabled } } - void GtkPrintDialog::impl_checkOptionalControlDependencies() { @@ -826,7 +814,6 @@ GtkPrintDialog::impl_checkOptionalControlDependencies() } } - beans::PropertyValue* GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const { @@ -844,7 +831,6 @@ GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const return pVal; } - void GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) { @@ -858,7 +844,6 @@ GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) { @@ -877,7 +862,6 @@ GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) { @@ -891,7 +875,6 @@ GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) } } - bool GtkPrintDialog::run() { @@ -951,7 +934,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[1].Name = "FirstPageOnLeft"; aFilterData[1].Value <<= sal_False; - const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES); if (pStr && !strcmp(pStr, "ranges")) { @@ -1052,7 +1034,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe } #endif - void GtkPrintDialog::updateControllerPrintRange() { @@ -1104,13 +1085,11 @@ GtkPrintDialog::updateControllerPrintRange() g_object_unref(G_OBJECT(pSettings)); } - GtkPrintDialog::~GtkPrintDialog() { gtk_widget_destroy(m_pDialog); } - void GtkPrintDialog::impl_readFromSettings() { @@ -1147,7 +1126,6 @@ GtkPrintDialog::impl_readFromSettings() g_object_unref(G_OBJECT(pSettings)); } - void GtkPrintDialog::impl_storeToSettings() const @@ -1170,7 +1148,6 @@ const pItem->Commit(); } - sal_uLong GtkSalInfoPrinter::GetCapabilities( const ImplJobSetup* const i_pSetupData, diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 00ce9338d32b..e6c10b709391 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -15,7 +15,6 @@ #include #include - /* * GLOAction */ @@ -158,7 +157,6 @@ g_lo_action_group_query_action (GActionGroup *group, if (action == NULL) return FALSE; - if (enabled) { GtkSalFrame* pFrame = lo_group->priv->frame; diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index e012aa0d8247..76c617bead13 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -40,7 +40,6 @@ struct item GHashTable* links; // Item links. }; - static void g_lo_menu_struct_item_init (struct item *menu_item) { @@ -511,7 +510,6 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu, } } - void g_lo_menu_set_submenu_to_item_in_section (GLOMenu *menu, gint section, diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f585c73c904d..a8fe4aba09dd 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 8d3a5134dc42..f22b54eea818 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1669,7 +1669,6 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) ImpBitmap *pIconImpBitmap = aIcon.ImplGetBitmapImpBitmap(); ImpBitmap *pIconImpMask = aIcon.ImplGetMaskImpBitmap(); - if( pIconImpBitmap && pIconImpMask ) { SalBitmap *pIconBitmap = @@ -3524,7 +3523,6 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) } #endif // GTK_CHECK_VERSION(3,0,0) - gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) { GtkSalFrame* pThis = (GtkSalFrame*)frame; @@ -3947,10 +3945,8 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) } } - // GtkSalFrame::IMHandler - GtkSalFrame::IMHandler::IMHandler( GtkSalFrame* pFrame ) : m_pFrame(pFrame), m_nPrevKeyPresses( 0 ), diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index d63fdd31c16a..203b9b42794d 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -379,7 +379,6 @@ void GtkSalMenu::UpdateFull() ImplUpdate( TRUE ); } - /* * GtkSalMenu */ @@ -712,7 +711,6 @@ void GtkSalMenu::Activate() ActivateAllSubmenus(static_cast(mpVCLMenu)); } - void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) { if ( !mbMenuBar ) @@ -765,7 +763,6 @@ void GtkSalMenu::ShowItem( unsigned nPos, bool bShow ) ( ( GtkSalMenuItem* ) maItems[ nPos ] )->mbVisible = bShow; } - void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& ) { } @@ -782,8 +779,6 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) { } - - /* * GtkSalMenuItem */ diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 9ddeda38e27a..2a1f4e7f4584 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1436,7 +1436,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) fprintf( stderr, "Theme name is \"%s\"\n", pThemeName ); #endif - } bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index f10eac36f379..7b907dea9c66 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -29,10 +29,8 @@ using namespace ::com::sun::star; - // UnxFilePickerCommandThread - UnxFilePickerCommandThread::UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD ) : m_pNotifyThread( pNotifyThread ), m_nReadFD( nReadFD ) diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 43dec15789fa..ff902787779d 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -60,10 +60,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; - // helper functions - namespace { uno::Sequence SAL_CALL FilePicker_getSupportedServiceNames() @@ -80,10 +78,8 @@ namespace } } - // UnxFilePicker - UnxFilePicker::UnxFilePicker( const uno::Reference& ) : UnxFilePicker_Base( m_rbHelperMtx ), m_nFilePickerPid( -1 ), diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index 0b43d2afda1e..f500767e9d1d 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -22,10 +22,8 @@ using namespace ::com::sun::star; - // UnxFilePickerNotifyThread - UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), m_bExit( false ), diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx index b2e47786faa4..533950abd9f7 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx @@ -35,10 +35,8 @@ #include #endif - // CommandEvent - KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringList ) : QCustomEvent( TypeId, pStringList ), m_eCommand( Unknown ) @@ -73,10 +71,8 @@ KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringL m_eCommand = pIdx->eType; } - // CommandThread - KDECommandThread::KDECommandThread( QWidget *pObject ) : m_pObject( pObject ) { diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx index 73210557980b..6b27ae4afb52 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.cxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx @@ -89,10 +89,8 @@ #include #include - // KDEFileDialog - KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter, QWidget *parent, const char *name ) : KFileDialog( startDir, filter, parent, name, true, m_pCustomWidget = new QVBox() ), @@ -750,7 +748,6 @@ QString KDEFileDialog::escapeString( const QString &rString ) return qString; } - void KDEFileFilterComboHack::setCurrentFilter( const QString& filter ) { setCurrentText( filter ); diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index 03ea2c1a293a..d7152a53ae85 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -56,10 +56,8 @@ #define KLocale TDELocale #endif // ENABLE_TDE - // Main - static const KCmdLineOptions sOptions[] = { { "winid ", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx index da938183867f..1262f3e9e7c2 100644 --- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx +++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx @@ -33,10 +33,8 @@ #include #include - // Modality filter - KDEModalityFilter::KDEModalityFilter( WId nWinId ) : m_nWinId( nWinId ) { diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 5e58799fcd9e..6f51fad7035c 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1263,7 +1263,6 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP ; } - /** Test whether the position is in the native widget. If the return value is true, bIsInside contains information whether @@ -1365,7 +1364,6 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, return false; } - /** Draw the requested control described by nPart/nState. @param rControlRegion @@ -1715,10 +1713,8 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar return bReturn; } - // KDESalFrame implementation - KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : X11SalFrame( pParent, nStyle ) { @@ -2089,10 +2085,8 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder() delete pGraphics; } - // KDESalInstance implementation - SalFrame * KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle ) { @@ -2106,10 +2100,8 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDESalInstance::createFilePicker( new UnxFilePicker( xMSF ) ); } - // KDESalData pieces - // Create the widget painter so we have some control over // the destruction sequence, so Qt doesn't die in action. diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 4f819fb4c0a1..969fd2c082e3 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -80,10 +80,8 @@ using namespace ::com::sun::star::uno; #define ALLOW_REMOTE_URLS 0 #endif - // helper functions - #include namespace @@ -109,10 +107,8 @@ QString toQString(const OUString& s) return QString::fromUtf16(s.getStr(), s.getLength()); } - // KDE4FilePicker - KDE4FilePicker::KDE4FilePicker( const uno::Reference& ) : KDE4FilePicker_Base(_helperMutex) , _resMgr( ResMgr::CreateResMgr("fps_office") ) diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx index 0e87c6209cf6..dff67e3e870e 100644 --- a/vcl/unx/kde4/KDEData.cxx +++ b/vcl/unx/kde4/KDEData.cxx @@ -29,7 +29,6 @@ #include "KDEXLib.hxx" #include "KDESalDisplay.hxx" - KDEData::~KDEData() { } diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index 650b2662005d..e55169f5bd28 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -88,5 +88,4 @@ bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 25b092a17106..bd99e2d5a1fc 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -337,7 +337,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( style ); } - void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { for( int i = 0; i < nMaxGraphics; i++ ) diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 4fbe79bf24f1..173479622103 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -990,5 +990,4 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, return FALSE; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index 1061e39e5580..38b5422879ea 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define Region QtXRegion #include #undef Region diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index 7a08533a2b32..add2b60384b8 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -31,7 +31,6 @@ #include #include - SalSystem* X11SalInstance::CreateSalSystem() { return new X11SalSystem(); diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index a650c8e2d99d..0e9a32a8541b 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -23,8 +23,6 @@ #include "win/saldata.hxx" - - rtl_TextEncoding ImplSalGetSystemEncoding() { static UINT nOldAnsiCodePage = 0; @@ -42,8 +40,6 @@ rtl_TextEncoding ImplSalGetSystemEncoding() return eEncoding; } - - OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen) { return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen, @@ -53,8 +49,6 @@ OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen) RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT ); } - - int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) { int nRet; @@ -81,36 +75,26 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) return nRet; } - - BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { return PostMessageW( hWnd, nMsg, wParam, lParam ); } - - BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { return SendMessageW( hWnd, nMsg, wParam, lParam ); } - - BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax ) { return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax ); } - - BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg ) { return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg ); } - - LONG ImplDispatchMessage( CONST MSG *lpMsg ) { return DispatchMessageW( lpMsg ); diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 19234fdf387e..3b4ededbb09f 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "svsys.h" #include "rtl/ustrbuf.hxx" @@ -43,8 +42,6 @@ WinSalSystem::~WinSalSystem() { } - - static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor, HDC hDC, LPRECT lpRect, @@ -178,7 +175,6 @@ OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen ) return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString(); } - /* We have to map the button identifier to the identifier used by the Win32 Platform SDK to specify the default button for the MessageBox API. The first dimension is the button combination, the second dimension diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index e831106c998d..88a76c346383 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -82,8 +81,6 @@ #include #endif - - void SalAbort( const OUString& rErrorText, bool ) { ImplFreeSalGDI(); @@ -102,13 +99,9 @@ void SalAbort( const OUString& rErrorText, bool ) } } - - LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); - - class SalYieldMutex : public comphelper::SolarMutex { osl::Mutex m_mutex; @@ -128,8 +121,6 @@ public: sal_uLong GetAcquireCount( sal_uLong nThreadId ); }; - - SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData ) { mpInstData = pInstData; @@ -137,8 +128,6 @@ SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData ) mnThreadId = 0; } - - void SalYieldMutex::acquire() { m_mutex.acquire(); @@ -146,8 +135,6 @@ void SalYieldMutex::acquire() mnThreadId = GetCurrentThreadId(); } - - void SalYieldMutex::release() { DWORD nThreadId = GetCurrentThreadId(); @@ -188,8 +175,6 @@ void SalYieldMutex::release() } } - - bool SalYieldMutex::tryToAcquire() { if( m_mutex.tryToAcquire() ) @@ -202,8 +187,6 @@ bool SalYieldMutex::tryToAcquire() return false; } - - sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId ) { if ( nThreadId == mnThreadId ) @@ -212,8 +195,6 @@ sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId ) return 0; } - - void ImplSalYieldMutexAcquireWithWait() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -260,8 +241,6 @@ void ImplSalYieldMutexAcquireWithWait() pInst->mpSalYieldMutex->acquire(); } - - bool ImplSalYieldMutexTryToAcquire() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -271,8 +250,6 @@ bool ImplSalYieldMutexTryToAcquire() return FALSE; } - - void ImplSalYieldMutexAcquire() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -280,8 +257,6 @@ void ImplSalYieldMutexAcquire() pInst->mpSalYieldMutex->acquire(); } - - void ImplSalYieldMutexRelease() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -292,8 +267,6 @@ void ImplSalYieldMutexRelease() } } - - sal_uLong ImplSalReleaseYieldMutex() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -312,8 +285,6 @@ sal_uLong ImplSalReleaseYieldMutex() return nCount; } - - void ImplSalAcquireYieldMutex( sal_uLong nCount ) { WinSalInstance* pInst = GetSalData()->mpFirstInstance; @@ -328,8 +299,6 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount ) } } - - bool WinSalInstance::CheckYieldMutex() { SalData* pSalData = GetSalData(); @@ -341,8 +310,6 @@ bool WinSalInstance::CheckYieldMutex() return true; } - - void SalData::initKeyCodeMap() { UINT nKey = 0xffffffff; @@ -367,11 +334,8 @@ void SalData::initKeyCodeMap() initKey( ';', KEY_SEMICOLON ); } - - // SalData - SalData::SalData() { mhInst = 0; // default instance handle @@ -454,7 +418,6 @@ void InitSalData() Gdiplus::GdiplusStartup(&pSalData->gdiplusToken, &gdiplusStartupInput, NULL); } - void DeInitSalData() { CoUninitialize(); @@ -469,8 +432,6 @@ void DeInitSalData() delete pSalData; } - - void InitSalMain() { // remember data, copied from WinMain @@ -486,8 +447,6 @@ void InitSalMain() } } - - SalInstance* CreateSalInstance() { SalData* pSalData = GetSalData(); @@ -570,8 +529,6 @@ SalInstance* CreateSalInstance() return pInst; } - - void DestroySalInstance( SalInstance* pInst ) { SalData* pSalData = GetSalData(); @@ -587,8 +544,6 @@ void DestroySalInstance( SalInstance* pInst ) delete pInst; } - - WinSalInstance::WinSalInstance() { mhComWnd = 0; @@ -599,8 +554,6 @@ WinSalInstance::WinSalInstance() ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex ); } - - WinSalInstance::~WinSalInstance() { ::tools::SolarMutex::SetSolarMutex( 0 ); @@ -610,29 +563,21 @@ WinSalInstance::~WinSalInstance() DestroyWindow( mhComWnd ); } - - comphelper::SolarMutex* WinSalInstance::GetYieldMutex() { return mpSalYieldMutex; } - - sal_uLong WinSalInstance::ReleaseYieldMutex() { return ImplSalReleaseYieldMutex(); } - - void WinSalInstance::AcquireYieldMutex( sal_uLong nCount ) { ImplSalAcquireYieldMutex( nCount ); } - - static void ImplSalDispatchMessage( MSG* pMsg ) { SalData* pSalData = GetSalData(); @@ -646,8 +591,6 @@ static void ImplSalDispatchMessage( MSG* pMsg ) ImplSalPostDispatchMsg( pMsg, lResult ); } - - void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents ) { MSG aMsg; @@ -677,8 +620,6 @@ void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents ) } } - - void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; @@ -728,13 +669,10 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) } } - - LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { LRESULT nRet = 0; - switch ( nMsg ) { case SAL_MSG_PRINTABORTJOB: @@ -874,8 +812,6 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa return nRet; } - - bool WinSalInstance::AnyInput( sal_uInt16 nType ) { MSG aMsg; @@ -956,8 +892,6 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType ) return FALSE; } - - void SalTimer::Start( sal_uLong nMS ) { // to switch to Main-Thread @@ -973,16 +907,12 @@ void SalTimer::Start( sal_uLong nMS ) ImplSalStartTimer( nMS, FALSE ); } - - SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { // to switch to Main-Thread return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd ); } - - SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { // to switch to Main-Thread @@ -994,15 +924,11 @@ SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSty return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)hWndParent ); } - - void WinSalInstance::DestroyFrame( SalFrame* pFrame ) { ImplSendMessage( mhComWnd, SAL_MSG_DESTROYFRAME, 0, (LPARAM)pFrame ); } - - SalObject* WinSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows bool /*bShow*/ ) @@ -1011,15 +937,11 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent, return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast(pParent) ); } - - void WinSalInstance::DestroyObject( SalObject* pObject ) { ImplSendMessage( mhComWnd, SAL_MSG_DESTROYOBJECT, 0, (LPARAM)pObject ); } - - void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) { rReturnedBytes = 1; @@ -1027,8 +949,6 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn return const_cast(""); } - - /** Add a file to the system shells recent document list if there is any. This function may have no effect under Unix because there is no standard API among the different desktop managers. @@ -1109,15 +1029,11 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS } } - - SalTimer* WinSalInstance::CreateSalTimer() { return new WinSalTimer(); } - - SalBitmap* WinSalInstance::CreateSalBitmap() { return new WinSalBitmap(); @@ -1140,8 +1056,6 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus() return new WinImeStatus(); } - - const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "Windows" ); diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index cddc07f16d9a..0aa2b752902f 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -17,17 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include - - SalShlData aSalShlData; - - extern "C" { @@ -54,8 +49,6 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) } - - HCURSOR ImplLoadSalCursor( int nId ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); @@ -67,8 +60,6 @@ HCURSOR ImplLoadSalCursor( int nId ) return hCursor; } - - HBITMAP ImplLoadSalBitmap( int nId ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); @@ -80,8 +71,6 @@ HBITMAP ImplLoadSalBitmap( int nId ) return hBitmap; } - - bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index c3d2e4e8ed8f..c0aba2842dee 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -26,14 +26,9 @@ #include #endif - - - // maximum period #define MAX_SYSPERIOD 65533 - - void ImplSalStartTimer( sal_uLong nMS, bool bMutex ) { SalData* pSalData = GetSalData(); @@ -56,8 +51,6 @@ void ImplSalStartTimer( sal_uLong nMS, bool bMutex ) pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS; } - - WinSalTimer::~WinSalTimer() { } @@ -90,8 +83,6 @@ void WinSalTimer::Stop() } } - - void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD ) { #if defined ( __MINGW32__ ) && !defined ( _WIN64 ) diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 5324581d4c6d..e1d53aadb592 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -63,8 +62,6 @@ #pragma warning(pop) #endif - - // - Inlines - inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex ) @@ -75,7 +72,6 @@ inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex ) ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) ); } - // Helper class to manage Gdiplus::Bitmap instances inside of // WinSalBitmap @@ -194,13 +190,11 @@ public: } }; - // Global instance of GdiPlusBuffer which manages Gdiplus::Bitmap // instances static GdiPlusBuffer aGdiPlusBuffer; - // - WinSalBitmap - WinSalBitmap::WinSalBitmap() @@ -213,15 +207,11 @@ WinSalBitmap::WinSalBitmap() { } - - WinSalBitmap::~WinSalBitmap() { Destroy(); } - - void WinSalBitmap::Destroy() { if(maGdiPlusBitmap.get()) @@ -238,8 +228,6 @@ void WinSalBitmap::Destroy() mnBitCount = 0; } - - GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const { WinSalBitmap* pThat = const_cast< WinSalBitmap* >(this); @@ -281,8 +269,6 @@ GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSourc return maGdiPlusBitmap; } - - Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() { Gdiplus::Bitmap* pRetval(0); @@ -372,8 +358,6 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() return pRetval; } - - Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource) { Gdiplus::Bitmap* pRetval(0); @@ -530,8 +514,6 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph return pRetval; } - - bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ) { bool bRet = TRUE; @@ -581,8 +563,6 @@ bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ) return bRet; } - - bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { bool bRet = FALSE; @@ -599,8 +579,6 @@ bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap return bRet; } - - bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap ) { bool bRet = FALSE; @@ -628,8 +606,6 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap ) return bRet; } - - bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics ) { bool bRet = FALSE; @@ -674,8 +650,6 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics ) return bRet; } - - bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount ) { bool bRet = FALSE; @@ -726,8 +700,6 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount ) return bRet; } - - bool WinSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& /*rSize*/, bool bMask ) { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > @@ -775,8 +747,6 @@ sal_uInt16 WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB ) return nColors; } - - HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rPal ) { DBG_ASSERT( nBits == 1 || nBits == 4 || nBits == 8 || nBits == 16 || nBits == 24, "Unsupported BitCount!" ); @@ -832,8 +802,6 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const return hDIB; } - - HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) { HANDLE hCopy = 0; @@ -878,8 +846,6 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) return hCopy; } - - BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) { BitmapBuffer* pBuffer = NULL; @@ -977,8 +943,6 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } - - void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { if( pBuffer ) @@ -1001,8 +965,6 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) } } - - void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, const Size& rSizePixel, bool bRLE4 ) { diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 464583d4f5b4..9cb39cc15f20 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -33,13 +32,9 @@ #include #include - - // comment out to prevent use of beziers on GDI functions #define USE_GDI_BEZIERS - - #define DITHER_PAL_DELTA 51 #define DITHER_PAL_STEPS 6 #define DITHER_PAL_COUNT (DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS) @@ -47,29 +42,21 @@ #define DITHER_EXTRA_COLORS 1 #define DMAP( _def_nVal, _def_nThres ) ((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal]) - - struct SysColorEntry { DWORD nRGB; SysColorEntry* pNext; }; - - static SysColorEntry* pFirstSysColor = NULL; static SysColorEntry* pActSysColor = NULL; - - // Blue7 static PALETTEENTRY aImplExtraColor1 = { 0, 184, 255, 0 }; - - static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] = { { 0, 0, 0, 0 }, @@ -90,8 +77,6 @@ static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] = { 0xFF, 0xFF, 0xFF, 0 } }; - - static BYTE aOrdDither8Bit[8][8] = { { 0, 38, 9, 48, 2, 40, 12, 50 }, @@ -104,8 +89,6 @@ static BYTE aOrdDither8Bit[8][8] = { 33, 20, 30, 17, 32, 20, 29, 16 } }; - - static BYTE aOrdDither16Bit[8][8] = { { 0, 6, 1, 7, 0, 6, 1, 7 }, @@ -118,20 +101,14 @@ static BYTE aOrdDither16Bit[8][8] = { 5, 3, 4, 2, 5, 3, 4, 2 } }; - - // we must create pens with 1-pixel width; otherwise the S3-graphics card // map has many paint problems when drawing polygons/polyLines and a // complex is set #define GSL_PEN_WIDTH 1 - - #define SAL_POLYPOLYCOUNT_STACKBUF 8 #define SAL_POLYPOLYPOINTS_STACKBUF 64 - - void ImplInitSalGDI() { SalData* pSalData = GetSalData(); @@ -309,8 +286,6 @@ void ImplInitSalGDI() ReleaseDC( 0, hDC ); } - - void ImplFreeSalGDI() { SalData* pSalData = GetSalData(); @@ -383,8 +358,6 @@ void ImplFreeSalGDI() ImplReleaseTempFonts( *pSalData ); } - - static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue ) { // dither color? @@ -411,8 +384,6 @@ static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue ) return FALSE; } - - int ImplIsSysColorEntry( SalColor nSalColor ) { SysColorEntry* pEntry = pFirstSysColor; @@ -430,8 +401,6 @@ int ImplIsSysColorEntry( SalColor nSalColor ) return FALSE; } - - static void ImplInsertSysColorEntry( int nSysIndex ) { const DWORD nRGB = GetSysColor( nSysIndex ); @@ -453,8 +422,6 @@ static void ImplInsertSysColorEntry( int nSysIndex ) } } - - void ImplUpdateSysColorEntries() { // delete old SysColorList @@ -492,8 +459,6 @@ void ImplUpdateSysColorEntries() ImplInsertSysColorEntry( COLOR_INACTIVECAPTIONTEXT ); } - - static SalColor ImplGetROPSalColor( SalROPColor nROPColor ) { SalColor nSalColor; @@ -504,8 +469,6 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor ) return nSalColor; } - - void ImplSalInitGraphics( WinSalGraphics* pData ) { // calculate the minimal line width for the printer @@ -523,8 +486,6 @@ void ImplSalInitGraphics( WinSalGraphics* pData ) ::SetROP2( pData->getHDC(), R2_COPYPEN ); } - - void ImplSalDeInitGraphics( WinSalGraphics* pData ) { // clear clip region @@ -538,8 +499,6 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData ) SelectFont( pData->getHDC(), pData->mhDefFont ); } - - HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) { SalData* pSalData = GetSalData(); @@ -572,8 +531,6 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) return pC->mhDC; } - - void ImplReleaseCachedDC( sal_uLong nID ) { SalData* pSalData = GetSalData(); @@ -583,8 +540,6 @@ void ImplReleaseCachedDC( sal_uLong nID ) SelectObject( pC->mhDC, pC->mhSelBmp ); } - - void ImplClearHDCCache( SalData* pData ) { for( sal_uLong i = 0; i < CACHESIZE_HDC; i++ ) @@ -604,8 +559,6 @@ void ImplClearHDCCache( SalData* pData ) } } - - // #100127# Fill point and flag memory from array of points which // might also contain bezier control points for the PolyDraw() GDI method // Make sure pWinPointAry and pWinFlagAry are big enough @@ -677,8 +630,6 @@ void ImplPreparePolyDraw( bool bCloseFigures, } } - - // #100127# draw an array of points which might also contain bezier control points void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { @@ -707,8 +658,6 @@ void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const B } } - - WinSalGraphics::WinSalGraphics() { for( int i = 0; i < MAX_FALLBACK; ++i ) @@ -741,8 +690,6 @@ WinSalGraphics::WinSalGraphics() mnPenWidth = GSL_PEN_WIDTH; } - - WinSalGraphics::~WinSalGraphics() { // free obsolete GDI objects @@ -776,8 +723,6 @@ WinSalGraphics::~WinSalGraphics() delete mpFontKernPairs; } - - void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) { rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX ); @@ -790,15 +735,11 @@ void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) rDPIX = rDPIY = 600; } - - sal_uInt16 WinSalGraphics::GetBitCount() const { return (sal_uInt16)GetDeviceCaps( getHDC(), BITSPIXEL ); } - - long WinSalGraphics::GetGraphicsWidth() const { if( mhWnd && IsWindow( mhWnd ) ) @@ -821,8 +762,6 @@ long WinSalGraphics::GetGraphicsWidth() const return 0; } - - void WinSalGraphics::ResetClipRegion() { if ( mhRegion ) @@ -834,8 +773,6 @@ void WinSalGraphics::ResetClipRegion() SelectClipRgn( getHDC(), 0 ); } - - bool WinSalGraphics::setClipRegion( const Region& i_rClip ) { if ( mhRegion ) @@ -1065,8 +1002,6 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip ) return true; } - - void WinSalGraphics::SetLineColor() { // create and select new pen @@ -1088,8 +1023,6 @@ void WinSalGraphics::SetLineColor() mbStockPen = TRUE; } - - void WinSalGraphics::SetLineColor( SalColor nSalColor ) { maLineColor = nSalColor; @@ -1147,8 +1080,6 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor ) mbStockPen = bStockPen; } - - void WinSalGraphics::SetFillColor() { // create and select new brush @@ -1170,8 +1101,6 @@ void WinSalGraphics::SetFillColor() mbStockBrush = TRUE; } - - void WinSalGraphics::SetFillColor( SalColor nSalColor ) { maFillColor = nSalColor; @@ -1275,30 +1204,22 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor ) mbStockBrush = bStockBrush; } - - void WinSalGraphics::SetXORMode( bool bSet, bool ) { mbXORMode = bSet; ::SetROP2( getHDC(), bSet ? R2_XORPEN : R2_COPYPEN ); } - - void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor ) { SetLineColor( ImplGetROPSalColor( nROPColor ) ); } - - void WinSalGraphics::SetROPFillColor( SalROPColor nROPColor ) { SetFillColor( ImplGetROPSalColor( nROPColor ) ); } - - void WinSalGraphics::drawPixel( long nX, long nY ) { if ( mbXORMode ) @@ -1313,8 +1234,6 @@ void WinSalGraphics::drawPixel( long nX, long nY ) SetPixel( getHDC(), (int)nX, (int)nY, mnPenColor ); } - - void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor ) { COLORREF nCol = PALETTERGB( SALCOLOR_RED( nSalColor ), @@ -1338,8 +1257,6 @@ void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor ) ::SetPixel( getHDC(), (int)nX, (int)nY, nCol ); } - - void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) { MoveToEx( getHDC(), (int)nX1, (int)nY1, NULL ); @@ -1380,8 +1297,6 @@ void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 ) } } - - void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) { if ( !mbPen ) @@ -1405,8 +1320,6 @@ void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) WIN_Rectangle( getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) ); } - - void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) { // for NT, we can handover the array directly @@ -1454,8 +1367,6 @@ void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) } } - - void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) { // for NT, we can handover the array directly @@ -1468,8 +1379,6 @@ void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) WIN_Polygon( getHDC(), pWinPtAry, MAX_64KSALPOINTS ); } - - void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) { @@ -1537,12 +1446,8 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint delete [] pWinPointAryAry; } - - #define SAL_POLY_STACKBUF 32 - - bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS @@ -1558,8 +1463,6 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt #endif } - - bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS @@ -1610,8 +1513,6 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA #endif } - - bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) { @@ -1667,8 +1568,6 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* #endif } - - #define POSTSCRIPT_BUFSIZE 0x4000 // MAXIMUM BUFSIZE EQ 0xFFFF static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_uLong nSize ) @@ -1771,7 +1670,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* // #107797# Write out EPS encapsulation header - // directly taken from the PLRM 3.0, p. 726. Note: // this will definitely cause problems when // recursively creating and embedding PostScript files @@ -1799,10 +1697,8 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* " } if\n" "} if\n\n" ); - // #i10737# Apply clipping manually - // Windows seems to ignore any clipping at the HDC, // when followed by a POSTSCRIPT_PASSTHROUGH @@ -1847,7 +1743,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* *((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)( aBuf.getLength() - 2 ); Escape ( getHDC(), nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 ); - // #107797# Write out EPS transformation code double dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] ); @@ -1867,7 +1762,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* *((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)( aBuf.getLength() - 2 ); Escape ( getHDC(), nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 ); - // #107797# Write out actual EPS content sal_uLong nToDo = nSize; @@ -1887,7 +1781,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* nToDo -= nResult; } - // #107797# Write out EPS encapsulation footer // reserve a sal_uInt16 again @@ -1906,8 +1799,6 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* return bRetValue; } - - SystemGraphicsData WinSalGraphics::GetGraphicsData() const { SystemGraphicsData aRes; @@ -1916,6 +1807,4 @@ SystemGraphicsData WinSalGraphics::GetGraphicsData() const return aRes; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index dc7f4c5d749e..720a61c35bc7 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -55,8 +54,6 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const return bRet; } - - void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { HDC hSrcDC; @@ -96,8 +93,6 @@ void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraph } } - - void ImplCalcOutSideRgn( const RECT& rSrcRect, int nLeft, int nTop, int nRight, int nBottom, HRGN& rhInvalidateRgn ) @@ -139,8 +134,6 @@ void ImplCalcOutSideRgn( const RECT& rSrcRect, } } - - void WinSalGraphics::copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, @@ -335,8 +328,6 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, } - - void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap, bool bPrinter, int nDrawMode ) @@ -443,8 +434,6 @@ void ImplDrawBitmap( HDC hDC, } } - - void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) { bool bTryDirectPaint(!mbPrinter && !mbXORMode); @@ -472,8 +461,6 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal mbXORMode ? SRCINVERT : SRCCOPY ); } - - void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, SalColor nTransparentColor ) @@ -528,8 +515,6 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, delete pMask; } - - void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, const SalBitmap& rSTransparentBitmap ) @@ -623,8 +608,6 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, } } - - bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) { @@ -652,8 +635,6 @@ bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, return bRet; } - - void WinSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, SalColor nMaskColor ) @@ -686,8 +667,6 @@ void WinSalGraphics::drawMask( const SalTwoRect& rPosAry, DeleteBrush( hMaskBrush ); } - - SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) { DBG_ASSERT( !mbPrinter, "No ::GetBitmap() from printer possible!" ); @@ -724,8 +703,6 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) return pSalBitmap; } - - SalColor WinSalGraphics::getPixel( long nX, long nY ) { COLORREF aWinCol = ::GetPixel( getHDC(), (int) nX, (int) nY ); @@ -738,8 +715,6 @@ SalColor WinSalGraphics::getPixel( long nX, long nY ) GetBValue( aWinCol ) ); } - - void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) { if ( nFlags & SAL_INVERT_TRACKFRAME ) @@ -783,8 +758,6 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv } } - - void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) { HPEN hPen; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index c88cc5882c8f..1154967df349 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -49,40 +49,28 @@ #include "win/saldata.hxx" #include "win/salgdi.h" - using namespace vcl; static const int MAXFONTHEIGHT = 2048; - // - Inlines - - inline FIXED FixedFromDouble( double d ) { const long l = (long) ( d * 65536. ); return *(FIXED*) &l; } - - inline int IntTimes256FromFixed(FIXED f) { int nFixedTimes256 = (f.value << 8) + ((f.fract+0x80) >> 8); return nFixedTimes256; } - - // these variables can be static because they store system wide settings static bool bImplSalCourierScalable = false; static bool bImplSalCourierNew = false; - - - - - // TODO: also support temporary TTC font files typedef std::map< OUString, ImplDevFontAttributes > FontAttrMap; @@ -223,8 +211,6 @@ void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDe } } - - // raw font data with a scoped lifetime class RawFontData { @@ -289,7 +275,6 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag ) } } - // platform specific font substitution hooks for glyph fallback enhancement // TODO: move into i18n module (maybe merge with svx/ucsubset.* // or merge with i18nutil/source/utility/unicode_data.h) @@ -597,8 +582,6 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon return bFound; } - - struct ImplEnumInfo { HDC mhDC; @@ -614,8 +597,6 @@ struct ImplEnumInfo int mnFontCount; }; - - static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) { rtl_TextEncoding eTextEncoding; @@ -645,8 +626,6 @@ static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) return eTextEncoding; } - - static FontFamily ImplFamilyToSal( BYTE nFamily ) { switch ( nFamily & 0xF0 ) @@ -673,8 +652,6 @@ static FontFamily ImplFamilyToSal( BYTE nFamily ) return FAMILY_DONTKNOW; } - - static BYTE ImplFamilyToWin( FontFamily eFamily ) { switch ( eFamily ) @@ -704,8 +681,6 @@ static BYTE ImplFamilyToWin( FontFamily eFamily ) return FF_DONTCARE; } - - static FontWeight ImplWeightToSal( int nWeight ) { if ( nWeight <= FW_THIN ) @@ -728,8 +703,6 @@ static FontWeight ImplWeightToSal( int nWeight ) return WEIGHT_BLACK; } - - static int ImplWeightToWin( FontWeight eWeight ) { switch ( eWeight ) @@ -769,8 +742,6 @@ static int ImplWeightToWin( FontWeight eWeight ) return 0; } - - inline FontPitch ImplLogPitchToSal( BYTE nPitch ) { if ( nPitch & FIXED_PITCH ) @@ -779,8 +750,6 @@ inline FontPitch ImplLogPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } - - inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) { // Grrrr! See NT help @@ -790,8 +759,6 @@ inline FontPitch ImplMetricPitchToSal( BYTE nPitch ) return PITCH_VARIABLE; } - - inline BYTE ImplPitchToWin( FontPitch ePitch ) { if ( ePitch == PITCH_FIXED ) @@ -802,8 +769,6 @@ inline BYTE ImplPitchToWin( FontPitch ePitch ) return DEFAULT_PITCH; } - - static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rEnumFont, const NEWTEXTMETRICA& rMetric, DWORD nFontType ) { @@ -877,8 +842,6 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rE return aDFA; } - - static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rEnumFont, const NEWTEXTMETRICW& rMetric, DWORD nFontType ) { @@ -952,8 +915,6 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE return aDFA; } - - static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont, const NEWTEXTMETRICA* pMetric, DWORD nFontType ) @@ -971,8 +932,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogF return pData; } - - static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont, const NEWTEXTMETRICW* pMetric, DWORD nFontType ) @@ -990,8 +949,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF return pData; } - - void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { OUString aFontName( reinterpret_cast(rLogFont.lfFaceName) ); @@ -1029,7 +986,6 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) } } - #if ENABLE_GRAPHITE #ifdef DEBUG @@ -1176,8 +1132,6 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS, #endif } - - ImplWinFontData::~ImplWinFontData() { delete[] mpFontCharSets; @@ -1194,20 +1148,14 @@ ImplWinFontData::~ImplWinFontData() delete mpEncodingVector; } - - sal_IntPtr ImplWinFontData::GetFontId() const { return mnId; } - - static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static inline DWORD CalcTag( const char p[4]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); } - - void ImplWinFontData::UpdateFromHDC( HDC hDC ) const { // short circuit if already initialized @@ -1264,7 +1212,6 @@ const gr_face* ImplWinFontData::GraphiteFace() const } #endif - bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const { if( !mbGsubRead ) @@ -1272,15 +1219,11 @@ bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const return !maGsubTable.empty(); } - - bool ImplWinFontData::IsGSUBstituted( sal_UCS4 cChar ) const { return( maGsubTable.find( cChar ) != maGsubTable.end() ); } - - const ImplFontCharMap* ImplWinFontData::GetImplFontCharMap() const { if( !mpUnicodeMap ) @@ -1294,8 +1237,6 @@ bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } - - void ImplWinFontData::ReadGsubTable( HDC hDC ) const { mbGsubRead = true; @@ -1341,8 +1282,6 @@ void ImplWinFontData::ReadGsubTable( HDC hDC ) const CloseTTFont( pTTFont ); } - - void ImplWinFontData::ReadCmapTable( HDC hDC ) const { if( mpUnicodeMap != NULL ) @@ -1411,8 +1350,6 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const } } - - void WinSalGraphics::SetTextColor( SalColor nSalColor ) { COLORREF aCol = PALETTERGB( SALCOLOR_RED( nSalColor ), @@ -1429,8 +1366,6 @@ void WinSalGraphics::SetTextColor( SalColor nSalColor ) ::SetTextColor( getHDC(), aCol ); } - - int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*, const NEWTEXTMETRICEXW*, DWORD, LPARAM lParam ) @@ -1439,8 +1374,6 @@ int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*, return 0; } - - void ImplGetLogFontFromFontSelect( HDC hDC, const FontSelectPattern* pFont, LOGFONTW& rLogFont, @@ -1512,8 +1445,6 @@ void ImplGetLogFontFromFontSelect( HDC hDC, } } - - HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ) { HFONT hNewFont = 0; @@ -1661,8 +1592,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel return 0; } - - void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel ) { // temporarily change the HDC to the font in the fallback level @@ -1739,8 +1668,6 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe pMetric->mnMinKashida = GetMinKashidaWidth(); } - - sal_uLong WinSalGraphics::GetKernPairs() { if ( mbFontKernInit ) @@ -1770,8 +1697,6 @@ sal_uLong WinSalGraphics::GetKernPairs() return mnFontKernPairCount; } - - const ImplFontCharMap* WinSalGraphics::GetImplFontCharMap() const { if( !mpWinFontData[0] ) @@ -1786,8 +1711,6 @@ bool WinSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil return mpWinFontData[0]->GetImplFontCapabilities(rFontCapabilities); } - - int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, const NEWTEXTMETRICEXA* pMetric, DWORD nFontType, LPARAM lParam ) @@ -1842,8 +1765,6 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, return 1; } - - int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, const NEWTEXTMETRICEXW* pMetric, DWORD nFontType, LPARAM lParam ) @@ -1892,8 +1813,6 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont, return 1; } - - struct TempFontItem { OUString maFontFilePath; @@ -1971,8 +1890,6 @@ bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL ) return (nRet > 0); } - - void ImplReleaseTempFonts( SalData& rSalData ) { int nCount = 0; @@ -2002,8 +1919,6 @@ void ImplReleaseTempFonts( SalData& rSalData ) #endif // FR_PRIVATE } - - static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL, ImplDevFontAttributes& rDFA ) { @@ -2095,12 +2010,9 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL, // byte offsets 0x4D0/0x4D1: winascent+windescent-emunits // byte offsets 0x4DF/0x4E0: avgwidth - return true; } - - bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, const OUString& rFontFileURL, const OUString& rFontName ) { @@ -2157,8 +2069,6 @@ bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection, return true; } - - void WinSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) { // make sure all fonts are registered at least temporarily @@ -2259,8 +2169,6 @@ void WinSalGraphics::ClearDevFontCache() //anything to do here ? } - - bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { HDC hDC = getHDC(); @@ -2291,8 +2199,6 @@ bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) { @@ -2475,8 +2381,6 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, return true; } - - class ScopedFont { public: @@ -2690,7 +2594,6 @@ bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, return (nRC == SF_OK); } - const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Unicode* pUnicodes, sal_Int32* pCharWidths, FontSubsetInfo& rInfo, long* pDataLen ) @@ -2746,13 +2649,11 @@ const void* WinSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, return (void*)pData; } - void WinSalGraphics::FreeEmbedFontData( const void* pData, long /*nLen*/ ) { delete[] reinterpret_cast(const_cast(pData)); } - const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { // TODO: even for builtin fonts we get here... why? @@ -2778,7 +2679,6 @@ const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace return pEncoding; } - void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, Int32Vector& rWidths, @@ -2871,11 +2771,9 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, } } - void WinSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) {} - SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const { SystemFontData aSysFontData; @@ -2891,5 +2789,4 @@ SystemFontData WinSalGraphics::GetSysFontData( int nFallbacklevel ) const return aSysFontData; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 23b286abdd88..1dc4f05a088a 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -61,8 +61,6 @@ #include - - void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GpPath *pPath, const basegfx::B2DPolygon& rPolygon, bool bNoLineJoin) { sal_uInt32 nCount(rPolygon.count()); @@ -324,8 +322,6 @@ bool WinSalGraphics::drawPolyLine( return true; } - - void paintToGdiPlus( Gdiplus::Graphics& rGraphics, const SalTwoRect& rTR, @@ -359,8 +355,6 @@ void paintToGdiPlus( 0); } - - void setInterpolationMode( Gdiplus::Graphics& rGraphics, const long& rSrcWidth, @@ -394,7 +388,6 @@ void setInterpolationMode( } } - bool WinSalGraphics::tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap) { if(rTR.mnSrcWidth && rTR.mnSrcHeight && rTR.mnDestWidth && rTR.mnDestHeight) @@ -459,8 +452,6 @@ bool WinSalGraphics::drawAlphaBitmap( return false; } - - bool WinSalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 45d6c5997987..8fcc16ef2540 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -50,11 +50,9 @@ using namespace std; - typedef map< wstring, HTHEME > ThemeMap; static ThemeMap aThemeMap; - /**************************************************** wrap visual styles API to avoid linking against it it is not available on all Windows platforms @@ -194,7 +192,6 @@ void SalData::initNWF( void ) pSVData->maNWFData.mbMenuBarDockingAreaCommonBG = true; } - // ********************************************************* // * Release theming handles // ******************************************************** @@ -343,7 +340,6 @@ bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return (hTheme != NULL); } - /* * HitTestNativeControl() * @@ -376,7 +372,6 @@ bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, cons return (hr == S_OK); } - Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& /* aRect */, THEMESIZE eTS = TS_TRUE ) { SIZE aSz; @@ -389,7 +384,6 @@ Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const // Helper functions - void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState, const Rectangle& rRect, int* pLunaPart, int *pLunaState, RECT *pRect ) { @@ -1277,7 +1271,6 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, // restore alignment SetTextAlign( getHDC(), ta ); - //GdiFlush(); return bOk; diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index f349cd943f37..fec719b1aaa1 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -28,8 +27,6 @@ #include #include - - static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount ) { @@ -67,8 +64,6 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, return hBitmap; } - - SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, long nDX, long nDY, sal_uInt16 nBitCount, @@ -163,8 +158,6 @@ WinSalVirtualDevice::WinSalVirtualDevice() mbForeignDC = FALSE; // uses a foreign DC instead of a bitmap } - - WinSalVirtualDevice::~WinSalVirtualDevice() { // remove VirDev from list of virtual devices @@ -188,8 +181,6 @@ WinSalVirtualDevice::~WinSalVirtualDevice() mpGraphics = NULL; } - - SalGraphics* WinSalVirtualDevice::AcquireGraphics() { if ( mbGraphics ) @@ -201,15 +192,11 @@ SalGraphics* WinSalVirtualDevice::AcquireGraphics() return mpGraphics; } - - void WinSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphics = FALSE; } - - bool WinSalVirtualDevice::SetSize( long nDX, long nDY ) { if( mbForeignDC || !mhBmp ) diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index f47456bf286d..adbb98eb1441 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "rtl/ustring.hxx" @@ -59,11 +58,8 @@ typedef boost::unordered_map IntMap; #define DROPPED_OUTGLYPH 0xFFFF - #include - - // win32 specific physical font instance class ImplWinFontEntry : public ImplFontEntry { @@ -102,8 +98,6 @@ private: mutable int mnMinKashidaGlyph; }; - - inline void ImplWinFontEntry::CacheGlyphWidth( int nCharCode, int nCharWidth ) { maWidthMap[ nCharCode ] = nCharWidth; @@ -117,8 +111,6 @@ inline int ImplWinFontEntry::GetCachedGlyphWidth( int nCharCode ) const return it->second; } - - class WinLayout : public SalLayout { public: @@ -141,8 +133,6 @@ protected: ImplWinFontEntry& mrWinFontEntry; }; - - class SimpleWinLayout : public WinLayout { public: @@ -187,8 +177,6 @@ private: BYTE mnCharSet; }; - - WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE ) : mhDC( hDC ), mhFont( (HFONT)::GetCurrentObject(hDC,OBJ_FONT) ), @@ -198,15 +186,11 @@ WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rW mrWinFontEntry( rWFE ) {} - - void WinLayout::InitFont() const { ::SelectObject( mhDC, mhFont ); } - - // Using reasonably sized fonts to emulate huge fonts works around // a lot of problems in printer and display drivers. Huge fonts are // mostly used by high resolution reference devices which are never @@ -229,8 +213,6 @@ HFONT WinLayout::DisableFontScaling() const return SelectFont( mhDC, hHugeFont ); } - - SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet, const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry ) : WinLayout( hDC, rWinFontData, rWinFontEntry ), @@ -251,8 +233,6 @@ SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet, mbDisableGlyphs = true; } - - SimpleWinLayout::~SimpleWinLayout() { delete[] mpGlyphRTLFlags; @@ -265,8 +245,6 @@ SimpleWinLayout::~SimpleWinLayout() delete[] mpOutGlyphs; } - - bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) { // prepare layout @@ -537,8 +515,6 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } - - int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart, long* pGlyphAdvances, int* pCharIndexes, const PhysicalFontFace** /*pFallbackFonts*/ ) const @@ -606,8 +582,6 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPo return nCount; } - - void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const { if( mnGlyphCount <= 0 ) @@ -654,8 +628,6 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const DeleteFont( SelectFont( aHDC, hOrigFont ) ); } - - long SimpleWinLayout::FillDXArray( long* pDXArray ) const { if( !mnWidth ) @@ -674,8 +646,6 @@ long SimpleWinLayout::FillDXArray( long* pDXArray ) const return mnWidth; } - - sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const // NOTE: the nFactor is used to prevent rounding errors for small nCharExtra values { @@ -699,8 +669,6 @@ sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF return -1; } - - void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const { long nXPos = mnBaseAdv; @@ -743,8 +711,6 @@ void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const } } - - void SimpleWinLayout::Justify( long nNewWidth ) { long nOldWidth = mnWidth; @@ -780,8 +746,6 @@ void SimpleWinLayout::Justify( long nNewWidth ) } } - - void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -819,8 +783,6 @@ void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs ) } } - - void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) { // try to avoid disturbance of text flow for LSB rounding case; @@ -864,8 +826,6 @@ void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) } } - - void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos ) { if( nStart > mnGlyphCount ) @@ -892,15 +852,11 @@ void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos ) mnBaseAdv += nDelta; } - - void SimpleWinLayout::DropGlyph( int nStart ) { mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH; } - - void SimpleWinLayout::Simplify( bool /*bIsBase*/ ) { // return early if no glyph has been dropped @@ -981,8 +937,6 @@ void SimpleWinLayout::Simplify( bool /*bIsBase*/ ) mnWidth = mnBaseAdv = 0; } - - struct VisualItem { public: @@ -1002,8 +956,6 @@ public: bool HasKashidas() const { return mbHasKashidas; } }; - - class UniscribeLayout : public WinLayout { public: @@ -1074,8 +1026,6 @@ static bool bUspInited = false; static bool bManualCellAlign = true; - - static bool InitUSP() { // get the usp10.dll version info @@ -1114,8 +1064,6 @@ static bool InitUSP() return true; } - - UniscribeLayout::UniscribeLayout( HDC hDC, const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry ) : WinLayout( hDC, rWinFontData, rWinFontEntry ), @@ -1139,8 +1087,6 @@ UniscribeLayout::UniscribeLayout( HDC hDC, mbDisableGlyphInjection( false ) {} - - UniscribeLayout::~UniscribeLayout() { delete[] mpScriptItems; @@ -1155,8 +1101,6 @@ UniscribeLayout::~UniscribeLayout() delete[] mpGlyphs2Chars; } - - bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) { // for a base layout only the context glyphs have to be dropped @@ -1575,8 +1519,6 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } - - // calculate the range of relevant glyphs for this visual item bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem, int& rMinGlyphPos, int& rEndGlyphPos ) const @@ -1638,8 +1580,6 @@ bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem, return true; } - - int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStartx8, sal_Int32* pGlyphAdvances, int* pCharPosAry, const PhysicalFontFace** /*pFallbackFonts*/ ) const @@ -1905,8 +1845,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, return nCount; } - - void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos ) { DBG_ASSERT( !(nStartx8 & 0xff), "USP::MoveGlyph(): glyph injection not disabled!" ); @@ -1972,8 +1910,6 @@ void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos ) } } - - void UniscribeLayout::DropGlyph( int nStartx8 ) { DBG_ASSERT( !(nStartx8 & 0xff), "USP::DropGlyph(): glyph injection not disabled!" ); @@ -2001,8 +1937,6 @@ void UniscribeLayout::DropGlyph( int nStartx8 ) mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH; } - - void UniscribeLayout::Simplify( bool /*bIsBase*/ ) { static const WCHAR cDroppedGlyph = DROPPED_OUTGLYPH; @@ -2104,8 +2038,6 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ ) } } - - void UniscribeLayout::DrawText( SalGraphics& ) const { HFONT hOrigFont = DisableFontScaling(); @@ -2156,8 +2088,6 @@ void UniscribeLayout::DrawText( SalGraphics& ) const DeleteFont( SelectFont( mhDC, hOrigFont ) ); } - - long UniscribeLayout::FillDXArray( long* pDXArray ) const { // calculate width of the complete layout @@ -2187,8 +2117,6 @@ long UniscribeLayout::FillDXArray( long* pDXArray ) const return nWidth; } - - sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { long nWidth = 0; @@ -2232,8 +2160,6 @@ sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF return -1; } - - void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const { int i; @@ -2301,8 +2227,6 @@ void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const } } - - void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -2314,8 +2238,6 @@ void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } - - void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) { const long* pDXArray = rArgs.mpDXArray; @@ -2453,8 +2375,6 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs ) } } - - void UniscribeLayout::InitKashidaHandling() { if( mnMinKashidaGlyph != 0 ) // already initialized @@ -2597,8 +2517,6 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int* return true; } - - void UniscribeLayout::Justify( long nNewWidth ) { long nOldWidth = 0; @@ -2649,8 +2567,6 @@ void UniscribeLayout::Justify( long nNewWidth ) } } - - bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const { // we have to find the visual item first since the mpLogClusters[] @@ -2904,7 +2820,6 @@ void GraphiteWinLayout::Simplify( bool is_base ) } #endif // ENABLE_GRAPHITE - SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) { DBG_ASSERT( mpWinFontEntry[nFallbackLevel], "WinSalGraphics mpWinFontEntry==NULL"); @@ -2957,8 +2872,6 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pWinLayout; } - - int WinSalGraphics::GetMinKashidaWidth() { if( !mpWinFontEntry[0] ) @@ -2968,8 +2881,6 @@ int WinSalGraphics::GetMinKashidaWidth() return nMinKashida; } - - ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD ) : ImplFontEntry( rFSD ) , mpKerningPairs( NULL ) @@ -2981,8 +2892,6 @@ ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD ) maScriptCache = NULL; } - - ImplWinFontEntry::~ImplWinFontEntry() { if( maScriptCache != NULL ) @@ -2990,15 +2899,11 @@ ImplWinFontEntry::~ImplWinFontEntry() delete[] mpKerningPairs; } - - bool ImplWinFontEntry::HasKernData() const { return (mnKerningPairs >= 0); } - - void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData ) { mnKerningPairs = nPairCount; @@ -3006,8 +2911,6 @@ void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData ::memcpy( mpKerningPairs, (const void*)pPairData, nPairCount*sizeof(KERNINGPAIR) ); } - - int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const { int nKernAmount = 0; @@ -3027,8 +2930,6 @@ int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const return nKernAmount; } - - bool ImplWinFontEntry::InitKashidaHandling( HDC hDC ) { if( mnMinKashidaWidth >= 0 ) // already cached? @@ -3052,8 +2953,6 @@ bool ImplWinFontEntry::InitKashidaHandling( HDC hDC ) return true; } - - PhysicalFontFace* ImplWinFontData::Clone() const { if( mpUnicodeMap ) @@ -3066,14 +2965,10 @@ PhysicalFontFace* ImplWinFontData::Clone() const return pClone; } - - ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplFontEntry* pEntry = new ImplWinFontEntry( rFSD ); return pEntry; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx index 54ae7ea58b32..7beb176814bd 100644 --- a/vcl/win/source/gdi/wntgdi.cxx +++ b/vcl/win/source/gdi/wntgdi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -26,8 +25,6 @@ #pragma warning(pop) #endif - - extern "C" { BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 ) @@ -36,8 +33,6 @@ BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 ) } } - - extern "C" { BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt ) @@ -46,8 +41,6 @@ BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt ) } } - - extern "C" { BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt ) diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index 00dd4351d076..0038ae9dc211 100644 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -44,7 +44,6 @@ #define PAPUGA_KEY_SHIFT 0x22A0000 #define PAPUGA_KEY_ALT 0x2380000 - namespace vcl_sal { struct KeysNameReplacement @@ -60,14 +59,10 @@ namespace vcl_sal { int nReplacements; }; - - // CAUTION CAUTION CAUTION // Every string value in the replacements tables must be in UTF-8 // but with the UTF-8 bytes encoded, not as such! Be careful! - - static const struct KeysNameReplacement aImplReplacements_Asturian[] = { { PAPUGA_KEY_BACK, "Retrocesu" }, diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 1aa874331fb3..90b36e034a58 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -113,21 +113,15 @@ using namespace ::com::sun::star::beans; # define WM_MOUSEHWHEEL 0x020E #endif - - const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); bool WinSalFrame::mbInReparent = FALSE; - - // Macros for support of WM_UNICHAR & Keyman 6.0 //#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800) #define Uni_UTF32ToSurrogate2(ch) (((unsigned long) (ch) - 0x10000) % 0x400 + 0xDC00) #define Uni_SupplementaryPlanesStart 0x10000 - - static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ); static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL ); @@ -197,8 +191,6 @@ static void ImplSaveFrameState( WinSalFrame* pFrame ) } } - - // if pParentRect is set, the workarea of the monitor that contains pParentRect is returned void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) { @@ -282,8 +274,6 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) } } - - SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uLong nSalFrameStyle ) { @@ -525,8 +515,6 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ) hWndParent, 0, hInstance, (void*)GetWindowPtr( oldhWnd ) ); } - - // translation table from System keycodes into StartView keycodes #define KEY_TAB_SIZE 146 @@ -681,8 +669,6 @@ static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] = 0 // SCROLLLOCK 145 }; - - static UINT ImplSalGetWheelScrollLines() { UINT nScrLines = 0; @@ -703,8 +689,6 @@ static UINT ImplSalGetWheelScrollLines() return nScrLines; } - - static UINT ImplSalGetWheelScrollChars() { UINT nScrChars = 0; @@ -729,8 +713,6 @@ static UINT ImplSalGetWheelScrollChars() return nScrChars; } - - static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height ) { // transform client size into window size @@ -745,8 +727,6 @@ static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height height = aWinRect.bottom - aWinRect.top + 1; } - - static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, int& rX, int& rY, int& rDX, int& rDY ) { @@ -824,8 +804,6 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, rDY = nScreenDY+(nFrameY*2)+nCaptionY; } - - static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE ) { if ( bAlways || !IsIconic( pFrame->mhWnd ) ) @@ -842,8 +820,6 @@ static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE } } - - WinSalFrame::WinSalFrame() { SalData* pSalData = GetSalData(); @@ -912,7 +888,6 @@ WinSalFrame::WinSalFrame() pSalData->mpFirstFrame = this; } - void WinSalFrame::updateScreenNumber() { if( mnDisplay == -1 ) // spans all monitors @@ -935,8 +910,6 @@ void WinSalFrame::updateScreenNumber() } } - - WinSalFrame::~WinSalFrame() { SalData* pSalData = GetSalData(); @@ -992,8 +965,6 @@ WinSalFrame::~WinSalFrame() } } - - SalGraphics* WinSalFrame::AcquireGraphics() { if ( mbGraphics ) @@ -1071,8 +1042,6 @@ SalGraphics* WinSalFrame::AcquireGraphics() } } - - void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) { if ( mpGraphics2 == pGraphics ) @@ -1095,15 +1064,11 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) mbGraphics = FALSE; } - - bool WinSalFrame::PostEvent( void* pData ) { return (bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } - - void WinSalFrame::SetTitle( const OUString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" ); @@ -1111,8 +1076,6 @@ void WinSalFrame::SetTitle( const OUString& rTitle ) SetWindowTextW( mhWnd, reinterpret_cast(rTitle.getStr()) ); } - - void WinSalFrame::SetIcon( sal_uInt16 nIcon ) { // If we have a window without an Icon (for example a dialog), ignore this call @@ -1133,8 +1096,6 @@ void WinSalFrame::SetIcon( sal_uInt16 nIcon ) ImplSendMessage( mhWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmIcon ); } - - void WinSalFrame::SetMenu( SalMenu* pSalMenu ) { WinSalMenu* pWMenu = static_cast(pSalMenu); @@ -1147,7 +1108,6 @@ void WinSalFrame::DrawMenuBar() ::DrawMenuBar( mhWnd ); } - HWND ImplGetParentHwnd( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -1161,15 +1121,11 @@ HWND ImplGetParentHwnd( HWND hWnd ) } - - SalFrame* WinSalFrame::GetParent() const { return GetWindowPtr( ImplGetParentHwnd( mhWnd ) ); } - - static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -1246,15 +1202,10 @@ static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) } } - - - void WinSalFrame::SetExtendedFrameStyle( SalExtStyle ) { } - - void WinSalFrame::Show( bool bVisible, bool bNoActivate ) { // Post this Message to the window, because this only works @@ -1266,15 +1217,11 @@ void WinSalFrame::Show( bool bVisible, bool bNoActivate ) ImplSalShow( mhWnd, bVisible, bNoActivate ); } - - void WinSalFrame::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } - - void WinSalFrame::SetMinClientSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; @@ -1287,8 +1234,6 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight ) mnMaxHeight = nHeight; } - - void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -1390,7 +1335,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, int nScreenWidth; int nScreenHeight; - RECT aRect; ImplSalGetWorkArea( mhWnd, &aRect, NULL ); nScreenX = aRect.left; @@ -1448,7 +1392,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, nY = ((aRect2.bottom-aRect2.top)-nHeight)/2 + aRect2.top; } - //if ( bVisible ) // mbDefPos = FALSE; @@ -1457,7 +1400,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, nEvent = SALEVENT_MOVERESIZE; } - // Adjust Window in the screen bool bCheckOffScreen = TRUE; @@ -1500,8 +1442,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, CallCallback( nEvent, NULL ); } - - static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAsChild ) { // save hwnd, will be overwritten in WM_CREATE during createwindow @@ -1635,7 +1575,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs } } - // TODO: add SetParent() call for SalObjects DBG_ASSERT( systemChildren.empty(), "WinSalFrame::SetParent() parent of living system child window will be destroyed!"); @@ -1651,8 +1590,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs SAL_MSG_DESTROYHWND, (WPARAM) 0, (LPARAM)hWndOld); } - - void WinSalFrame::SetParent( SalFrame* pNewParent ) { WinSalFrame::mbInReparent = TRUE; @@ -1673,9 +1610,6 @@ bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent ) return true; } - - - void WinSalFrame::GetWorkArea( Rectangle &rRect ) { RECT aRect; @@ -1686,16 +1620,12 @@ void WinSalFrame::GetWorkArea( Rectangle &rRect ) rRect.Bottom() = aRect.bottom-1; } - - void WinSalFrame::GetClientSize( long& rWidth, long& rHeight ) { rWidth = maGeometry.nWidth; rHeight = maGeometry.nHeight; } - - void WinSalFrame::SetWindowState( const SalFrameState* pState ) { // Check if the window fits into the screen, in case the screen @@ -1855,8 +1785,6 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) mbDefPos = FALSE; // window was positioned } - - bool WinSalFrame::GetWindowState( SalFrameState* pState ) { if ( maState.mnWidth && maState.mnHeight ) @@ -1873,8 +1801,6 @@ bool WinSalFrame::GetWindowState( SalFrameState* pState ) return FALSE; } - - void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) { WinSalSystem* pSys = static_cast(ImplGetSalSystem()); @@ -1944,8 +1870,6 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID ) } } - - void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { if ( (mbFullScreen == bFullScreen) && (!bFullScreen || (mnDisplay == nDisplay)) ) @@ -2009,8 +1933,6 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) } } - - void WinSalFrame::StartPresentation( bool bStart ) { if ( mbPresentation == bStart ) @@ -2064,8 +1986,6 @@ void WinSalFrame::StartPresentation( bool bStart ) } } - - void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) { HWND hWnd; @@ -2076,8 +1996,6 @@ void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) SetWindowPos( mhWnd, hWnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); } - - static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) { WinSalFrame* pToTopFrame = GetWindowPtr( hWnd ); @@ -2131,8 +2049,6 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) } } - - void WinSalFrame::ToTop( sal_uInt16 nFlags ) { nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS; // this flag is not needed on win32 @@ -2145,8 +2061,6 @@ void WinSalFrame::ToTop( sal_uInt16 nFlags ) ImplSalToTop( mhWnd, nFlags ); } - - void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { struct ImplPtrData @@ -2280,8 +2194,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) } } - - void WinSalFrame::CaptureMouse( bool bCapture ) { // Send this Message to the window, because CaptureMouse() only work @@ -2294,8 +2206,6 @@ void WinSalFrame::CaptureMouse( bool bCapture ) ImplSendMessage( mhWnd, nMsg, 0, 0 ); } - - void WinSalFrame::SetPointerPos( long nX, long nY ) { POINT aPt; @@ -2305,22 +2215,16 @@ void WinSalFrame::SetPointerPos( long nX, long nY ) SetCursorPos( aPt.x, aPt.y ); } - - void WinSalFrame::Flush() { GdiFlush(); } - - void WinSalFrame::Sync() { GdiFlush(); } - - static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -2381,16 +2285,12 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont } } - - void WinSalFrame::SetInputContext( SalInputContext* pContext ) { // Must be called in the main thread! ImplSendMessage( mhWnd, SAL_MSG_SETINPUTCONTEXT, 0, (LPARAM)(void*)pContext ); } - - static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) { HIMC hIMC = ImmGetContext( hWnd ); @@ -2407,16 +2307,12 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) } } - - void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags ) { // Must be called in the main thread! ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 ); } - - static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, UINT& rCount, UINT nMaxSize, const sal_Char* pReplace ) @@ -2487,8 +2383,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, rCount = 0; } - - OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static const UINT nMaxKeyLen = 350; @@ -2689,15 +2583,11 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } - - inline Color ImplWinColorToSal( COLORREF nColor ) { return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } - - static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { ImplSalLogFontToFontW( hDC, rLogFont, rFont ); @@ -2716,8 +2606,6 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rF } } - - static long ImplA2I( const BYTE* pStr ) { long n = 0; @@ -2741,8 +2629,6 @@ static long ImplA2I( const BYTE* pStr ) return n; } - - void WinSalFrame::UpdateSettings( AllSettings& rSettings ) { MouseSettings aMouseSettings = rSettings.GetMouseSettings(); @@ -2979,23 +2865,17 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) WinSalGraphics::updateSettingsNative( rSettings ); } - - const SystemEnvData* WinSalFrame::GetSystemData() const { return &maSysData; } - - void WinSalFrame::Beep() { // a simple beep MessageBeep( 0 ); } - - SalFrame::SalPointerState WinSalFrame::GetPointerState() { SalPointerState aState; @@ -3021,8 +2901,6 @@ SalFrame::SalPointerState WinSalFrame::GetPointerState() return aState; } - - SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState() { SalIndicatorState aState; @@ -3056,15 +2934,11 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode ) } } - - void WinSalFrame::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } - - void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) { if( mpClipRgnData ) @@ -3080,8 +2954,6 @@ void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) mbFirstClipRect = TRUE; } - - void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { if( ! mpClipRgnData ) @@ -3123,8 +2995,6 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) mpNextClipRect++; } - - void WinSalFrame::EndSetClipRegion() { if( ! mpClipRgnData ) @@ -3163,8 +3033,6 @@ void WinSalFrame::EndSetClipRegion() } } - - static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -3330,8 +3198,6 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, return nRet; } - - static long ImplHandleMouseActivateMsg( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -3350,8 +3216,6 @@ static long ImplHandleMouseActivateMsg( HWND hWnd ) return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt ); } - - static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { DBG_ASSERT( nMsg == WM_MOUSEWHEEL || @@ -3422,8 +3286,6 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar return nRet; } - - static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) { sal_uInt16 nKeyCode; @@ -3444,8 +3306,6 @@ static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) return nKeyCode; } - - static void ImplUpdateInputLang( WinSalFrame* pFrame ) { UINT nLang = LOWORD( GetKeyboardLayout( 0 ) ); @@ -3461,7 +3321,6 @@ static void ImplUpdateInputLang( WinSalFrame* pFrame ) return; } - static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode ) { ImplUpdateInputLang( pFrame ); @@ -3471,8 +3330,6 @@ static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode ) return (sal_Unicode)nCharCode; } - - LanguageType WinSalFrame::GetInputLanguage() { if( !mnInputLang ) @@ -3484,8 +3341,6 @@ LanguageType WinSalFrame::GetInputLanguage() return (LanguageType) mnInputLang; } - - bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { bool bRet = FALSE; @@ -3522,8 +3377,6 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT return bRet; } - - static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) { @@ -3806,8 +3659,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, } } - - long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -3859,8 +3710,6 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, return 0; } - - long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -3897,8 +3746,6 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) return nRet; } - - static bool ImplHandlePaintMsg( HWND hWnd ) { bool bMutex = FALSE; @@ -3966,8 +3813,6 @@ static bool ImplHandlePaintMsg( HWND hWnd ) return bMutex ? true : false; } - - static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) { // Paint @@ -3986,8 +3831,6 @@ static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) ImplPostMessage( hWnd, SAL_MSG_POSTPAINT, (WPARAM)pRect, 0 ); } - - static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect ) { // calculate and set frame geometry of a maximized window - useful if the window is still hidden @@ -4072,8 +3915,6 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ) pFrame->updateScreenNumber(); } - - static void ImplCallMoveHdl( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -4086,8 +3927,6 @@ static void ImplCallMoveHdl( HWND hWnd ) } } - - static void ImplCallClosePopupsHdl( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -4097,8 +3936,6 @@ static void ImplCallClosePopupsHdl( HWND hWnd ) } } - - static void ImplHandleMoveMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4136,8 +3973,6 @@ static void ImplHandleMoveMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTMOVE, 0, 0 ); } - - static void ImplCallSizeHdl( HWND hWnd ) { // as Windows can send these messages also, we have to use @@ -4159,8 +3994,6 @@ static void ImplCallSizeHdl( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTCALLSIZE, 0, 0 ); } - - static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { if ( (wParam != SIZE_MAXSHOW) && (wParam != SIZE_MAXHIDE) ) @@ -4180,8 +4013,6 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) } } - - static void ImplHandleFocusMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4218,8 +4049,6 @@ static void ImplHandleFocusMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTFOCUS, 0, 0 ); } - - static void ImplHandleCloseMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4236,8 +4065,6 @@ static void ImplHandleCloseMsg( HWND hWnd ) ImplPostMessage( hWnd, WM_CLOSE, 0, 0 ); } - - static long ImplHandleShutDownMsg( HWND hWnd ) { ImplSalYieldMutexAcquireWithWait(); @@ -4251,8 +4078,6 @@ static long ImplHandleShutDownMsg( HWND hWnd ) return nRet; } - - static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -4303,8 +4128,6 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, ImplSalYieldMutexRelease(); } - - static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) { ImplSalYieldMutexAcquireWithWait(); @@ -4316,8 +4139,6 @@ static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) ImplSalYieldMutexRelease(); } - - static void ImplHandleForcePalette( HWND hWnd ) { SalData* pSalData = GetSalData(); @@ -4350,8 +4171,6 @@ static void ImplHandleForcePalette( HWND hWnd ) } } - - static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -4500,8 +4319,6 @@ static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, return nCols; } - - static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) { int bRet = FALSE; @@ -4577,8 +4394,6 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) return bRet; } - - // retrieves the SalMenuItem pointer from a hMenu // the pointer is stored in every item, so if no position // is specified we just use the first item (ie, pos=0) @@ -5098,8 +4913,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam ) return FALSE; } - - static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) { ImplSalYieldMutexAcquireWithWait(); @@ -5131,8 +4944,6 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) ImplSalYieldMutexRelease(); } - - static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) { COMPOSITIONFORM aForm; @@ -5162,8 +4973,6 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) } } - - static bool ImplHandleIMEStartComposition( HWND hWnd ) { bool bDef = TRUE; @@ -5192,8 +5001,6 @@ static bool ImplHandleIMEStartComposition( HWND hWnd ) return bDef; } - - static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, HIMC hIMC, LPARAM lParam ) { @@ -5323,8 +5130,6 @@ static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, return !bDef; } - - static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) { bool bDef = TRUE; @@ -5370,8 +5175,6 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) return bDef; } - - static bool ImplHandleIMEEndComposition( HWND hWnd ) { bool bDef = TRUE; @@ -5390,8 +5193,6 @@ static bool ImplHandleIMEEndComposition( HWND hWnd ) return bDef; } - - static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { sal_Int16 nCommand = 0; @@ -5437,7 +5238,6 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) return false; } - static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) { if ( wParam == (WPARAM)IMN_OPENCANDIDATE ) @@ -5491,8 +5291,6 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) } } - - static bool ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) { @@ -5531,8 +5329,6 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) return false; } - - static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5586,8 +5382,6 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) return nRet; } - - static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5654,8 +5448,6 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) { return TRUE; } - - void SalTestMouseLeave() { SalData* pSalData = GetSalData(); @@ -5669,8 +5461,6 @@ void SalTestMouseLeave() } } - - static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam , LRESULT& rResult ) { @@ -5699,8 +5489,6 @@ static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa return TRUE; } - - LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { LRESULT nRet = 0; @@ -6177,8 +5965,6 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l return nRet; } - - bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) { // handle all messages concerning all frames so they get processed only once @@ -6200,8 +5986,6 @@ bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LR return bResult; } - - bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) { static int first=1; @@ -6262,8 +6046,6 @@ bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) return TRUE; } - - #ifdef _WIN32 bool HasAtHook() { diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 522bf2134827..075860413b1a 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -39,8 +38,6 @@ static DWORD myerr=0; - - bool SalData::IsKnownMenuHandle( HMENU hMenu ) { if( mhMenuSet.find( hMenu ) == mhMenuSet.end() ) @@ -49,8 +46,6 @@ bool SalData::IsKnownMenuHandle( HMENU hMenu ) return TRUE; } - - // WinSalInst factory methods SalMenu* WinSalInstance::CreateMenu( bool bMenuBar, Menu* ) @@ -75,7 +70,6 @@ void WinSalInstance::DestroyMenu( SalMenu* pSalMenu ) delete pSalMenu; } - SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) { if( !pItemData ) @@ -124,9 +118,6 @@ void WinSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) delete pSalMenuItem; } - - - static void ImplDrawMenuBar( SalMenu *pMenu ) { if( pMenu->VisibleMenuBar() ) @@ -140,9 +131,6 @@ static void ImplDrawMenuBar( SalMenu *pMenu ) } } - - - /* * WinSalMenu */ @@ -377,13 +365,10 @@ void WinSalMenu::GetSystemMenuData( SystemMenuData* pData ) pData->hMenu = mhMenu; } - - /* * SalMenuItem */ - WinSalMenuItem::WinSalMenuItem() { memset( &mInfo, 0, sizeof( MENUITEMINFOW ) ); @@ -398,6 +383,4 @@ WinSalMenuItem::~WinSalMenuItem() ImplRemoveItemById( mpSalMenu, mnId ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 981937638e25..d79c52271b4c 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include @@ -31,8 +30,6 @@ #include #include - - static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) { if ( hWndParent == hWndChild ) @@ -52,8 +49,6 @@ static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) return FALSE; } - - WinSalObject* ImplFindSalObject( HWND hWndChild ) { SalData* pSalData = GetSalData(); @@ -69,8 +64,6 @@ WinSalObject* ImplFindSalObject( HWND hWndChild ) return NULL; } - - WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) { WinSalFrame* pFrame = NULL; @@ -92,8 +85,6 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) return pFrame; } - - LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) { // Used for Unicode and none Unicode @@ -149,8 +140,6 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) return CallNextHookEx( pSalData->mhSalObjMsgHook, nCode, wParam, lParam ); } - - bool ImplSalPreDispatchMsg( MSG* pMsg ) { // Used for Unicode and none Unicode @@ -234,8 +223,6 @@ bool ImplSalPreDispatchMsg( MSG* pMsg ) return FALSE; } - - void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) { // Used for Unicode and none Unicode @@ -260,8 +247,6 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) pSalData->mnSalObjWantKeyEvt = 0; } - - LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { WinSalObject* pSysObj; @@ -388,8 +373,6 @@ LRESULT CALLBACK SalSysObjWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM return nRet; } - - LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { LRESULT nRet = 0; @@ -470,8 +453,6 @@ LRESULT CALLBACK SalSysObjChildWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LP return nRet; } - - SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) { SalData* pSalData = GetSalData(); @@ -567,8 +548,6 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) return NULL; } - - WinSalObject::WinSalObject() { SalData* pSalData = GetSalData(); @@ -584,8 +563,6 @@ WinSalObject::WinSalObject() pSalData->mpFirstObject = this; } - - WinSalObject::~WinSalObject() { SalData* pSalData = GetSalData(); @@ -626,22 +603,16 @@ WinSalObject::~WinSalObject() ImplSendMessage( hWndParent, SAL_MSG_FORCEPALETTE, 0, 0 ); } - - void WinSalObject::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } - - sal_uInt16 WinSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } - - void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) { sal_uLong nRectBufSize = sizeof(RECT)*nRectCount; @@ -662,8 +633,6 @@ void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) mbFirstClipRect = TRUE; } - - void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { RECT* pRect = mpNextClipRect; @@ -701,8 +670,6 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight mpNextClipRect++; } - - void WinSalObject::EndSetClipRegion() { HRGN hRegion; @@ -726,8 +693,6 @@ void WinSalObject::EndSetClipRegion() SetWindowRgn( mhWnd, hRegion, TRUE ); } - - void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { sal_uLong nStyle = 0; @@ -742,8 +707,6 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) SWP_NOZORDER | SWP_NOACTIVATE | nStyle ); } - - void WinSalObject::Show( bool bVisible ) { if ( bVisible ) @@ -752,15 +715,11 @@ void WinSalObject::Show( bool bVisible ) ShowWindow( mhWnd, SW_HIDE ); } - - void WinSalObject::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } - - void WinSalObject::GrabFocus() { if ( mhLastFocusWnd && diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 715b7cedebdf..8e592dc78972 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // bootstrap stuff #include #include @@ -52,7 +51,6 @@ using namespace ::com::sun::star; - namespace { @@ -779,7 +777,6 @@ void setupMethodStubs( functor_vector_type& res ) } - void grindFunc( OutputDevice& rTarget, functor_vector_type::const_iterator iter, sal_Int32 nTurns, @@ -801,7 +798,6 @@ void grindFunc( OutputDevice& rTarget, pMsg ); } - /** Call OutputDevice render methods repeatedly, and output elapsed time to stdout */ @@ -864,7 +860,6 @@ void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 ) } } - void TestWindow::Paint( const Rectangle& ) { outDevGrind( *this ); diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 33cd1346773b..8bfc84bcf3b3 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -37,7 +36,6 @@ using namespace ::com::sun::star::lang; // Forward declaration void Main(); - SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); @@ -54,7 +52,6 @@ SAL_IMPLEMENT_MAIN() return 0; } - class MyWin : public WorkWindow { public: @@ -69,7 +66,6 @@ public: void Resize(); }; - void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -79,49 +75,41 @@ void Main() Application::Execute(); } - MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - void MyWin::Resize() { WorkWindow::Resize(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 61fe3e056349..4537158734f6 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -47,13 +47,11 @@ #include #include - using namespace cppu; using namespace comphelper; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - // Forward declaration void Main(); @@ -256,43 +254,36 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, ) return 0; } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - void MyWin::Resize() { WorkWindow::Resize(); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index e5c677375c93..0078e7bbfc45 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -41,11 +41,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - // Forward declaration void Main(); - SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); @@ -62,7 +60,6 @@ SAL_IMPLEMENT_MAIN() return 0; } - class MyWin : public WorkWindow { Bitmap m_aBitmap; @@ -78,7 +75,6 @@ public: void Resize(); }; - void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -88,7 +84,6 @@ void Main() Application::Execute(); } - MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), m_aBitmap( Size( 256, 256 ), 32 ) @@ -114,37 +109,31 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : m_aBitmap.ReleaseAccess( pAcc ); } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - static Point project( const Point& rPoint ) { const double angle_x = M_PI / 6.0; @@ -306,8 +295,6 @@ void MyWin::Paint( const Rectangle& rRect ) Size( aPaperSize.Width() - 2000, 500 ) ), aGradient ); - - LineInfo aLineInfo( LINE_SOLID, 200 ); double sind = sin( DELTA*M_PI/180.0 ); double cosd = cos( DELTA*M_PI/180.0 ); @@ -345,7 +332,6 @@ void MyWin::Paint( const Rectangle& rRect ) Pop(); } - void MyWin::Resize() { WorkWindow::Resize(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index c8cd734e7732..80c5d66f0993 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include #include @@ -40,7 +39,6 @@ using namespace ::com::sun::star::lang; // Forward declaration void Main(); - SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); @@ -57,7 +55,6 @@ SAL_IMPLEMENT_MAIN() return 0; } - class MyWin : public WorkWindow { public: @@ -72,7 +69,6 @@ public: void Resize(); }; - void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -82,19 +78,16 @@ void Main() Application::Execute(); } - MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { Rectangle aRect(0,0,4,4); @@ -103,25 +96,21 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) DrawRect( aRect ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - void MyWin::Paint( const Rectangle& rRect ) { fprintf(stderr, "MyWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), rRect.getY(), rRect.getWidth(), rRect.getHeight()); @@ -146,7 +135,6 @@ void MyWin::Paint( const Rectangle& rRect ) DrawText( Point( 20, 30 ), OUString( "Just a simple test text" ) ); } - void MyWin::Resize() { WorkWindow::Resize(); -- cgit v1.2.3