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
671 lines
27 KiB
C++
671 lines
27 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_svl.hxx"
|
|
|
|
// include ---------------------------------------------------------------
|
|
|
|
#include <svl/srchitem.hxx>
|
|
#include <sal/macros.h>
|
|
|
|
#include <unotools/searchopt.hxx>
|
|
#include <com/sun/star/util/XReplaceable.hpp>
|
|
#include <com/sun/star/util/XSearchable.hpp>
|
|
#include <com/sun/star/util/XSearchDescriptor.hpp>
|
|
#include <com/sun/star/util/XPropertyReplace.hpp>
|
|
#include <com/sun/star/util/XReplaceDescriptor.hpp>
|
|
#include <com/sun/star/lang/Locale.hpp>
|
|
#include <svl/memberid.hrc>
|
|
#include <i18npool/mslangid.hxx>
|
|
|
|
using namespace utl;
|
|
using namespace com::sun::star::beans;
|
|
using namespace com::sun::star::i18n;
|
|
using namespace com::sun::star::lang;
|
|
using namespace com::sun::star::uno;
|
|
using namespace com::sun::star::util;
|
|
|
|
#define CFG_ROOT_NODE "Office.Common/SearchOptions"
|
|
|
|
#define SRCH_PARAMS 12
|
|
#define SRCH_PARA_OPTIONS "Options"
|
|
#define SRCH_PARA_FAMILY "Family"
|
|
#define SRCH_PARA_COMMAND "Command"
|
|
#define SRCH_PARA_CELLTYPE "CellType"
|
|
#define SRCH_PARA_APPFLAG "AppFlag"
|
|
#define SRCH_PARA_ROWDIR "RowDirection"
|
|
#define SRCH_PARA_ALLTABLES "AllTables"
|
|
#define SRCH_PARA_SEARCHFILTERED "SearchFiltered"
|
|
#define SRCH_PARA_BACKWARD "Backward"
|
|
#define SRCH_PARA_PATTERN "Pattern"
|
|
#define SRCH_PARA_CONTENT "Content"
|
|
#define SRCH_PARA_ASIANOPT "AsianOptions"
|
|
|
|
// STATIC DATA -----------------------------------------------------------
|
|
|
|
TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0));
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
|
|
{
|
|
// names of transliteration relevant properties
|
|
static const char* aTranslitNames[] =
|
|
{
|
|
"IsMatchCase", // 0
|
|
"Japanese/IsMatchFullHalfWidthForms", // 1
|
|
"Japanese/IsMatchHiraganaKatakana", // 2
|
|
"Japanese/IsMatchContractions", // 3
|
|
"Japanese/IsMatchMinusDashCho-on", // 4
|
|
"Japanese/IsMatchRepeatCharMarks", // 5
|
|
"Japanese/IsMatchVariantFormKanji", // 6
|
|
"Japanese/IsMatchOldKanaForms", // 7
|
|
"Japanese/IsMatch_DiZi_DuZu", // 8
|
|
"Japanese/IsMatch_BaVa_HaFa", // 9
|
|
"Japanese/IsMatch_TsiThiChi_DhiZi", // 10
|
|
"Japanese/IsMatch_HyuIyu_ByuVyu", // 11
|
|
"Japanese/IsMatch_SeShe_ZeJe", // 12
|
|
"Japanese/IsMatch_IaIya", // 13
|
|
"Japanese/IsMatch_KiKu", // 14
|
|
"Japanese/IsIgnorePunctuation", // 15
|
|
"Japanese/IsIgnoreWhitespace", // 16
|
|
"Japanese/IsIgnoreProlongedSoundMark", // 17
|
|
"Japanese/IsIgnoreMiddleDot" // 18
|
|
};
|
|
|
|
const int nCount = SAL_N_ELEMENTS( aTranslitNames );
|
|
Sequence< ::rtl::OUString > aNames( nCount );
|
|
::rtl::OUString* pNames = aNames.getArray();
|
|
for (sal_Int32 i = 0; i < nCount; ++i)
|
|
pNames[i] = ::rtl::OUString::createFromAscii( aTranslitNames[i] );
|
|
|
|
return aNames;
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
|
|
|
|
SfxPoolItem( nId ),
|
|
ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
|
|
|
|
aSearchOpt ( SearchAlgorithms_ABSOLUTE,
|
|
SearchFlags::LEV_RELAXED,
|
|
::rtl::OUString(),
|
|
::rtl::OUString(),
|
|
Locale(),
|
|
2, 2, 2,
|
|
TransliterationModules_IGNORE_CASE ),
|
|
eFamily ( SFX_STYLE_FAMILY_PARA ),
|
|
nCommand ( 0 ),
|
|
nCellType ( SVX_SEARCHIN_FORMULA ),
|
|
nAppFlag ( SVX_SEARCHAPP_WRITER ),
|
|
bRowDirection ( sal_True ),
|
|
bAllTables ( sal_False ),
|
|
bSearchFiltered ( sal_False ),
|
|
bNotes ( sal_False),
|
|
bBackward ( sal_False ),
|
|
bPattern ( sal_False ),
|
|
bContent ( sal_False ),
|
|
bAsianOptions ( sal_False )
|
|
{
|
|
EnableNotification( lcl_GetNotifyNames() );
|
|
|
|
SvtSearchOptions aOpt;
|
|
|
|
bBackward = aOpt.IsBackwards();
|
|
bAsianOptions = aOpt.IsUseAsianOptions();
|
|
bNotes = aOpt.IsNotes();
|
|
|
|
if (aOpt.IsUseRegularExpression())
|
|
aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
|
|
if (aOpt.IsSimilaritySearch())
|
|
aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
|
|
if (aOpt.IsWholeWordsOnly())
|
|
aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
|
|
|
|
sal_Int32 &rFlags = aSearchOpt.transliterateFlags;
|
|
|
|
if (!aOpt.IsMatchCase())
|
|
rFlags |= TransliterationModules_IGNORE_CASE;
|
|
if ( aOpt.IsMatchFullHalfWidthForms())
|
|
rFlags |= TransliterationModules_IGNORE_WIDTH;
|
|
if ( bAsianOptions )
|
|
{
|
|
if ( aOpt.IsMatchHiraganaKatakana())
|
|
rFlags |= TransliterationModules_IGNORE_KANA;
|
|
if ( aOpt.IsMatchContractions())
|
|
rFlags |= TransliterationModules_ignoreSize_ja_JP;
|
|
if ( aOpt.IsMatchMinusDashChoon())
|
|
rFlags |= TransliterationModules_ignoreMinusSign_ja_JP;
|
|
if ( aOpt.IsMatchRepeatCharMarks())
|
|
rFlags |= TransliterationModules_ignoreIterationMark_ja_JP;
|
|
if ( aOpt.IsMatchVariantFormKanji())
|
|
rFlags |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
|
|
if ( aOpt.IsMatchOldKanaForms())
|
|
rFlags |= TransliterationModules_ignoreTraditionalKana_ja_JP;
|
|
if ( aOpt.IsMatchDiziDuzu())
|
|
rFlags |= TransliterationModules_ignoreZiZu_ja_JP;
|
|
if ( aOpt.IsMatchBavaHafa())
|
|
rFlags |= TransliterationModules_ignoreBaFa_ja_JP;
|
|
if ( aOpt.IsMatchTsithichiDhizi())
|
|
rFlags |= TransliterationModules_ignoreTiJi_ja_JP;
|
|
if ( aOpt.IsMatchHyuiyuByuvyu())
|
|
rFlags |= TransliterationModules_ignoreHyuByu_ja_JP;
|
|
if ( aOpt.IsMatchSesheZeje())
|
|
rFlags |= TransliterationModules_ignoreSeZe_ja_JP;
|
|
if ( aOpt.IsMatchIaiya())
|
|
rFlags |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
|
|
if ( aOpt.IsMatchKiku())
|
|
rFlags |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
|
|
if ( aOpt.IsIgnorePunctuation())
|
|
rFlags |= TransliterationModules_ignoreSeparator_ja_JP;
|
|
if ( aOpt.IsIgnoreWhitespace())
|
|
rFlags |= TransliterationModules_ignoreSpace_ja_JP;
|
|
if ( aOpt.IsIgnoreProlongedSoundMark())
|
|
rFlags |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
|
|
if ( aOpt.IsIgnoreMiddleDot())
|
|
rFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
|
|
}
|
|
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
|
|
|
|
SfxPoolItem ( rItem ),
|
|
ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
|
|
|
|
aSearchOpt ( rItem.aSearchOpt ),
|
|
eFamily ( rItem.eFamily ),
|
|
nCommand ( rItem.nCommand ),
|
|
nCellType ( rItem.nCellType ),
|
|
nAppFlag ( rItem.nAppFlag ),
|
|
bRowDirection ( rItem.bRowDirection ),
|
|
bAllTables ( rItem.bAllTables ),
|
|
bSearchFiltered ( rItem.bSearchFiltered ),
|
|
bNotes ( rItem.bNotes),
|
|
bBackward ( rItem.bBackward ),
|
|
bPattern ( rItem.bPattern ),
|
|
bContent ( rItem.bContent ),
|
|
bAsianOptions ( rItem.bAsianOptions )
|
|
{
|
|
EnableNotification( lcl_GetNotifyNames() );
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
SvxSearchItem::~SvxSearchItem()
|
|
{
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const
|
|
{
|
|
return new SvxSearchItem(*this);
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
//! used below
|
|
static sal_Bool operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 )
|
|
{
|
|
return rItem1.algorithmType == rItem2.algorithmType &&
|
|
rItem1.searchFlag == rItem2.searchFlag &&
|
|
rItem1.searchString == rItem2.searchString &&
|
|
rItem1.replaceString == rItem2.replaceString &&
|
|
//rItem1.Locale == rItem2.Locale &&
|
|
rItem1.changedChars == rItem2.changedChars &&
|
|
rItem1.deletedChars == rItem2.deletedChars &&
|
|
rItem1.insertedChars == rItem2.insertedChars &&
|
|
rItem1.transliterateFlags == rItem2.transliterateFlags;
|
|
}
|
|
|
|
|
|
int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
|
|
{
|
|
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
|
|
const SvxSearchItem &rSItem = (SvxSearchItem &) rItem;
|
|
return ( nCommand == rSItem.nCommand ) &&
|
|
( bBackward == rSItem.bBackward ) &&
|
|
( bPattern == rSItem.bPattern ) &&
|
|
( bContent == rSItem.bContent ) &&
|
|
( eFamily == rSItem.eFamily ) &&
|
|
( bRowDirection == rSItem.bRowDirection ) &&
|
|
( bAllTables == rSItem.bAllTables ) &&
|
|
( bSearchFiltered == rSItem.bSearchFiltered ) &&
|
|
( nCellType == rSItem.nCellType ) &&
|
|
( nAppFlag == rSItem.nAppFlag ) &&
|
|
( bAsianOptions == rSItem.bAsianOptions ) &&
|
|
( aSearchOpt == rSItem.aSearchOpt ) &&
|
|
( bNotes == rSItem.bNotes );
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
SfxItemPresentation SvxSearchItem::GetPresentation
|
|
(
|
|
SfxItemPresentation ,
|
|
SfxMapUnit ,
|
|
SfxMapUnit ,
|
|
XubString& ,
|
|
const IntlWrapper *
|
|
) const
|
|
{
|
|
return SFX_ITEM_PRESENTATION_NONE;
|
|
}
|
|
|
|
void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& rDescr )
|
|
{
|
|
SetSearchString( rDescr->getSearchString() );
|
|
::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) );
|
|
sal_Bool bTemp = false;
|
|
aAny >>= bTemp ;
|
|
SetWordOnly( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) );
|
|
aAny >>= bTemp ;
|
|
SetExact( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) );
|
|
aAny >>= bTemp ;
|
|
SetBackward( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ) );
|
|
aAny >>= bTemp ;
|
|
SetSelection( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) );
|
|
aAny >>= bTemp ;
|
|
SetRegExp( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) );
|
|
aAny >>= bTemp ;
|
|
SetLevenshtein( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) );
|
|
aAny >>= bTemp ;
|
|
SetLEVRelaxed( bTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ) );
|
|
sal_Int16 nTemp = 0;
|
|
aAny >>= nTemp ;
|
|
SetLEVOther( nTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ) );
|
|
aAny >>= nTemp ;
|
|
SetLEVShorter( nTemp );
|
|
aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ) );
|
|
aAny >>= nTemp ;
|
|
SetLEVLonger( nTemp );
|
|
}
|
|
|
|
void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr )
|
|
{
|
|
rDescr->setSearchString( GetSearchString() );
|
|
::com::sun::star::uno::Any aAny;
|
|
aAny <<= GetWordOnly() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), aAny );
|
|
aAny <<= GetExact() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), aAny );
|
|
aAny <<= GetBackward() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), aAny );
|
|
aAny <<= GetSelection() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ), aAny );
|
|
aAny <<= GetRegExp() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), aAny );
|
|
aAny <<= IsLevenshtein() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), aAny );
|
|
aAny <<= IsLEVRelaxed() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), aAny );
|
|
aAny <<= GetLEVOther() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ), aAny );
|
|
aAny <<= GetLEVShorter() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ), aAny );
|
|
aAny <<= GetLEVLonger() ;
|
|
rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ), aAny );
|
|
}
|
|
|
|
|
|
void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
|
|
{
|
|
// applies transliteration changes in the configuration database
|
|
// to the current SvxSearchItem
|
|
SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() );
|
|
}
|
|
|
|
void SvxSearchItem::Commit()
|
|
{
|
|
}
|
|
|
|
void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
|
|
{
|
|
if (bVal)
|
|
aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH;
|
|
else
|
|
aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_WIDTH;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetWordOnly( sal_Bool bVal )
|
|
{
|
|
if (bVal)
|
|
aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
|
|
else
|
|
aSearchOpt.searchFlag &= ~SearchFlags::NORM_WORD_ONLY;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetExact( sal_Bool bVal )
|
|
{
|
|
if (!bVal)
|
|
aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE;
|
|
else
|
|
aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_CASE;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetSelection( sal_Bool bVal )
|
|
{
|
|
if (bVal)
|
|
{
|
|
aSearchOpt.searchFlag |= (SearchFlags::REG_NOT_BEGINOFLINE |
|
|
SearchFlags::REG_NOT_ENDOFLINE);
|
|
}
|
|
else
|
|
{
|
|
aSearchOpt.searchFlag &= ~(SearchFlags::REG_NOT_BEGINOFLINE |
|
|
SearchFlags::REG_NOT_ENDOFLINE);
|
|
}
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetRegExp( sal_Bool bVal )
|
|
{
|
|
if ( bVal )
|
|
aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
|
|
else if ( SearchAlgorithms_REGEXP == aSearchOpt.algorithmType )
|
|
aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal )
|
|
{
|
|
if (bVal)
|
|
aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED;
|
|
else
|
|
aSearchOpt.searchFlag &= ~SearchFlags::LEV_RELAXED;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetLevenshtein( sal_Bool bVal )
|
|
{
|
|
if ( bVal )
|
|
aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
|
|
else if ( SearchAlgorithms_APPROXIMATE == aSearchOpt.algorithmType )
|
|
aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
|
|
}
|
|
|
|
|
|
void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags )
|
|
{
|
|
aSearchOpt.transliterateFlags = nFlags;
|
|
}
|
|
|
|
bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
|
|
{
|
|
nMemberId &= ~CONVERT_TWIPS;
|
|
switch ( nMemberId )
|
|
{
|
|
case 0 :
|
|
{
|
|
Sequence< PropertyValue > aSeq( SRCH_PARAMS );
|
|
aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_OPTIONS ) );
|
|
aSeq[0].Value <<= aSearchOpt;
|
|
aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_FAMILY ));
|
|
aSeq[1].Value <<= sal_Int16( eFamily );
|
|
aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_COMMAND ));
|
|
aSeq[2].Value <<= nCommand;
|
|
aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CELLTYPE ));
|
|
aSeq[3].Value <<= nCellType;
|
|
aSeq[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_APPFLAG ));
|
|
aSeq[4].Value <<= nAppFlag;
|
|
aSeq[5].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ROWDIR ));
|
|
aSeq[5].Value <<= bRowDirection;
|
|
aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));
|
|
aSeq[6].Value <<= bAllTables;
|
|
aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_SEARCHFILTERED ));
|
|
aSeq[6].Value <<= bSearchFiltered;
|
|
aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));
|
|
aSeq[7].Value <<= bBackward;
|
|
aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));
|
|
aSeq[8].Value <<= bPattern;
|
|
aSeq[9].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CONTENT ));
|
|
aSeq[9].Value <<= bContent;
|
|
aSeq[10].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ASIANOPT ));
|
|
aSeq[10].Value <<= bAsianOptions;
|
|
rVal <<= aSeq;
|
|
}
|
|
break;
|
|
case MID_SEARCH_COMMAND:
|
|
rVal <<= (sal_Int16) nCommand; break;
|
|
case MID_SEARCH_STYLEFAMILY:
|
|
rVal <<= (sal_Int16) eFamily; break;
|
|
case MID_SEARCH_CELLTYPE:
|
|
rVal <<= (sal_Int32) nCellType; break;
|
|
case MID_SEARCH_ROWDIRECTION:
|
|
rVal <<= (sal_Bool) bRowDirection; break;
|
|
case MID_SEARCH_ALLTABLES:
|
|
rVal <<= (sal_Bool) bAllTables; break;
|
|
case MID_SEARCH_SEARCHFILTERED:
|
|
rVal <<= (sal_Bool) bSearchFiltered; break;
|
|
case MID_SEARCH_BACKWARD:
|
|
rVal <<= (sal_Bool) bBackward; break;
|
|
case MID_SEARCH_PATTERN:
|
|
rVal <<= (sal_Bool) bPattern; break;
|
|
case MID_SEARCH_CONTENT:
|
|
rVal <<= (sal_Bool) bContent; break;
|
|
case MID_SEARCH_ASIANOPTIONS:
|
|
rVal <<= (sal_Bool) bAsianOptions; break;
|
|
case MID_SEARCH_ALGORITHMTYPE:
|
|
rVal <<= (sal_Int16) aSearchOpt.algorithmType; break;
|
|
case MID_SEARCH_FLAGS:
|
|
rVal <<= aSearchOpt.searchFlag; break;
|
|
case MID_SEARCH_SEARCHSTRING:
|
|
rVal <<= aSearchOpt.searchString; break;
|
|
case MID_SEARCH_REPLACESTRING:
|
|
rVal <<= aSearchOpt.replaceString; break;
|
|
case MID_SEARCH_CHANGEDCHARS:
|
|
rVal <<= aSearchOpt.changedChars; break;
|
|
case MID_SEARCH_DELETEDCHARS:
|
|
rVal <<= aSearchOpt.deletedChars; break;
|
|
case MID_SEARCH_INSERTEDCHARS:
|
|
rVal <<= aSearchOpt.insertedChars; break;
|
|
case MID_SEARCH_TRANSLITERATEFLAGS:
|
|
rVal <<= aSearchOpt.transliterateFlags; break;
|
|
case MID_SEARCH_LOCALE:
|
|
{
|
|
sal_Int16 nLocale;
|
|
if (aSearchOpt.Locale.Language.getLength() || aSearchOpt.Locale.Country.getLength() )
|
|
nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale );
|
|
else
|
|
nLocale = LANGUAGE_NONE;
|
|
rVal <<= nLocale;
|
|
break;
|
|
}
|
|
|
|
default:
|
|
DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" );
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// -----------------------------------------------------------------------
|
|
|
|
bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
|
|
{
|
|
nMemberId &= ~CONVERT_TWIPS;
|
|
bool bRet = false;
|
|
sal_Int32 nInt = 0;
|
|
switch ( nMemberId )
|
|
{
|
|
case 0 :
|
|
{
|
|
Sequence< PropertyValue > aSeq;
|
|
if ( ( rVal >>= aSeq ) && ( aSeq.getLength() == SRCH_PARAMS ) )
|
|
{
|
|
sal_Int16 nConvertedCount( 0 );
|
|
for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
|
|
{
|
|
if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_OPTIONS ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= aSearchOpt ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_FAMILY ) ) )
|
|
{
|
|
sal_uInt16 nTemp( 0 );
|
|
if ( ( aSeq[i].Value >>= nTemp ) == sal_True )
|
|
{
|
|
eFamily = SfxStyleFamily( nTemp );
|
|
++nConvertedCount;
|
|
}
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_COMMAND ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= nCommand ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_CELLTYPE ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= nCellType ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_APPFLAG ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= nAppFlag ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ROWDIR ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bRowDirection ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ALLTABLES ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_SEARCHFILTERED ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bSearchFiltered ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_BACKWARD ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bBackward ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_PATTERN ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bPattern ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_CONTENT ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bContent ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ASIANOPT ) ) )
|
|
{
|
|
if ( ( aSeq[i].Value >>= bAsianOptions ) == sal_True )
|
|
++nConvertedCount;
|
|
}
|
|
}
|
|
|
|
bRet = ( nConvertedCount == SRCH_PARAMS );
|
|
}
|
|
break;
|
|
}
|
|
case MID_SEARCH_COMMAND:
|
|
bRet = (rVal >>= nInt); nCommand = (sal_uInt16) nInt; break;
|
|
case MID_SEARCH_STYLEFAMILY:
|
|
bRet = (rVal >>= nInt); eFamily = (SfxStyleFamily) (sal_Int16) nInt; break;
|
|
case MID_SEARCH_CELLTYPE:
|
|
bRet = (rVal >>= nInt); nCellType = (sal_uInt16) nInt; break;
|
|
case MID_SEARCH_ROWDIRECTION:
|
|
bRet = (rVal >>= bRowDirection); break;
|
|
case MID_SEARCH_ALLTABLES:
|
|
bRet = (rVal >>= bAllTables); break;
|
|
case MID_SEARCH_SEARCHFILTERED:
|
|
bRet = (rVal >>= bSearchFiltered); break;
|
|
case MID_SEARCH_BACKWARD:
|
|
bRet = (rVal >>= bBackward); break;
|
|
case MID_SEARCH_PATTERN:
|
|
bRet = (rVal >>= bPattern); break;
|
|
case MID_SEARCH_CONTENT:
|
|
bRet = (rVal >>= bContent); break;
|
|
case MID_SEARCH_ASIANOPTIONS:
|
|
bRet = (rVal >>= bAsianOptions); break;
|
|
case MID_SEARCH_ALGORITHMTYPE:
|
|
bRet = (rVal >>= nInt); aSearchOpt.algorithmType = (SearchAlgorithms)(sal_Int16)nInt; break;
|
|
case MID_SEARCH_FLAGS:
|
|
bRet = (rVal >>= aSearchOpt.searchFlag); break;
|
|
case MID_SEARCH_SEARCHSTRING:
|
|
bRet = (rVal >>= aSearchOpt.searchString); break;
|
|
case MID_SEARCH_REPLACESTRING:
|
|
bRet = (rVal >>= aSearchOpt.replaceString); break;
|
|
case MID_SEARCH_CHANGEDCHARS:
|
|
bRet = (rVal >>= aSearchOpt.changedChars); break;
|
|
case MID_SEARCH_DELETEDCHARS:
|
|
bRet = (rVal >>= aSearchOpt.deletedChars); break;
|
|
case MID_SEARCH_INSERTEDCHARS:
|
|
bRet = (rVal >>= aSearchOpt.insertedChars); break;
|
|
case MID_SEARCH_TRANSLITERATEFLAGS:
|
|
bRet = (rVal >>= aSearchOpt.transliterateFlags); break;
|
|
case MID_SEARCH_LOCALE:
|
|
{
|
|
bRet = (rVal >>= nInt);
|
|
if ( bRet )
|
|
{
|
|
if ( nInt == LANGUAGE_NONE )
|
|
{
|
|
aSearchOpt.Locale = ::com::sun::star::lang::Locale();
|
|
}
|
|
else
|
|
{
|
|
MsLangId::convertLanguageToLocale( (sal_Int16) nInt, aSearchOpt.Locale );
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
OSL_FAIL( "Unknown MemberId" );
|
|
}
|
|
|
|
return bRet;
|
|
}
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|