67d2af6fac
The following builds for me: basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl, psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl The rest still needs fixing ;-) Conflicts: canvas/prj/build.lst canvas/source/cairo/cairo_textlayout.cxx canvas/source/directx/dx_winstuff.hxx canvas/source/tools/image.cxx canvas/source/vcl/canvashelper.cxx comphelper/inc/comphelper/documentconstants.hxx comphelper/inc/comphelper/optionalvalue.hxx comphelper/inc/comphelper/querydeep.hxx comphelper/prj/build.lst comphelper/qa/complex/makefile.mk comphelper/qa/string/test_string_noadditional.cxx comphelper/source/misc/componentmodule.cxx comphelper/source/misc/mimeconfighelper.cxx comphelper/source/misc/querydeep.cxx comphelper/source/misc/uieventslogger.cxx comphelper/source/property/TypeGeneration.cxx comphelper/test/uno_iterators/uno_iterators.cxx comphelper/util/makefile.mk cppcanvas/source/mtfrenderer/implrenderer.cxx dtrans/prj/build.lst dtrans/source/generic/dtrans.cxx dtrans/source/win32/dtobj/FmtFilter.cxx i18npool/prj/build.lst i18npool/source/localedata/data/localedata_others.map i18npool/source/localedata/data/makefile.mk i18npool/source/localedata/localedata.cxx i18npool/source/localedata/saxparser.cxx i18npool/source/registerservices/registerservices.cxx i18npool/source/search/textsearch.cxx l10ntools/inc/cfgmerge.hxx l10ntools/inc/export.hxx l10ntools/inc/gsicheck.hxx l10ntools/inc/l10ntools/vosapp.hxx l10ntools/inc/tagtest.hxx l10ntools/inc/xmlparse.hxx l10ntools/layout/layoutparse.cxx l10ntools/layout/tralay.cxx l10ntools/source/cfgmerge.cxx l10ntools/source/export.cxx l10ntools/source/export2.cxx l10ntools/source/gsicheck.cxx l10ntools/source/help/HelpLinker.cxx l10ntools/source/lngex.cxx l10ntools/source/lngmerge.cxx l10ntools/source/merge.cxx l10ntools/source/tagtest.cxx l10ntools/source/xmlparse.cxx padmin/source/fontentry.cxx padmin/source/padialog.cxx padmin/source/padialog.src padmin/source/pamain.cxx rsc/inc/rscarray.hxx rsc/inc/rscclass.hxx rsc/inc/rscclobj.hxx rsc/inc/rsccont.hxx rsc/inc/rscdb.hxx rsc/inc/rscdef.hxx rsc/inc/rscmgr.hxx rsc/inc/rscrange.hxx rsc/inc/rsctop.hxx rsc/inc/vclrsc.hxx rsc/source/parser/rscdb.cxx rsc/source/parser/rscicpx.cxx rsc/source/parser/rscinit.cxx rsc/source/prj/start.cxx rsc/source/res/rscarray.cxx rsc/source/res/rscclass.cxx rsc/source/res/rscclobj.cxx rsc/source/res/rsccont.cxx rsc/source/res/rscmgr.cxx rsc/source/res/rscrange.cxx rsc/source/res/rsctop.cxx rsc/source/rsc/rsc.cxx rsc/source/tools/rscdef.cxx rsc/source/tools/rsctools.cxx sax/source/expatwrap/sax_expat.cxx sax/source/fastparser/facreg.cxx sax/source/tools/fastserializer.cxx sot/inc/sot/filelist.hxx sot/inc/sot/object.hxx sot/source/base/factory.cxx sot/source/base/filelist.cxx sot/source/sdstor/stg.cxx sot/source/sdstor/stgcache.cxx sot/source/sdstor/stgole.cxx sot/source/sdstor/stgstrms.cxx sot/source/sdstor/storage.cxx sot/source/sdstor/ucbstorage.cxx svl/inc/svl/cenumitm.hxx svl/inc/svl/cintitem.hxx svl/inc/svl/cntwall.hxx svl/inc/svl/ctypeitm.hxx svl/inc/svl/custritm.hxx svl/inc/svl/dateitem.hxx svl/inc/svl/filerec.hxx svl/inc/svl/globalnameitem.hxx svl/inc/svl/ilstitem.hxx svl/inc/svl/imageitm.hxx svl/inc/svl/intitem.hxx svl/inc/svl/itempool.hxx svl/inc/svl/itemset.hxx svl/inc/svl/lckbitem.hxx svl/inc/svl/poolitem.hxx svl/inc/svl/ptitem.hxx svl/inc/svl/rectitem.hxx svl/inc/svl/sfontitm.hxx svl/inc/svl/slstitm.hxx svl/inc/svl/srchitem.hxx svl/inc/svl/svarray.hxx svl/inc/svl/svdde.hxx svl/inc/svl/svstdarr.hxx svl/inc/svl/szitem.hxx svl/inc/svl/visitem.hxx svl/inc/svl/zforlist.hxx svl/inc/svl/zformat.hxx svl/prj/build.lst svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx svl/qa/complex/ConfigItems/helper/makefile.mk svl/qa/makefile.mk svl/source/filepicker/pickerhelper.cxx svl/source/filerec/filerec.cxx svl/source/items/cenumitm.cxx svl/source/items/cintitem.cxx svl/source/items/cntwall.cxx svl/source/items/ctypeitm.cxx svl/source/items/custritm.cxx svl/source/items/dateitem.cxx svl/source/items/globalnameitem.cxx svl/source/items/ilstitem.cxx svl/source/items/imageitm.cxx svl/source/items/intitem.cxx svl/source/items/itempool.cxx svl/source/items/itemprop.cxx svl/source/items/itemset.cxx svl/source/items/lckbitem.cxx svl/source/items/poolio.cxx svl/source/items/poolitem.cxx svl/source/items/ptitem.cxx svl/source/items/rectitem.cxx svl/source/items/slstitm.cxx svl/source/items/srchitem.cxx svl/source/items/style.cxx svl/source/items/szitem.cxx svl/source/items/visitem.cxx svl/source/items/whiter.cxx svl/source/memtools/svarray.cxx svl/source/misc/PasswordHelper.cxx svl/source/misc/adrparse.cxx svl/source/misc/lngmisc.cxx svl/source/notify/brdcst.cxx svl/source/notify/listener.cxx svl/source/notify/listenerbase.cxx svl/source/numbers/makefile.mk svl/source/numbers/nbdll.cxx svl/source/numbers/zforfind.cxx svl/source/numbers/zforlist.cxx svl/source/numbers/zformat.cxx svl/source/numbers/zforscan.cxx svl/source/passwordcontainer/passwordcontainer.cxx svl/source/svdde/ddecli.cxx svl/source/svdde/ddeimp.hxx svl/source/svdde/ddemlos2.h svl/source/svdde/ddesvr.cxx svl/source/undo/undo.cxx svl/source/uno/registerservices.cxx svl/util/makefile.mk svtools/bmpmaker/bmpsum.cxx svtools/bmpmaker/g2g.cxx svtools/bmpmaker/makefile.mk svtools/inc/borderhelper.hxx svtools/inc/svtools/accessiblefactory.hxx svtools/inc/svtools/apearcfg.hxx svtools/inc/svtools/brwbox.hxx svtools/inc/svtools/ctrlbox.hxx svtools/inc/svtools/ctrltool.hxx svtools/inc/svtools/editbrowsebox.hxx svtools/inc/svtools/ehdl.hxx svtools/inc/svtools/embedhlp.hxx svtools/inc/svtools/filter.hxx svtools/inc/svtools/ivctrl.hxx svtools/inc/svtools/parhtml.hxx svtools/inc/svtools/printdlg.hxx svtools/inc/svtools/rtftoken.h svtools/inc/svtools/ruler.hxx svtools/inc/svtools/svicnvw.hxx svtools/inc/svtools/svlbitm.hxx svtools/inc/svtools/svlbox.hxx svtools/inc/svtools/svtreebx.hxx svtools/inc/svtools/tabbar.hxx svtools/inc/svtools/table/abstracttablecontrol.hxx svtools/inc/svtools/taskbar.hxx svtools/inc/svtools/textview.hxx svtools/inc/svtools/valueset.hxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/datwin.cxx svtools/source/brwbox/datwin.hxx svtools/source/brwbox/makefile.mk svtools/source/config/apearcfg.cxx svtools/source/config/htmlcfg.cxx svtools/source/config/menuoptions.cxx svtools/source/config/miscopt.cxx svtools/source/contnr/cont_pch.cxx svtools/source/contnr/ctrdll.cxx svtools/source/contnr/fileview.cxx svtools/source/contnr/imivctl1.cxx svtools/source/contnr/ivctrl.cxx svtools/source/contnr/makefile.mk svtools/source/contnr/svcontnr.src svtools/source/contnr/svicnvw.cxx svtools/source/contnr/svimpbox.cxx svtools/source/contnr/svimpicn.cxx svtools/source/contnr/svlbitm.cxx svtools/source/contnr/svtreebx.cxx svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx svtools/source/control/asynclink.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrldll.cxx svtools/source/control/ctrltool.cxx svtools/source/control/filectrl.cxx svtools/source/control/filectrl.src svtools/source/control/headbar.cxx svtools/source/control/inettbc.cxx svtools/source/control/makefile.mk svtools/source/control/prgsbar.cxx svtools/source/control/roadmap.cxx svtools/source/control/ruler.cxx svtools/source/control/scriptedtext.cxx svtools/source/control/stdmenu.cxx svtools/source/control/tabbar.cxx svtools/source/control/taskbar.cxx svtools/source/control/taskbox.cxx svtools/source/control/taskmisc.cxx svtools/source/control/taskstat.cxx svtools/source/control/valueacc.cxx svtools/source/control/valueset.cxx svtools/source/dialogs/addresstemplate.cxx svtools/source/dialogs/addresstemplate.src svtools/source/dialogs/colrdlg.src svtools/source/dialogs/filedlg2.cxx svtools/source/dialogs/filedlg2.hxx svtools/source/dialogs/makefile.mk svtools/source/dialogs/printdlg.cxx svtools/source/dialogs/printdlg.src svtools/source/dialogs/propctrl.cxx svtools/source/dialogs/propctrl.hxx svtools/source/dialogs/property.cxx svtools/source/edit/makefile.mk svtools/source/edit/sychconv.cxx svtools/source/edit/syntaxhighlight.cxx svtools/source/edit/textdoc.cxx svtools/source/edit/texteng.cxx svtools/source/edit/textundo.cxx svtools/source/edit/textview.cxx svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx svtools/source/filter.vcl/filter/dlgejpg.cxx svtools/source/filter.vcl/filter/dlgejpg.hxx svtools/source/filter.vcl/filter/dlgejpg.src svtools/source/filter.vcl/filter/dlgepng.cxx svtools/source/filter.vcl/filter/dlgepng.hxx svtools/source/filter.vcl/filter/dlgepng.src svtools/source/filter.vcl/filter/dlgexpor.cxx svtools/source/filter.vcl/filter/dlgexpor.hxx svtools/source/filter.vcl/filter/dlgexpor.src svtools/source/filter.vcl/filter/filter2.cxx svtools/source/filter.vcl/filter/makefile.mk svtools/source/filter.vcl/filter/sgfbram.cxx svtools/source/filter.vcl/filter/sgvmain.cxx svtools/source/filter.vcl/filter/sgvspln.cxx svtools/source/filter.vcl/filter/strings.src svtools/source/filter.vcl/jpeg/makefile.mk svtools/source/filter.vcl/wmf/emfwr.cxx svtools/source/filter.vcl/wmf/emfwr.hxx svtools/source/filter.vcl/wmf/enhwmf.cxx svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.hxx svtools/source/graphic/grfcache.cxx svtools/source/graphic/grfcache.hxx svtools/source/graphic/grfmgr.cxx svtools/source/graphic/makefile.mk svtools/source/inc/accessibletableimp.hxx svtools/source/inc/svimpbox.hxx svtools/source/java/patchjavaerror.src svtools/source/misc/ehdl.cxx svtools/source/misc/errtxt.src svtools/source/misc/helpagentwindow.cxx svtools/source/misc/imagemgr.cxx svtools/source/misc/imagemgr.src svtools/source/misc/imageresourceaccess.cxx svtools/source/misc/imap.cxx svtools/source/misc/langtab.src svtools/source/misc/makefile.mk svtools/source/misc/svtdata.cxx svtools/source/misc/templatefoldercache.cxx svtools/source/misc/transfer2.cxx svtools/source/misc/undo.src svtools/source/plugapp/commtest.cxx svtools/source/plugapp/commtest.src svtools/source/plugapp/makefile.mk svtools/source/plugapp/testtool.src svtools/source/productregistration/productregistration.cxx svtools/source/svhtml/htmlkywd.cxx svtools/source/svhtml/parhtml.cxx svtools/source/svrtf/rtfkey2.cxx svtools/source/svrtf/rtfkeywd.cxx svtools/source/table/defaultinputhandler.cxx svtools/source/table/makefile.mk svtools/source/table/tablecontrol.cxx svtools/source/table/tablecontrol_impl.cxx svtools/source/table/tablecontrol_impl.hxx svtools/source/table/tabledatawindow.cxx svtools/source/table/tablegeometry.cxx svtools/source/table/tablegeometry.hxx svtools/source/toolpanel/makefile.mk svtools/source/toolpanel/toolpaneldrawer.cxx svtools/source/uno/addrtempuno.cxx svtools/source/uno/miscservices.cxx svtools/source/uno/svtxgridcontrol.cxx svtools/source/uno/svtxgridcontrol.hxx svtools/source/uno/toolboxcontroller.cxx svtools/source/uno/treecontrolpeer.cxx svtools/source/uno/unocontroltablemodel.cxx svtools/source/uno/unocontroltablemodel.hxx svtools/source/uno/unoimap.cxx svtools/source/urlobj/inetimg.cxx svtools/util/makefile.mk svtools/workben/browser.cxx svtools/workben/cui/makefile.mk svtools/workben/makefile.mk svtools/workben/stest.cxx svtools/workben/toolpanel/makefile.mk svtools/workben/urange.cxx toolkit/inc/toolkit/awt/vclxdevice.hxx toolkit/inc/toolkit/awt/vclxgraphics.hxx toolkit/inc/toolkit/awt/vclxwindows.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/throbberimpl.hxx toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java toolkit/source/awt/asynccallback.cxx toolkit/source/awt/vclxgraphics.cxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxwindow.cxx toolkit/source/awt/xsimpleanimation.cxx toolkit/source/awt/xthrobber.cxx toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/grid/defaultgridcolumnmodel.cxx toolkit/source/controls/grid/defaultgriddatamodel.cxx toolkit/source/controls/grid/gridcontrol.cxx toolkit/source/controls/grid/initguard.hxx toolkit/source/controls/unocontrol.cxx toolkit/source/controls/unocontrolcontainer.cxx toolkit/source/controls/unocontrols.cxx toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/property.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/source/helper/throbberimpl.cxx toolkit/source/helper/tkresmgr.cxx tools/StaticLibrary_ooopathutils.mk tools/bootstrp/addexes/makefile.mk tools/bootstrp/addexes2/makefile.mk tools/bootstrp/addexes2/mkfilt.cxx tools/bootstrp/command.cxx tools/bootstrp/cppdep.cxx tools/bootstrp/iserver.cxx tools/bootstrp/makefile.mk tools/bootstrp/mkcreate.cxx tools/bootstrp/prj.cxx tools/bootstrp/rscdep.cxx tools/bootstrp/sstring.cxx tools/inc/bootstrp/command.hxx tools/inc/bootstrp/mkcreate.hxx tools/inc/bootstrp/prj.hxx tools/inc/bootstrp/sstring.hxx tools/inc/tools/agapi.hxx tools/inc/tools/agitem.hxx tools/inc/tools/chapi.hxx tools/inc/tools/download.hxx tools/inc/tools/eacopier.hxx tools/inc/tools/fract.hxx tools/inc/tools/fsys.hxx tools/inc/tools/geninfo.hxx tools/inc/tools/globname.hxx tools/inc/tools/inetmime.hxx tools/inc/tools/multisel.hxx tools/inc/tools/poly.hxx tools/inc/tools/postsys.h tools/inc/tools/postwin.h tools/inc/tools/presys.h tools/inc/tools/prewin.h tools/inc/tools/pstm.hxx tools/inc/tools/ref.hxx tools/inc/tools/simplerm.hxx tools/inc/tools/solar.h tools/inc/tools/table.hxx tools/inc/tools/urlkeys.hxx tools/inc/tools/urlobj.hxx tools/prj/build.lst tools/prj/d.lst tools/qa/makefile.mk tools/source/communi/geninfo.cxx tools/source/debug/debug.cxx tools/source/fsys/dirent.cxx tools/source/fsys/tdir.cxx tools/source/fsys/unx.cxx tools/source/fsys/urlobj.cxx tools/source/generic/color.cxx tools/source/generic/config.cxx tools/source/generic/fract.cxx tools/source/inet/inetmime.cxx tools/source/memtools/multisel.cxx tools/source/memtools/table.cxx tools/source/rc/resmgr.cxx tools/source/ref/globname.cxx tools/source/ref/pstm.cxx tools/source/solar/solar.c tools/source/stream/strmos2.cxx tools/source/stream/strmunx.cxx tools/source/stream/strmwnt.cxx tools/source/string/makefile.mk tools/source/testtoolloader/testtoolloader.cxx tools/test/makefile.mk tools/util/makefile.mk tools/win/inc/dll.hxx tools/win/inc/parser.hxx tools/win/inc/shellex.h tools/win/inc/shutil.h tools/win/inc/toolsdll.hxx tools/win/inc/winshell.hxx tools/workben/makefile.mk ucbhelper/source/client/proxydecider.cxx ucbhelper/workben/ucbexplorer/ucbexplorer.hrc unotools/inc/unotools/unotunnelhelper.hxx unotools/source/config/fltrcfg.cxx unotools/source/config/lingucfg.cxx unotools/source/config/misccfg.cxx unotools/source/config/pathoptions.cxx unotools/source/config/searchopt.cxx unotools/source/i18n/localedatawrapper.cxx unotools/source/ucbhelper/localfilehelper.cxx unotools/source/ucbhelper/ucbhelper.cxx unotools/source/ucbhelper/xtempfile.cxx vcl/aqua/inc/salbmp.h vcl/aqua/inc/salgdi.h vcl/aqua/inc/salinst.h vcl/aqua/source/app/salinst.cxx vcl/aqua/source/gdi/aquaprintaccessoryview.mm vcl/aqua/source/gdi/salgdi.cxx vcl/aqua/source/gdi/salprn.cxx vcl/aqua/source/window/salframeview.mm vcl/aqua/source/window/salobj.cxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/brdwin.hxx vcl/inc/vcl/button.hxx vcl/inc/vcl/cmdevt.hxx vcl/inc/vcl/cvtgrf.hxx vcl/inc/vcl/dialog.hxx vcl/inc/vcl/dockwin.hxx vcl/inc/vcl/event.hxx vcl/inc/vcl/fixed.hxx vcl/inc/vcl/fldunit.hxx vcl/inc/vcl/floatwin.hxx vcl/inc/vcl/gdimtf.hxx vcl/inc/vcl/glyphcache.hxx vcl/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_layout.hxx vcl/inc/vcl/ilstbox.hxx vcl/inc/vcl/image.h vcl/inc/vcl/imgctrl.hxx vcl/inc/vcl/impbmpconv.hxx vcl/inc/vcl/impprn.hxx vcl/inc/vcl/jobset.h vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/lstbox.hxx vcl/inc/vcl/mapunit.hxx vcl/inc/vcl/menu.hxx vcl/inc/vcl/msgbox.hxx vcl/inc/vcl/outdev.hxx vcl/inc/vcl/prndlg.hxx vcl/inc/vcl/salatype.hxx vcl/inc/vcl/salbmp.hxx vcl/inc/vcl/salgdi.hxx vcl/inc/vcl/salinst.hxx vcl/inc/vcl/seleng.hxx vcl/inc/vcl/settings.hxx vcl/inc/vcl/smartid.hxx vcl/inc/vcl/status.hxx vcl/inc/vcl/strhelper.hxx vcl/inc/vcl/svapp.hxx vcl/inc/vcl/svdata.hxx vcl/inc/vcl/syschild.hxx vcl/inc/vcl/sysdata.hxx vcl/inc/vcl/taskpanelist.hxx vcl/inc/vcl/toolbox.hxx vcl/inc/vcl/vclevent.hxx vcl/inc/vcl/windata.hxx vcl/inc/vcl/window.hxx vcl/inc/vcl/wintypes.hxx vcl/os2/source/app/salinst.cxx vcl/os2/source/gdi/salgdi.cxx vcl/os2/source/window/salmenu.cxx vcl/os2/source/window/salobj.cxx vcl/prj/build.lst vcl/source/app/dbggui.cxx vcl/source/app/help.cxx vcl/source/app/idlemgr.cxx vcl/source/app/settings.cxx vcl/source/app/svapp.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/app/svmainhook.cxx vcl/source/app/unohelp.cxx vcl/source/app/vclevent.cxx vcl/source/control/button.cxx vcl/source/control/combobox.cxx vcl/source/control/edit.cxx vcl/source/control/field.cxx vcl/source/control/fixed.cxx vcl/source/control/ilstbox.cxx vcl/source/control/imgctrl.cxx vcl/source/control/makefile.mk vcl/source/control/tabctrl.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap2.cxx vcl/source/gdi/bitmap4.cxx vcl/source/gdi/bmpconv.cxx vcl/source/gdi/cvtsvm.cxx vcl/source/gdi/font.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/image.cxx vcl/source/gdi/impimage.cxx vcl/source/gdi/jobset.cxx vcl/source/gdi/makefile.mk vcl/source/gdi/metaact.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev4.cxx vcl/source/gdi/outdevnative.cxx vcl/source/gdi/pdfwriter.cxx vcl/source/gdi/pdfwriter_impl.cxx vcl/source/gdi/print3.cxx vcl/source/gdi/salmisc.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/glyphcache.cxx vcl/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_textsrc.hxx vcl/source/helper/canvasbitmap.cxx vcl/source/helper/smartid.cxx vcl/source/helper/xconnection.cxx vcl/source/src/btntext.src vcl/source/src/images.src vcl/source/src/print.src vcl/source/window/accel.cxx vcl/source/window/accmgr.cxx vcl/source/window/brdwin.cxx vcl/source/window/btndlg.cxx vcl/source/window/dlgctrl.cxx vcl/source/window/javachild.cxx vcl/source/window/menu.cxx vcl/source/window/msgbox.cxx vcl/source/window/printdlg.cxx vcl/source/window/status.cxx vcl/source/window/syschild.cxx vcl/source/window/toolbox.cxx vcl/source/window/toolbox2.cxx vcl/source/window/window.cxx vcl/source/window/window2.cxx vcl/source/window/wrkwin.cxx vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkobject.cxx vcl/unx/headless/svpbmp.hxx vcl/unx/headless/svpgdi.cxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.hxx vcl/unx/headless/svpprn.cxx vcl/unx/headless/svpprn.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx vcl/unx/headless/svptext.cxx vcl/unx/inc/dtint.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/pspgraphics.h vcl/unx/inc/salbmp.h vcl/unx/inc/saldata.hxx vcl/unx/inc/saldisp.hxx vcl/unx/inc/salgdi.h vcl/unx/inc/salinst.h vcl/unx/inc/xfont.hxx vcl/unx/kde/kdedata.cxx vcl/unx/kde4/KDESalGraphics.cxx vcl/unx/source/app/keysymnames.cxx vcl/unx/source/app/saldata.cxx vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/salinst.cxx vcl/unx/source/app/wmadaptor.cxx vcl/unx/source/dtrans/X11_selection.cxx vcl/unx/source/dtrans/X11_service.cxx vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/pspgraphics.cxx vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salprnpsp.cxx vcl/unx/source/gdi/xfont.cxx vcl/unx/source/gdi/xlfd_attr.cxx vcl/unx/source/gdi/xlfd_attr.hxx vcl/unx/source/gdi/xlfd_extd.cxx vcl/unx/source/gdi/xlfd_extd.hxx vcl/unx/source/gdi/xlfd_smpl.cxx vcl/unx/source/gdi/xlfd_smpl.hxx vcl/unx/source/printer/ppdparser.cxx vcl/unx/source/printer/printerinfomanager.cxx vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salmenu.cxx vcl/unx/source/window/salobj.cxx vcl/util/makefile2.pmk vcl/win/inc/salbmp.h vcl/win/inc/saldata.hxx vcl/win/inc/salgdi.h vcl/win/inc/salinst.h vcl/win/source/app/saldata.cxx vcl/win/source/app/salinst.cxx vcl/win/source/gdi/salgdi.cxx vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/salprn.cxx vcl/win/source/gdi/winlayout.cxx vcl/win/source/window/salframe.cxx vcl/win/source/window/salobj.cxx vcl/workben/outdevgrind.cxx vos/inc/vos/execabl.hxx vos/inc/vos/macros.hxx vos/inc/vos/pipe.hxx vos/inc/vos/process.hxx vos/inc/vos/refernce.hxx vos/inc/vos/signal.hxx vos/inc/vos/socket.hxx vos/inc/vos/stream.hxx vos/inc/vos/thread.hxx vos/source/pipe.cxx vos/source/process.cxx vos/source/signal.cxx vos/source/thread.cxx vos/source/timer.cxx
1290 lines
46 KiB
C++
1290 lines
46 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_vcl.hxx"
|
|
#include <vcl/settings.hxx>
|
|
#include <tools/poly.hxx>
|
|
#include <vcl/outdev.hxx>
|
|
#include <vcl/bmpacc.hxx>
|
|
#include <vcl/decoview.hxx>
|
|
#include <vcl/window.hxx>
|
|
#include <vcl/ctrl.hxx>
|
|
|
|
// =======================================================================
|
|
|
|
#define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \
|
|
BUTTON_DRAW_PRESSED | \
|
|
BUTTON_DRAW_CHECKED | \
|
|
BUTTON_DRAW_HIGHLIGHT)
|
|
|
|
// =======================================================================
|
|
|
|
static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
|
|
SymbolType eType )
|
|
{
|
|
// Groessen vorberechnen
|
|
long nMin = Min( rRect.GetWidth(), rRect.GetHeight() );
|
|
long nSize = nMin;
|
|
|
|
if ( nMin & 0x01 )
|
|
nMin--;
|
|
Point aCenter = rRect.Center();
|
|
long nCenterX = aCenter.X();
|
|
long nCenterY = aCenter.Y();
|
|
long n2 = nMin / 2;
|
|
long n4 = nMin / 4;
|
|
long nLeft;
|
|
long nTop;
|
|
long nRight;
|
|
long nBottom;
|
|
long nTemp;
|
|
long i;
|
|
|
|
switch ( eType )
|
|
{
|
|
case SYMBOL_ARROW_UP:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
{
|
|
n2--;
|
|
n4--;
|
|
}
|
|
nTop = nCenterY-n2;
|
|
nBottom = nCenterY;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nTop++;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
pDev->DrawRect( Rectangle( nCenterX-n4, nBottom,
|
|
nCenterX+n4, nBottom+n2 ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_ARROW_DOWN:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
{
|
|
n2--;
|
|
n4--;
|
|
}
|
|
nTop = nCenterY;
|
|
nBottom = nCenterY+n2;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nBottom--;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
pDev->DrawRect( Rectangle( nCenterX-n4, nTop-n2,
|
|
nCenterX+n4, nTop ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_ARROW_LEFT:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
{
|
|
n2--;
|
|
n4--;
|
|
}
|
|
nLeft = nCenterX-n2;
|
|
nRight = nCenterX;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nLeft++;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
i++;
|
|
}
|
|
pDev->DrawRect( Rectangle( nRight, nCenterY-n4,
|
|
nRight+n2, nCenterY+n4 ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_ARROW_RIGHT:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
{
|
|
n2--;
|
|
n4--;
|
|
}
|
|
nLeft = nCenterX;
|
|
nRight = nCenterX+n2;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nRight--;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
i++;
|
|
}
|
|
pDev->DrawRect( Rectangle( nLeft-n2, nCenterY-n4,
|
|
nLeft, nCenterY+n4 ) );
|
|
}
|
|
break;
|
|
|
|
|
|
case SYMBOL_SPIN_UP:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
n2--;
|
|
nTop = nCenterY-n4;
|
|
nBottom = nTop+n2;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nTop++;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_SPIN_DOWN:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
n2--;
|
|
nTop = nCenterY-n4;
|
|
nBottom = nTop+n2;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nBottom--;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_SPIN_LEFT:
|
|
case SYMBOL_FIRST:
|
|
case SYMBOL_PREV:
|
|
case SYMBOL_REVERSEPLAY:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
n2--;
|
|
nLeft = nCenterX-n4;
|
|
if ( eType == SYMBOL_FIRST )
|
|
nLeft++;
|
|
nRight = nLeft+n2;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nLeft++;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
i++;
|
|
}
|
|
if ( eType == SYMBOL_FIRST )
|
|
{
|
|
pDev->DrawRect( Rectangle( nCenterX-n4-1, nCenterY-n2,
|
|
nCenterX-n4-1, nCenterY+n2 ) );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_SPIN_RIGHT:
|
|
case SYMBOL_LAST:
|
|
case SYMBOL_NEXT:
|
|
case SYMBOL_PLAY:
|
|
{
|
|
if ( !(nMin & 0x01) )
|
|
n2--;
|
|
nLeft = nCenterX-n4;
|
|
if ( eType == SYMBOL_LAST )
|
|
nLeft--;
|
|
nRight = nLeft+n2;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nRight--;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
i++;
|
|
}
|
|
if ( eType == SYMBOL_LAST )
|
|
{
|
|
pDev->DrawRect( Rectangle( nCenterX+n4+1, nCenterY-n2,
|
|
nCenterX+n4+1, nCenterY+n2 ) );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_PAGEUP:
|
|
case SYMBOL_PAGEDOWN:
|
|
{
|
|
if ( !( nSize & 0x01 ))
|
|
{
|
|
// An even rectangle size means we have to use a smaller size for
|
|
// our arrows as we want to use one pixel for the spearhead! Otherwise
|
|
// it will be clipped!
|
|
nCenterX++;
|
|
n2 = ( nMin-1 ) / 2;
|
|
n4 = ( nMin-1 ) / 4;
|
|
}
|
|
|
|
nTop = nCenterY-n2;
|
|
nBottom = nCenterY-1;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop+n2+1, nCenterX, nBottom+n2+1 ) );
|
|
i = 1;
|
|
while ( i < n2 )
|
|
{
|
|
( eType == SYMBOL_PAGEUP ) ? nTop++ : nBottom--;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
pDev->DrawRect( Rectangle( nTemp, nTop+n2+1, nTemp, nBottom+n2+1 ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
pDev->DrawRect( Rectangle( nTemp, nTop+n2+1, nTemp, nBottom+n2+1 ) );
|
|
i++;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_RADIOCHECKMARK:
|
|
case SYMBOL_RECORD:
|
|
{
|
|
const long nExt = ( n2 << 1 ) + 1;
|
|
Bitmap aBmp( Size( nExt, nExt ), 1 );
|
|
BitmapWriteAccess* pWAcc = aBmp.AcquireWriteAccess();
|
|
|
|
if( pWAcc )
|
|
{
|
|
const Color aWhite( COL_WHITE );
|
|
const Color aBlack( COL_BLACK );
|
|
|
|
pWAcc->Erase( aWhite );
|
|
pWAcc->SetLineColor( aBlack );
|
|
pWAcc->SetFillColor( aBlack );
|
|
pWAcc->DrawPolygon( Polygon( Point( n2, n2 ), n2, n2 ) );
|
|
aBmp.ReleaseAccess( pWAcc );
|
|
pDev->DrawMask( Point( nCenterX - n2, nCenterY - n2 ), aBmp, pDev->GetFillColor() );
|
|
}
|
|
else
|
|
pDev->DrawPolygon( Polygon( Point( nCenterX, nCenterY ), n2, n2 ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_STOP:
|
|
{
|
|
nLeft = nCenterX-n2;
|
|
nRight = nCenterX+n2;
|
|
nTop = nCenterY-n2;
|
|
nBottom = nCenterY+n2;
|
|
pDev->DrawRect( Rectangle( nLeft, nTop, nRight, nBottom ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_PAUSE:
|
|
{
|
|
nLeft = nCenterX-n2;
|
|
nRight = nCenterX+n2-1;
|
|
nTop = nCenterY-n2;
|
|
nBottom = nCenterY+n2;
|
|
pDev->DrawRect( Rectangle( nLeft, nTop, nCenterX-2, nBottom ) );
|
|
pDev->DrawRect( Rectangle( nCenterX+1, nTop, nRight, nBottom ) );
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_WINDSTART:
|
|
case SYMBOL_WINDBACKWARD:
|
|
{
|
|
nLeft = nCenterX-n2+1;
|
|
nRight = nCenterX;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nCenterY, nRight+n2, nCenterY ) );
|
|
i = 1;
|
|
while ( i < n2 )
|
|
{
|
|
nLeft++;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nTemp, nRight+n2, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nTemp, nRight+n2, nTemp ) );
|
|
i++;
|
|
}
|
|
if ( eType == SYMBOL_WINDSTART )
|
|
{
|
|
pDev->DrawRect( Rectangle( nCenterX-n2, nCenterY-n2,
|
|
nCenterX-n2, nCenterY+n2 ) );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_WINDEND:
|
|
case SYMBOL_WINDFORWARD:
|
|
{
|
|
nLeft = nCenterX-n2;
|
|
nRight = nCenterX-1;
|
|
pDev->DrawRect( Rectangle( nLeft, nCenterY, nRight, nCenterY ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nCenterY, nRight+n2, nCenterY ) );
|
|
i = 1;
|
|
while ( i < n2 )
|
|
{
|
|
nRight--;
|
|
nTemp = nCenterY-i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nTemp, nRight+n2, nTemp ) );
|
|
nTemp = nCenterY+i;
|
|
pDev->DrawRect( Rectangle( nLeft, nTemp, nRight, nTemp ) );
|
|
pDev->DrawRect( Rectangle( nLeft+n2, nTemp, nRight+n2, nTemp ) );
|
|
i++;
|
|
}
|
|
if ( eType == SYMBOL_WINDEND )
|
|
{
|
|
pDev->DrawRect( Rectangle( nCenterX+n2, nCenterY-n2,
|
|
nCenterX+n2, nCenterY+n2 ) );
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_CLOSE:
|
|
{
|
|
Size aRectSize( 2, 1 );
|
|
if ( nMin < 8 )
|
|
aRectSize.Width() = 1;
|
|
else if ( nMin > 20 )
|
|
aRectSize.Width() = nMin/10;
|
|
nLeft = nCenterX-n2+1;
|
|
nTop = nCenterY-n2+1;
|
|
nBottom = nCenterY-n2+nMin-aRectSize.Width()+1;
|
|
i = 0;
|
|
while ( i < nMin-aRectSize.Width()+1 )
|
|
{
|
|
pDev->DrawRect( Rectangle( Point( nLeft+i, nTop+i ), aRectSize ) );
|
|
pDev->DrawRect( Rectangle( Point( nLeft+i, nBottom-i ), aRectSize ) );
|
|
i++;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_ROLLUP:
|
|
case SYMBOL_ROLLDOWN:
|
|
{
|
|
Rectangle aRect( nCenterX-n2, nCenterY-n2,
|
|
nCenterX+n2, nCenterY-n2+1 );
|
|
pDev->DrawRect( aRect );
|
|
if ( eType == SYMBOL_ROLLDOWN )
|
|
{
|
|
Rectangle aTempRect = aRect;
|
|
aTempRect.Bottom() = nCenterY+n2;
|
|
aTempRect.Right() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Left() = aRect.Right();
|
|
aTempRect.Right() = aRect.Right();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Top() = aTempRect.Bottom();
|
|
aTempRect.Left() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
}
|
|
}
|
|
break;
|
|
case SYMBOL_CHECKMARK:
|
|
{
|
|
// #106953# never mirror checkmarks
|
|
sal_Bool bRTL = pDev->ImplHasMirroredGraphics() && pDev->IsRTLEnabled();
|
|
Point aPos1( bRTL ? rRect.Right() : rRect.Left(),
|
|
rRect.Bottom() - rRect.GetHeight() / 3 );
|
|
Point aPos2( bRTL ? rRect.Right() - rRect.GetWidth()/3 : rRect.Left() + rRect.GetWidth()/3,
|
|
rRect.Bottom() );
|
|
Point aPos3( bRTL ? rRect.TopLeft() : rRect.TopRight() );
|
|
Size aRectSize( 1, 2 );
|
|
long nStepsY = aPos2.Y()-aPos1.Y();
|
|
long nX = aPos1.X();
|
|
long nY = aPos1.Y();
|
|
long n;
|
|
for ( n = 0; n <= nStepsY; n++ )
|
|
{
|
|
if( bRTL )
|
|
nX--;
|
|
pDev->DrawRect( Rectangle( Point( nX, nY++ ), aRectSize ) );
|
|
if( !bRTL )
|
|
nX++;
|
|
}
|
|
nStepsY = aPos2.Y()-aPos3.Y();
|
|
nX = aPos2.X();
|
|
nY = aPos2.Y();
|
|
for ( n = 0; n <= nStepsY; n++ )
|
|
{
|
|
if( bRTL )
|
|
if ( --nX < rRect.Left() )
|
|
break;
|
|
pDev->DrawRect( Rectangle( Point( nX, nY-- ), aRectSize ) );
|
|
if( !bRTL )
|
|
if ( ++nX > rRect.Right() )
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case SYMBOL_SPIN_UPDOWN:
|
|
{
|
|
nTop = nCenterY-n2-1;
|
|
nBottom = nTop+n2;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nTop++;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
nTop = nCenterY+1;
|
|
nBottom = nTop+n2;
|
|
pDev->DrawRect( Rectangle( nCenterX, nTop, nCenterX, nBottom ) );
|
|
i = 1;
|
|
while ( i <= n2 )
|
|
{
|
|
nBottom--;
|
|
nTemp = nCenterX-i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
nTemp = nCenterX+i;
|
|
pDev->DrawRect( Rectangle( nTemp, nTop, nTemp, nBottom ) );
|
|
i++;
|
|
}
|
|
}
|
|
break;
|
|
|
|
|
|
case SYMBOL_FLOAT:
|
|
{
|
|
Rectangle aRect( nCenterX-n2, nCenterY-n2+3,
|
|
nCenterX+n2-2, nCenterY-n2+4 );
|
|
pDev->DrawRect( aRect );
|
|
Rectangle aTempRect = aRect;
|
|
aTempRect.Bottom() = nCenterY+n2;
|
|
aTempRect.Right() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Left() = aRect.Right();
|
|
aTempRect.Right() = aRect.Right();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Top() = aTempRect.Bottom();
|
|
aTempRect.Left() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
aRect = Rectangle( nCenterX-n2+2, nCenterY-n2,
|
|
nCenterX+n2, nCenterY-n2+1 );
|
|
pDev->DrawRect( aRect );
|
|
aTempRect = aRect;
|
|
aTempRect.Bottom() = nCenterY+n2-3;
|
|
aTempRect.Right() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Left() = aRect.Right();
|
|
aTempRect.Right() = aRect.Right();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Top() = aTempRect.Bottom();
|
|
aTempRect.Left() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
}
|
|
break;
|
|
case SYMBOL_DOCK:
|
|
{
|
|
Rectangle aRect( nCenterX-n2, nCenterY-n2,
|
|
nCenterX+n2, nCenterY-n2 );
|
|
pDev->DrawRect( aRect );
|
|
Rectangle aTempRect = aRect;
|
|
aTempRect.Bottom() = nCenterY+n2;
|
|
aTempRect.Right() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Left() = aRect.Right();
|
|
aTempRect.Right() = aRect.Right();
|
|
pDev->DrawRect( aTempRect );
|
|
aTempRect.Top() = aTempRect.Bottom();
|
|
aTempRect.Left() = aRect.Left();
|
|
pDev->DrawRect( aTempRect );
|
|
}
|
|
break;
|
|
case SYMBOL_HIDE:
|
|
{
|
|
long nExtra = nMin / 8;
|
|
Rectangle aRect( nCenterX-n2+nExtra, nCenterY+n2-1,
|
|
nCenterX+n2-nExtra, nCenterY+n2 );
|
|
pDev->DrawRect( aRect );
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType,
|
|
const Color& rColor, sal_uInt16 nStyle )
|
|
{
|
|
const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
|
|
Rectangle aRect = mpOutDev->LogicToPixel( rRect );
|
|
Color aOldLineColor = mpOutDev->GetLineColor();
|
|
Color aOldFillColor = mpOutDev->GetFillColor();
|
|
sal_Bool bOldMapMode = mpOutDev->IsMapModeEnabled();
|
|
mpOutDev->SetLineColor();
|
|
mpOutDev->SetFillColor( rColor );
|
|
mpOutDev->EnableMapMode( sal_False );
|
|
|
|
if ( (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ||
|
|
(mpOutDev->GetOutDevType() == OUTDEV_PRINTER) )
|
|
nStyle |= BUTTON_DRAW_MONO;
|
|
|
|
if ( nStyle & SYMBOL_DRAW_MONO )
|
|
{
|
|
if ( nStyle & SYMBOL_DRAW_DISABLE )
|
|
mpOutDev->SetFillColor( Color( COL_GRAY ) );
|
|
else
|
|
mpOutDev->SetFillColor( Color( COL_BLACK ) );
|
|
}
|
|
else
|
|
{
|
|
if ( nStyle & SYMBOL_DRAW_DISABLE )
|
|
{
|
|
// Als Embosed ausgeben
|
|
mpOutDev->SetFillColor( rStyleSettings.GetLightColor() );
|
|
Rectangle aTempRect = aRect;
|
|
aTempRect.Move( 1, 1 );
|
|
ImplDrawSymbol( mpOutDev, aTempRect, eType );
|
|
mpOutDev->SetFillColor( rStyleSettings.GetShadowColor() );
|
|
}
|
|
else
|
|
mpOutDev->SetFillColor( rColor );
|
|
}
|
|
|
|
ImplDrawSymbol( mpOutDev, aRect, eType );
|
|
|
|
mpOutDev->SetLineColor( aOldLineColor );
|
|
mpOutDev->SetFillColor( aOldFillColor );
|
|
mpOutDev->EnableMapMode( bOldMapMode );
|
|
}
|
|
|
|
// =======================================================================
|
|
|
|
void DecorationView::DrawFrame( const Rectangle& rRect,
|
|
const Color& rLeftTopColor,
|
|
const Color& rRightBottomColor )
|
|
{
|
|
Rectangle aRect = mpOutDev->LogicToPixel( rRect );
|
|
Color aOldLineColor = mpOutDev->GetLineColor();
|
|
Color aOldFillColor = mpOutDev->GetFillColor();
|
|
sal_Bool bOldMapMode = mpOutDev->IsMapModeEnabled();
|
|
mpOutDev->EnableMapMode( sal_False );
|
|
mpOutDev->SetLineColor();
|
|
mpOutDev->ImplDraw2ColorFrame( aRect, rLeftTopColor, rRightBottomColor );
|
|
mpOutDev->SetLineColor( aOldLineColor );
|
|
mpOutDev->SetFillColor( aOldFillColor );
|
|
mpOutDev->EnableMapMode( bOldMapMode );
|
|
}
|
|
|
|
// =======================================================================
|
|
|
|
void DecorationView::DrawHighlightFrame( const Rectangle& rRect,
|
|
sal_uInt16 nStyle )
|
|
{
|
|
const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
|
|
Color aLightColor = rStyleSettings.GetLightColor();
|
|
Color aShadowColor = rStyleSettings.GetShadowColor();
|
|
|
|
if ( (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ||
|
|
(mpOutDev->GetOutDevType() == OUTDEV_PRINTER) )
|
|
{
|
|
aLightColor = Color( COL_BLACK );
|
|
aShadowColor = Color( COL_BLACK );
|
|
}
|
|
else if ( nStyle & FRAME_HIGHLIGHT_TESTBACKGROUND )
|
|
{
|
|
Wallpaper aBackground = mpOutDev->GetBackground();
|
|
if ( aBackground.IsBitmap() || aBackground.IsGradient() )
|
|
{
|
|
aLightColor = rStyleSettings.GetFaceColor();
|
|
aShadowColor = Color( COL_BLACK );
|
|
}
|
|
else
|
|
{
|
|
Color aBackColor = aBackground.GetColor();
|
|
if ( (aLightColor.GetColorError( aBackColor ) < 32) ||
|
|
(aShadowColor.GetColorError( aBackColor ) < 32) )
|
|
{
|
|
aLightColor = Color( COL_WHITE );
|
|
aShadowColor = Color( COL_BLACK );
|
|
|
|
if ( aLightColor.GetColorError( aBackColor ) < 32 )
|
|
aLightColor.DecreaseLuminance( 64 );
|
|
if ( aShadowColor.GetColorError( aBackColor ) < 32 )
|
|
aShadowColor.IncreaseLuminance( 64 );
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( (nStyle & FRAME_HIGHLIGHT_STYLE) == FRAME_HIGHLIGHT_IN )
|
|
{
|
|
Color aTempColor = aLightColor;
|
|
aLightColor = aShadowColor;
|
|
aShadowColor = aTempColor;
|
|
}
|
|
|
|
DrawFrame( rRect, aLightColor, aShadowColor );
|
|
}
|
|
|
|
// =======================================================================
|
|
|
|
static void ImplDrawDPILineRect( OutputDevice* pDev, Rectangle& rRect,
|
|
const Color* pColor, sal_Bool bRound = sal_False )
|
|
{
|
|
long nLineWidth = pDev->ImplGetDPIX()/300;
|
|
long nLineHeight = pDev->ImplGetDPIY()/300;
|
|
if ( !nLineWidth )
|
|
nLineWidth = 1;
|
|
if ( !nLineHeight )
|
|
nLineHeight = 1;
|
|
|
|
if ( pColor )
|
|
{
|
|
if ( (nLineWidth == 1) && (nLineHeight == 1) )
|
|
{
|
|
pDev->SetLineColor( *pColor );
|
|
pDev->SetFillColor();
|
|
if( bRound )
|
|
{
|
|
pDev->DrawLine( Point( rRect.Left()+1, rRect.Top()), Point( rRect.Right()-1, rRect.Top()) );
|
|
pDev->DrawLine( Point( rRect.Left()+1, rRect.Bottom()), Point( rRect.Right()-1, rRect.Bottom()) );
|
|
pDev->DrawLine( Point( rRect.Left(), rRect.Top()+1), Point( rRect.Left(), rRect.Bottom()-1) );
|
|
pDev->DrawLine( Point( rRect.Right(), rRect.Top()+1), Point( rRect.Right(), rRect.Bottom()-1) );
|
|
}
|
|
else
|
|
pDev->DrawRect( rRect );
|
|
}
|
|
else
|
|
{
|
|
long nWidth = rRect.GetWidth();
|
|
long nHeight = rRect.GetHeight();
|
|
pDev->SetLineColor();
|
|
pDev->SetFillColor( *pColor );
|
|
pDev->DrawRect( Rectangle( rRect.TopLeft(), Size( nWidth, nLineHeight ) ) );
|
|
pDev->DrawRect( Rectangle( rRect.TopLeft(), Size( nLineWidth, nHeight ) ) );
|
|
pDev->DrawRect( Rectangle( Point( rRect.Left(), rRect.Bottom()-nLineHeight ),
|
|
Size( nWidth, nLineHeight ) ) );
|
|
pDev->DrawRect( Rectangle( Point( rRect.Right()-nLineWidth, rRect.Top() ),
|
|
Size( nLineWidth, nHeight ) ) );
|
|
}
|
|
}
|
|
|
|
rRect.Left() += nLineWidth;
|
|
rRect.Top() += nLineHeight;
|
|
rRect.Right() -= nLineWidth;
|
|
rRect.Bottom() -= nLineHeight;
|
|
}
|
|
|
|
// =======================================================================
|
|
|
|
static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
|
|
const StyleSettings& rStyleSettings, sal_uInt16 nStyle )
|
|
{
|
|
// mask menu style
|
|
sal_Bool bMenuStyle = (nStyle & FRAME_DRAW_MENU) ? sal_True : sal_False;
|
|
nStyle &= ~FRAME_DRAW_MENU;
|
|
|
|
Window *pWin = NULL;
|
|
if( pDev->GetOutDevType() == OUTDEV_WINDOW )
|
|
pWin = (Window*) pDev;
|
|
|
|
// UseFlatBorders disables 3D style for all frames except menus
|
|
// menus may use different border colors (eg on XP)
|
|
// normal frames will be drawn using the shadow color
|
|
// whereas window frame borders will use black
|
|
sal_Bool bFlatBorders = ( !bMenuStyle && rStyleSettings.GetUseFlatBorders() );
|
|
|
|
// no flat borders for standard VCL controls (ie formcontrols that keep their classic look)
|
|
// will not affect frame windows (like dropdowns)
|
|
if( bFlatBorders && pWin && pWin->GetType() == WINDOW_BORDERWINDOW && (pWin != pWin->ImplGetFrameWindow()) )
|
|
{
|
|
// check for formcontrol, i.e., a control without NWF enabled
|
|
Control *pControl = dynamic_cast< Control* >( pWin->GetWindow( WINDOW_CLIENT ) );
|
|
if( pControl && pControl->IsNativeWidgetEnabled() )
|
|
bFlatBorders = sal_True;
|
|
else
|
|
bFlatBorders = sal_False;
|
|
}
|
|
|
|
// no round corners for window frame borders
|
|
sal_Bool bRound = (bFlatBorders && !(nStyle & FRAME_DRAW_WINDOWBORDER));
|
|
|
|
if ( (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) ||
|
|
(pDev->GetOutDevType() == OUTDEV_PRINTER) ||
|
|
bFlatBorders )
|
|
nStyle |= FRAME_DRAW_MONO;
|
|
|
|
if ( nStyle & FRAME_DRAW_NODRAW )
|
|
{
|
|
sal_uInt16 nValueStyle = bMenuStyle ? nStyle | FRAME_DRAW_MENU : nStyle;
|
|
if( pWin->GetType() == WINDOW_BORDERWINDOW )
|
|
nValueStyle |= FRAME_DRAW_BORDERWINDOWBORDER;
|
|
ImplControlValue aControlValue( nValueStyle );
|
|
Rectangle aBound, aContent;
|
|
Rectangle aNatRgn( rRect );
|
|
if(pWin && pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
|
|
aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
|
|
{
|
|
rRect = aContent;
|
|
}
|
|
else if ( nStyle & FRAME_DRAW_MONO )
|
|
ImplDrawDPILineRect( pDev, rRect, NULL, bRound );
|
|
else
|
|
{
|
|
sal_uInt16 nFrameStyle = nStyle & FRAME_DRAW_STYLE;
|
|
|
|
if ( nFrameStyle == FRAME_DRAW_GROUP )
|
|
{
|
|
rRect.Left() += 2;
|
|
rRect.Top() += 2;
|
|
rRect.Right() -= 2;
|
|
rRect.Bottom() -= 2;
|
|
}
|
|
else if ( (nFrameStyle == FRAME_DRAW_IN) ||
|
|
(nFrameStyle == FRAME_DRAW_OUT) )
|
|
{
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
}
|
|
else // FRAME_DRAW_DOUBLEIN || FRAME_DRAW_DOUBLEOUT
|
|
{
|
|
rRect.Left() += 2;
|
|
rRect.Top() += 2;
|
|
rRect.Right() -= 2;
|
|
rRect.Bottom() -= 2;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if( pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) )
|
|
{
|
|
sal_uInt16 nValueStyle = bMenuStyle ? nStyle | FRAME_DRAW_MENU : nStyle;
|
|
if( pWin->GetType() == WINDOW_BORDERWINDOW )
|
|
nValueStyle |= FRAME_DRAW_BORDERWINDOWBORDER;
|
|
ImplControlValue aControlValue( nValueStyle );
|
|
Rectangle aBound, aContent;
|
|
Rectangle aNatRgn( rRect );
|
|
if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
|
|
aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
|
|
{
|
|
if( pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED,
|
|
aControlValue, rtl::OUString()) )
|
|
{
|
|
rRect = aContent;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( nStyle & FRAME_DRAW_MONO )
|
|
{
|
|
Color aColor = bRound ? rStyleSettings.GetShadowColor()
|
|
: pDev->GetSettings().GetStyleSettings().GetMonoColor();
|
|
// when the MonoColor wasn't set, check face color
|
|
if (
|
|
(bRound && aColor.IsDark()) ||
|
|
(
|
|
(aColor == Color(COL_BLACK)) &&
|
|
(pDev->GetSettings().GetStyleSettings().GetFaceColor().IsDark())
|
|
)
|
|
)
|
|
{
|
|
aColor = Color( COL_WHITE );
|
|
}
|
|
ImplDrawDPILineRect( pDev, rRect, &aColor, bRound );
|
|
}
|
|
else
|
|
{
|
|
sal_uInt16 nFrameStyle = nStyle & FRAME_DRAW_STYLE;
|
|
if ( nFrameStyle == FRAME_DRAW_GROUP )
|
|
{
|
|
pDev->SetFillColor();
|
|
pDev->SetLineColor( rStyleSettings.GetLightColor() );
|
|
rRect.Top()++;
|
|
rRect.Left()++;
|
|
pDev->DrawRect( rRect );
|
|
rRect.Top()--;
|
|
rRect.Left()--;
|
|
pDev->SetLineColor( rStyleSettings.GetShadowColor() );
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
pDev->DrawRect( rRect );
|
|
rRect.Right()++;
|
|
rRect.Bottom()++;
|
|
}
|
|
else
|
|
{
|
|
pDev->SetLineColor();
|
|
|
|
if ( (nFrameStyle == FRAME_DRAW_IN) ||
|
|
(nFrameStyle == FRAME_DRAW_OUT) )
|
|
{
|
|
if ( nFrameStyle == FRAME_DRAW_IN )
|
|
{
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetShadowColor(),
|
|
rStyleSettings.GetLightColor() );
|
|
}
|
|
else
|
|
{
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetLightColor(),
|
|
rStyleSettings.GetShadowColor() );
|
|
}
|
|
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
}
|
|
else // FRAME_DRAW_DOUBLEIN || FRAME_DRAW_DOUBLEOUT
|
|
{
|
|
if ( nFrameStyle == FRAME_DRAW_DOUBLEIN )
|
|
{
|
|
if( bFlatBorders ) // no 3d effect
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetShadowColor(),
|
|
rStyleSettings.GetShadowColor() );
|
|
else
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetShadowColor(),
|
|
rStyleSettings.GetLightColor() );
|
|
}
|
|
else
|
|
{
|
|
if( bMenuStyle )
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetMenuBorderColor(),
|
|
rStyleSettings.GetDarkShadowColor() );
|
|
else
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
bFlatBorders ? // no 3d effect
|
|
rStyleSettings.GetDarkShadowColor() :
|
|
rStyleSettings.GetLightBorderColor(),
|
|
rStyleSettings.GetDarkShadowColor() );
|
|
|
|
}
|
|
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
|
|
sal_Bool bDrawn = sal_True;
|
|
if ( nFrameStyle == FRAME_DRAW_DOUBLEIN )
|
|
{
|
|
if( bFlatBorders ) // no 3d effect
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetFaceColor(),
|
|
rStyleSettings.GetFaceColor() );
|
|
else
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetDarkShadowColor(),
|
|
rStyleSettings.GetLightBorderColor() );
|
|
}
|
|
else
|
|
{
|
|
// flat menues have no shadow border
|
|
if( !bMenuStyle || !rStyleSettings.GetUseFlatMenues() )
|
|
pDev->ImplDraw2ColorFrame( rRect,
|
|
rStyleSettings.GetLightColor(),
|
|
rStyleSettings.GetShadowColor() );
|
|
else
|
|
bDrawn = sal_False;
|
|
}
|
|
if( bDrawn )
|
|
{
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle )
|
|
{
|
|
Rectangle aRect = rRect;
|
|
sal_Bool bOldMap = mpOutDev->IsMapModeEnabled();
|
|
if ( bOldMap )
|
|
{
|
|
aRect = mpOutDev->LogicToPixel( aRect );
|
|
mpOutDev->EnableMapMode( sal_False );
|
|
}
|
|
|
|
if ( !rRect.IsEmpty() )
|
|
{
|
|
if ( nStyle & FRAME_DRAW_NODRAW )
|
|
ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle );
|
|
else
|
|
{
|
|
Color maOldLineColor = mpOutDev->GetLineColor();
|
|
Color maOldFillColor = mpOutDev->GetFillColor();
|
|
ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle );
|
|
mpOutDev->SetLineColor( maOldLineColor );
|
|
mpOutDev->SetFillColor( maOldFillColor );
|
|
}
|
|
}
|
|
|
|
if ( bOldMap )
|
|
{
|
|
mpOutDev->EnableMapMode( bOldMap );
|
|
aRect = mpOutDev->PixelToLogic( aRect );
|
|
}
|
|
|
|
return aRect;
|
|
}
|
|
|
|
// =======================================================================
|
|
|
|
static void ImplDrawButton( OutputDevice* pDev, Rectangle& rRect,
|
|
const StyleSettings& rStyleSettings, sal_uInt16 nStyle )
|
|
{
|
|
Rectangle aFillRect = rRect;
|
|
|
|
if ( nStyle & BUTTON_DRAW_MONO )
|
|
{
|
|
if ( !(nStyle & BUTTON_DRAW_NODRAW) )
|
|
{
|
|
Color aBlackColor( COL_BLACK );
|
|
|
|
if ( nStyle & BUTTON_DRAW_DEFAULT )
|
|
ImplDrawDPILineRect( pDev, aFillRect, &aBlackColor );
|
|
|
|
ImplDrawDPILineRect( pDev, aFillRect, &aBlackColor );
|
|
|
|
Size aBrdSize( 1, 1 );
|
|
if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
|
|
{
|
|
MapMode aResMapMode( MAP_100TH_MM );
|
|
aBrdSize = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
|
|
if ( !aBrdSize.Width() )
|
|
aBrdSize.Width() = 1;
|
|
if ( !aBrdSize.Height() )
|
|
aBrdSize.Height() = 1;
|
|
}
|
|
pDev->SetLineColor();
|
|
pDev->SetFillColor( aBlackColor );
|
|
Rectangle aRect1;
|
|
Rectangle aRect2;
|
|
aRect1.Left() = aFillRect.Left();
|
|
aRect1.Right() = aFillRect.Right(),
|
|
aRect2.Top() = aFillRect.Top();
|
|
aRect2.Bottom() = aFillRect.Bottom();
|
|
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
|
|
{
|
|
aRect1.Top() = aFillRect.Top();
|
|
aRect1.Bottom() = aBrdSize.Height()-1;
|
|
aRect2.Left() = aFillRect.Left();
|
|
aRect2.Right() = aFillRect.Left()+aBrdSize.Width()-1;
|
|
aFillRect.Left() += aBrdSize.Width();
|
|
aFillRect.Top() += aBrdSize.Height();
|
|
}
|
|
else
|
|
{
|
|
aRect1.Top() = aFillRect.Bottom()-aBrdSize.Height()+1;
|
|
aRect1.Bottom() = aFillRect.Bottom();
|
|
aRect2.Left() = aFillRect.Right()-aBrdSize.Width()+1;
|
|
aRect2.Right() = aFillRect.Right(),
|
|
aFillRect.Right() -= aBrdSize.Width();
|
|
aFillRect.Bottom() -= aBrdSize.Height();
|
|
}
|
|
pDev->DrawRect( aRect1 );
|
|
pDev->DrawRect( aRect2 );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if ( !(nStyle & BUTTON_DRAW_NODRAW) )
|
|
{
|
|
if ( nStyle & BUTTON_DRAW_DEFAULT )
|
|
{
|
|
Color aDefBtnColor = rStyleSettings.GetDarkShadowColor();
|
|
ImplDrawDPILineRect( pDev, aFillRect, &aDefBtnColor );
|
|
}
|
|
}
|
|
|
|
if ( !(nStyle & BUTTON_DRAW_NODRAW) )
|
|
{
|
|
pDev->SetLineColor();
|
|
if ( nStyle & BUTTON_DRAW_NOLEFTLIGHTBORDER )
|
|
{
|
|
pDev->SetFillColor( rStyleSettings.GetLightBorderColor() );
|
|
pDev->DrawRect( Rectangle( aFillRect.Left(), aFillRect.Top(),
|
|
aFillRect.Left(), aFillRect.Bottom() ) );
|
|
aFillRect.Left()++;
|
|
}
|
|
if ( (nStyle & BUTTON_DRAW_NOTOPLIGHTBORDER) &&
|
|
!(nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED)) )
|
|
{
|
|
pDev->SetFillColor( rStyleSettings.GetLightBorderColor() );
|
|
pDev->DrawRect( Rectangle( aFillRect.Left(), aFillRect.Top(),
|
|
aFillRect.Right(), aFillRect.Top() ) );
|
|
aFillRect.Top()++;
|
|
}
|
|
if ( (( (nStyle & BUTTON_DRAW_NOBOTTOMSHADOWBORDER) | BUTTON_DRAW_FLAT) == (BUTTON_DRAW_NOBOTTOMSHADOWBORDER | BUTTON_DRAW_FLAT)) &&
|
|
!(nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED | BUTTON_DRAW_HIGHLIGHT)) )
|
|
{
|
|
pDev->SetFillColor( rStyleSettings.GetDarkShadowColor() );
|
|
pDev->DrawRect( Rectangle( aFillRect.Left(), aFillRect.Bottom(),
|
|
aFillRect.Right(), aFillRect.Bottom() ) );
|
|
aFillRect.Bottom()--;
|
|
}
|
|
|
|
Color aColor1;
|
|
Color aColor2;
|
|
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
|
|
{
|
|
aColor1 = rStyleSettings.GetDarkShadowColor();
|
|
aColor2 = rStyleSettings.GetLightColor();
|
|
}
|
|
else
|
|
{
|
|
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
|
|
aColor1 = rStyleSettings.GetLightBorderColor();
|
|
else
|
|
aColor1 = rStyleSettings.GetLightColor();
|
|
if ( (nStyle & BUTTON_DRAW_FLATTEST) == BUTTON_DRAW_FLAT )
|
|
aColor2 = rStyleSettings.GetShadowColor();
|
|
else
|
|
aColor2 = rStyleSettings.GetDarkShadowColor();
|
|
}
|
|
pDev->ImplDraw2ColorFrame( aFillRect, aColor1, aColor2 );
|
|
aFillRect.Left()++;
|
|
aFillRect.Top()++;
|
|
aFillRect.Right()--;
|
|
aFillRect.Bottom()--;
|
|
|
|
if ( !((nStyle & BUTTON_DRAW_FLATTEST) == BUTTON_DRAW_FLAT) )
|
|
{
|
|
if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
|
|
{
|
|
aColor1 = rStyleSettings.GetShadowColor();
|
|
aColor2 = rStyleSettings.GetLightBorderColor();
|
|
}
|
|
else
|
|
{
|
|
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
|
|
aColor1 = rStyleSettings.GetLightColor();
|
|
else
|
|
aColor1 = rStyleSettings.GetLightBorderColor();
|
|
aColor2 = rStyleSettings.GetShadowColor();
|
|
}
|
|
pDev->ImplDraw2ColorFrame( aFillRect, aColor1, aColor2 );
|
|
aFillRect.Left()++;
|
|
aFillRect.Top()++;
|
|
aFillRect.Right()--;
|
|
aFillRect.Bottom()--;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( !(nStyle & (BUTTON_DRAW_NOFILL | BUTTON_DRAW_NODRAW)) )
|
|
{
|
|
pDev->SetLineColor();
|
|
if ( nStyle & BUTTON_DRAW_MONO )
|
|
{
|
|
// Hack: Auf Druckern wollen wir im MonoChrom-Modus trotzdem
|
|
// erstmal graue Buttons haben
|
|
if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
|
|
pDev->SetFillColor( Color( COL_LIGHTGRAY ) );
|
|
else
|
|
pDev->SetFillColor( Color( COL_WHITE ) );
|
|
}
|
|
else
|
|
{
|
|
if ( nStyle & (BUTTON_DRAW_CHECKED | BUTTON_DRAW_DONTKNOW) )
|
|
pDev->SetFillColor( rStyleSettings.GetCheckedColor() );
|
|
else
|
|
pDev->SetFillColor( rStyleSettings.GetFaceColor() );
|
|
}
|
|
pDev->DrawRect( aFillRect );
|
|
}
|
|
|
|
// Ein Border freilassen, der jedoch bei Default-Darstellung
|
|
// mitbenutzt wird
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
rRect.Right()--;
|
|
rRect.Bottom()--;
|
|
|
|
if ( nStyle & BUTTON_DRAW_NOLIGHTBORDER )
|
|
{
|
|
rRect.Left()++;
|
|
rRect.Top()++;
|
|
}
|
|
else if ( nStyle & BUTTON_DRAW_NOLEFTLIGHTBORDER )
|
|
rRect.Left()++;
|
|
|
|
if ( nStyle & BUTTON_DRAW_PRESSED )
|
|
{
|
|
if ( (rRect.GetHeight() > 10) && (rRect.GetWidth() > 10) )
|
|
{
|
|
rRect.Left() += 4;
|
|
rRect.Top() += 4;
|
|
rRect.Right() -= 1;
|
|
rRect.Bottom() -= 1;
|
|
}
|
|
else
|
|
{
|
|
rRect.Left() += 3;
|
|
rRect.Top() += 3;
|
|
rRect.Right() -= 2;
|
|
rRect.Bottom() -= 2;
|
|
}
|
|
}
|
|
else if ( nStyle & BUTTON_DRAW_CHECKED )
|
|
{
|
|
rRect.Left() += 3;
|
|
rRect.Top() += 3;
|
|
rRect.Right() -= 2;
|
|
rRect.Bottom() -= 2;
|
|
}
|
|
else
|
|
{
|
|
rRect.Left() += 2;
|
|
rRect.Top() += 2;
|
|
rRect.Right() -= 3;
|
|
rRect.Bottom() -= 3;
|
|
}
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle )
|
|
{
|
|
Rectangle aRect = rRect;
|
|
sal_Bool bOldMap = mpOutDev->IsMapModeEnabled();
|
|
if ( bOldMap )
|
|
{
|
|
aRect = mpOutDev->LogicToPixel( aRect );
|
|
mpOutDev->EnableMapMode( sal_False );
|
|
}
|
|
|
|
if ( !rRect.IsEmpty() )
|
|
{
|
|
const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
|
|
|
|
if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO )
|
|
nStyle |= BUTTON_DRAW_MONO;
|
|
|
|
if ( nStyle & BUTTON_DRAW_NODRAW )
|
|
ImplDrawButton( mpOutDev, aRect, rStyleSettings, nStyle );
|
|
else
|
|
{
|
|
Color maOldLineColor = mpOutDev->GetLineColor();
|
|
Color maOldFillColor = mpOutDev->GetFillColor();
|
|
ImplDrawButton( mpOutDev, aRect, rStyleSettings, nStyle );
|
|
mpOutDev->SetLineColor( maOldLineColor );
|
|
mpOutDev->SetFillColor( maOldFillColor );
|
|
}
|
|
}
|
|
|
|
if ( bOldMap )
|
|
{
|
|
mpOutDev->EnableMapMode( bOldMap );
|
|
aRect = mpOutDev->PixelToLogic( aRect );
|
|
}
|
|
|
|
return aRect;
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical )
|
|
{
|
|
Point aStart( rStart ), aStop( rStop );
|
|
const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings();
|
|
|
|
mpOutDev->Push( PUSH_LINECOLOR );
|
|
if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO )
|
|
mpOutDev->SetLineColor( Color( COL_BLACK ) );
|
|
else
|
|
mpOutDev->SetLineColor( rStyleSettings.GetShadowColor() );
|
|
|
|
mpOutDev->DrawLine( aStart, aStop );
|
|
if ( !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
|
|
{
|
|
mpOutDev->SetLineColor( rStyleSettings.GetLightColor() );
|
|
if( bVertical )
|
|
{
|
|
aStart.X()++;
|
|
aStop.X()++;
|
|
}
|
|
else
|
|
{
|
|
aStart.Y()++;
|
|
aStop.Y()++;
|
|
}
|
|
mpOutDev->DrawLine( aStart, aStop );
|
|
}
|
|
mpOutDev->Pop();
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|