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
751 lines
28 KiB
C++
751 lines
28 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_svtools.hxx"
|
|
#include <svtools/wizardmachine.hxx>
|
|
#include <svtools/helpid.hrc>
|
|
#include <tools/debug.hxx>
|
|
#include <tools/diagnose_ex.h>
|
|
#include <vcl/msgbox.hxx>
|
|
#include <svtools/svtdata.hxx>
|
|
#include <svtools/svtools.hrc>
|
|
|
|
//.........................................................................
|
|
namespace svt
|
|
{
|
|
//.........................................................................
|
|
|
|
//=====================================================================
|
|
//= WizardPageImplData
|
|
//=====================================================================
|
|
struct WizardPageImplData
|
|
{
|
|
WizardPageImplData()
|
|
{
|
|
}
|
|
};
|
|
|
|
//=====================================================================
|
|
//= OWizardPage
|
|
//=====================================================================
|
|
//---------------------------------------------------------------------
|
|
OWizardPage::OWizardPage( Window* _pParent, WinBits _nStyle )
|
|
:TabPage( _pParent, _nStyle )
|
|
,m_pImpl( new WizardPageImplData )
|
|
{
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
OWizardPage::OWizardPage( Window* _pParent, const ResId& _rResId )
|
|
:TabPage( _pParent, _rResId )
|
|
,m_pImpl( new WizardPageImplData )
|
|
{
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
OWizardPage::~OWizardPage()
|
|
{
|
|
delete m_pImpl;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardPage::initializePage()
|
|
{
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardPage::ActivatePage()
|
|
{
|
|
TabPage::ActivatePage();
|
|
updateDialogTravelUI();
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardPage::updateDialogTravelUI()
|
|
{
|
|
OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() );
|
|
if ( pWizardMachine )
|
|
pWizardMachine->updateTravelUI();
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
bool OWizardPage::canAdvance() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
|
|
{
|
|
return sal_True;
|
|
}
|
|
|
|
//=====================================================================
|
|
//= WizardMachineImplData
|
|
//=====================================================================
|
|
struct WizardMachineImplData : public WizardTypes
|
|
{
|
|
String sTitleBase; // the base for the title
|
|
::std::stack< WizardState > aStateHistory; // the history of all states (used for implementing "Back")
|
|
|
|
WizardState nFirstUnknownPage;
|
|
// the WizardDialog does not allow non-linear transitions (e.g. it's
|
|
// not possible to add pages in a non-linear order), so we need some own maintainance data
|
|
|
|
sal_Bool m_bAutoNextButtonState;
|
|
|
|
bool m_bTravelingSuspended;
|
|
|
|
WizardMachineImplData()
|
|
:nFirstUnknownPage( 0 )
|
|
,m_bAutoNextButtonState( sal_False )
|
|
,m_bTravelingSuspended( false )
|
|
{
|
|
}
|
|
};
|
|
|
|
long OWizardMachine::calcRightHelpOffset(sal_uInt32 _nButtonFlags)
|
|
{
|
|
sal_Int32 nMask = 1;
|
|
sal_Int32 nRightAlignedButtonCount = -1;
|
|
for (unsigned int i = 0; i < 8*sizeof(_nButtonFlags); i++ )
|
|
{
|
|
if( ( _nButtonFlags & nMask ) != 0 )
|
|
nRightAlignedButtonCount++;
|
|
nMask <<= 1;
|
|
}
|
|
Size aSize = GetPageSizePixel();
|
|
sal_Int32 nTotButtonWidth = nRightAlignedButtonCount * LogicalCoordinateToPixel(50);
|
|
sal_Int32 nTotRightButtonSpaceOffset = (nRightAlignedButtonCount) * WIZARDDIALOG_BUTTON_STDOFFSET_X;
|
|
if ((_nButtonFlags & WZB_NEXT) && (_nButtonFlags & WZB_NEXT))
|
|
nTotRightButtonSpaceOffset = (nTotRightButtonSpaceOffset - WIZARDDIALOG_BUTTON_STDOFFSET_X) + WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X;
|
|
return aSize.Width() - nTotButtonWidth - nTotRightButtonSpaceOffset;
|
|
}
|
|
|
|
//=====================================================================
|
|
//= OWizardMachine
|
|
//=====================================================================
|
|
//---------------------------------------------------------------------
|
|
OWizardMachine::OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags )
|
|
:WizardDialog( _pParent, _rRes )
|
|
,m_pFinish(NULL)
|
|
,m_pCancel(NULL)
|
|
,m_pNextPage(NULL)
|
|
,m_pPrevPage(NULL)
|
|
,m_pHelp(NULL)
|
|
,m_pImpl( new WizardMachineImplData )
|
|
{
|
|
implConstruct( _nButtonFlags );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
|
|
:WizardDialog( _pParent, i_nStyle )
|
|
,m_pFinish(NULL)
|
|
,m_pCancel(NULL)
|
|
,m_pNextPage(NULL)
|
|
,m_pPrevPage(NULL)
|
|
,m_pHelp(NULL)
|
|
,m_pImpl( new WizardMachineImplData )
|
|
{
|
|
implConstruct( _nButtonFlags );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags )
|
|
{
|
|
m_pImpl->sTitleBase = GetText();
|
|
|
|
// create the buttons according to the wizard button flags
|
|
// the help button
|
|
if (_nButtonFlags & WZB_HELP)
|
|
{
|
|
m_pHelp= new HelpButton(this, WB_TABSTOP);
|
|
m_pHelp->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
|
|
m_pHelp->Show();
|
|
AddButton( m_pHelp, WIZARDDIALOG_BUTTON_STDOFFSET_X);
|
|
}
|
|
|
|
// the previous button
|
|
if (_nButtonFlags & WZB_PREVIOUS)
|
|
{
|
|
m_pPrevPage = new PushButton(this, WB_TABSTOP);
|
|
m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
|
|
m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
|
|
m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS)));
|
|
m_pPrevPage->Show();
|
|
|
|
if (_nButtonFlags & WZB_NEXT)
|
|
AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button
|
|
else
|
|
AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
|
|
SetPrevButton( m_pPrevPage );
|
|
m_pPrevPage->SetClickHdl( LINK( this, OWizardMachine, OnPrevPage ) );
|
|
}
|
|
|
|
// the next button
|
|
if (_nButtonFlags & WZB_NEXT)
|
|
{
|
|
m_pNextPage = new PushButton(this, WB_TABSTOP);
|
|
m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
|
|
m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
|
|
m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT)));
|
|
m_pNextPage->Show();
|
|
|
|
AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
|
|
SetNextButton( m_pNextPage );
|
|
m_pNextPage->SetClickHdl( LINK( this, OWizardMachine, OnNextPage ) );
|
|
}
|
|
|
|
// the finish button
|
|
if (_nButtonFlags & WZB_FINISH)
|
|
{
|
|
m_pFinish = new OKButton(this, WB_TABSTOP);
|
|
m_pFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
|
|
m_pFinish->SetText(String(SvtResId(STR_WIZDLG_FINISH)));
|
|
m_pFinish->Show();
|
|
|
|
AddButton( m_pFinish, WIZARDDIALOG_BUTTON_STDOFFSET_X );
|
|
m_pFinish->SetClickHdl( LINK( this, OWizardMachine, OnFinish ) );
|
|
}
|
|
|
|
// the cancel button
|
|
if (_nButtonFlags & WZB_CANCEL)
|
|
{
|
|
m_pCancel = new CancelButton(this, WB_TABSTOP);
|
|
m_pCancel->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
|
|
m_pCancel->Show();
|
|
|
|
AddButton( m_pCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X );
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
OWizardMachine::~OWizardMachine()
|
|
{
|
|
delete m_pFinish;
|
|
delete m_pCancel;
|
|
delete m_pNextPage;
|
|
delete m_pPrevPage;
|
|
delete m_pHelp;
|
|
|
|
for (WizardState i=0; i<m_pImpl->nFirstUnknownPage; ++i)
|
|
delete GetPage(i);
|
|
|
|
delete m_pImpl;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::implUpdateTitle()
|
|
{
|
|
String sCompleteTitle(m_pImpl->sTitleBase);
|
|
|
|
// append the page title
|
|
TabPage* pCurrentPage = GetPage(getCurrentState());
|
|
if ( pCurrentPage && pCurrentPage->GetText().Len() )
|
|
{
|
|
sCompleteTitle += String::CreateFromAscii(" - ");
|
|
sCompleteTitle += pCurrentPage->GetText();
|
|
}
|
|
|
|
SetText(sCompleteTitle);
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
const String& OWizardMachine::getTitleBase() const
|
|
{
|
|
return m_pImpl->sTitleBase;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::setTitleBase(const String& _rTitleBase)
|
|
{
|
|
m_pImpl->sTitleBase = _rTitleBase;
|
|
implUpdateTitle();
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState )
|
|
{
|
|
if ( NULL == GetPage( i_nState ) )
|
|
{
|
|
TabPage* pNewPage = createPage( i_nState );
|
|
DBG_ASSERT( pNewPage, "OWizardMachine::GetOrCreatePage: invalid new page (NULL)!" );
|
|
|
|
// fill up the page sequence of our base class (with dummies)
|
|
while ( m_pImpl->nFirstUnknownPage < i_nState )
|
|
{
|
|
AddPage( NULL );
|
|
++m_pImpl->nFirstUnknownPage;
|
|
}
|
|
|
|
if ( m_pImpl->nFirstUnknownPage == i_nState )
|
|
{
|
|
// encountered this page number the first time
|
|
AddPage( pNewPage );
|
|
++m_pImpl->nFirstUnknownPage;
|
|
}
|
|
else
|
|
// already had this page - just change it
|
|
SetPage( i_nState, pNewPage );
|
|
}
|
|
return GetPage( i_nState );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::ActivatePage()
|
|
{
|
|
WizardDialog::ActivatePage();
|
|
|
|
WizardState nCurrentLevel = GetCurLevel();
|
|
GetOrCreatePage( nCurrentLevel );
|
|
|
|
enterState( nCurrentLevel );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
long OWizardMachine::DeactivatePage()
|
|
{
|
|
WizardState nCurrentState = getCurrentState();
|
|
if (!leaveState(nCurrentState) || !WizardDialog::DeactivatePage())
|
|
return sal_False;
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::defaultButton(sal_uInt32 _nWizardButtonFlags)
|
|
{
|
|
// the new default button
|
|
PushButton* pNewDefButton = NULL;
|
|
if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH))
|
|
pNewDefButton = m_pFinish;
|
|
if (m_pNextPage && (_nWizardButtonFlags & WZB_NEXT))
|
|
pNewDefButton = m_pNextPage;
|
|
if (m_pPrevPage && (_nWizardButtonFlags & WZB_PREVIOUS))
|
|
pNewDefButton = m_pPrevPage;
|
|
if (m_pHelp && (_nWizardButtonFlags & WZB_HELP))
|
|
pNewDefButton = m_pHelp;
|
|
if (m_pCancel && (_nWizardButtonFlags & WZB_CANCEL))
|
|
pNewDefButton = m_pCancel;
|
|
|
|
if ( pNewDefButton )
|
|
defaultButton( pNewDefButton );
|
|
else
|
|
implResetDefault( this );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::implResetDefault(Window* _pWindow)
|
|
{
|
|
Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD);
|
|
while (pChildLoop)
|
|
{
|
|
// does the window participate in the tabbing order?
|
|
if (pChildLoop->GetStyle() & WB_DIALOGCONTROL)
|
|
implResetDefault(pChildLoop);
|
|
|
|
// is it a button?
|
|
WindowType eType = pChildLoop->GetType();
|
|
if ( (WINDOW_BUTTON == eType)
|
|
|| (WINDOW_PUSHBUTTON == eType)
|
|
|| (WINDOW_OKBUTTON == eType)
|
|
|| (WINDOW_CANCELBUTTON == eType)
|
|
|| (WINDOW_HELPBUTTON == eType)
|
|
|| (WINDOW_IMAGEBUTTON == eType)
|
|
|| (WINDOW_MENUBUTTON == eType)
|
|
|| (WINDOW_MOREBUTTON == eType)
|
|
)
|
|
{
|
|
pChildLoop->SetStyle(pChildLoop->GetStyle() & ~WB_DEFBUTTON);
|
|
}
|
|
|
|
// the next one ...
|
|
pChildLoop = pChildLoop->GetWindow(WINDOW_NEXT);
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::defaultButton(PushButton* _pNewDefButton)
|
|
{
|
|
// loop through all (direct and indirect) descendants which participate in our tabbing order, and
|
|
// reset the WB_DEFBUTTON for every window which is a button
|
|
implResetDefault(this);
|
|
|
|
// set it's new style
|
|
if (_pNewDefButton)
|
|
_pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON);
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable)
|
|
{
|
|
if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH))
|
|
m_pFinish->Enable(_bEnable);
|
|
if (m_pNextPage && (_nWizardButtonFlags & WZB_NEXT))
|
|
m_pNextPage->Enable(_bEnable);
|
|
if (m_pPrevPage && (_nWizardButtonFlags & WZB_PREVIOUS))
|
|
m_pPrevPage->Enable(_bEnable);
|
|
if (m_pHelp && (_nWizardButtonFlags & WZB_HELP))
|
|
m_pHelp->Enable(_bEnable);
|
|
if (m_pCancel && (_nWizardButtonFlags & WZB_CANCEL))
|
|
m_pCancel->Enable(_bEnable);
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::enterState(WizardState _nState)
|
|
{
|
|
// tell the page
|
|
IWizardPageController* pController = getPageController( GetPage( _nState ) );
|
|
OSL_ENSURE( pController, "OWizardMachine::enterState: no controller for the given page!" );
|
|
if ( pController )
|
|
pController->initializePage();
|
|
|
|
if ( isAutomaticNextButtonStateEnabled() )
|
|
enableButtons( WZB_NEXT, canAdvance() );
|
|
|
|
enableButtons( WZB_PREVIOUS, !m_pImpl->aStateHistory.empty() );
|
|
|
|
// set the new title - it depends on the current page (i.e. state)
|
|
implUpdateTitle();
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::leaveState(WizardState)
|
|
{
|
|
// no need to ask the page here.
|
|
// If we reach this point, we already gave the current page the chance to commit it's data,
|
|
// and it was allowed to commit it's data
|
|
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::onFinish()
|
|
{
|
|
return Finnish( RET_OK );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
IMPL_LINK(OWizardMachine, OnFinish, PushButton*, EMPTYARG)
|
|
{
|
|
if ( isTravelingSuspended() )
|
|
return 0;
|
|
WizardTravelSuspension aTravelGuard( *this );
|
|
if ( !prepareLeaveCurrentState( eFinish ) )
|
|
{
|
|
return 0L;
|
|
}
|
|
return onFinish() ? 1L : 0L;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
OWizardMachine::WizardState OWizardMachine::determineNextState( WizardState _nCurrentState ) const
|
|
{
|
|
return _nCurrentState + 1;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
|
|
{
|
|
IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
|
|
ENSURE_OR_RETURN( pController != NULL, "OWizardMachine::prepareLeaveCurrentState: no controller for the current page!", sal_True );
|
|
return pController->commitPage( _eReason );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState )
|
|
{
|
|
// alowed to leave the current page?
|
|
if ( !prepareLeaveCurrentState( eTravelBackward ) )
|
|
return sal_False;
|
|
|
|
// don't travel directly on m_pImpl->aStateHistory, in case something goes wrong
|
|
::std::stack< WizardState > aTravelVirtually = m_pImpl->aStateHistory;
|
|
::std::stack< WizardState > aOldStateHistory = m_pImpl->aStateHistory;
|
|
|
|
WizardState nCurrentRollbackState = getCurrentState();
|
|
while ( nCurrentRollbackState != _nTargetState )
|
|
{
|
|
DBG_ASSERT( !aTravelVirtually.empty(), "OWizardMachine::skipBackwardUntil: this target state does not exist in the history!" );
|
|
nCurrentRollbackState = aTravelVirtually.top();
|
|
aTravelVirtually.pop();
|
|
}
|
|
m_pImpl->aStateHistory = aTravelVirtually;
|
|
if ( !ShowPage( _nTargetState ) )
|
|
{
|
|
m_pImpl->aStateHistory = aOldStateHistory;
|
|
return sal_False;
|
|
}
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::skipUntil( WizardState _nTargetState )
|
|
{
|
|
WizardState nCurrentState = getCurrentState();
|
|
|
|
// alowed to leave the current page?
|
|
if ( !prepareLeaveCurrentState( nCurrentState < _nTargetState ? eTravelForward : eTravelBackward ) )
|
|
return sal_False;
|
|
|
|
// don't travel directly on m_pImpl->aStateHistory, in case something goes wrong
|
|
::std::stack< WizardState > aTravelVirtually = m_pImpl->aStateHistory;
|
|
::std::stack< WizardState > aOldStateHistory = m_pImpl->aStateHistory;
|
|
while ( nCurrentState != _nTargetState )
|
|
{
|
|
WizardState nNextState = determineNextState( nCurrentState );
|
|
if ( WZS_INVALID_STATE == nNextState )
|
|
{
|
|
OSL_FAIL( "OWizardMachine::skipUntil: the given target state does not exist!" );
|
|
return sal_False;
|
|
}
|
|
|
|
// remember the skipped state in the history
|
|
aTravelVirtually.push( nCurrentState );
|
|
|
|
// get the next state
|
|
nCurrentState = nNextState;
|
|
}
|
|
m_pImpl->aStateHistory = aTravelVirtually;
|
|
// show the target page
|
|
if ( !ShowPage( nCurrentState ) )
|
|
{
|
|
// argh! prepareLeaveCurrentPage succeeded, determineNextState succeeded,
|
|
// but ShowPage doesn't? Somebody behaves very strange here ....
|
|
OSL_FAIL( "OWizardMachine::skipUntil: very unpolite ...." );
|
|
m_pImpl->aStateHistory = aOldStateHistory;
|
|
return sal_False;
|
|
}
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::skip(sal_Int32 _nSteps)
|
|
{
|
|
DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!");
|
|
// alowed to leave the current page?
|
|
if ( !prepareLeaveCurrentState( eTravelForward ) )
|
|
return sal_False;
|
|
|
|
WizardState nCurrentState = getCurrentState();
|
|
WizardState nNextState = determineNextState(nCurrentState);
|
|
// loop _nSteps steps
|
|
while (_nSteps-- > 0)
|
|
{
|
|
if (WZS_INVALID_STATE == nNextState)
|
|
return sal_False;
|
|
|
|
// remember the skipped state in the history
|
|
m_pImpl->aStateHistory.push(nCurrentState);
|
|
|
|
// get the next state
|
|
nCurrentState = nNextState;
|
|
nNextState = determineNextState(nCurrentState);
|
|
}
|
|
|
|
// show the (n+1)th page
|
|
if (!ShowPage(nCurrentState))
|
|
{
|
|
// TODO: this leaves us in a state where we have no current page and an inconsistent state history.
|
|
// Perhaps we should rollback the skipping here ....
|
|
OSL_FAIL("OWizardMachine::skip: very unpolite ....");
|
|
// if somebody does a skip and then does not allow to leave ...
|
|
// (can't be a commit error, as we've already committed the current page. So if ShowPage fails here,
|
|
// somebody behaves really strange ...)
|
|
return sal_False;
|
|
}
|
|
|
|
// all fine
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::travelNext()
|
|
{
|
|
// allowed to leave the current page?
|
|
if ( !prepareLeaveCurrentState( eTravelForward ) )
|
|
return sal_False;
|
|
|
|
// determine the next state to travel to
|
|
WizardState nCurrentState = getCurrentState();
|
|
WizardState nNextState = determineNextState(nCurrentState);
|
|
if (WZS_INVALID_STATE == nNextState)
|
|
return sal_False;
|
|
|
|
// the state history is used by the enterState method
|
|
// all fine
|
|
m_pImpl->aStateHistory.push(nCurrentState);
|
|
if (!ShowPage(nNextState))
|
|
{
|
|
m_pImpl->aStateHistory.pop();
|
|
return sal_False;
|
|
}
|
|
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
sal_Bool OWizardMachine::travelPrevious()
|
|
{
|
|
DBG_ASSERT(m_pImpl->aStateHistory.size() > 0, "OWizardMachine::travelPrevious: have no previous page!");
|
|
|
|
// alowed to leave the current page?
|
|
if ( !prepareLeaveCurrentState( eTravelBackward ) )
|
|
return sal_False;
|
|
|
|
// the next state to switch to
|
|
WizardState nPreviousState = m_pImpl->aStateHistory.top();
|
|
|
|
// the state history is used by the enterState method
|
|
m_pImpl->aStateHistory.pop();
|
|
// show this page
|
|
if (!ShowPage(nPreviousState))
|
|
{
|
|
m_pImpl->aStateHistory.push(nPreviousState);
|
|
return sal_False;
|
|
}
|
|
|
|
// all fine
|
|
return sal_True;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::removePageFromHistory( WizardState nToRemove )
|
|
{
|
|
|
|
::std::stack< WizardState > aTemp;
|
|
while(!m_pImpl->aStateHistory.empty())
|
|
{
|
|
WizardState nPreviousState = m_pImpl->aStateHistory.top();
|
|
m_pImpl->aStateHistory.pop();
|
|
if(nPreviousState != nToRemove)
|
|
aTemp.push( nPreviousState );
|
|
else
|
|
break;
|
|
}
|
|
while(!aTemp.empty())
|
|
{
|
|
m_pImpl->aStateHistory.push( aTemp.top() );
|
|
aTemp.pop();
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::enableAutomaticNextButtonState( bool _bEnable )
|
|
{
|
|
m_pImpl->m_bAutoNextButtonState = _bEnable;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
bool OWizardMachine::isAutomaticNextButtonStateEnabled() const
|
|
{
|
|
return m_pImpl->m_bAutoNextButtonState;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
IMPL_LINK(OWizardMachine, OnPrevPage, PushButton*, EMPTYARG)
|
|
{
|
|
if ( isTravelingSuspended() )
|
|
return 0;
|
|
WizardTravelSuspension aTravelGuard( *this );
|
|
sal_Int32 nRet = travelPrevious();
|
|
return nRet;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
IMPL_LINK(OWizardMachine, OnNextPage, PushButton*, EMPTYARG)
|
|
{
|
|
if ( isTravelingSuspended() )
|
|
return 0;
|
|
WizardTravelSuspension aTravelGuard( *this );
|
|
sal_Int32 nRet = travelNext();
|
|
return nRet;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const
|
|
{
|
|
IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage );
|
|
return pController;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::getStateHistory( ::std::vector< WizardState >& _out_rHistory )
|
|
{
|
|
::std::stack< WizardState > aHistoryCopy( m_pImpl->aStateHistory );
|
|
while ( !aHistoryCopy.empty() )
|
|
{
|
|
_out_rHistory.push_back( aHistoryCopy.top() );
|
|
aHistoryCopy.pop();
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
bool OWizardMachine::canAdvance() const
|
|
{
|
|
return WZS_INVALID_STATE != determineNextState( getCurrentState() );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::updateTravelUI()
|
|
{
|
|
const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
|
|
OSL_ENSURE( pController != NULL, "RoadmapWizard::updateTravelUI: no controller for the current page!" );
|
|
|
|
bool bCanAdvance =
|
|
( !pController || pController->canAdvance() ) // the current page allows to advance
|
|
&& canAdvance(); // the dialog as a whole allows to advance
|
|
enableButtons( WZB_NEXT, bCanAdvance );
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
bool OWizardMachine::isTravelingSuspended() const
|
|
{
|
|
return m_pImpl->m_bTravelingSuspended;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::suspendTraveling( AccessGuard )
|
|
{
|
|
DBG_ASSERT( !m_pImpl->m_bTravelingSuspended, "OWizardMachine::suspendTraveling: already suspended!" );
|
|
m_pImpl->m_bTravelingSuspended = true;
|
|
}
|
|
|
|
//---------------------------------------------------------------------
|
|
void OWizardMachine::resumeTraveling( AccessGuard )
|
|
{
|
|
DBG_ASSERT( m_pImpl->m_bTravelingSuspended, "OWizardMachine::resumeTraveling: nothing to resume!" );
|
|
m_pImpl->m_bTravelingSuspended = false;
|
|
}
|
|
|
|
//.........................................................................
|
|
} // namespace svt
|
|
//.........................................................................
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|