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
1117 lines
39 KiB
C++
1117 lines
39 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_toolkit.hxx"
|
|
|
|
|
|
#include <toolkit/awt/vclxmenu.hxx>
|
|
#include <toolkit/helper/macros.hxx>
|
|
#include <toolkit/helper/servicenames.hxx>
|
|
#include <toolkit/helper/vclunohelper.hxx>
|
|
#include <toolkit/helper/convert.hxx>
|
|
#include <cppuhelper/typeprovider.hxx>
|
|
#include <rtl/memory.h>
|
|
#include <rtl/uuid.h>
|
|
#include <osl/mutex.hxx>
|
|
|
|
#include <vcl/menu.hxx>
|
|
#include <vcl/keycod.hxx>
|
|
#include <vcl/image.hxx>
|
|
#include <vcl/mnemonic.hxx>
|
|
#include <vcl/svapp.hxx>
|
|
|
|
#include <com/sun/star/awt/KeyModifier.hpp>
|
|
|
|
|
|
#ifdef DBG_UTIL
|
|
#define THROW_MENUITEM_NOT_FOUND( Func, nItemId ) \
|
|
if ( MENU_ITEM_NOTFOUND == mpMenu->GetItemPos( nItemId ) ) \
|
|
throw ::com::sun::star::container::NoSuchElementException( \
|
|
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Func ) ) \
|
|
+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": There is no menu item with " ) ) \
|
|
+= ::rtl::OUString::valueOf( sal_Int32( nItemId ) ) \
|
|
+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " as identifier" ) ), \
|
|
*this \
|
|
);
|
|
#define THROW_MENUPOS_NOT_FOUND( Func, nPos ) \
|
|
if ( MENU_ITEM_NOTFOUND == sal_uInt16( nPos ) ) \
|
|
throw ::com::sun::star::container::NoSuchElementException( \
|
|
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Func ) ) \
|
|
+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": There is no menu item at position " ) ) \
|
|
+= ::rtl::OUString::valueOf( sal_Int32( nPos ) ), \
|
|
*this \
|
|
);
|
|
#else
|
|
#define THROW_MENUITEM_NOT_FOUND( Func, nItemId ) \
|
|
if ( MENU_ITEM_NOTFOUND == mpMenu->GetItemPos( nItemId ) ) \
|
|
throw ::com::sun::star::container::NoSuchElementException();
|
|
#define THROW_MENUPOS_NOT_FOUND( Func, nPos ) \
|
|
if ( MENU_ITEM_NOTFOUND == sal_uInt16( nPos ) ) \
|
|
throw ::com::sun::star::container::NoSuchElementException();
|
|
#endif
|
|
|
|
|
|
// ----------------------------------------------------
|
|
// class VCLXMenu
|
|
// ----------------------------------------------------
|
|
|
|
DBG_NAME(VCLXMenu)
|
|
|
|
VCLXMenu::VCLXMenu() : maMenuListeners( *this )
|
|
{
|
|
DBG_CTOR( VCLXMenu, 0 );
|
|
mpMenu = NULL;
|
|
}
|
|
|
|
VCLXMenu::VCLXMenu( Menu* pMenu ) : maMenuListeners( *this )
|
|
{
|
|
DBG_CTOR( VCLXMenu, 0 );
|
|
mpMenu = pMenu;
|
|
}
|
|
|
|
VCLXMenu::~VCLXMenu()
|
|
{
|
|
DBG_DTOR( VCLXMenu, 0 );
|
|
for ( size_t n = maPopupMenueRefs.size(); n; ) {
|
|
delete maPopupMenueRefs[ --n ];
|
|
}
|
|
if ( mpMenu )
|
|
{
|
|
mpMenu->RemoveEventListener( LINK( this, VCLXMenu, MenuEventListener ) );
|
|
delete mpMenu;
|
|
}
|
|
}
|
|
|
|
sal_Bool VCLXMenu::IsPopupMenu() const
|
|
{
|
|
return (mpMenu && ! mpMenu->IsMenuBar());
|
|
}
|
|
|
|
void VCLXMenu::ImplCreateMenu( sal_Bool bPopup )
|
|
{
|
|
DBG_ASSERT( !mpMenu, "CreateMenu: Menu exists!" );
|
|
|
|
if ( bPopup )
|
|
mpMenu = new PopupMenu;
|
|
else
|
|
mpMenu = new MenuBar;
|
|
|
|
mpMenu->AddEventListener( LINK( this, VCLXMenu, MenuEventListener ) );
|
|
}
|
|
|
|
IMPL_LINK( VCLXMenu, MenuEventListener, VclSimpleEvent*, pEvent )
|
|
{
|
|
DBG_ASSERT( pEvent && pEvent->ISA( VclMenuEvent ), "Unknown Event!" );
|
|
if ( pEvent && pEvent->ISA( VclMenuEvent ) )
|
|
{
|
|
DBG_ASSERT( ((VclMenuEvent*)pEvent)->GetMenu() && mpMenu, "Menu???" );
|
|
|
|
VclMenuEvent* pMenuEvent = (VclMenuEvent*)pEvent;
|
|
if ( pMenuEvent->GetMenu() == mpMenu ) // Also called for the root menu
|
|
{
|
|
switch ( pMenuEvent->GetId() )
|
|
{
|
|
case VCLEVENT_MENU_SELECT:
|
|
{
|
|
if ( maMenuListeners.getLength() )
|
|
{
|
|
::com::sun::star::awt::MenuEvent aEvent;
|
|
aEvent.Source = (::cppu::OWeakObject*)this;
|
|
aEvent.MenuId = mpMenu->GetCurItemId();
|
|
maMenuListeners.select( aEvent );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_OBJECT_DYING:
|
|
{
|
|
mpMenu = NULL;
|
|
}
|
|
break;
|
|
case VCLEVENT_MENU_HIGHLIGHT:
|
|
{
|
|
if ( maMenuListeners.getLength() )
|
|
{
|
|
::com::sun::star::awt::MenuEvent aEvent;
|
|
aEvent.Source = (::cppu::OWeakObject*)this;
|
|
aEvent.MenuId = mpMenu->GetCurItemId();
|
|
maMenuListeners.highlight( aEvent );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_MENU_ACTIVATE:
|
|
{
|
|
if ( maMenuListeners.getLength() )
|
|
{
|
|
::com::sun::star::awt::MenuEvent aEvent;
|
|
aEvent.Source = (::cppu::OWeakObject*)this;
|
|
aEvent.MenuId = mpMenu->GetCurItemId();
|
|
maMenuListeners.activate( aEvent );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_MENU_DEACTIVATE:
|
|
{
|
|
if ( maMenuListeners.getLength() )
|
|
{
|
|
::com::sun::star::awt::MenuEvent aEvent;
|
|
aEvent.Source = (::cppu::OWeakObject*)this;
|
|
aEvent.MenuId = mpMenu->GetCurItemId();
|
|
maMenuListeners.deactivate( aEvent );
|
|
}
|
|
}
|
|
break;
|
|
|
|
// ignore accessibility events
|
|
case VCLEVENT_MENU_ENABLE:
|
|
case VCLEVENT_MENU_INSERTITEM:
|
|
case VCLEVENT_MENU_REMOVEITEM:
|
|
case VCLEVENT_MENU_SUBMENUACTIVATE:
|
|
case VCLEVENT_MENU_SUBMENUDEACTIVATE:
|
|
case VCLEVENT_MENU_SUBMENUCHANGED:
|
|
case VCLEVENT_MENU_DEHIGHLIGHT:
|
|
case VCLEVENT_MENU_DISABLE:
|
|
case VCLEVENT_MENU_ITEMTEXTCHANGED:
|
|
case VCLEVENT_MENU_ITEMCHECKED:
|
|
case VCLEVENT_MENU_ITEMUNCHECKED:
|
|
case VCLEVENT_MENU_SHOW:
|
|
case VCLEVENT_MENU_HIDE:
|
|
break;
|
|
|
|
default: OSL_FAIL( "MenuEventListener - Unknown event!" );
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
//=============================================================================
|
|
//=============================================================================
|
|
//=============================================================================
|
|
|
|
|
|
// ::com::sun::star::lang::XServiceInfo
|
|
::rtl::OUString SAL_CALL VCLXMenu::getImplementationName( )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
|
|
const sal_Bool bIsPopupMenu = IsPopupMenu();
|
|
aGuard.clear();
|
|
|
|
::rtl::OUString implName( RTL_CONSTASCII_USTRINGPARAM( "stardiv.Toolkit." ) );
|
|
if ( bIsPopupMenu )
|
|
implName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VCLXPopupMenu" ) );
|
|
else
|
|
implName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VCLXMenuBar" ) );
|
|
|
|
return implName;
|
|
}
|
|
|
|
|
|
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL VCLXMenu::getSupportedServiceNames( )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
|
|
const sal_Bool bIsPopupMenu = IsPopupMenu();
|
|
aGuard.clear();
|
|
|
|
::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 );
|
|
if ( bIsPopupMenu )
|
|
aNames[ 0 ] = ::rtl::OUString::createFromAscii( szServiceName2_PopupMenu );
|
|
else
|
|
aNames[ 0 ] = ::rtl::OUString::createFromAscii( szServiceName2_MenuBar );
|
|
|
|
return aNames;
|
|
}
|
|
|
|
|
|
::sal_Bool SAL_CALL VCLXMenu::supportsService( const ::rtl::OUString& rServiceName )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::com::sun::star::uno::Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() );
|
|
|
|
if ( aServiceNames[ 0 ] == rServiceName )
|
|
return sal_True;
|
|
|
|
return sal_False;
|
|
}
|
|
|
|
|
|
// ::com::sun::star::uno::XInterface
|
|
::com::sun::star::uno::Any VCLXMenu::queryInterface( const ::com::sun::star::uno::Type & rType )
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
|
|
const sal_Bool bIsPopupMenu = IsPopupMenu();
|
|
aGuard.clear();
|
|
|
|
::com::sun::star::uno::Any aRet;
|
|
|
|
if ( bIsPopupMenu )
|
|
aRet = ::cppu::queryInterface( rType,
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenu*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenuExtended*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XPopupMenuExtended*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XPopupMenuExtended*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
|
|
else
|
|
aRet = ::cppu::queryInterface( rType,
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBar*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBarExtended*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XMenuBarExtended*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XMenuBarExtended*) this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ),
|
|
SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
|
|
|
|
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
|
|
}
|
|
|
|
// ::com::sun::star::lang::XUnoTunnel
|
|
IMPL_XUNOTUNNEL( VCLXMenu )
|
|
|
|
// ::com::sun::star::lang::XTypeProvider
|
|
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > VCLXMenu::getTypes()
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
|
|
const sal_Bool bIsPopupMenu = IsPopupMenu();
|
|
aGuard.clear();
|
|
|
|
static ::cppu::OTypeCollection* pCollectionMenuBar = NULL;
|
|
static ::cppu::OTypeCollection* pCollectionPopupMenu = NULL;
|
|
|
|
if ( bIsPopupMenu )
|
|
{
|
|
if( !pCollectionPopupMenu )
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
|
|
if( !pCollectionPopupMenu )
|
|
{
|
|
static ::cppu::OTypeCollection collectionPopupMenu(
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenu>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenuExtended>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuExtended>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuExtended2>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>* ) NULL ) );
|
|
pCollectionPopupMenu = &collectionPopupMenu;
|
|
}
|
|
}
|
|
|
|
return (*pCollectionPopupMenu).getTypes();
|
|
}
|
|
else
|
|
{
|
|
if( !pCollectionMenuBar )
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
|
|
if( !pCollectionMenuBar )
|
|
{
|
|
static ::cppu::OTypeCollection collectionMenuBar(
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenu>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBarExtended>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuExtended>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuExtended2>* ) NULL ),
|
|
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>* ) NULL ) );
|
|
pCollectionMenuBar = &collectionMenuBar;
|
|
}
|
|
}
|
|
return (*pCollectionMenuBar).getTypes();
|
|
}
|
|
}
|
|
|
|
|
|
::com::sun::star::uno::Sequence< sal_Int8 > VCLXMenu::getImplementationId()
|
|
throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
|
|
const sal_Bool bIsPopupMenu = IsPopupMenu();
|
|
aGuard.clear();
|
|
|
|
static ::cppu::OImplementationId* pIdMenuBar = NULL;
|
|
static ::cppu::OImplementationId* pIdPopupMenu = NULL;
|
|
|
|
if ( bIsPopupMenu )
|
|
{
|
|
if( !pIdPopupMenu )
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
|
|
if( !pIdPopupMenu )
|
|
{
|
|
static ::cppu::OImplementationId idPopupMenu( sal_False );
|
|
pIdPopupMenu = &idPopupMenu;
|
|
}
|
|
}
|
|
|
|
return (*pIdPopupMenu).getImplementationId();
|
|
}
|
|
else
|
|
{
|
|
if( !pIdMenuBar )
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
|
|
if( !pIdMenuBar )
|
|
{
|
|
static ::cppu::OImplementationId idMenuBar( sal_False );
|
|
pIdMenuBar = &idMenuBar;
|
|
}
|
|
}
|
|
|
|
return (*pIdMenuBar).getImplementationId();
|
|
}
|
|
}
|
|
|
|
|
|
//=============================================================================
|
|
//=============================================================================
|
|
//=============================================================================
|
|
|
|
|
|
void VCLXMenu::addMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
maMenuListeners.addInterface( rxListener );
|
|
}
|
|
|
|
void VCLXMenu::removeMenuListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
maMenuListeners.removeInterface( rxListener );
|
|
}
|
|
|
|
void VCLXMenu::insertItem( sal_Int16 nItemId, const ::rtl::OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->InsertItem( nItemId, aText, (MenuItemBits)nItemStyle, nPos );
|
|
}
|
|
|
|
void VCLXMenu::removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
sal_Int32 nItemCount = (sal_Int32)mpMenu->GetItemCount();
|
|
if ( mpMenu && ( nCount > 0 ) && ( nPos >= 0 ) && ( nPos < nItemCount ) && ( nItemCount > 0 ))
|
|
{
|
|
sal_Int16 nP = sal::static_int_cast< sal_Int16 >(
|
|
Min( (int)(nPos+nCount), (int)nItemCount ));
|
|
while( nP-nPos > 0 )
|
|
mpMenu->RemoveItem( --nP );
|
|
}
|
|
}
|
|
|
|
sal_Int16 VCLXMenu::getItemCount( ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->GetItemCount() : 0;
|
|
}
|
|
|
|
sal_Int16 VCLXMenu::getItemId( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->GetItemId( nPos ) : 0;
|
|
}
|
|
|
|
sal_Int16 VCLXMenu::getItemPos( sal_Int16 nId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->GetItemPos( nId ) : 0;
|
|
}
|
|
|
|
void VCLXMenu::enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->EnableItem( nItemId, bEnable );
|
|
}
|
|
|
|
sal_Bool VCLXMenu::isItemEnabled( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->IsItemEnabled( nItemId ) : sal_False;
|
|
}
|
|
|
|
void VCLXMenu::setItemText( sal_Int16 nItemId, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->SetItemText( nItemId, aText );
|
|
}
|
|
|
|
::rtl::OUString VCLXMenu::getItemText( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::rtl::OUString aItemText;
|
|
if ( mpMenu )
|
|
aItemText = mpMenu->GetItemText( nItemId );
|
|
return aItemText;
|
|
}
|
|
|
|
void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& rxPopupMenu ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
VCLXMenu* pVCLMenu = VCLXMenu::GetImplementation( rxPopupMenu );
|
|
DBG_ASSERT( pVCLMenu && pVCLMenu->GetMenu() && pVCLMenu->IsPopupMenu(), "setPopupMenu: Invalid Menu!" );
|
|
|
|
if ( mpMenu && pVCLMenu && pVCLMenu->GetMenu() && pVCLMenu->IsPopupMenu() )
|
|
{
|
|
// Selbst eine Ref halten!
|
|
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
|
|
*pNewRef = rxPopupMenu;
|
|
maPopupMenueRefs.push_back( pNewRef );
|
|
|
|
mpMenu->SetPopupMenu( nItemId, (PopupMenu*) pVCLMenu->GetMenu() );
|
|
}
|
|
}
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > VCLXMenu::getPopupMenu( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > aRef;
|
|
Menu* pMenu = mpMenu ? mpMenu->GetPopupMenu( nItemId ) : NULL;
|
|
if ( pMenu )
|
|
{
|
|
for ( size_t n = maPopupMenueRefs.size(); n; )
|
|
{
|
|
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenueRefs[ --n ];
|
|
Menu* pM = ((VCLXMenu*)pRef->get())->GetMenu();
|
|
if ( pM == pMenu )
|
|
{
|
|
aRef = *pRef;
|
|
break;
|
|
}
|
|
}
|
|
// it seems the popup menu is not insert into maPopupMenueRefs
|
|
// if the popup men is not created by stardiv.Toolkit.VCLXPopupMenu
|
|
if( !aRef.is() )
|
|
{
|
|
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
|
|
*pNewRef = new VCLXPopupMenu( (PopupMenu*)pMenu );
|
|
aRef = *pNewRef;
|
|
}
|
|
}
|
|
return aRef;
|
|
}
|
|
|
|
// ::com::sun::star::awt::XPopupMenu
|
|
void VCLXMenu::insertSeparator( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->InsertSeparator( nPos );
|
|
}
|
|
|
|
void VCLXMenu::setDefaultItem( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->SetDefaultItem( nItemId );
|
|
}
|
|
|
|
sal_Int16 VCLXMenu::getDefaultItem( ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->GetDefaultItem() : 0;
|
|
}
|
|
|
|
void VCLXMenu::checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->CheckItem( nItemId, bCheck );
|
|
}
|
|
|
|
sal_Bool VCLXMenu::isItemChecked( sal_Int16 nItemId ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
return mpMenu ? mpMenu->IsItemChecked( nItemId ) : sal_False;
|
|
}
|
|
|
|
sal_Int16 VCLXMenu::execute( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rxWindowPeer, const ::com::sun::star::awt::Rectangle& rArea, sal_Int16 nFlags ) throw(::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
sal_Int16 nRet = 0;
|
|
if ( mpMenu && IsPopupMenu() )
|
|
nRet = ((PopupMenu*)mpMenu)->Execute( VCLUnoHelper::GetWindow( rxWindowPeer ), VCLRectangle(rArea), nFlags | POPUPMENU_NOMOUSEUPCLOSE );
|
|
return nRet;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setCommand( sal_Int16 nItemId, const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->SetItemCommand( nItemId, aCommand );
|
|
}
|
|
|
|
::rtl::OUString SAL_CALL VCLXMenu::getCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::rtl::OUString aItemCommand;
|
|
if ( mpMenu )
|
|
aItemCommand = mpMenu->GetItemCommand( nItemId );
|
|
return aItemCommand;
|
|
}
|
|
|
|
void SAL_CALL VCLXMenu::setHelpCommand( sal_Int16 nItemId, const ::rtl::OUString& aHelp ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
mpMenu->SetHelpCommand( nItemId, aHelp );
|
|
}
|
|
|
|
::rtl::OUString SAL_CALL VCLXMenu::getHelpCommand( sal_Int16 nItemId ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::rtl::OUString aHelpCommand;
|
|
if ( mpMenu )
|
|
aHelpCommand = mpMenu->GetHelpCommand( nItemId );
|
|
return aHelpCommand;
|
|
}
|
|
|
|
|
|
// ============================================================================
|
|
// ============================================================================
|
|
// ============================================================================
|
|
|
|
|
|
// BEGIN ANONYMOUS NAMESPACE
|
|
namespace
|
|
{
|
|
namespace css = ::com::sun::star;
|
|
|
|
Image lcl_XGraphic2VCLImage(
|
|
const css::uno::Reference< css::graphic::XGraphic >& xGraphic,
|
|
sal_Bool bResize )
|
|
{
|
|
Image aImage;
|
|
if ( !xGraphic.is() )
|
|
return aImage;
|
|
|
|
aImage = Image( xGraphic );
|
|
const ::Size aCurSize = aImage.GetSizePixel();
|
|
const sal_Int32 nCurWidth = aCurSize.Width();
|
|
const sal_Int32 nCurHeight = aCurSize.Height();
|
|
const sal_Int32 nIdeal( 16 );
|
|
|
|
if ( nCurWidth > 0 && nCurHeight > 0 )
|
|
{
|
|
if ( bResize && ( nCurWidth > nIdeal || nCurHeight > nIdeal ) )
|
|
{
|
|
sal_Int32 nIdealWidth = nCurWidth > nIdeal ? nIdeal : nCurWidth;
|
|
sal_Int32 nIdealHeight = nCurHeight > nIdeal ? nIdeal : nCurHeight;
|
|
|
|
::Size aNewSize( nIdealWidth, nIdealHeight );
|
|
|
|
sal_Bool bModified( sal_False );
|
|
BitmapEx aBitmapEx = aImage.GetBitmapEx();
|
|
bModified = aBitmapEx.Scale( aNewSize, BMP_SCALE_INTERPOLATE );
|
|
|
|
if ( bModified )
|
|
aImage = Image( aBitmapEx );
|
|
}
|
|
}
|
|
return aImage;
|
|
}
|
|
|
|
/**
|
|
As svtools builds after toolkit, we can not include/use
|
|
svtools/inc/acceleratorexecute.hxx
|
|
So I just copy here svt::AcceleratorExecute::st_AWTKey2VCLKey
|
|
and svt::AcceleratorExecute::st_VCLKey2AWTKey
|
|
*/
|
|
css::awt::KeyEvent lcl_VCLKey2AWTKey(const KeyCode& aVCLKey)
|
|
{
|
|
css::awt::KeyEvent aAWTKey;
|
|
aAWTKey.Modifiers = 0;
|
|
aAWTKey.KeyCode = (sal_Int16)aVCLKey.GetCode();
|
|
|
|
if (aVCLKey.IsShift())
|
|
aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT;
|
|
if (aVCLKey.IsMod1())
|
|
aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
|
|
if (aVCLKey.IsMod2())
|
|
aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
|
|
if (aVCLKey.IsMod3())
|
|
aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
|
|
|
|
return aAWTKey;
|
|
}
|
|
|
|
KeyCode lcl_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
|
|
{
|
|
sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
|
|
sal_Bool bMod1 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 );
|
|
sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 );
|
|
sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 );
|
|
sal_uInt16 nKey = (sal_uInt16)aAWTKey.KeyCode;
|
|
|
|
return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
|
|
}
|
|
|
|
} // END ANONYMOUS NAMESPACE
|
|
|
|
|
|
// ============================================================================
|
|
// ============================================================================
|
|
// ============================================================================
|
|
|
|
|
|
// XMenuExtended2 Methods
|
|
|
|
::sal_Bool SAL_CALL VCLXMenu::isPopupMenu( ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
return IsPopupMenu();
|
|
}
|
|
|
|
void SAL_CALL VCLXMenu::clear( ) throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
if ( mpMenu )
|
|
mpMenu->Clear();
|
|
}
|
|
|
|
|
|
::com::sun::star::awt::MenuItemType SAL_CALL VCLXMenu::getItemType( ::sal_Int16 nItemPos )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::com::sun::star::awt::MenuItemType aMenuItemType =
|
|
::com::sun::star::awt::MenuItemType_DONTKNOW;
|
|
if ( mpMenu )
|
|
{
|
|
THROW_MENUPOS_NOT_FOUND( "VCLXMenu::getItemType()", nItemPos )
|
|
aMenuItemType = ( (::com::sun::star::awt::MenuItemType) mpMenu->GetItemType( nItemPos ) );
|
|
}
|
|
|
|
return aMenuItemType;
|
|
}
|
|
|
|
void SAL_CALL VCLXMenu::hideDisabledEntries( ::sal_Bool bHide )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
if ( mpMenu )
|
|
{
|
|
if ( bHide )
|
|
mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
|
|
else
|
|
mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MENU_FLAG_HIDEDISABLEDENTRIES );
|
|
}
|
|
}
|
|
|
|
|
|
// ============================================================================
|
|
// ============================================================================
|
|
// ============================================================================
|
|
|
|
|
|
// XPopupMenuExtended Methods
|
|
|
|
::sal_Bool SAL_CALL VCLXMenu::isInExecute( )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
return ( (PopupMenu*) mpMenu )->IsInExecute();
|
|
else
|
|
return sal_False;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::endExecute()
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
( (PopupMenu*) mpMenu )->EndExecute();
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setLogo( const ::com::sun::star::awt::MenuLogo& aMenuLogo )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu )
|
|
{
|
|
if ( aMenuLogo.Graphic.is() )
|
|
{
|
|
Image aImage = lcl_XGraphic2VCLImage( aMenuLogo.Graphic, sal_False );
|
|
MenuLogo aVCLMenuLogo;
|
|
|
|
aVCLMenuLogo.aBitmap = aImage.GetBitmapEx();
|
|
aVCLMenuLogo.aStartColor = Color( (sal_uInt32)(aMenuLogo.StartColor) );
|
|
aVCLMenuLogo.aEndColor = Color( (sal_uInt32)(aMenuLogo.EndColor) );
|
|
|
|
mpMenu->SetLogo( aVCLMenuLogo );
|
|
}
|
|
else
|
|
mpMenu->SetLogo();
|
|
}
|
|
}
|
|
|
|
|
|
::com::sun::star::awt::MenuLogo SAL_CALL VCLXMenu::getLogo( )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::com::sun::star::awt::MenuLogo aAWTMenuLogo;
|
|
if ( mpMenu )
|
|
{
|
|
if ( mpMenu->HasLogo() )
|
|
{
|
|
MenuLogo aVCLMenuLogo = mpMenu->GetLogo();
|
|
aAWTMenuLogo.Graphic = Image(aVCLMenuLogo.aBitmap).GetXGraphic();
|
|
aAWTMenuLogo.StartColor = aVCLMenuLogo.aStartColor.GetColor();
|
|
aAWTMenuLogo.EndColor = aVCLMenuLogo.aEndColor.GetColor();
|
|
}
|
|
}
|
|
return aAWTMenuLogo;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::enableAutoMnemonics( ::sal_Bool bEnable )
|
|
throw (::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
if ( mpMenu )
|
|
{
|
|
if ( !bEnable )
|
|
mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
|
|
else
|
|
mpMenu->SetMenuFlags( mpMenu->GetMenuFlags() & ~MENU_FLAG_NOAUTOMNEMONICS );
|
|
}
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setAcceleratorKeyEvent( ::sal_Int16 nItemId,
|
|
const ::com::sun::star::awt::KeyEvent& aKeyEvent )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setAcceleratorKeyEvent()", nItemId )
|
|
KeyCode aVCLKeyCode = lcl_AWTKey2VCLKey( aKeyEvent );
|
|
mpMenu->SetAccelKey( nItemId, aVCLKeyCode );
|
|
}
|
|
}
|
|
|
|
|
|
::com::sun::star::awt::KeyEvent SAL_CALL VCLXMenu::getAcceleratorKeyEvent( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::com::sun::star::awt::KeyEvent aKeyEvent;
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getAcceleratorKeyEvent()", nItemId )
|
|
KeyCode nKeyCode = mpMenu->GetAccelKey( nItemId );
|
|
aKeyEvent = lcl_VCLKey2AWTKey( nKeyCode );
|
|
}
|
|
|
|
return aKeyEvent;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sHelpText )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setHelpText()", nItemId )
|
|
mpMenu->SetHelpText( nItemId, sHelpText );
|
|
}
|
|
}
|
|
|
|
|
|
::rtl::OUString SAL_CALL VCLXMenu::getHelpText( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
rtl::OUString sHelpText;
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getHelpText()", nItemId )
|
|
sHelpText = mpMenu->GetHelpText( nItemId );
|
|
}
|
|
|
|
return sHelpText;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setTipHelpText( ::sal_Int16 nItemId, const ::rtl::OUString& sTipHelpText )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setTipHelpText()", nItemId )
|
|
mpMenu->SetTipHelpText( nItemId, sTipHelpText );
|
|
}
|
|
}
|
|
|
|
|
|
::rtl::OUString SAL_CALL VCLXMenu::getTipHelpText( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
rtl::OUString sTipHelpText;
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getTipHelpText()", nItemId )
|
|
sTipHelpText = mpMenu->GetTipHelpText( nItemId );
|
|
}
|
|
return sTipHelpText;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setItemImage(
|
|
::sal_Int16 nItemId,
|
|
const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic, ::sal_Bool bScale )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setItemImage()", nItemId )
|
|
Image aImage = lcl_XGraphic2VCLImage( xGraphic, bScale );
|
|
mpMenu->SetItemImage( nItemId, aImage );
|
|
}
|
|
}
|
|
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL VCLXMenu::getItemImage( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > rxGraphic;
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getItemImage()", nItemId )
|
|
Image aImage = mpMenu->GetItemImage( nItemId );
|
|
if ( !!aImage )
|
|
rxGraphic = aImage.GetXGraphic();
|
|
}
|
|
return rxGraphic;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setItemImageAngle( ::sal_Int16 nItemId, ::sal_Int32 nAngle )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setItemImageAngle()", nItemId )
|
|
mpMenu->SetItemImageAngle( nItemId, nAngle );
|
|
}
|
|
}
|
|
|
|
|
|
::sal_Int32 SAL_CALL VCLXMenu::getItemImageAngle( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
::sal_Int32 nItemImageAngle( 0 );
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::getItemImageAngle()", nItemId )
|
|
nItemImageAngle = mpMenu->GetItemImageAngle( nItemId );
|
|
}
|
|
return nItemImageAngle;
|
|
}
|
|
|
|
|
|
void SAL_CALL VCLXMenu::setItemImageMirrorMode( ::sal_Int16 nItemId, ::sal_Bool bMirror )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::setItemImageMirrorMode()", nItemId )
|
|
mpMenu->SetItemImageMirrorMode( nItemId, bMirror );
|
|
}
|
|
}
|
|
|
|
|
|
::sal_Bool SAL_CALL VCLXMenu::isItemImageInMirrorMode( ::sal_Int16 nItemId )
|
|
throw ( ::com::sun::star::container::NoSuchElementException,
|
|
::com::sun::star::uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aSolarGuard;
|
|
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
|
|
|
|
sal_Bool bMirrorMode( sal_False );
|
|
if ( mpMenu && IsPopupMenu() )
|
|
{
|
|
THROW_MENUITEM_NOT_FOUND( "VCLXMenu::isItemImageInMirrorMode()", nItemId )
|
|
bMirrorMode = mpMenu->GetItemImageMirrorMode( nItemId );
|
|
}
|
|
return bMirrorMode;
|
|
}
|
|
|
|
|
|
// ----------------------------------------------------
|
|
// class VCLXMenuBar
|
|
// ----------------------------------------------------
|
|
|
|
DBG_NAME(VCLXMenuBar);
|
|
|
|
VCLXMenuBar::VCLXMenuBar()
|
|
{
|
|
DBG_CTOR( VCLXMenuBar, 0 );
|
|
ImplCreateMenu( sal_False );
|
|
}
|
|
|
|
VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar )
|
|
{
|
|
DBG_CTOR( VCLXMenuBar, 0 );
|
|
}
|
|
|
|
// ----------------------------------------------------
|
|
// class VCLXPopupMenu
|
|
// ----------------------------------------------------
|
|
|
|
DBG_NAME(VCLXPopupMenu);
|
|
|
|
VCLXPopupMenu::VCLXPopupMenu()
|
|
{
|
|
DBG_CTOR( VCLXPopupMenu, 0 );
|
|
ImplCreateMenu( sal_True );
|
|
}
|
|
|
|
VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
|
|
{
|
|
DBG_CTOR( VCLXPopupMenu, 0 );
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|