Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (252 commits) masterfix DEV300: #i10000# usage of L10N build_type ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300 DEV300 masterfix: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r) hr75: #i116747#: remove obsolete copyright notices hr75: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r) #i10000# WAE: cast to right type gnumake3: remove comphelper version; fix including extract.hxx chart52: #i28670# import/export of manual chart legend size from/to XLS chart52: #i28670# import of manual chart legend size from OOXML chart52: adapt to changed API removetooltypes: adjust rebase for linux removetooltypes01: #i112600# adjust rebase for windows removetooltypes01: #i112600# Fix build problems on non-pro CWS gnumake3: -D_DLL is needed on Windows; removed superficial _DLL_ usage all over the place added some accessible names and releations in PDFImport dialog and XML Settings dialog masterfix: #i10000# header file removed XPathLogger.cxx: added include for <stdio.h> masterfix: #i10000#: WAE fix removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff removetooltypes01: #i112600# remove tooltypes from writerfilter ... Conflicts: binfilter/bf_basic/source/classes/sbunoobj.cxx binfilter/bf_basic/source/inc/buffer.hxx binfilter/bf_basic/source/inc/filefmt.hxx binfilter/bf_basic/source/runtime/basrdll.cxx binfilter/bf_basic/source/sbx/sbxdec.hxx binfilter/bf_basic/source/sbx/sbxres.hxx binfilter/bf_forms/source/component/DatabaseForm.hxx binfilter/bf_forms/source/component/forms_CheckBox.cxx binfilter/bf_forms/source/component/forms_ComboBox.cxx binfilter/bf_forms/source/component/forms_Currency.cxx binfilter/bf_forms/source/component/forms_Date.cxx binfilter/bf_forms/source/component/forms_Edit.cxx binfilter/bf_forms/source/component/forms_File.cxx binfilter/bf_forms/source/component/forms_Filter.cxx binfilter/bf_forms/source/component/forms_FormComponent.cxx binfilter/bf_forms/source/component/forms_FormattedField.cxx binfilter/bf_forms/source/component/forms_GroupManager.cxx binfilter/bf_forms/source/component/forms_Hidden.cxx binfilter/bf_forms/source/component/forms_ImageControl.cxx binfilter/bf_forms/source/component/forms_ListBox.cxx binfilter/bf_forms/source/component/forms_Numeric.cxx binfilter/bf_forms/source/component/forms_Pattern.cxx binfilter/bf_forms/source/component/forms_RadioButton.cxx binfilter/bf_forms/source/component/forms_Time.cxx binfilter/bf_forms/source/misc/forms_formsmodule.cxx binfilter/bf_forms/source/misc/forms_services.cxx binfilter/bf_forms/source/resource/forms_frm_resource.cxx binfilter/bf_sc/source/core/inc/ansitab.hxx binfilter/bf_sc/source/core/tool/sc_compiler.cxx binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx binfilter/bf_sc/source/ui/inc/dbdocfun.hxx binfilter/bf_sc/source/ui/inc/drawutil.hxx binfilter/bf_sc/source/ui/inc/dwfunctr.hxx binfilter/bf_sc/source/ui/inc/editable.hxx binfilter/bf_sc/source/ui/inc/gridmerg.hxx binfilter/bf_sc/source/ui/inc/imoptdlg.hxx binfilter/bf_sc/source/ui/inc/namecrea.hxx binfilter/bf_sc/source/ui/inc/navsett.hxx binfilter/bf_sc/source/ui/inc/refundo.hxx binfilter/bf_sc/source/ui/inc/undoolk.hxx binfilter/bf_sc/source/ui/inc/viewutil.hxx binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx binfilter/bf_sch/source/ui/app/sch_menu.src binfilter/bf_sch/source/ui/inc/globopt.hxx binfilter/bf_sch/source/ui/inc/guiutil.hxx binfilter/bf_sch/source/ui/unoidl/sch_register.cxx binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx binfilter/bf_sd/source/filter/propread.hxx binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx binfilter/bf_sd/source/ui/inc/unokywds.hxx binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx binfilter/bf_sfx2/source/inc/fltoptint.hxx binfilter/bf_sfx2/source/inc/sfxtypes.hxx binfilter/bf_so3/inc/binddata.hxx binfilter/bf_so3/source/inplace/client.cxx binfilter/bf_so3/source/ole/socont.h binfilter/bf_so3/source/persist/binddata.cxx binfilter/bf_so3/source/persist/transbnd.cxx binfilter/bf_so3/source/persist/transprt.cxx binfilter/bf_starmath/source/starmath_register.cxx binfilter/bf_svtools/source/config/svt_menuoptions.cxx binfilter/bf_svtools/source/config/svt_saveopt.cxx binfilter/bf_svtools/source/config/svt_searchopt.cxx binfilter/bf_svtools/source/filter.vcl/igif/decode.hxx binfilter/bf_svtools/source/items1/svt_cenumitm.cxx binfilter/bf_svtools/source/items1/svt_poolio.cxx binfilter/bf_svtools/source/misc/svt_ehdl.cxx binfilter/bf_svtools/source/misc1/svt_adrparse.cxx binfilter/bf_svtools/source/misc1/svt_inethist.cxx binfilter/bf_svtools/source/numbers/numfmuno.hxx binfilter/bf_svtools/source/numbers/numhead.hxx binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx binfilter/bf_svtools/source/numbers/svt_numuno.cxx binfilter/bf_svtools/source/numbers/zforscan.hxx binfilter/bf_svtools/source/svdde/ddeimp.hxx binfilter/bf_svtools/source/uno/svt_registerservices.cxx binfilter/bf_svx/source/editeng/svx_editattr.cxx binfilter/bf_svx/source/inc/dbtoolsclient.hxx binfilter/bf_svx/source/items/svx_paperinf.cxx binfilter/bf_svx/source/outliner/paralist.hxx binfilter/bf_svx/source/svdraw/svdtxhdl.hxx binfilter/bf_svx/source/svdraw/svx_svdattr.cxx binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx binfilter/bf_svx/source/unodraw/svx_unoprov.cxx binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx binfilter/bf_sw/source/core/bastyp/sw_index.cxx binfilter/bf_sw/source/core/except/sw_errhdl.cxx binfilter/bf_sw/source/core/inc/docfld.hxx binfilter/bf_sw/source/core/inc/flowfrm.hxx binfilter/bf_sw/source/core/inc/frame.hxx binfilter/bf_sw/source/core/inc/hffrm.hxx binfilter/bf_sw/source/core/inc/notxtfrm.hxx binfilter/bf_sw/source/core/inc/pamtyp.hxx binfilter/bf_sw/source/core/inc/rowfrm.hxx binfilter/bf_sw/source/core/inc/sectfrm.hxx binfilter/bf_sw/source/core/inc/splargs.hxx binfilter/bf_sw/source/core/inc/splcstk.hxx binfilter/bf_sw/source/core/inc/swblocks.hxx binfilter/bf_sw/source/core/inc/tabfrm.hxx binfilter/bf_sw/source/core/inc/toxhlp.hxx binfilter/bf_sw/source/core/inc/txmsrt.hxx binfilter/bf_sw/source/core/inc/txtfrm.hxx binfilter/bf_sw/source/core/layout/virtoutp.hxx binfilter/bf_sw/source/core/sw3io/crypter.hxx binfilter/bf_sw/source/core/sw3io/sw3imp.hxx binfilter/bf_sw/source/core/sw3io/sw3marks.hxx binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx binfilter/bf_sw/source/core/swg/rdswg.hxx binfilter/bf_sw/source/core/swg/swgids.hxx binfilter/bf_sw/source/core/text/guess.hxx binfilter/bf_sw/source/core/text/itratr.hxx binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx binfilter/bf_sw/source/filter/excel/excfntbf.hxx binfilter/bf_sw/source/filter/excel/excvfbff.hxx binfilter/bf_sw/source/filter/excel/excxfbuf.hxx binfilter/bf_sw/source/filter/inc/fltglbls.hxx binfilter/bf_sw/source/filter/inc/fltini.hxx binfilter/bf_sw/source/filter/inc/w4wflt.hxx binfilter/bf_sw/source/filter/inc/w4wpar.hxx binfilter/bf_sw/source/filter/inc/w4wstk.hxx binfilter/bf_sw/source/filter/inc/wrt_fn.hxx binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx binfilter/bf_sw/source/filter/w4w/w4wgraf.hxx binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx binfilter/bf_sw/source/filter/xml/sw_swxml.cxx binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx binfilter/bf_sw/source/filter/xml/xmlexpit.hxx binfilter/bf_sw/source/filter/xml/xmlimpit.hxx binfilter/bf_sw/source/filter/xml/xmlitem.hxx binfilter/bf_sw/source/filter/xml/xmltbli.hxx binfilter/bf_sw/source/ui/app/sw_docsh.cxx binfilter/bf_sw/source/ui/app/sw_docshini.cxx binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx binfilter/bf_sw/source/ui/inc/bmpwin.hxx binfilter/bf_sw/source/ui/inc/caption.hxx binfilter/bf_sw/source/ui/inc/docinf.hxx binfilter/bf_sw/source/ui/inc/fontcfg.hxx binfilter/bf_sw/source/ui/inc/formedt.hxx binfilter/bf_sw/source/ui/inc/hdftctrl.hxx binfilter/bf_sw/source/ui/inc/idxmrk.hxx binfilter/bf_sw/source/ui/inc/initui.hxx binfilter/bf_sw/source/ui/inc/modcfg.hxx binfilter/bf_sw/source/ui/inc/pview.hxx binfilter/bf_sw/source/ui/inc/scroll.hxx binfilter/bf_sw/source/ui/inc/swcont.hxx binfilter/bf_sw/source/ui/inc/uitool.hxx binfilter/bf_sw/source/ui/inc/unotxvw.hxx binfilter/bf_sw/source/ui/inc/usrpref.hxx binfilter/bf_sw/source/ui/inc/workctrl.hxx binfilter/bf_sw/source/ui/inc/wrtsh.hxx binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx binfilter/bf_xmloff/source/core/xmloff_facreg.cxx binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx binfilter/binfilterdetect/source/bindetect.cxx binfilter/filter/source/bf_migrate/bf_migrateexports.cxx binfilter/filter/source/bf_migrate/bf_migratefilter.cxx binfilter/filter/source/bf_migrate/bf_migratefilter.hxx binfilter/filter/source/bf_offwrp/bf_wrapper.cxx binfilter/inc/bf_basic/basmgr.hxx binfilter/inc/bf_basic/sbmeth.hxx binfilter/inc/bf_basic/sbstar.hxx binfilter/inc/bf_basic/sbx.hxx binfilter/inc/bf_basic/sbxcore.hxx binfilter/inc/bf_basic/sbxdef.hxx binfilter/inc/bf_basic/sbxfac.hxx binfilter/inc/bf_basic/sbxobj.hxx binfilter/inc/bf_basic/sbxvar.hxx binfilter/inc/bf_goodies/b3dcolor.hxx binfilter/inc/bf_goodies/b3dcompo.hxx binfilter/inc/bf_goodies/b3dentty.hxx binfilter/inc/bf_goodies/b3dgeom.hxx binfilter/inc/bf_goodies/b3dlight.hxx binfilter/inc/bf_goodies/b3dtex.hxx binfilter/inc/bf_goodies/b3dtrans.hxx binfilter/inc/bf_goodies/b3dvolum.hxx binfilter/inc/bf_goodies/base3d.hxx binfilter/inc/bf_goodies/bucket.hxx binfilter/inc/bf_goodies/hmatrix.hxx binfilter/inc/bf_goodies/matril3d.hxx binfilter/inc/bf_goodies/matrix3d.hxx binfilter/inc/bf_goodies/point3d.hxx binfilter/inc/bf_goodies/point4d.hxx binfilter/inc/bf_goodies/vector3d.hxx binfilter/inc/bf_sc/arealink.hxx binfilter/inc/bf_sc/bclist.hxx binfilter/inc/bf_sc/callform.hxx binfilter/inc/bf_sc/cellform.hxx binfilter/inc/bf_sc/chartuno.hxx binfilter/inc/bf_sc/chgviset.hxx binfilter/inc/bf_sc/collect.hxx binfilter/inc/bf_sc/column.hxx binfilter/inc/bf_sc/conditio.hxx binfilter/inc/bf_sc/consoli.hxx binfilter/inc/bf_sc/dbcolect.hxx binfilter/inc/bf_sc/dbdocutl.hxx binfilter/inc/bf_sc/dbtoken.hxx binfilter/inc/bf_sc/detdata.hxx binfilter/inc/bf_sc/detfunc.hxx binfilter/inc/bf_sc/dociter.hxx binfilter/inc/bf_sc/docpool.hxx binfilter/inc/bf_sc/docuno.hxx binfilter/inc/bf_sc/dpobject.hxx binfilter/inc/bf_sc/dpoutput.hxx binfilter/inc/bf_sc/dpsave.hxx binfilter/inc/bf_sc/dpshttab.hxx binfilter/inc/bf_sc/dptabdat.hxx binfilter/inc/bf_sc/dptabres.hxx binfilter/inc/bf_sc/drawpage.hxx binfilter/inc/bf_sc/drwlayer.hxx binfilter/inc/bf_sc/editsrc.hxx binfilter/inc/bf_sc/fielduno.hxx binfilter/inc/bf_sc/filter.hxx binfilter/inc/bf_sc/fmtuno.hxx binfilter/inc/bf_sc/funcuno.hxx binfilter/inc/bf_sc/global.hxx binfilter/inc/bf_sc/hints.hxx binfilter/inc/bf_sc/indexmap.hxx binfilter/inc/bf_sc/inputopt.hxx binfilter/inc/bf_sc/markarr.hxx binfilter/inc/bf_sc/markdata.hxx binfilter/inc/bf_sc/navicfg.hxx binfilter/inc/bf_sc/optutil.hxx binfilter/inc/bf_sc/pagepar.hxx binfilter/inc/bf_sc/printopt.hxx binfilter/inc/bf_sc/prnsave.hxx binfilter/inc/bf_sc/progress.hxx binfilter/inc/bf_sc/rangelst.hxx binfilter/inc/bf_sc/rangenam.hxx binfilter/inc/bf_sc/rangeseq.hxx binfilter/inc/bf_sc/rangeutl.hxx binfilter/inc/bf_sc/rechead.hxx binfilter/inc/bf_sc/refdata.hxx binfilter/inc/bf_sc/refreshtimer.hxx binfilter/inc/bf_sc/scmod.hxx binfilter/inc/bf_sc/shapeuno.hxx binfilter/inc/bf_sc/sortparam.hxx binfilter/inc/bf_sc/stlsheet.hxx binfilter/inc/bf_sc/subtotal.hxx binfilter/inc/bf_sc/table.hxx binfilter/inc/bf_sc/tablink.hxx binfilter/inc/bf_sc/tabopparams.hxx binfilter/inc/bf_sc/textuno.hxx binfilter/inc/bf_sc/unoguard.hxx binfilter/inc/bf_sc/unowids.hxx binfilter/inc/bf_sc/userdat.hxx binfilter/inc/bf_sc/validat.hxx binfilter/inc/bf_sc/viewopti.hxx binfilter/inc/bf_sch/calculat.hxx binfilter/inc/bf_sch/charttyp.hxx binfilter/inc/bf_sch/chaxis.hxx binfilter/inc/bf_sch/chdescr.hxx binfilter/inc/bf_sch/docshell.hxx binfilter/inc/bf_sch/glob.hxx binfilter/inc/bf_sch/globfunc.hxx binfilter/inc/bf_sch/memchrt.hxx binfilter/inc/bf_sch/objfac.hxx binfilter/inc/bf_sch/schgroup.hxx binfilter/inc/bf_sch/stlsheet.hxx binfilter/inc/bf_sd/anminfo.hxx binfilter/inc/bf_sd/docshell.hxx binfilter/inc/bf_sd/drawdoc.hxx binfilter/inc/bf_sd/grdocsh.hxx binfilter/inc/bf_sd/sdattr.hxx binfilter/inc/bf_sfx2/app.hxx binfilter/inc/bf_sfx2/bitset.hxx binfilter/inc/bf_sfx2/docfac.hxx binfilter/inc/bf_sfx2/docfile.hxx binfilter/inc/bf_sfx2/docfilt.hxx binfilter/inc/bf_sfx2/docinf.hxx binfilter/inc/bf_sfx2/doctempl.hxx binfilter/inc/bf_sfx2/event.hxx binfilter/inc/bf_sfx2/fcontnr.hxx binfilter/inc/bf_sfx2/frameobj.hxx binfilter/inc/bf_sfx2/genlink.hxx binfilter/inc/bf_sfx2/interno.hxx binfilter/inc/bf_sfx2/minarray.hxx binfilter/inc/bf_sfx2/minstack.hxx binfilter/inc/bf_sfx2/misccfg.hxx binfilter/inc/bf_sfx2/plugobj.hxx binfilter/inc/bf_sfx2/printer.hxx binfilter/inc/bf_sfx2/saveopt.hxx binfilter/inc/bf_sfx2/sfxuno.hxx binfilter/inc/bf_sfx2/timestamp.hxx binfilter/inc/bf_so3/binding.hxx binfilter/inc/bf_so3/factory.hxx binfilter/inc/bf_so3/ipenv.hxx binfilter/inc/bf_so3/ipwin.hxx binfilter/inc/bf_so3/linkmgr.hxx binfilter/inc/bf_so3/linksrc.hxx binfilter/inc/bf_so3/lnkbase.hxx binfilter/inc/bf_so3/outplace.hxx binfilter/inc/bf_so3/persist.hxx binfilter/inc/bf_so3/protocol.hxx binfilter/inc/bf_so3/pseudo.hxx binfilter/inc/bf_so3/so2dll.hxx binfilter/inc/bf_so3/svstor.hxx binfilter/inc/bf_so3/transbnd.hxx binfilter/inc/bf_so3/transprt.hxx binfilter/inc/bf_starmath/symbol.hxx binfilter/inc/bf_starmath/unomodel.hxx binfilter/inc/bf_starmath/utility.hxx binfilter/inc/bf_starmath/xchar.hxx binfilter/inc/bf_svtools/DocumentInfoPreview.hxx binfilter/inc/bf_svtools/aeitem.hxx binfilter/inc/bf_svtools/apearcfg.hxx binfilter/inc/bf_svtools/bf_prewin.h binfilter/inc/bf_svtools/bintitem.hxx binfilter/inc/bf_svtools/brdcst.hxx binfilter/inc/bf_svtools/broadcast.hxx binfilter/inc/bf_svtools/cancel.hxx binfilter/inc/bf_svtools/cenumitm.hxx binfilter/inc/bf_svtools/cintitem.hxx binfilter/inc/bf_svtools/cntnrsrt.hxx binfilter/inc/bf_svtools/cntwall.hxx binfilter/inc/bf_svtools/cstitem.hxx binfilter/inc/bf_svtools/ctypeitm.hxx binfilter/inc/bf_svtools/custritm.hxx binfilter/inc/bf_svtools/dateitem.hxx binfilter/inc/bf_svtools/defaultoptions.hxx binfilter/inc/bf_svtools/dtritem.hxx binfilter/inc/bf_svtools/eitem.hxx binfilter/inc/bf_svtools/expander.hxx binfilter/inc/bf_svtools/filerec.hxx binfilter/inc/bf_svtools/filter.hxx binfilter/inc/bf_svtools/flagitem.hxx binfilter/inc/bf_svtools/flbytes.hxx binfilter/inc/bf_svtools/fltcall.hxx binfilter/inc/bf_svtools/fltdefs.hxx binfilter/inc/bf_svtools/frqitem.hxx binfilter/inc/bf_svtools/fstathelper.hxx binfilter/inc/bf_svtools/gifread.hxx binfilter/inc/bf_svtools/globalnameitem.hxx binfilter/inc/bf_svtools/hint.hxx binfilter/inc/bf_svtools/htmlout.hxx binfilter/inc/bf_svtools/httpcook.hxx binfilter/inc/bf_svtools/imap.hxx binfilter/inc/bf_svtools/imapcirc.hxx binfilter/inc/bf_svtools/imapobj.hxx binfilter/inc/bf_svtools/imappoly.hxx binfilter/inc/bf_svtools/imaprect.hxx binfilter/inc/bf_svtools/inethist.hxx binfilter/inc/bf_svtools/inidef.hxx binfilter/inc/bf_svtools/intitem.hxx binfilter/inc/bf_svtools/itemiter.hxx binfilter/inc/bf_svtools/itempool.hxx binfilter/inc/bf_svtools/itemset.hxx binfilter/inc/bf_svtools/jpeg.hxx binfilter/inc/bf_svtools/lckbitem.hxx binfilter/inc/bf_svtools/lingucfg.hxx binfilter/inc/bf_svtools/listener.hxx binfilter/inc/bf_svtools/lngmisc.hxx binfilter/inc/bf_svtools/loginerr.hxx binfilter/inc/bf_svtools/lstner.hxx binfilter/inc/bf_svtools/misccfg.hxx binfilter/inc/bf_svtools/nfkeytab.hxx binfilter/inc/bf_svtools/nranges.hxx binfilter/inc/bf_svtools/pngread.hxx binfilter/inc/bf_svtools/poolcach.hxx binfilter/inc/bf_svtools/ptitem.hxx binfilter/inc/bf_svtools/rectitem.hxx binfilter/inc/bf_svtools/reqitem.hxx binfilter/inc/bf_svtools/searchopt.hxx binfilter/inc/bf_svtools/sectctr.hxx binfilter/inc/bf_svtools/section.hxx binfilter/inc/bf_svtools/sgfbram.hxx binfilter/inc/bf_svtools/sgffilt.hxx binfilter/inc/bf_svtools/slstitm.hxx binfilter/inc/bf_svtools/style.hxx binfilter/inc/bf_svtools/svarray.hxx binfilter/inc/bf_svtools/svdde.hxx binfilter/inc/bf_svtools/svicnvw.hxx binfilter/inc/bf_svtools/svimpbox.hxx binfilter/inc/bf_svtools/svimpicn.hxx binfilter/inc/bf_svtools/syslocaleoptions.hxx binfilter/inc/bf_svtools/szitem.hxx binfilter/inc/bf_svtools/testtool.hxx binfilter/inc/bf_svtools/tfrmitem.hxx binfilter/inc/bf_svtools/tresitem.hxx binfilter/inc/bf_svtools/ttprops.hxx binfilter/inc/bf_svtools/undo.hxx binfilter/inc/bf_svtools/whiter.hxx binfilter/inc/bf_svtools/wmf.hxx binfilter/inc/bf_svtools/xbmread.hxx binfilter/inc/bf_svtools/xmlcnimp.hxx binfilter/inc/bf_svtools/xpmread.hxx binfilter/inc/bf_svtools/zforfind.hxx binfilter/inc/bf_svtools/zforlist.hxx binfilter/inc/bf_svtools/zformat.hxx binfilter/inc/bf_svx/boxobj.hxx binfilter/inc/bf_svx/camera3d.hxx binfilter/inc/bf_svx/cube3d.hxx binfilter/inc/bf_svx/def3d.hxx binfilter/inc/bf_svx/deflt3d.hxx binfilter/inc/bf_svx/dlight3d.hxx binfilter/inc/bf_svx/editdata.hxx binfilter/inc/bf_svx/editobj.hxx binfilter/inc/bf_svx/editstat.hxx binfilter/inc/bf_svx/editview.hxx binfilter/inc/bf_svx/extrud3d.hxx binfilter/inc/bf_svx/fmmodel.hxx binfilter/inc/bf_svx/fmpage.hxx binfilter/inc/bf_svx/forbiddencharacterstable.hxx binfilter/inc/bf_svx/gallery.hxx binfilter/inc/bf_svx/grfcrop.hxx binfilter/inc/bf_svx/lathe3d.hxx binfilter/inc/bf_svx/light3d.hxx binfilter/inc/bf_svx/linkmgr.hxx binfilter/inc/bf_svx/obj3d.hxx binfilter/inc/bf_svx/outliner.hxx binfilter/inc/bf_svx/outlobj.hxx binfilter/inc/bf_svx/plight3d.hxx binfilter/inc/bf_svx/pntobj3d.hxx binfilter/inc/bf_svx/poly3d.hxx binfilter/inc/bf_svx/polygn3d.hxx binfilter/inc/bf_svx/polyob3d.hxx binfilter/inc/bf_svx/polysc3d.hxx binfilter/inc/bf_svx/scene3d.hxx binfilter/inc/bf_svx/sdginitm.hxx binfilter/inc/bf_svx/sdooitm.hxx binfilter/inc/bf_svx/sdshitm.hxx binfilter/inc/bf_svx/sdtagitm.hxx binfilter/inc/bf_svx/sdtaiitm.hxx binfilter/inc/bf_svx/sdtcfitm.hxx binfilter/inc/bf_svx/sdynitm.hxx binfilter/inc/bf_svx/sphere3d.hxx binfilter/inc/bf_svx/svdattr.hxx binfilter/inc/bf_svx/svddrag.hxx binfilter/inc/bf_svx/svdetc.hxx binfilter/inc/bf_svx/svdhdl.hxx binfilter/inc/bf_svx/svdhlpln.hxx binfilter/inc/bf_svx/svdio.hxx binfilter/inc/bf_svx/svditer.hxx binfilter/inc/bf_svx/svdlayer.hxx binfilter/inc/bf_svx/svdmark.hxx binfilter/inc/bf_svx/svdmodel.hxx binfilter/inc/bf_svx/svdmrkv.hxx binfilter/inc/bf_svx/svdoattr.hxx binfilter/inc/bf_svx/svdocapt.hxx binfilter/inc/bf_svx/svdocirc.hxx binfilter/inc/bf_svx/svdoedge.hxx binfilter/inc/bf_svx/svdograf.hxx binfilter/inc/bf_svx/svdogrp.hxx binfilter/inc/bf_svx/svdomeas.hxx binfilter/inc/bf_svx/svdoole2.hxx binfilter/inc/bf_svx/svdopage.hxx binfilter/inc/bf_svx/svdopath.hxx binfilter/inc/bf_svx/svdorect.hxx binfilter/inc/bf_svx/svdosmbr.hxx binfilter/inc/bf_svx/svdosmev.hxx binfilter/inc/bf_svx/svdosmrt.hxx binfilter/inc/bf_svx/svdotext.hxx binfilter/inc/bf_svx/svdouno.hxx binfilter/inc/bf_svx/svdovirt.hxx binfilter/inc/bf_svx/svdpage.hxx binfilter/inc/bf_svx/svdpagv.hxx binfilter/inc/bf_svx/svdpntv.hxx binfilter/inc/bf_svx/svdpool.hxx binfilter/inc/bf_svx/svdsob.hxx binfilter/inc/bf_svx/svdtouch.hxx binfilter/inc/bf_svx/svdtypes.hxx binfilter/inc/bf_svx/svdundo.hxx binfilter/inc/bf_svx/svdviter.hxx binfilter/inc/bf_svx/svdvmark.hxx binfilter/inc/bf_svx/svimbase.hxx binfilter/inc/bf_svx/svx3ditems.hxx binfilter/inc/bf_svx/svxfont.hxx binfilter/inc/bf_svx/swafopt.hxx binfilter/inc/bf_svx/sxcaitm.hxx binfilter/inc/bf_svx/sxcecitm.hxx binfilter/inc/bf_svx/sxcllitm.hxx binfilter/inc/bf_svx/sxmbritm.hxx binfilter/inc/bf_svx/sxmspitm.hxx binfilter/inc/bf_svx/sxmsuitm.hxx binfilter/inc/bf_svx/sxmtaitm.hxx binfilter/inc/bf_svx/sxmtfitm.hxx binfilter/inc/bf_svx/sxmtritm.hxx binfilter/inc/bf_svx/sxopitm.hxx binfilter/inc/bf_svx/unoedsrc.hxx binfilter/inc/bf_svx/unoforou.hxx binfilter/inc/bf_svx/unolingu.hxx binfilter/inc/bf_svx/unoshape.hxx binfilter/inc/bf_svx/unotext.hxx binfilter/inc/bf_svx/unoviwed.hxx binfilter/inc/bf_svx/unoviwou.hxx binfilter/inc/bf_svx/viewpt3d.hxx binfilter/inc/bf_svx/volume3d.hxx binfilter/inc/bf_svx/xbitmap.hxx binfilter/inc/bf_svx/xflbckit.hxx binfilter/inc/bf_svx/xflbmsli.hxx binfilter/inc/bf_svx/xflbmtit.hxx binfilter/inc/bf_svx/xflbstit.hxx binfilter/inc/bf_svx/xflftrit.hxx binfilter/inc/bf_svx/xflgrit.hxx binfilter/inc/bf_svx/xflhtit.hxx binfilter/inc/bf_svx/xftmrit.hxx binfilter/inc/bf_svx/xit.hxx binfilter/inc/bf_svx/xlndsit.hxx binfilter/inc/bf_svx/xlnedcit.hxx binfilter/inc/bf_svx/xlnstcit.hxx binfilter/inc/bf_svx/xmlcnitm.hxx binfilter/inc/bf_svx/xmlgrhlp.hxx binfilter/inc/bf_svx/xoutbmp.hxx binfilter/inc/bf_svx/xoutx.hxx binfilter/inc/bf_svx/xpoly.hxx binfilter/inc/bf_svx/xpolyimp.hxx binfilter/inc/bf_svx/xpool.hxx binfilter/inc/bf_svx/xtextit0.hxx binfilter/inc/bf_svx/zoomitem.hxx binfilter/inc/bf_sw/accessibilityoptions.hxx binfilter/inc/bf_sw/authfld.hxx binfilter/inc/bf_sw/authratr.hxx binfilter/inc/bf_sw/bparr.hxx binfilter/inc/bf_sw/breakit.hxx binfilter/inc/bf_sw/calbck.hxx binfilter/inc/bf_sw/cellatr.hxx binfilter/inc/bf_sw/cellfml.hxx binfilter/inc/bf_sw/charatr.hxx binfilter/inc/bf_sw/crsrsh.hxx binfilter/inc/bf_sw/crsskip.hxx binfilter/inc/bf_sw/cshtyp.hxx binfilter/inc/bf_sw/ddefld.hxx binfilter/inc/bf_sw/docary.hxx binfilter/inc/bf_sw/docfac.hxx binfilter/inc/bf_sw/docsh.hxx binfilter/inc/bf_sw/docstat.hxx binfilter/inc/bf_sw/docufld.hxx binfilter/inc/bf_sw/dpage.hxx binfilter/inc/bf_sw/drawdoc.hxx binfilter/inc/bf_sw/editsh.hxx binfilter/inc/bf_sw/errhdl.hxx binfilter/inc/bf_sw/expfld.hxx binfilter/inc/bf_sw/fesh.hxx binfilter/inc/bf_sw/fmtanchr.hxx binfilter/inc/bf_sw/fmtclds.hxx binfilter/inc/bf_sw/fmtcnct.hxx binfilter/inc/bf_sw/fmtcntnt.hxx binfilter/inc/bf_sw/fmtfordr.hxx binfilter/inc/bf_sw/fmtfsize.hxx binfilter/inc/bf_sw/fmtftntx.hxx binfilter/inc/bf_sw/fmthdft.hxx binfilter/inc/bf_sw/fmtline.hxx binfilter/inc/bf_sw/fmtlsplt.hxx binfilter/inc/bf_sw/fmtornt.hxx binfilter/inc/bf_sw/fmtsrnd.hxx binfilter/inc/bf_sw/format.hxx binfilter/inc/bf_sw/frmatr.hxx binfilter/inc/bf_sw/frmfmt.hxx binfilter/inc/bf_sw/ftninfo.hxx binfilter/inc/bf_sw/grfatr.hxx binfilter/inc/bf_sw/hintids.hxx binfilter/inc/bf_sw/hints.hxx binfilter/inc/bf_sw/index.hxx binfilter/inc/bf_sw/iodetect.hxx binfilter/inc/bf_sw/linetype.hxx binfilter/inc/bf_sw/mdiexp.hxx binfilter/inc/bf_sw/ndarr.hxx binfilter/inc/bf_sw/ndindex.hxx binfilter/inc/bf_sw/ndole.hxx binfilter/inc/bf_sw/ndtxt.hxx binfilter/inc/bf_sw/ndtyp.hxx binfilter/inc/bf_sw/newhdl.hxx binfilter/inc/bf_sw/pagedesc.hxx binfilter/inc/bf_sw/pageiter.hxx binfilter/inc/bf_sw/paratr.hxx binfilter/inc/bf_sw/poolfmt.awk binfilter/inc/bf_sw/poolfmt.hxx binfilter/inc/bf_sw/pvprtdat.hxx binfilter/inc/bf_sw/redline.hxx binfilter/inc/bf_sw/reffld.hxx binfilter/inc/bf_sw/shellio.hxx binfilter/inc/bf_sw/sw3io.hxx binfilter/inc/bf_sw/swatrset.hxx binfilter/inc/bf_sw/swcrsr.hxx binfilter/inc/bf_sw/swdbdata.hxx binfilter/inc/bf_sw/swdbtoolsclient.hxx binfilter/inc/bf_sw/swevent.hxx binfilter/inc/bf_sw/swgpar.hxx binfilter/inc/bf_sw/swgstr.hxx binfilter/inc/bf_sw/swmodule.hxx binfilter/inc/bf_sw/swprtopt.hxx binfilter/inc/bf_sw/swrect.hxx binfilter/inc/bf_sw/swregion.hxx binfilter/inc/bf_sw/swserv.hxx binfilter/inc/bf_sw/swtable.hxx binfilter/inc/bf_sw/swtypes.hxx binfilter/inc/bf_sw/swunohelper.hxx binfilter/inc/bf_sw/swwait.hxx binfilter/inc/bf_sw/tgrditem.hxx binfilter/inc/bf_sw/toxwrap.hxx binfilter/inc/bf_sw/txatbase.hxx binfilter/inc/bf_sw/txatritr.hxx binfilter/inc/bf_sw/txtatr.hxx binfilter/inc/bf_sw/txtftn.hxx binfilter/inc/bf_sw/txtinet.hxx binfilter/inc/bf_sw/undobj.hxx binfilter/inc/bf_sw/unoatxt.hxx binfilter/inc/bf_sw/unocoll.hxx binfilter/inc/bf_sw/unocrsr.hxx binfilter/inc/bf_sw/unodraw.hxx binfilter/inc/bf_sw/unoevtlstnr.hxx binfilter/inc/bf_sw/unofield.hxx binfilter/inc/bf_sw/unoframe.hxx binfilter/inc/bf_sw/unoidx.hxx binfilter/inc/bf_sw/unoobj.hxx binfilter/inc/bf_sw/unoport.hxx binfilter/inc/bf_sw/unoprnms.hxx binfilter/inc/bf_sw/unoredline.hxx binfilter/inc/bf_sw/unoredlines.hxx binfilter/inc/bf_sw/unosrch.hxx binfilter/inc/bf_sw/unostyle.hxx binfilter/inc/bf_sw/unotbl.hxx binfilter/inc/bf_sw/unotxdoc.hxx binfilter/inc/bf_sw/viewopt.hxx binfilter/inc/bf_sw/viewsh.hxx binfilter/inc/bf_sw/viscrs.hxx binfilter/inc/bf_xmloff/NamedBoolPropertyHdl.hxx binfilter/inc/bf_xmloff/VisAreaContext.hxx binfilter/inc/bf_xmloff/i18nmap.hxx binfilter/inc/bf_xmloff/sdxmlexp.hxx binfilter/inc/bf_xmloff/styleexp.hxx binfilter/inc/bf_xmloff/txtfldi.hxx binfilter/inc/bf_xmloff/xexptran.hxx binfilter/inc/bf_xmloff/xmlcnimp.hxx binfilter/inc/bf_xmloff/xmlcnitm.hxx binfilter/inc/bf_xmloff/xmlehelp.hxx binfilter/inc/bf_xmloff/xmlexp.hxx binfilter/inc/bf_xmloff/xmlictxt.hxx binfilter/inc/bf_xmloff/xmlimppr.hxx binfilter/inc/bf_xmloff/xmlnume.hxx binfilter/inc/bf_xmloff/xmlnumfi.hxx binfilter/inc/bf_xmloff/xmlstyle.hxx binfilter/inc/bf_xmloff/xmltoken.hxx binfilter/inc/bf_xmloff/xmluconv.hxx filter/inc/filter/msfilter/escherex.hxx filter/inc/filter/msfilter/msdffimp.hxx filter/inc/filter/msfilter/svdfppt.hxx filter/inc/filter/msfilter/svxmsbas.hxx filter/inc/registration.hxx filter/source/docbook/sofftodocbookheadings.xsl filter/source/flash/swfuno.cxx filter/source/flash/swfwriter1.cxx filter/source/graphicfilter/egif/dlgegif.cxx filter/source/graphicfilter/egif/egif.cxx filter/source/graphicfilter/egif/makefile.mk filter/source/graphicfilter/eos2met/dlgeos2.cxx filter/source/graphicfilter/eos2met/dlgeos2.hxx filter/source/graphicfilter/eos2met/eos2met.cxx filter/source/graphicfilter/eos2met/makefile.mk filter/source/graphicfilter/epbm/dlgepbm.cxx filter/source/graphicfilter/epbm/epbm.cxx filter/source/graphicfilter/epbm/makefile.mk filter/source/graphicfilter/epgm/dlgepgm.cxx filter/source/graphicfilter/epgm/dlgepgm.hxx filter/source/graphicfilter/epgm/epgm.cxx filter/source/graphicfilter/epgm/makefile.mk filter/source/graphicfilter/epict/dlgepct.cxx filter/source/graphicfilter/epict/epict.cxx filter/source/graphicfilter/epict/makefile.mk filter/source/graphicfilter/eppm/dlgeppm.cxx filter/source/graphicfilter/eppm/dlgeppm.hxx filter/source/graphicfilter/eppm/eppm.cxx filter/source/graphicfilter/eppm/makefile.mk filter/source/graphicfilter/eps/dlgeps.cxx filter/source/graphicfilter/eps/dlgeps.hxx filter/source/graphicfilter/eps/eps.cxx filter/source/graphicfilter/eps/makefile.mk filter/source/graphicfilter/eras/eras.cxx filter/source/graphicfilter/etiff/etiff.cxx filter/source/graphicfilter/expm/expm.cxx filter/source/graphicfilter/icgm/actimpr.cxx filter/source/graphicfilter/idxf/dxf2mtf.cxx filter/source/graphicfilter/idxf/dxf2mtf.hxx filter/source/graphicfilter/idxf/dxfgrprd.cxx filter/source/graphicfilter/idxf/dxfgrprd.hxx filter/source/graphicfilter/idxf/idxf.cxx filter/source/graphicfilter/ieps/ieps.cxx filter/source/graphicfilter/ios2met/ios2met.cxx filter/source/graphicfilter/ipbm/ipbm.cxx filter/source/graphicfilter/ipcd/ipcd.cxx filter/source/graphicfilter/ipcx/ipcx.cxx filter/source/graphicfilter/ipict/ipict.cxx filter/source/graphicfilter/ipict/makefile.mk filter/source/graphicfilter/ipsd/ipsd.cxx filter/source/graphicfilter/iras/iras.cxx filter/source/graphicfilter/itga/itga.cxx filter/source/graphicfilter/itiff/itiff.cxx filter/source/msfilter/escherex.cxx filter/source/msfilter/eschesdo.cxx filter/source/msfilter/eschesdo.hxx filter/source/msfilter/makefile.mk filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msocximex.cxx filter/source/msfilter/msoleexp.cxx filter/source/msfilter/msvbahelper.cxx filter/source/msfilter/powerpoint/pptimporteruno.cxx filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svxmsbas.cxx filter/source/pdf/pdfexport.cxx filter/source/pdf/pdfuno.cxx filter/source/placeware/uno.cxx filter/source/svg/makefile.mk filter/source/svg/svgexport.cxx filter/source/svg/svgfontexport.cxx filter/source/svg/svguno.cxx filter/source/svg/svgwriter.cxx filter/source/t602/filterenv.cxx filter/source/xmlfilteradaptor/genericfilter.cxx filter/source/xmlfilterdetect/fdcomp.cxx filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xsltdialog/xmlfileview.cxx filter/source/xsltdialog/xmlfilterdialogcomponent.cxx filter/source/xsltfilter/XSLTFilter.cxx hwpfilter/source/hwpreader.hxx oox/inc/oox/core/binarycodec.hxx oox/inc/oox/core/binaryfilterbase.hxx oox/inc/oox/core/contexthandler.hxx oox/inc/oox/core/contexthandler2.hxx oox/inc/oox/core/fasttokenhandler.hxx oox/inc/oox/core/filterbase.hxx oox/inc/oox/core/filterdetect.hxx oox/inc/oox/core/fragmenthandler.hxx oox/inc/oox/core/fragmenthandler2.hxx oox/inc/oox/core/recordparser.hxx oox/inc/oox/core/relations.hxx oox/inc/oox/core/relationshandler.hxx oox/inc/oox/core/xmlfilterbase.hxx oox/inc/oox/drawingml/chart/axiscontext.hxx oox/inc/oox/drawingml/chart/axisconverter.hxx oox/inc/oox/drawingml/chart/axismodel.hxx oox/inc/oox/drawingml/chart/chartcontextbase.hxx oox/inc/oox/drawingml/chart/chartconverter.hxx oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx oox/inc/oox/drawingml/chart/chartspaceconverter.hxx oox/inc/oox/drawingml/chart/chartspacefragment.hxx oox/inc/oox/drawingml/chart/chartspacemodel.hxx oox/inc/oox/drawingml/chart/converterbase.hxx oox/inc/oox/drawingml/chart/datasourcecontext.hxx oox/inc/oox/drawingml/chart/datasourceconverter.hxx oox/inc/oox/drawingml/chart/datasourcemodel.hxx oox/inc/oox/drawingml/chart/modelbase.hxx oox/inc/oox/drawingml/chart/objectformatter.hxx oox/inc/oox/drawingml/chart/plotareacontext.hxx oox/inc/oox/drawingml/chart/plotareaconverter.hxx oox/inc/oox/drawingml/chart/plotareamodel.hxx oox/inc/oox/drawingml/chart/seriescontext.hxx oox/inc/oox/drawingml/chart/seriesconverter.hxx oox/inc/oox/drawingml/chart/seriesmodel.hxx oox/inc/oox/drawingml/chart/titlecontext.hxx oox/inc/oox/drawingml/chart/titleconverter.hxx oox/inc/oox/drawingml/chart/titlemodel.hxx oox/inc/oox/drawingml/chart/typegroupcontext.hxx oox/inc/oox/drawingml/chart/typegroupconverter.hxx oox/inc/oox/drawingml/chart/typegroupmodel.hxx oox/inc/oox/drawingml/textbody.hxx oox/inc/oox/drawingml/textliststyle.hxx oox/inc/oox/drawingml/textparagraphproperties.hxx oox/inc/oox/helper/attributelist.hxx oox/inc/oox/helper/binaryinputstream.hxx oox/inc/oox/helper/binaryoutputstream.hxx oox/inc/oox/helper/binarystreambase.hxx oox/inc/oox/helper/containerhelper.hxx oox/inc/oox/helper/graphichelper.hxx oox/inc/oox/helper/helper.hxx oox/inc/oox/helper/modelobjecthelper.hxx oox/inc/oox/helper/progressbar.hxx oox/inc/oox/helper/propertymap.hxx oox/inc/oox/helper/propertyset.hxx oox/inc/oox/helper/textinputstream.hxx oox/inc/oox/ole/axbinaryreader.hxx oox/inc/oox/ole/axcontrolfragment.hxx oox/inc/oox/ole/olehelper.hxx oox/inc/oox/ole/oleobjecthelper.hxx oox/inc/oox/ole/vbacontrol.hxx oox/inc/oox/ole/vbainputstream.hxx oox/inc/oox/ole/vbamodule.hxx oox/inc/oox/ole/vbaproject.hxx oox/inc/oox/ole/vbaprojectfilter.hxx oox/inc/oox/token/propertynames.hxx oox/inc/oox/vml/vmldrawing.hxx oox/inc/oox/vml/vmldrawingfragment.hxx oox/inc/oox/vml/vmlformatting.hxx oox/inc/oox/vml/vmlinputstream.hxx oox/inc/oox/vml/vmlshape.hxx oox/inc/oox/vml/vmlshapecontainer.hxx oox/inc/oox/vml/vmlshapecontext.hxx oox/inc/oox/xls/addressconverter.hxx oox/inc/oox/xls/biffcodec.hxx oox/inc/oox/xls/biffdetector.hxx oox/inc/oox/xls/biffhelper.hxx oox/inc/oox/xls/biffinputstream.hxx oox/inc/oox/xls/biffoutputstream.hxx oox/inc/oox/xls/chartsheetfragment.hxx oox/inc/oox/xls/commentsbuffer.hxx oox/inc/oox/xls/commentsfragment.hxx oox/inc/oox/xls/condformatbuffer.hxx oox/inc/oox/xls/condformatcontext.hxx oox/inc/oox/xls/connectionsfragment.hxx oox/inc/oox/xls/defnamesbuffer.hxx oox/inc/oox/xls/drawingfragment.hxx oox/inc/oox/xls/excelchartconverter.hxx oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelhandlers.hxx oox/inc/oox/xls/excelvbaproject.hxx oox/inc/oox/xls/externallinkbuffer.hxx oox/inc/oox/xls/externallinkfragment.hxx oox/inc/oox/xls/formulabase.hxx oox/inc/oox/xls/formulaparser.hxx oox/inc/oox/xls/numberformatsbuffer.hxx oox/inc/oox/xls/ooxformulaparser.hxx oox/inc/oox/xls/pagesettings.hxx oox/inc/oox/xls/pivotcachebuffer.hxx oox/inc/oox/xls/pivotcachefragment.hxx oox/inc/oox/xls/pivottablebuffer.hxx oox/inc/oox/xls/pivottablefragment.hxx oox/inc/oox/xls/querytablefragment.hxx oox/inc/oox/xls/richstring.hxx oox/inc/oox/xls/richstringcontext.hxx oox/inc/oox/xls/scenariobuffer.hxx oox/inc/oox/xls/scenariocontext.hxx oox/inc/oox/xls/sharedformulabuffer.hxx oox/inc/oox/xls/sharedstringsbuffer.hxx oox/inc/oox/xls/sharedstringsfragment.hxx oox/inc/oox/xls/sheetdatacontext.hxx oox/inc/oox/xls/stylesbuffer.hxx oox/inc/oox/xls/stylesfragment.hxx oox/inc/oox/xls/tablebuffer.hxx oox/inc/oox/xls/tablefragment.hxx oox/inc/oox/xls/themebuffer.hxx oox/inc/oox/xls/unitconverter.hxx oox/inc/oox/xls/viewsettings.hxx oox/inc/oox/xls/webquerybuffer.hxx oox/inc/oox/xls/workbookfragment.hxx oox/inc/oox/xls/workbooksettings.hxx oox/inc/oox/xls/worksheetbuffer.hxx oox/inc/oox/xls/worksheetfragment.hxx oox/inc/oox/xls/worksheethelper.hxx oox/inc/oox/xls/worksheetsettings.hxx oox/prj/build.lst oox/prj/d.lst oox/source/core/binarycodec.cxx oox/source/core/binaryfilterbase.cxx oox/source/core/contexthandler.cxx oox/source/core/contexthandler2.cxx oox/source/core/facreg.cxx oox/source/core/fasttokenhandler.cxx oox/source/core/filterbase.cxx oox/source/core/filterdetect.cxx oox/source/core/fragmenthandler.cxx oox/source/core/fragmenthandler2.cxx oox/source/core/recordparser.cxx oox/source/core/relations.cxx oox/source/core/relationshandler.cxx oox/source/core/xmlfilterbase.cxx oox/source/docprop/ooxmldocpropimport.cxx oox/source/docprop/ooxmldocpropimport.hxx oox/source/drawingml/chart/axiscontext.cxx oox/source/drawingml/chart/axisconverter.cxx oox/source/drawingml/chart/axismodel.cxx oox/source/drawingml/chart/chartcontextbase.cxx oox/source/drawingml/chart/chartconverter.cxx oox/source/drawingml/chart/chartdrawingfragment.cxx oox/source/drawingml/chart/chartspaceconverter.cxx oox/source/drawingml/chart/chartspacefragment.cxx oox/source/drawingml/chart/chartspacemodel.cxx oox/source/drawingml/chart/converterbase.cxx oox/source/drawingml/chart/datasourcecontext.cxx oox/source/drawingml/chart/datasourceconverter.cxx oox/source/drawingml/chart/datasourcemodel.cxx oox/source/drawingml/chart/modelbase.cxx oox/source/drawingml/chart/objectformatter.cxx oox/source/drawingml/chart/plotareacontext.cxx oox/source/drawingml/chart/plotareaconverter.cxx oox/source/drawingml/chart/seriescontext.cxx oox/source/drawingml/chart/seriesconverter.cxx oox/source/drawingml/chart/seriesmodel.cxx oox/source/drawingml/chart/titlecontext.cxx oox/source/drawingml/chart/titleconverter.cxx oox/source/drawingml/chart/titlemodel.cxx oox/source/drawingml/chart/typegroupcontext.cxx oox/source/drawingml/chart/typegroupconverter.cxx oox/source/drawingml/chart/typegroupmodel.cxx oox/source/drawingml/shape.cxx oox/source/drawingml/shapecontext.cxx oox/source/drawingml/table/tableproperties.cxx oox/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textliststyle.cxx oox/source/drawingml/transform2dcontext.cxx oox/source/dump/biffdumper.cxx oox/source/dump/dffdumper.cxx oox/source/dump/dumperbase.cxx oox/source/dump/oledumper.cxx oox/source/dump/pptxdumper.cxx oox/source/dump/xlsbdumper.cxx oox/source/helper/attributelist.cxx oox/source/helper/binaryinputstream.cxx oox/source/helper/binarystreambase.cxx oox/source/helper/containerhelper.cxx oox/source/helper/graphichelper.cxx oox/source/helper/modelobjecthelper.cxx oox/source/helper/progressbar.cxx oox/source/helper/propertymap.cxx oox/source/helper/propertyset.cxx oox/source/helper/textinputstream.cxx oox/source/ole/axbinaryreader.cxx oox/source/ole/axcontrol.cxx oox/source/ole/olehelper.cxx oox/source/ole/oleobjecthelper.cxx oox/source/ole/vbacontrol.cxx oox/source/ole/vbamodule.cxx oox/source/ole/vbaproject.cxx oox/source/ole/vbaprojectfilter.cxx oox/source/ppt/customshowlistcontext.cxx oox/source/ppt/pptimport.cxx oox/source/ppt/pptshapegroupcontext.cxx oox/source/shape/FastTokenHandlerService.cxx oox/source/shape/FastTokenHandlerService.hxx oox/source/token/makefile.mk oox/source/token/namespacemap.cxx oox/source/token/properties.txt oox/source/token/propertynames.cxx oox/source/token/tokenmap.cxx oox/source/token/tokens.hxx.head oox/source/vml/vmldrawing.cxx oox/source/vml/vmldrawingfragment.cxx oox/source/vml/vmlformatting.cxx oox/source/vml/vmlinputstream.cxx oox/source/vml/vmlshape.cxx oox/source/vml/vmlshapecontainer.cxx oox/source/vml/vmlshapecontext.cxx oox/source/vml/vmltextbox.cxx oox/source/xls/addressconverter.cxx oox/source/xls/autofiltercontext.cxx oox/source/xls/biffcodec.cxx oox/source/xls/biffdetector.cxx oox/source/xls/biffhelper.cxx oox/source/xls/biffinputstream.cxx oox/source/xls/biffoutputstream.cxx oox/source/xls/chartsheetfragment.cxx oox/source/xls/commentsbuffer.cxx oox/source/xls/commentsfragment.cxx oox/source/xls/condformatbuffer.cxx oox/source/xls/condformatcontext.cxx oox/source/xls/connectionsfragment.cxx oox/source/xls/defnamesbuffer.cxx oox/source/xls/drawingfragment.cxx oox/source/xls/excelchartconverter.cxx oox/source/xls/excelfilter.cxx oox/source/xls/excelhandlers.cxx oox/source/xls/externallinkbuffer.cxx oox/source/xls/externallinkfragment.cxx oox/source/xls/formulabase.cxx oox/source/xls/formulaparser.cxx oox/source/xls/numberformatsbuffer.cxx oox/source/xls/ooxformulaparser.cxx oox/source/xls/pagesettings.cxx oox/source/xls/pivotcachebuffer.cxx oox/source/xls/pivotcachefragment.cxx oox/source/xls/pivottablebuffer.cxx oox/source/xls/pivottablefragment.cxx oox/source/xls/querytablefragment.cxx oox/source/xls/richstring.cxx oox/source/xls/richstringcontext.cxx oox/source/xls/scenariobuffer.cxx oox/source/xls/scenariocontext.cxx oox/source/xls/sharedformulabuffer.cxx oox/source/xls/sharedstringsbuffer.cxx oox/source/xls/sharedstringsfragment.cxx oox/source/xls/sheetdatacontext.cxx oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesfragment.cxx oox/source/xls/tablebuffer.cxx oox/source/xls/tablefragment.cxx oox/source/xls/themebuffer.cxx oox/source/xls/unitconverter.cxx oox/source/xls/webquerybuffer.cxx oox/source/xls/workbookfragment.cxx oox/source/xls/workbookhelper.cxx oox/source/xls/workbooksettings.cxx oox/source/xls/worksheetbuffer.cxx oox/source/xls/worksheetfragment.cxx oox/source/xls/worksheethelper.cxx oox/source/xls/worksheetsettings.cxx unoxml/source/rdf/librdf_repository.cxx unoxml/source/xpath/xpathapi.hxx writerfilter/inc/resourcemodel/Fraction.hxx writerfilter/inc/resourcemodel/TagLogger.hxx writerfilter/inc/resourcemodel/XPathLogger.hxx writerfilter/source/dmapper/BorderHandler.cxx writerfilter/source/dmapper/CellColorHandler.cxx writerfilter/source/dmapper/CellColorHandler.hxx writerfilter/source/dmapper/CellMarginHandler.cxx writerfilter/source/dmapper/CellMarginHandler.hxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/FFDataHandler.cxx writerfilter/source/dmapper/FontTable.cxx writerfilter/source/dmapper/FontTable.hxx writerfilter/source/dmapper/GraphicImport.cxx writerfilter/source/dmapper/GraphicImport.hxx writerfilter/source/dmapper/MeasureHandler.cxx writerfilter/source/dmapper/NumberingManager.cxx writerfilter/source/dmapper/NumberingManager.hxx writerfilter/source/dmapper/OLEHandler.cxx writerfilter/source/dmapper/OLEHandler.hxx writerfilter/source/dmapper/PropertyIds.hxx writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.hxx writerfilter/source/dmapper/PropertyMapHelper.cxx writerfilter/source/dmapper/PropertyMapHelper.hxx writerfilter/source/dmapper/SectionColumnHandler.cxx writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/StyleSheetTable.hxx writerfilter/source/dmapper/TDefTableHandler.cxx writerfilter/source/dmapper/dmapperLoggers.hxx writerfilter/source/filter/ImportFilter.cxx writerfilter/source/filter/RtfFilter.cxx writerfilter/source/filter/RtfFilter.hxx writerfilter/source/ooxml/OOXMLFactory.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.hxx writerfilter/source/ooxml/OOXMLFastHelper.hxx writerfilter/source/ooxml/OOXMLParserState.hxx writerfilter/source/ooxml/factoryimpl_ns.xsl writerfilter/source/ooxml/model.xml writerfilter/source/resourcemodel/TagLogger.cxx writerfilter/source/resourcemodel/XPathLogger.cxx writerperfect/prj/build.lst writerperfect/source/wpdimp/wpft_genericfilter.cxx
author: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 22:49:23 -0600
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 22:49:23 -0600
commit: f673d89a6a4f6b2d3d519ab17a57b299cb6be1ad (patch)
tree: dc8127da17e362197b1b19df7b6957ce554fb0fd /oox/inc
parent: 50bc1bc97b170c38648fab979ccb812a3c458cab (diff)
parent: 818573bfbce420afedffd45d7bb080f25da32625 (diff)
153 files changed, 3477 insertions, 2065 deletions
diff --git a/oox/inc/oox/core/binarycodec.hxx b/oox/inc/oox/core/binarycodec.hxx
index f60dca65eb1d..f7dccbb3b43e 100644
--- a/oox/inc/oox/core/binarycodec.hxx
+++ b/oox/inc/oox/core/binarycodec.hxx
@@ -29,6 +29,9 @@
 #ifndef OOX_CORE_BINARYCODEC_HXX
 #define OOX_CORE_BINARYCODEC_HXX
 
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
+
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
 
@@ -86,6 +89,22 @@ public:
      */
     void                initKey( const sal_uInt8 pnPassData[ 16 ] );
 
+    /** Initializes the algorithm with the encryption data.
+
+        @param aData
+            The sequence contains the necessary data to initialize
+            the codec.
+     */
+    bool                initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+
+    /** Retrieves the encryption data
+
+        @return
+            The sequence contains the necessary data to initialize
+            the codec.
+     */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
+
     /** Verifies the validity of the password using the passed key and hash.
 
         @precond
@@ -151,16 +170,6 @@ public:
      */
     bool                skip( sal_Int32 nBytes );
 
-    // static -----------------------------------------------------------------
-
-    /** Calculates the 16-bit hash value for the given password.
-
-        The password data may be longer than 16 bytes. The array does not need
-        to be terminated with a null byte (but it can without invalidating the
-        result).
-     */
-    static sal_uInt16   getHash( const sal_uInt8* pnPassData, sal_Int32 nSize );
-
 private:
     CodecType           meCodecType;        /// Codec type.
     sal_uInt8           mpnKey[ 16 ];       /// Encryption key.
@@ -190,6 +199,22 @@ public:
 
                         ~BinaryCodec_RCF();
 
+    /** Initializes the algorithm with the encryption data.
+
+        @param aData
+            The sequence contains the necessary data to initialize
+            the codec.
+     */
+    bool            initCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData );
+
+    /** Retrieves the encryption data
+
+        @return
+            The sequence contains the necessary data to initialize
+            the codec.
+     */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > getEncryptionData();
+
     /** Initializes the algorithm with the specified password and document ID.
 
         @param pnPassData
@@ -279,9 +304,14 @@ public:
     bool                skip( sal_Int32 nBytes );
 
 private:
+    void                InitKeyImpl(
+                            const sal_uInt8 pKeyData[64],
+                            const sal_uInt8 pUnique[16] );
+
     rtlCipher           mhCipher;
     rtlDigest           mhDigest;
     sal_uInt8           mpnDigestValue[ RTL_DIGEST_LENGTH_MD5 ];
+    sal_uInt8           mpnUnique[16];
 };
 
 // ============================================================================
@@ -291,4 +321,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/binaryfilterbase.hxx b/oox/inc/oox/core/binaryfilterbase.hxx
index f1e1bf877996..d347ac755f63 100644
--- a/oox/inc/oox/core/binaryfilterbase.hxx
+++ b/oox/inc/oox/core/binaryfilterbase.hxx
@@ -41,7 +41,8 @@ class BinaryFilterBase : public FilterBase
 {
 public:
     explicit            BinaryFilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual             ~BinaryFilterBase();
 
@@ -61,4 +62,4 @@ typedef ::rtl::Reference< BinaryFilterBase > BinaryFilterRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index 3fb3766b4ef2..9bad2003c12c 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -29,16 +29,18 @@
 #ifndef OOX_CORE_CONTEXTHANDLER_HXX
 #define OOX_CORE_CONTEXTHANDLER_HXX
 
+#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <boost/shared_ptr.hpp>
-#include <rtl/ref.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
+#include <rtl/ref.hxx>
+#include "oox/token/namespaces.hxx"
+#include "oox/token/tokens.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XLocator; } }
 } } }
 
-namespace oox { class RecordInputStream; }
+namespace oox { class SequenceInputStream; }
 
 namespace oox {
 namespace core {
@@ -92,8 +94,8 @@ public:
 
     // record context interface -----------------------------------------------
 
-    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        startRecord( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual void        endRecord( sal_Int32 nRecId );
 
 protected:
@@ -116,4 +118,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx
index 3f6db7c813c3..303693914920 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/oox/inc/oox/core/contexthandler2.hxx
@@ -31,39 +31,43 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include "tokens.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/helper/recordinputstream.hxx"
+#include "oox/helper/binaryinputstream.hxx"
 #include "oox/core/contexthandler.hxx"
-#include "oox/core/namespaces.hxx"
 
 namespace oox {
 namespace core {
 
 // ============================================================================
 
-struct ContextInfo;
+const sal_Int32 XML_ROOT_CONTEXT    = SAL_MAX_INT32;
 
-/** Helper class that provides a context identifier stack.
+// ============================================================================
+
+struct ElementInfo;
+
+/** Helper class that provides a context stack.
 
     Fragment handlers and context handlers derived from this helper class will
-    track the identifiers of the current context in a stack. The idea is to use
-    the same instance of a fragment handler or context handler to process
+    track the identifiers of the visited elements in a stack. The idea is to
+    use the same instance of a fragment handler or context handler to process
     several nested elements in an XML stream. For that, the abstract function
-    onCreateContext() has to return 'true' for the passed element.
+    onCreateContext() has to return 'this' for the passed element.
 
     Derived classes have to implement the createFastChildContext(),
     startFastElement(), characters(), and endFastElement() functions from the
     com.sun.star.xml.sax.XFastContextHandler interface by simply forwarding
-    them to the respective implCreateChildContext(), implStartCurrentContext(),
-    implCharacters(), and implEndCurrentContext() functions of this helper. The
-    new abstract functions have to be implemented according to the elements to
-    be processed.
+    them to the respective implCreateChildContext(), implStartElement(),
+    implCharacters(), and implEndElement() functions of this helper. This is
+    implemented already in the classes ContextHandler2 and FragmentHandler2.
+    The new abstract functions have to be implemented according to the elements
+    to be processed.
 
     Similarly, for binary import, derived classes have to forward the
     createRecordContext(), startRecord(), and endRecord() functions from the
     ContextHandler class to the implCreateRecordContext(), implStartRecord(),
-    and implEndRecord() functions of this helper.
+    and implEndRecord() functions of this helper. Again, this is implemented
+    already in the classes ContextHandler2 and FragmentHandler2.
  */
 class ContextHandler2Helper
 {
@@ -72,78 +76,97 @@ public:
     explicit            ContextHandler2Helper( const ContextHandler2Helper& rParent );
     virtual             ~ContextHandler2Helper();
 
+    // allow instances to be stored in ::rtl::Reference
     virtual void SAL_CALL acquire() throw() = 0;
     virtual void SAL_CALL release() throw() = 0;
 
-    virtual ContextHandler& queryContextHandler() = 0;
-
     // interface --------------------------------------------------------------
 
-    /** Will be called if a new context can be created for the passed element.
+    /** Will be called to create a context handler for the passed element.
 
-        Usually 'true' should be returned to improve performance by reusing the
+        Usually 'this' can be returned to improve performance by reusing the
         same instance to process several elements. Used by OOXML import only.
      */
     virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) = 0;
 
-    /** Will be called if a new context element has been started.
+    /** Will be called when a new element has been started.
+
+        This function is called at the context handler returned from
+        onCreateContext(), or, for root elements of an XML stream, at the
+        fragment handler itself.
 
-        The current element identifier can be accessed by using
-        getCurrentContext() or isCurrentContext(). Used by OOXML import only.
+        The current element identifier can be accessed with getCurrentElement()
+        or isCurrentElement(). Used by OOXML import only.
      */
     virtual void        onStartElement( const AttributeList& rAttribs ) = 0;
 
-    /** Will be called if the current context element is about to be left.
+    /** Will be called before a new child element starts, or if the current
+        element is about to be left.
 
-        The current element identifier can be accessed by using
-        getCurrentContext() or isCurrentContext(). Used by OOXML import only.
+        This helper function collects all text fragments received by the
+        characters() function (such as encoded characters which are passed in
+        separate calls to the characters() function), and passes the
+        concatenated and trimmed string.
 
-        @param rChars  The characters collected in this element.
+        The current element identifier can be accessed with getCurrentElement()
+        or isCurrentElement(). Used by OOXML import only.
      */
-    virtual void        onEndElement( const ::rtl::OUString& rChars ) = 0;
+    virtual void        onCharacters( const ::rtl::OUString& rChars ) = 0;
 
-    /** Will be called if a new context can be created for the passed element.
+    /** Will be called when the current element is about to be left.
 
-        Usually 'true' should be returned to improve performance by reusing the
-        same instance to process several elements. Used by OOBIN import only.
+        The current element identifier can be accessed with getCurrentElement()
+        or isCurrentElement(). Used by OOXML import only.
      */
-    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm ) = 0;
+    virtual void        onEndElement() = 0;
 
-    /** Will be called if a new record in a binary stream has been started.
+    /** Will be called to create a context handler for the passed record.
 
-        The current record identifier can be accessed by using
-        getCurrentContext() or isCurrentContext(). Used by OOBIN import only.
+        Usually 'this' can be returned to improve performance by reusing the
+        same instance to process several records. Used by BIFF import only.
      */
-    virtual void        onStartRecord( RecordInputStream& rStrm ) = 0;
+    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) = 0;
 
-    /** Will be called if the current context record is about to be left.
+    /** Will be called when a new record block in a binary stream has been
+        started.
 
-        The current record identifier can be accessed by using
-        getCurrentContext() or isCurrentContext(). Used by OOBIN import only.
+        The current record identifier can be accessed with getCurrentElement()
+        or isCurrentElement(). Used by BIFF import only.
+     */
+    virtual void        onStartRecord( SequenceInputStream& rStrm ) = 0;
+
+    /** Will be called when the current record block is about to be left.
+
+        The current record identifier can be accessed with getCurrentElement()
+        or isCurrentElement(). Used by BIFF import only.
      */
     virtual void        onEndRecord() = 0;
 
     // helpers ----------------------------------------------------------------
 
-    /** Returns the element identifier of the current topmost context. */
+    /** Returns the identifier of the currently processed element. */
     sal_Int32           getCurrentElement() const;
 
-    /** Returns true, if nElement contains the current topmost context. */
+    /** Returns true, if nElement contains the identifier of the currently
+        processed element. */
     inline bool         isCurrentElement( sal_Int32 nElement ) const
                             { return getCurrentElement() == nElement; }
 
-    /** Returns true, if either nElement1 or nElement2 contain the current topmost context. */
+    /** Returns true, if either nElement1 or nElement2 contain the identifier
+        of the currently processed element. */
     inline bool         isCurrentElement( sal_Int32 nElement1, sal_Int32 nElement2 ) const
                             { return isCurrentElement( nElement1 ) || isCurrentElement( nElement2 ); }
 
-    /** Returns the element identifier of the specified parent context. */
-    sal_Int32           getPreviousElement( sal_Int32 nCountBack = 1 ) const;
+    /** Returns the identifier of the specified parent element. */
+    sal_Int32           getParentElement( sal_Int32 nCountBack = 1 ) const;
 
-    /** Returns the element identifier of the specified parent context. */
-    inline sal_Int32    isPreviousElement( sal_Int32 nElement, sal_Int32 nCountBack = 1 ) const
-                            { return getPreviousElement( nCountBack ) == nElement; }
+    /** Returns true, if nElement contains the identifier of the specified
+        parent element. */
+    inline sal_Int32    isParentElement( sal_Int32 nElement, sal_Int32 nCountBack = 1 ) const
+                            { return getParentElement( nCountBack ) == nElement; }
 
-    /** Returns true, if the current element is the root element. */
+    /** Returns true, if the element currently processed is the root element of
+        the context or fragment handler. */
     bool                isRootElement() const;
 
     // implementation ---------------------------------------------------------
@@ -156,7 +179,7 @@ protected:
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
 
     /** Must be called from startFastElement() in derived classes. */
-    void                implStartCurrentContext(
+    void                implStartElement(
                             sal_Int32 nElement,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs );
 
@@ -164,13 +187,13 @@ protected:
     void                implCharacters( const ::rtl::OUString& rChars );
 
     /** Must be called from endFastElement() in derived classes. */
-    void                implEndCurrentContext( sal_Int32 nElement );
+    void                implEndElement( sal_Int32 nElement );
 
     /** Must be called from createRecordContext() in derived classes. */
-    ContextHandlerRef   implCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    ContextHandlerRef   implCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     /** Must be called from startRecord() in derived classes. */
-    void                implStartRecord( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                implStartRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     /** Must be called from endRecord() in derived classes. */
     void                implEndRecord( sal_Int32 nRecId );
@@ -178,15 +201,15 @@ protected:
 private:
     ContextHandler2Helper& operator=( const ContextHandler2Helper& );
 
-    ContextInfo&        pushContextInfo( sal_Int32 nElement );
-    void                popContextInfo();
-    void                appendCollectedChars();
+    ElementInfo&        pushElementInfo( sal_Int32 nElement );
+    void                popElementInfo();
+    void                processCollectedChars();
 
 private:
-    typedef ::std::vector< ContextInfo >        ContextStack;
+    typedef ::std::vector< ElementInfo >        ContextStack;
     typedef ::boost::shared_ptr< ContextStack > ContextStackRef;
 
-    ContextStackRef     mxContextStack;     /// Stack of processed contexts.
+    ContextStackRef     mxContextStack;     /// Stack of all processed elements.
     size_t              mnRootStackSize;    /// Stack size on construction time.
     bool                mbEnableTrimSpace;  /// True = trim whitespace in characters().
 };
@@ -203,8 +226,6 @@ public:
     virtual void SAL_CALL acquire() throw() { ContextHandler::acquire(); }
     virtual void SAL_CALL release() throw() { ContextHandler::release(); }
 
-    virtual ContextHandler& queryContextHandler();
-
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
@@ -230,18 +251,19 @@ public:
 
     // oox.core.ContextHandler interface --------------------------------------
 
-    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        startRecord( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual void        endRecord( sal_Int32 nRecId );
 
     // oox.core.ContextHandler2Helper interface -------------------------------
 
     virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
     virtual void        onEndRecord();
 };
 
@@ -252,4 +274,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/fastparser.hxx b/oox/inc/oox/core/fastparser.hxx
new file mode 100755
index 000000000000..967c42474dcc
--- /dev/null
+++ b/oox/inc/oox/core/fastparser.hxx
@@ -0,0 +1,93 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_CORE_FASTPARSER_HXX
+#define OOX_CORE_FASTPARSER_HXX
+
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/sax/XFastParser.hpp>
+
+namespace oox {
+    struct NamespaceMap;
+    class StorageBase;
+}
+
+namespace oox {
+namespace core {
+
+// ============================================================================
+
+/** Wrapper for a fast SAX parser that works on automatically generated OOXML
+    token and namespace identifiers.
+ */
+class FastParser
+{
+public:
+    explicit            FastParser(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
+
+    virtual             ~FastParser();
+
+    /** Registers an OOXML namespace at the parser. */
+    void                registerNamespace( sal_Int32 nNamespaceId )
+                            throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+
+    /** Sets the passed document handler that will receive the SAX parser events. */
+    void                setDocumentHandler(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& rxDocHandler )
+                            throw( ::com::sun::star::uno::RuntimeException );
+
+    /** Parses the passed SAX input source.
+        @param bCloseStream  True = closes the stream in the input source after parsing. */
+    void                parseStream( const ::com::sun::star::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
+                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+
+    /** Parses the passed input stream.
+        @param bCloseStream  True = closes the passed stream after parsing. */
+    void                parseStream(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream,
+                            const ::rtl::OUString& rStreamName, bool bCloseStream = false )
+                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+
+    /** Parses a stream from the passed storage with the specified name.
+        @param bCloseStream  True = closes the stream after parsing. */
+    void                parseStream( StorageBase& rStorage, const ::rtl::OUString& rStreamName, bool bCloseStream = false )
+                            throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastParser >
+                        mxParser;
+    const NamespaceMap& mrNamespaceMap;
+};
+
+// ============================================================================
+
+} // namespace core
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/oox/inc/oox/core/fasttokenhandler.hxx
index 31035b1daba5..e3bdee6b728d 100644
--- a/oox/inc/oox/core/fasttokenhandler.hxx
+++ b/oox/inc/oox/core/fasttokenhandler.hxx
@@ -29,8 +29,9 @@
 #ifndef OOX_CORE_FASTTOKENHANDLER_HXX
 #define OOX_CORE_FASTTOKENHANDLER_HXX
 
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 namespace oox { class TokenMap; }
 
@@ -39,15 +40,23 @@ namespace core {
 
 // ============================================================================
 
+typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandlerBase;
+
 /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface
     that provides access to the tokens generated from the internal token name list.
  */
-class FastTokenHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastTokenHandler >
+class FastTokenHandler : public FastTokenHandlerBase
 {
 public:
     explicit            FastTokenHandler();
     virtual             ~FastTokenHandler();
 
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XFastTokenHandler
     virtual sal_Int32 SAL_CALL getToken( const ::rtl::OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException);
@@ -64,4 +73,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 0e4b0f2e4b4e..e2eea2587391 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -30,14 +30,15 @@
 #define OOX_CORE_FILTERBASE_HXX
 
 #include <memory>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include "oox/helper/binarystreambase.hxx"
@@ -45,16 +46,18 @@
 #include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
     namespace awt { struct DeviceInfo; }
-    namespace frame { class XModel; }
-    namespace task { class XStatusIndicator; }
-    namespace task { class XInteractionHandler; }
     namespace frame { class XFrame; }
+    namespace frame { class XModel; }
+    namespace graphic { class XGraphic; }
     namespace io { class XInputStream; }
     namespace io { class XOutputStream; }
     namespace io { class XStream; }
-    namespace graphic { class XGraphic; }
+    namespace lang { class XMultiComponentFactory; }
+    namespace lang { class XMultiServiceFactory; }
+    namespace task { class XInteractionHandler; }
+    namespace task { class XStatusIndicator; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace comphelper {
@@ -69,6 +72,7 @@ namespace oox {
 
 namespace oox { namespace ole {
     class OleObjectHelper;
+    class VbaProject;
 } }
 
 namespace oox {
@@ -96,7 +100,8 @@ class OOX_DLLPUBLIC FilterBase : public FilterBaseBase, public ::cppu::BaseMutex
 {
 public:
     explicit            FilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual             ~FilterBase();
 
@@ -118,9 +123,17 @@ public:
     /** Returns the specified argument passed through the XInitialization interface. */
     ::com::sun::star::uno::Any getArgument( const ::rtl::OUString& rArgName ) const;
 
-    /** Returns the global service factory passed in the filter constructor (always existing). */
+    /** Returns the component context passed in the filter constructor (always existing). */
+    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                        getComponentContext() const;
+
+    /** Returns the component service factory (always existing). */
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >&
+                        getComponentFactory() const;
+
+    /** Returns the multi service factory of the component (always existing). */
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
-                        getGlobalFactory() const;
+                        getServiceFactory() const;
 
     /** Returns the document model (always existing). */
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >&
@@ -130,7 +143,7 @@ public:
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
                         getModelFactory() const;
 
-    /** Returns the frame that will contain the document model. */
+    /** Returns the frame that will contain the document model (may be null). */
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
                         getTargetFrame() const;
 
@@ -203,9 +216,13 @@ public:
     /** Returns a helper for the handling of OLE obejcts. */
     ::oox::ole::OleObjectHelper& getOleObjectHelper() const;
 
-    /** Requests a password from the media descriptor or from the user. On
-        success, the password will be inserted into the media descriptor. */
-    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
+    /** Returns the VBA project manager. */
+    ::oox::ole::VbaProject& getVbaProject() const;
+
+    /** Requests the encryption data from the media descriptor or from the user. On
+        success, the encryption data will be inserted into the media descriptor. */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
+                        requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
 
     /** Imports the raw binary data from the specified stream.
         @return  True, if the data could be imported from the stream. */
@@ -280,6 +297,9 @@ private:
         resolving palette colors. */
     virtual GraphicHelper* implCreateGraphicHelper() const;
 
+    /** Derived classes create a VBA project manager object. */
+    virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0;
+
     virtual ::rtl::OUString implGetImplementationName() const = 0;
 
     virtual StorageRef  implCreateStorage(
@@ -298,4 +318,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/filterdetect.hxx b/oox/inc/oox/core/filterdetect.hxx
index 5944766195d8..f28af86eea37 100644
--- a/oox/inc/oox/core/filterdetect.hxx
+++ b/oox/inc/oox/core/filterdetect.hxx
@@ -39,6 +39,7 @@
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace comphelper { class MediaDescriptor; }
@@ -97,7 +98,8 @@ private:
 class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
 {
 public:
-    explicit            FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+    explicit            FilterDetect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
     virtual             ~FilterDetect();
 
     /** Tries to extract an unencrypted ZIP package from the passed media
@@ -150,12 +152,12 @@ public:
         interface of the temporary file will be stored in the 'ComponentData'
         property of the passed media descriptor.
      */
-    virtual ::rtl::OUString SAL_CALL detect(
-                            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
+    virtual ::rtl::OUString SAL_CALL
+                        detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq )
                             throw( ::com::sun::star::uno::RuntimeException );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 };
 
 // ============================================================================
@@ -165,4 +167,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx
index 5f8dc3463e68..4cadfce9c121 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/oox/inc/oox/core/fragmenthandler.hxx
@@ -136,4 +136,4 @@ typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/oox/inc/oox/core/fragmenthandler2.hxx
index fcfea7c3070f..7408fbd12e2e 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -50,8 +50,6 @@ public:
     virtual void SAL_CALL acquire() throw() { FragmentHandler::acquire(); }
     virtual void SAL_CALL release() throw() { FragmentHandler::release(); }
 
-    virtual ContextHandler& queryContextHandler();
-
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
@@ -87,18 +85,19 @@ public:
 
     // oox.core.ContextHandler interface --------------------------------------
 
-    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        startRecord( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual void        endRecord( sal_Int32 nRecId );
 
     // oox.core.ContextHandler2Helper interface -------------------------------
 
     virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
     virtual void        onEndRecord();
 
     // oox.core.FragmentHandler2 interface ------------------------------------
@@ -114,4 +113,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/recordparser.hxx b/oox/inc/oox/core/recordparser.hxx
index f1812e3169c9..90ac5f3b487c 100644
--- a/oox/inc/oox/core/recordparser.hxx
+++ b/oox/inc/oox/core/recordparser.hxx
@@ -30,7 +30,6 @@
 #define OOX_CORE_RECORDPARSER_HXX
 
 #include <map>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <rtl/ref.hxx>
@@ -97,4 +96,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 1317de745382..1b5432426f5d 100644..100755
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -36,14 +36,21 @@
 namespace oox {
 namespace core {
 
-/** Expands to an OUString containing an officeDocument relation type created
+// ============================================================================
+
+/** Expands to an OUString containing an 'officeDocument' relation type created
     from the passed literal(!) ASCII(!) character array. */
-#define CREATE_OFFICEDOC_RELATIONSTYPE( ascii ) \
+#define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \
     CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/" ascii )
 
+/** Expands to an OUString containing a 'package' relation type created from
+    the passed literal(!) ASCII(!) character array. */
+#define CREATE_PACKAGE_RELATION_TYPE( ascii ) \
+    CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii )
+
 /** Expands to an OUString containing an MS Office specific relation type
     created from the passed literal(!) ASCII(!) character array. */
-#define CREATE_MSOFFICE_RELATIONSTYPE( ascii ) \
+#define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \
     CREATE_OUSTRING( "http://schemas.microsoft.com/office/2006/relationships/" ascii )
 
 // ============================================================================
@@ -101,4 +108,4 @@ private:
 
 #endif // OOX_CORE_RELATIONS
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/relationshandler.hxx b/oox/inc/oox/core/relationshandler.hxx
index e42bb4639a83..06e237460b43 100644
--- a/oox/inc/oox/core/relationshandler.hxx
+++ b/oox/inc/oox/core/relationshandler.hxx
@@ -60,4 +60,4 @@ private:
 
 #endif // OOX_CORE_RELATIONSHANDLER
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx
index 0f7393bec4ab..eb809c3eddfe 100644
--- a/oox/inc/oox/core/xmlfilterbase.hxx
+++ b/oox/inc/oox/core/xmlfilterbase.hxx
@@ -29,16 +29,16 @@
 #ifndef OOX_CORE_XMLFILTERBASE_HXX
 #define OOX_CORE_XMLFILTERBASE_HXX
 
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextCursor.hpp>
+#include <com/sun/star/text/XTextField.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include "oox/drawingml/table/tablestylelist.hxx"
 #include "oox/core/filterbase.hxx"
 #include "oox/core/relations.hxx"
-#include <oox/dllapi.h>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/text/XText.hpp>
+#include "oox/drawingml/table/tablestylelist.hxx"
+#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
@@ -47,9 +47,11 @@ namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XFastDocumentHandler; } }
 } } }
 
-namespace oox { namespace drawingml { class Theme; } }
-namespace oox { namespace drawingml { namespace chart { class ChartConverter; } } }
-namespace oox { namespace vml { class Drawing; } }
+namespace oox {
+    namespace drawingml { class Theme; }
+    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace vml { class Drawing; }
+}
 
 namespace sax_fastparser {
     class FastSerializerHelper;
@@ -62,6 +64,8 @@ namespace core {
 
 class FragmentHandler;
 
+// ============================================================================
+
 struct TextField {
     com::sun::star::uno::Reference< com::sun::star::text::XText > xText;
     com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > xTextCursor;
@@ -77,7 +81,8 @@ class OOX_DLLPUBLIC XmlFilterBase : public FilterBase
 {
 public:
     explicit            XmlFilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual             ~XmlFilterBase();
 
@@ -226,4 +231,4 @@ typedef ::rtl::Reference< XmlFilterBase > XmlFilterRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/axiscontext.hxx b/oox/inc/oox/drawingml/chart/axiscontext.hxx
index 0cf08d0c99b8..762760aa8aa3 100644
--- a/oox/inc/oox/drawingml/chart/axiscontext.hxx
+++ b/oox/inc/oox/drawingml/chart/axiscontext.hxx
@@ -126,4 +126,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/axisconverter.hxx b/oox/inc/oox/drawingml/chart/axisconverter.hxx
index 2293b96b5e3c..395d2e0a9006 100644
--- a/oox/inc/oox/drawingml/chart/axisconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/axisconverter.hxx
@@ -70,4 +70,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/axismodel.hxx b/oox/inc/oox/drawingml/chart/axismodel.hxx
index bd9aa42fc715..7fd9ffaf355d 100644
--- a/oox/inc/oox/drawingml/chart/axismodel.hxx
+++ b/oox/inc/oox/drawingml/chart/axismodel.hxx
@@ -78,9 +78,9 @@ struct AxisModel
     OptValue< double >  mofLogBase;         /// Logarithmic base for logarithmic axes.
     OptValue< double >  mofMax;             /// Maximum axis value.
     OptValue< double >  mofMin;             /// Minimum axis value.
+    OptValue< sal_Int32 > monBaseTimeUnit;  /// Base time unit shown on a date axis.
     sal_Int32           mnAxisId;           /// Unique axis identifier.
     sal_Int32           mnAxisPos;          /// Position of the axis (top/bottom/left/right).
-    sal_Int32           mnBaseTimeUnit;     /// Base time unit shown on a date axis.
     sal_Int32           mnCrossAxisId;      /// Identifier of a crossing axis.
     sal_Int32           mnCrossBetween;     /// This value axis crosses between or inside category.
     sal_Int32           mnCrossMode;        /// Mode this axis crosses another axis (min, max, auto).
@@ -95,7 +95,7 @@ struct AxisModel
     sal_Int32           mnTickLabelSkip;    /// Number of tick mark labels to skip.
     sal_Int32           mnTickMarkSkip;     /// Number of tick marks to skip.
     sal_Int32           mnTypeId;           /// Type identifier of this axis.
-    bool                mbAuto;             /// True = automatic axis settings.
+    bool                mbAuto;             /// True = automatic selection of text/date axis type.
     bool                mbDeleted;          /// True = axis has been deleted manually.
     bool                mbNoMultiLevel;     /// True = no multi-level categories supported.
 
@@ -111,4 +111,4 @@ struct AxisModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
index 4e368341b210..d5a944bcec3d 100644
--- a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
@@ -101,4 +101,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartconverter.hxx b/oox/inc/oox/drawingml/chart/chartconverter.hxx
index 96a22187da53..8c39f37405c2 100644
--- a/oox/inc/oox/drawingml/chart/chartconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/chartconverter.hxx
@@ -110,4 +110,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
index 585b4217663e..37a49835e92f 100644
--- a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
@@ -102,7 +102,8 @@ public:
     virtual             ~ChartDrawingFragment();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
@@ -121,4 +122,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx b/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx
index e03642927c5e..eb711c2332c3 100644
--- a/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx
@@ -63,4 +63,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
index a3e796b70b67..54277e8e4a38 100644
--- a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
+++ b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
@@ -61,4 +61,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
index 7ad710bd3c18..0a2d21bb5d8d 100644
--- a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
+++ b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
@@ -64,6 +64,7 @@ struct ChartSpaceModel
     bool                mbAutoTitleDel;     /// True = automatic title deleted manually.
     bool                mbPlotVisOnly;      /// True = plot visible cells in a sheet only.
     bool                mbShowLabelsOverMax;/// True = show labels over chart maximum.
+    bool                mbPivotChart;       /// True = pivot chart.
 
     explicit            ChartSpaceModel();
                         ~ChartSpaceModel();
@@ -77,4 +78,4 @@ struct ChartSpaceModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/oox/inc/oox/drawingml/chart/converterbase.hxx
index 855e5faddefa..1d717e75da63 100644
--- a/oox/inc/oox/drawingml/chart/converterbase.hxx
+++ b/oox/inc/oox/drawingml/chart/converterbase.hxx
@@ -139,9 +139,10 @@ public:
         OOXML layout model. Returns true, if returned rectangle is valid. */
     bool                calcAbsRectangle( ::com::sun::star::awt::Rectangle& orRect ) const;
 
-    /** Tries to set the position from the contained OOXML layout model.
-        Returns true, if a manual position could be calculated. */
+    /** Tries to set the position and size from the contained OOXML layout model.
+        Returns true, if a manual position and size could be calculated. */
     bool                convertFromModel( PropertySet& rPropSet );
+
     /** Tries to set the position from the contained OOXML layout model.
         Returns true, if a manual position could be calculated. */
     bool                convertFromModel(
@@ -157,4 +158,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
index 9f232b7534e9..d0948ac1035e 100644
--- a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
@@ -52,7 +52,7 @@ public:
     virtual             ~DoubleSequenceContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
 private:
     sal_Int32           mnPtIndex;          /// Current data point index.
@@ -70,7 +70,7 @@ public:
     virtual             ~StringSequenceContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
 private:
     sal_Int32           mnPtIndex;          /// Current data point index.
@@ -100,4 +100,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
index 39b9e0f5cae2..7186529fade4 100644
--- a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
@@ -77,4 +77,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
index 143e6a7fbf21..bb26a3257fbd 100644
--- a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
+++ b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
@@ -71,4 +71,4 @@ struct DataSourceModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/modelbase.hxx b/oox/inc/oox/drawingml/chart/modelbase.hxx
index b4f5819de8b2..8da378328dbb 100644
--- a/oox/inc/oox/drawingml/chart/modelbase.hxx
+++ b/oox/inc/oox/drawingml/chart/modelbase.hxx
@@ -29,9 +29,9 @@
 #ifndef OOX_DRAWINGML_CHART_MODELBASE_HXX
 #define OOX_DRAWINGML_CHART_MODELBASE_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/helper.hxx"
-#include "tokens.hxx"
+#include "oox/helper/refmap.hxx"
+#include "oox/helper/refvector.hxx"
 
 namespace oox { class AttributeList; }
 
@@ -140,4 +140,4 @@ struct LayoutModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/oox/inc/oox/drawingml/chart/objectformatter.hxx
index d88450d95f7c..7c837a3e03d0 100644
--- a/oox/inc/oox/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/oox/drawingml/chart/objectformatter.hxx
@@ -29,7 +29,6 @@
 #ifndef OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 #define OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/chart/modelbase.hxx"
@@ -172,4 +171,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/plotareacontext.hxx b/oox/inc/oox/drawingml/chart/plotareacontext.hxx
index aac136ffd49a..da379f878249 100644
--- a/oox/inc/oox/drawingml/chart/plotareacontext.hxx
+++ b/oox/inc/oox/drawingml/chart/plotareacontext.hxx
@@ -89,4 +89,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
index 42af2ced4479..3ac712aabbbb 100644
--- a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
@@ -109,4 +109,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/plotareamodel.hxx b/oox/inc/oox/drawingml/chart/plotareamodel.hxx
index afa471b30fb5..2cb156b19a5b 100644
--- a/oox/inc/oox/drawingml/chart/plotareamodel.hxx
+++ b/oox/inc/oox/drawingml/chart/plotareamodel.hxx
@@ -93,4 +93,4 @@ struct PlotAreaModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/seriescontext.hxx b/oox/inc/oox/drawingml/chart/seriescontext.hxx
index 5a4c84140fec..09c6a7c30936 100644
--- a/oox/inc/oox/drawingml/chart/seriescontext.hxx
+++ b/oox/inc/oox/drawingml/chart/seriescontext.hxx
@@ -48,7 +48,7 @@ public:
     virtual             ~DataLabelContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 };
 
 // ============================================================================
@@ -64,7 +64,7 @@ public:
     virtual             ~DataLabelsContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 };
 
 // ============================================================================
@@ -125,7 +125,7 @@ public:
     virtual             ~TrendlineContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 };
 
 // ============================================================================
@@ -272,4 +272,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/seriesconverter.hxx b/oox/inc/oox/drawingml/chart/seriesconverter.hxx
index d63133ade7a7..098dbc4f93ee 100644
--- a/oox/inc/oox/drawingml/chart/seriesconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/seriesconverter.hxx
@@ -173,4 +173,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/seriesmodel.hxx b/oox/inc/oox/drawingml/chart/seriesmodel.hxx
index 7d5469c5dd4f..45cad7bdfafa 100644
--- a/oox/inc/oox/drawingml/chart/seriesmodel.hxx
+++ b/oox/inc/oox/drawingml/chart/seriesmodel.hxx
@@ -243,4 +243,4 @@ struct SeriesModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/titlecontext.hxx b/oox/inc/oox/drawingml/chart/titlecontext.hxx
index 80a425217af7..c11cdbcc32ac 100644
--- a/oox/inc/oox/drawingml/chart/titlecontext.hxx
+++ b/oox/inc/oox/drawingml/chart/titlecontext.hxx
@@ -48,7 +48,7 @@ public:
     virtual             ~TextContext();
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 };
 
 // ============================================================================
@@ -89,4 +89,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/titleconverter.hxx b/oox/inc/oox/drawingml/chart/titleconverter.hxx
index 993254206b04..01cd7092fbe3 100644
--- a/oox/inc/oox/drawingml/chart/titleconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/titleconverter.hxx
@@ -112,4 +112,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/titlemodel.hxx b/oox/inc/oox/drawingml/chart/titlemodel.hxx
index c401ee322bf8..27dd93f99494 100644
--- a/oox/inc/oox/drawingml/chart/titlemodel.hxx
+++ b/oox/inc/oox/drawingml/chart/titlemodel.hxx
@@ -95,4 +95,4 @@ struct LegendModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/typegroupcontext.hxx b/oox/inc/oox/drawingml/chart/typegroupcontext.hxx
index a6d1507ece80..dbba5de9625d 100644
--- a/oox/inc/oox/drawingml/chart/typegroupcontext.hxx
+++ b/oox/inc/oox/drawingml/chart/typegroupcontext.hxx
@@ -170,4 +170,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
index 30d2d0b49dd9..23f95af47735 100644
--- a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
@@ -204,4 +204,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/chart/typegroupmodel.hxx b/oox/inc/oox/drawingml/chart/typegroupmodel.hxx
index ba997f8a9f2d..4ecb74744294 100644
--- a/oox/inc/oox/drawingml/chart/typegroupmodel.hxx
+++ b/oox/inc/oox/drawingml/chart/typegroupmodel.hxx
@@ -102,4 +102,4 @@ struct TypeGroupModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/drawingml/clrscheme.hxx b/oox/inc/oox/drawingml/clrscheme.hxx
index ac0fc6d89bbc..73af9c1ac351 100644
--- a/oox/inc/oox/drawingml/clrscheme.hxx
+++ b/oox/inc/oox/drawingml/clrscheme.hxx
@@ -32,7 +32,6 @@
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <vector>
-#include "oox/core/namespaces.hxx"
 #include "oox/drawingml/color.hxx"
 
 namespace oox { namespace drawingml {
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index f9f91327a39d..112a337a8ceb 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -29,13 +29,7 @@
 #ifndef OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 #define OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/core/xmlfilterbase.hxx"
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <boost/shared_ptr.hpp>
-#include "oox/helper/helper.hxx"
-#include "tokens.hxx"
 #include <vector>
 #include <map>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -46,11 +40,15 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp>
-#ifndef __com_sun_star_beans_PropertyValues_hpp__
 #include <com/sun/star/beans/PropertyValues.hpp>
-#endif
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include "oox/core/xmlfilterbase.hxx"
+#include "oox/drawingml/color.hxx"
+#include "oox/helper/helper.hxx"
+#include "oox/helper/propertymap.hxx"
+#include "oox/token/tokens.hxx"
 
 namespace oox { namespace drawingml {
 
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx
index c2a0a5e32534..7fcfa38bddbd 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -118,6 +118,8 @@ struct BlipFillProperties
     OptValue< sal_Int32 > moBitmapMode;         /// Bitmap tile or stretch.
     OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
                         moFillRect;             /// Stretch fill offsets.
+    OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
+                        moClipRect;
     OptValue< sal_Int32 > moTileOffsetX;        /// Width of bitmap tiles (EMUs).
     OptValue< sal_Int32 > moTileOffsetY;        /// Height of bitmap tiles (EMUs).
     OptValue< sal_Int32 > moTileScaleX;         /// Horizontal scaling of bitmap tiles (1/1000 percent).
diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/oox/inc/oox/drawingml/graphicshapecontext.hxx
index 7b08057419d2..45ac831aa1c8 100644
--- a/oox/inc/oox/drawingml/graphicshapecontext.hxx
+++ b/oox/inc/oox/drawingml/graphicshapecontext.hxx
@@ -69,7 +69,7 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 
 private:
-    ::boost::shared_ptr< ::oox::vml::OleObjectInfo > mxOleObjectInfo;
+    ::oox::vml::OleObjectInfo& mrOleObjectInfo;
 };
 
 // ====================================================================
@@ -107,7 +107,7 @@ public:
                         throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 
 private:
-    bool                mbEmbedShapes;
+    ChartShapeInfo&     mrChartShapeInfo;
 };
 
 // ====================================================================
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 879036d78e6c..f5ad5540a7de 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -41,6 +41,10 @@
 #include <vector>
 #include <map>
 
+namespace oox { namespace vml {
+    struct OleObjectInfo;
+} }
+
 namespace oox { namespace drawingml {
 
 class CustomShapeProperties;
@@ -58,37 +62,15 @@ typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
 
 // ============================================================================
 
-/** A callback that will be called before and after the API shape is created
-    from the imported shape.
-
-    An instance of a derived class of this callback can be set at every
-    ::oox::drawingml::Shape instance to implement anything that needs a created
-    and inserted XShape.
- */
-class CreateShapeCallback
+/** Additional information for a chart embedded in a drawing shape. */
+struct ChartShapeInfo
 {
-public:
-    virtual ::rtl::OUString onCreateXShape(
-                            const ::rtl::OUString& rServiceName,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+    ::rtl::OUString     maFragmentPath;     /// Path to related XML stream, e.g. for charts.
+    bool                mbEmbedShapes;      /// True = load chart shapes into chart, false = load into parent drawpage.
 
-    virtual void        onXShapeCreated(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) const;
-
-    inline const PropertyMap& getShapeProperties() const { return maShapeProps; }
-
-protected:
-    explicit            CreateShapeCallback( ::oox::core::XmlFilterBase& rFilter );
-    virtual             ~CreateShapeCallback();
-
-protected:
-    ::oox::core::XmlFilterBase& mrFilter;
-    PropertyMap         maShapeProps;
+    inline explicit     ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {}
 };
 
-typedef ::boost::shared_ptr< CreateShapeCallback > CreateShapeCallbackRef;
-
 // ============================================================================
 
 class Shape
@@ -96,7 +78,7 @@ class Shape
 {
 public:
 
-    Shape( const sal_Char* pServiceType = NULL );
+    explicit Shape( const sal_Char* pServiceType = 0 );
     virtual ~Shape();
 
     rtl::OUString&                  getServiceName(){ return msServiceName; }
@@ -141,6 +123,11 @@ public:
     // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value)
     void                            setDefaults();
 
+    ::oox::vml::OleObjectInfo&      setOleObjectType();
+    ChartShapeInfo&                 setChartType( bool bEmbedShapes );
+    void                            setDiagramType();
+    void                            setTableType();
+
     void                setTextBody(const TextBodyPtr & pTextBody);
     TextBodyPtr         getTextBody();
     void                setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle );
@@ -150,11 +137,9 @@ public:
     inline const ShapeStyleRefMap&  getShapeStyleRefs() const { return maShapeStyleRefs; }
     const ShapeStyleRef*            getShapeStyleRef( sal_Int32 nRefType ) const;
 
-    inline void         setCreateShapeCallback( CreateShapeCallbackRef xCallback ) { mxCreateCallback = xCallback; }
-
     // addShape is creating and inserting the corresponding XShape.
     void                addShape(
-                            const oox::core::XmlFilterBase& rFilterBase,
+                            ::oox::core::XmlFilterBase& rFilterBase,
                             const Theme* pTheme,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
                             const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
@@ -171,7 +156,7 @@ protected:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
                         createAndInsert(
-                            const ::oox::core::XmlFilterBase& rFilterBase,
+                            ::oox::core::XmlFilterBase& rFilterBase,
                             const ::rtl::OUString& rServiceName,
                             const Theme* pTheme,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
@@ -179,13 +164,22 @@ protected:
                             sal_Bool bClearText );
 
     void                addChildren(
-                            const ::oox::core::XmlFilterBase& rFilterBase,
+                            ::oox::core::XmlFilterBase& rFilterBase,
                             Shape& rMaster,
                             const Theme* pTheme,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
                             const ::com::sun::star::awt::Rectangle& rClientRect,
                             ShapeIdMap* pShapeMap );
 
+    virtual ::rtl::OUString finalizeServiceName(
+                            ::oox::core::XmlFilterBase& rFilter,
+                            const ::rtl::OUString& rServiceName,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+
+    virtual void        finalizeXShape(
+                            ::oox::core::XmlFilterBase& rFilter,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+
     std::vector< ShapePtr >     maChildren;               // only used for group shapes
     com::sun::star::awt::Size   maChSize;                 // only used for group shapes
     com::sun::star::awt::Point  maChPosition;             // only used for group shapes
@@ -216,7 +210,22 @@ protected:
     com::sun::star::awt::Point      maPosition;
 
 private:
-    CreateShapeCallbackRef          mxCreateCallback;
+    enum FrameType
+    {
+        FRAMETYPE_GENERIC,          /// Generic shape, no special type.
+        FRAMETYPE_OLEOBJECT,        /// OLE object embedded in a shape.
+        FRAMETYPE_CHART,            /// Chart embedded in a shape.
+        FRAMETYPE_DIAGRAM,          /// Complex diagram drawing shape.
+        FRAMETYPE_TABLE             /// A table embedded in a shape.
+    };
+
+    typedef ::boost::shared_ptr< ::oox::vml::OleObjectInfo >    OleObjectInfoRef;
+    typedef ::boost::shared_ptr< ChartShapeInfo >               ChartShapeInfoRef;
+
+    FrameType           meFrameType;        /// Type for graphic frame shapes.
+    OleObjectInfoRef    mxOleObjectInfo;    /// Additional data for OLE objects.
+    ChartShapeInfoRef   mxChartShapeInfo;   /// Additional data for chart shapes.
+
     sal_Int32                       mnRotation;
     sal_Bool                        mbFlipH;
     sal_Bool                        mbFlipV;
@@ -225,6 +234,8 @@ private:
 
 ::rtl::OUString GetShapeType( sal_Int32 nType );
 
+// ============================================================================
+
 } }
 
 #endif  //  OOX_DRAWINGML_SHAPE_HXX
diff --git a/oox/inc/oox/drawingml/textbody.hxx b/oox/inc/oox/drawingml/textbody.hxx
index 2e545ebdca63..aa2fdcd71317 100644
--- a/oox/inc/oox/drawingml/textbody.hxx
+++ b/oox/inc/oox/drawingml/textbody.hxx
@@ -29,7 +29,6 @@
 #ifndef OOX_DRAWINGML_TEXTBODY_HXX
 #define OOX_DRAWINGML_TEXTBODY_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/textbodyproperties.hxx"
 #include "oox/drawingml/textliststyle.hxx"
diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx
index 04e9919275df..29d8f29a48ce 100644
--- a/oox/inc/oox/drawingml/textliststyle.hxx
+++ b/oox/inc/oox/drawingml/textliststyle.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 #define OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/drawingml/textparagraphproperties.hxx"
+#include "oox/helper/refvector.hxx"
 
 namespace oox { namespace drawingml {
 
@@ -51,10 +51,6 @@ public:
     inline const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; };
     inline TextParagraphPropertiesVector&       getAggregationListStyle() { return maAggregationListStyle; };
 
-#if OSL_DEBUG_LEVEL > 0
-    void dump( int nLevels=9 ) const;
-#endif
-
 protected:
 
     TextParagraphPropertiesVector maListStyle;
diff --git a/oox/inc/oox/drawingml/textparagraph.hxx b/oox/inc/oox/drawingml/textparagraph.hxx
index fa4bec9af1da..b1f6599a30aa 100644
--- a/oox/inc/oox/drawingml/textparagraph.hxx
+++ b/oox/inc/oox/drawingml/textparagraph.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/textrun.hxx"
 #include "oox/drawingml/textliststyle.hxx"
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index b2c50964d8f7..e037ff2c3726 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx
@@ -114,10 +114,6 @@ public:
         size can be zero and the default value is returned. */
     float                               getCharHeightPoints( float fDefault ) const;
 
-#if OSL_DEBUG_LEVEL > 0
-    void dump() const;
-#endif
-
 protected:
 
     TextCharacterProperties         maTextCharacterProperties;
diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx
index 0638aeafdb11..81041be136d3 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/oox/inc/oox/drawingml/theme.hxx
@@ -29,7 +29,6 @@
 #ifndef OOX_DRAWINGML_THEME_HXX
 #define OOX_DRAWINGML_THEME_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/drawingml/clrscheme.hxx"
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/textfont.hxx"
diff --git a/oox/inc/oox/dump/biffdumper.hxx b/oox/inc/oox/dump/biffdumper.hxx
index d76df7fc8bba..c6eae2876621 100644
--- a/oox/inc/oox/dump/biffdumper.hxx
+++ b/oox/inc/oox/dump/biffdumper.hxx
@@ -191,6 +191,9 @@ protected:
                             ::oox::xls::BiffStringFlags nUniFlags = ::oox::xls::BIFF_STR_DEFAULT,
                             rtl_TextEncoding eDefaultTextEnc = RTL_TEXTENCODING_DONTKNOW );
 
+    ::rtl::OUString     dumpSegmentedUniString( const String& rName );
+    void                dumpSegmentedUniStringArray( const String& rName );
+
     sal_uInt8           dumpBoolean( const String& rName = EMPTY_STRING );
     sal_uInt8           dumpErrorCode( const String& rName = EMPTY_STRING );
 
@@ -441,6 +444,8 @@ private:
     void                dumpExtCfColor( const String& rName = EMPTY_STRING );
     void                dumpExtGradientHead();
 
+    sal_uInt8           dumpFilterColumnOperator( const String& rName );
+
     ::rtl::OUString     dumpPivotString( const String& rName, sal_uInt16 nStrLen );
     ::rtl::OUString     dumpPivotString( const String& rName );
 
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 0a6099ca887c..98ecd090dd9d 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -911,7 +911,7 @@ public:
     void                eraseNameList( const ::rtl::OUString& rListName );
     NameListRef         getNameList( const ::rtl::OUString& rListName ) const;
 
-    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier );
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier );
     inline bool         isPasswordCancelled() const { return mbPwCancelled; }
 
 protected:
@@ -1012,7 +1012,7 @@ public:
     template< typename Type >
     bool                hasName( const NameListWrapper& rListWrp, Type nKey ) const;
 
-    ::rtl::OUString     requestPassword( ::comphelper::IDocPasswordVerifier& rVerifier );
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier );
     bool                isPasswordCancelled() const;
 
 protected:
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index b4759c686f71..c02d07d79758 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -142,15 +142,19 @@ private:
     void                dumpCodePageProperty( sal_uInt32 nStartPos );
     void                dumpDictionaryProperty( sal_uInt32 nStartPos );
 
-    void                dumpPropertyContents( sal_Int32 nPropId );
-    void                dumpPropertyValue( sal_Int32 nPropId, sal_Int32 nBaseType );
+    sal_uInt16          dumpPropertyContents( sal_Int32 nPropId );
+    void                dumpPropertyValue( sal_Int32 nPropId, sal_uInt16 nBaseType );
+    void                dumpPropertyVector( sal_Int32 nPropId, sal_uInt16 nBaseType );
+    void                dumpPropertyArray( sal_Int32 nPropId, sal_uInt16 nBaseType );
 
-    sal_Int32           dumpPropertyType();
-    void                dumpBlob( const String& rName );
+    sal_uInt16          dumpPropertyType();
+    void                dumpBlob( sal_Int32 nPropId, const String& rName );
     ::rtl::OUString     dumpString8( const String& rName );
     ::rtl::OUString     dumpCharArray8( const String& rName, sal_Int32 nLen );
     ::rtl::OUString     dumpString16( const String& rName );
     ::rtl::OUString     dumpCharArray16( const String& rName, sal_Int32 nLen );
+    bool                dumpTypedProperty( const String& rName, sal_uInt16 nExpectedType );
+    void                dumpHlinks( sal_Int32 nSize );
 
     bool                startElement( sal_uInt32 nStartPos );
     void                writeSectionHeader( const ::rtl::OUString& rGuid, sal_uInt32 nStartPos );
diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/oox/inc/oox/dump/xlsbdumper.hxx
index dd175309ff02..197844387b03 100644
--- a/oox/inc/oox/dump/xlsbdumper.hxx
+++ b/oox/inc/oox/dump/xlsbdumper.hxx
@@ -30,7 +30,6 @@
 #define OOX_DUMP_XLSBDUMPER_HXX
 
 #include "oox/dump/dumperbase.hxx"
-#include "oox/helper/recordinputstream.hxx"
 
 #if OOX_INCLUDE_DUMPER
 
@@ -97,9 +96,9 @@ private:
     bool                readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue );
 
 private:
-    typedef ::boost::shared_ptr< RecordInputStream > RecordInputStreamRef;
+    typedef ::boost::shared_ptr< SequenceInputStream > SequenceInputStreamRef;
 
-    RecordInputStreamRef mxBiffStrm;
+    SequenceInputStreamRef mxBiffStrm;
     NameListRef         mxErrCodes;
 };
 
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index f792b12c293b..3d079fc178b1 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -32,7 +32,8 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include "oox/helper/helper.hxx"
-#include "tokens.hxx"
+#include "oox/token/namespaces.hxx"
+#include "oox/token/tokens.hxx"
 
 namespace oox {
 
@@ -44,6 +45,9 @@ namespace oox {
 class AttributeConversion
 {
 public:
+    /** Returns the XML token identifier from the passed string. */
+    static sal_Int32    decodeToken( const ::rtl::OUString& rValue );
+
     /** Returns the decoded string value. All characters in the format
         '_xHHHH_' (H being a hexadecimal digit), will be decoded. */
     static ::rtl::OUString decodeXString( const ::rtl::OUString& rValue );
@@ -191,4 +195,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index d2e0141213ed..2c7d0bd18f5c 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -290,4 +290,4 @@ typedef ::boost::shared_ptr< RelativeInputStream > RelativeInputStreamRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index 240ce2e15fb8..c9bab075ebf1 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -160,4 +160,4 @@ typedef ::boost::shared_ptr< SequenceOutputStream > SequenceOutputStreamRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/oox/inc/oox/helper/binarystreambase.hxx
index 130a094fed51..de0bedbb2b37 100644
--- a/oox/inc/oox/helper/binarystreambase.hxx
+++ b/oox/inc/oox/helper/binarystreambase.hxx
@@ -146,4 +146,4 @@ protected:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 9a0a0774c43b..e2577313a11e 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -31,8 +31,6 @@
 
 #include <vector>
 #include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
@@ -50,81 +48,6 @@ namespace oox {
 
 // ============================================================================
 
-/** Template for a vector of ref-counted objects with additional accessor functions.
-
-    An instance of the class RefVector< Type > stores elements of the type
-    ::boost::shared_ptr< Type >. The new accessor functions has() and get()
-    work correctly for indexes out of the current range, there is no need to
-    check the passed index before.
- */
-template< typename ObjType >
-class RefVector : public ::std::vector< ::boost::shared_ptr< ObjType > >
-{
-public:
-    typedef ::std::vector< ::boost::shared_ptr< ObjType > > container_type;
-    typedef typename container_type::value_type             value_type;
-    typedef typename container_type::size_type              size_type;
-
-public:
-    /** Returns true, if the object with the passed index exists. Returns
-        false, if the vector element exists but is an empty reference. */
-    inline bool         has( sal_Int32 nIndex ) const
-                        {
-                            const value_type* pxRef = getRef( nIndex );
-                            return pxRef && pxRef->get();
-                        }
-
-    /** Returns a reference to the object with the passed index, or 0 on error. */
-    inline value_type   get( sal_Int32 nIndex ) const
-                        {
-                            if( const value_type* pxRef = getRef( nIndex ) ) return *pxRef;
-                            return value_type();
-                        }
-
-    /** Returns the index of the last element, or -1, if the vector is empty.
-        Does *not* check whether the last element is an empty reference. */
-    inline sal_Int32    getLastIndex() const { return static_cast< sal_Int32 >( this->size() ) - 1; }
-
-    /** Calls the passed functor for every contained object, automatically
-        skips all elements that are empty references. */
-    template< typename FunctorType >
-    inline void         forEach( FunctorType aFunctor ) const
-                        {
-                            ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( aFunctor ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType >
-    inline void         forEachMem( FuncType pFunc ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType >
-    inline void         forEachMem( FuncType pFunc, ParamType aParam ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType1, typename ParamType2 >
-    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
-    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
-                        }
-
     /** Calls the passed member function of ObjType on every contained object,
         automatically skips all elements that are empty references. */
     template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
@@ -132,163 +55,6 @@ public:
                         {
                             forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
                         }
-    /** Calls the passed functor for every contained object. Passes the index as
-        first argument and the object reference as second argument to rFunctor. */
-    template< typename FunctorType >
-    inline void         forEachWithIndex( const FunctorType& rFunctor ) const
-                        {
-                            ::std::for_each( this->begin(), this->end(), ForEachFunctorWithIndex< FunctorType >( rFunctor ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the vector index to the member function. */
-    template< typename FuncType >
-    inline void         forEachMemWithIndex( FuncType pFunc ) const
-                        {
-                            forEachWithIndex( ::boost::bind( pFunc, _2, _1 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the vector index as first argument to the member function. */
-    template< typename FuncType, typename ParamType >
-    inline void         forEachMemWithIndex( FuncType pFunc, ParamType aParam ) const
-                        {
-                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the vector index as first argument to the member function. */
-    template< typename FuncType, typename ParamType1, typename ParamType2 >
-    inline void         forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
-                        {
-                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the vector index as first argument to the member function. */
-    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
-    inline void         forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
-                        {
-                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) );
-                        }
-
-    /** Searches for an element by using the passed functor that takes a
-        constant reference of the object type (const ObjType&). */
-    template< typename FunctorType >
-    inline value_type   findIf( const FunctorType& rFunctor ) const
-                        {
-                            typename container_type::const_iterator aIt = ::std::find_if( this->begin(), this->end(), FindFunctor< FunctorType >( rFunctor ) );
-                            return (aIt == this->end()) ? value_type() : *aIt;
-                        }
-
-private:
-    template< typename FunctorType >
-    struct ForEachFunctor
-    {
-        FunctorType         maFunctor;
-        inline explicit     ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
-        inline void         operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( *rxValue ); }
-    };
-
-    template< typename FunctorType >
-    struct ForEachFunctorWithIndex
-    {
-        FunctorType         maFunctor;
-        sal_Int32           mnIndex;
-        inline explicit     ForEachFunctorWithIndex( const FunctorType& rFunctor ) : maFunctor( rFunctor ), mnIndex( 0 ) {}
-        inline void         operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( mnIndex, *rxValue ); ++mnIndex; }
-    };
-
-    template< typename FunctorType >
-    struct FindFunctor
-    {
-        FunctorType         maFunctor;
-        inline explicit     FindFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
-        inline bool         operator()( const value_type& rxValue ) { return rxValue.get() && maFunctor( *rxValue ); }
-    };
-
-    inline const value_type* getRef( sal_Int32 nIndex ) const
-                        {
-                            return ((0 <= nIndex) && (static_cast< size_type >( nIndex ) < this->size())) ?
-                                &(*this)[ static_cast< size_type >( nIndex ) ] : 0;
-                        }
-};
-
-// ============================================================================
-
-/** Template for a map of ref-counted objects with additional accessor functions.
-
-    An instance of the class RefMap< Type > stores elements of the type
-    ::boost::shared_ptr< Type >. The new accessor functions has() and get()
-    work correctly for nonexisting keys, there is no need to check the passed
-    key before.
- */
-template< typename KeyType, typename ObjType, typename CompType = ::std::less< KeyType > >
-class RefMap : public ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType >
-{
-public:
-    typedef ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType > container_type;
-    typedef typename container_type::key_type                               key_type;
-    typedef typename container_type::mapped_type                            mapped_type;
-    typedef typename container_type::value_type                             value_type;
-    typedef typename container_type::key_compare                            key_compare;
-
-public:
-    /** Returns true, if the object accossiated to the passed key exists.
-        Returns false, if the key exists but points to an empty reference. */
-    inline bool         has( key_type nKey ) const
-                        {
-                            const mapped_type* pxRef = getRef( nKey );
-                            return pxRef && pxRef->get();
-                        }
-
-    /** Returns a reference to the object accossiated to the passed key, or an
-        empty reference on error. */
-    inline mapped_type  get( key_type nKey ) const
-                        {
-                            if( const mapped_type* pxRef = getRef( nKey ) ) return *pxRef;
-                            return mapped_type();
-                        }
-
-    /** Calls the passed functor for every contained object, automatically
-        skips all elements that are empty references. */
-    template< typename FunctorType >
-    inline void         forEach( const FunctorType& rFunctor ) const
-                        {
-                            ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType >
-    inline void         forEachMem( FuncType pFunc ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType >
-    inline void         forEachMem( FuncType pFunc, ParamType aParam ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType1, typename ParamType2 >
-    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object,
-        automatically skips all elements that are empty references. */
-    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
-    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
-                        {
-                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
-                        }
     /** Calls the passed member function of ObjType on every contained object,
         automatically skips all elements that are empty references. */
     template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
@@ -296,72 +62,6 @@ public:
                         {
                             forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
                         }
-    /** Calls the passed functor for every contained object. Passes the key as
-        first argument and the object reference as second argument to rFunctor. */
-    template< typename FunctorType >
-    inline void         forEachWithKey( const FunctorType& rFunctor ) const
-                        {
-                            ::std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the object key as argument to the member function. */
-    template< typename FuncType >
-    inline void         forEachMemWithKey( FuncType pFunc ) const
-                        {
-                            forEachWithKey( ::boost::bind( pFunc, _2, _1 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the object key as first argument to the member function. */
-    template< typename FuncType, typename ParamType >
-    inline void         forEachMemWithKey( FuncType pFunc, ParamType aParam ) const
-                        {
-                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the object key as first argument to the member function. */
-    template< typename FuncType, typename ParamType1, typename ParamType2 >
-    inline void         forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
-                        {
-                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) );
-                        }
-
-    /** Calls the passed member function of ObjType on every contained object.
-        Passes the object key as first argument to the member function. */
-    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
-    inline void         forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
-                        {
-                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) );
-                        }
-
-private:
-    template< typename FunctorType >
-    struct ForEachFunctor
-    {
-        FunctorType         maFunctor;
-        inline explicit     ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
-        inline void         operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( *rValue.second ); }
-    };
-
-    template< typename FunctorType >
-    struct ForEachFunctorWithKey
-    {
-        FunctorType         maFunctor;
-        inline explicit     ForEachFunctorWithKey( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
-        inline void         operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( rValue.first, *rValue.second ); }
-    };
-
-    inline const mapped_type* getRef( key_type nKey ) const
-                        {
-                            typename container_type::const_iterator aIt = find( nKey );
-                            return (aIt == this->end()) ? 0 : &aIt->second;
-                        }
-};
-
-// ============================================================================
-
 /** Template for a 2-dimensional array of objects.
 
     This class template provides a similar interface to the ::std::vector
@@ -533,45 +233,53 @@ public:
 
     /** Returns the pointer to an existing element of the passed vector, or a
         null pointer, if the passed index is out of bounds. */
-    template< typename Type >
-    static const Type*  getVectorElement( const ::std::vector< Type >& rVector, sal_Int32 nIndex );
+    template< typename VectorType >
+    static const typename VectorType::value_type*
+                        getVectorElement( const VectorType& rVector, sal_Int32 nIndex );
 
     /** Returns the pointer to an existing element of the passed vector, or a
         null pointer, if the passed index is out of bounds. */
-    template< typename Type >
-    static Type*        getVectorElement( ::std::vector< Type >& rVector, sal_Int32 nIndex );
+    template< typename VectorType >
+    static typename VectorType::value_type*
+                        getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex );
 
     /** Returns the reference to an existing element of the passed vector, or
         the passed default value, if the passed index is out of bounds. */
-    template< typename Type >
-    static const Type&  getVectorElement( const ::std::vector< Type >& rVector, sal_Int32 nIndex, const Type& rDefault );
+    template< typename VectorType >
+    static const typename VectorType::value_type&
+                        getVectorElement( const VectorType& rVector, sal_Int32 nIndex, const typename VectorType::value_type& rDefault );
 
     /** Returns the reference to an existing element of the passed vector, or
         the passed default value, if the passed index is out of bounds. */
-    template< typename Type >
-    static Type&        getVectorElement( ::std::vector< Type >& rVector, sal_Int32 nIndex, Type& rDefault );
+    template< typename VectorType >
+    static typename VectorType::value_type&
+                        getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex, typename VectorType::value_type& rDefault );
 
     /** Returns the pointer to an existing element of the passed map, or a null
         pointer, if an element with the passed key does not exist. */
-    template< typename Type, typename KeyType >
-    static const Type*  getMapElement( const ::std::map< KeyType, Type >& rMap, KeyType nKey );
+    template< typename MapType >
+    static const typename MapType::mapped_type*
+                        getMapElement( const MapType& rMap, const typename MapType::key_type& rKey );
 
     /** Returns the pointer to an existing element of the passed map, or a null
         pointer, if an element with the passed key does not exist. */
-    template< typename Type, typename KeyType >
-    static Type*        getMapElement( ::std::map< KeyType, Type >& rMap, KeyType nKey );
+    template< typename MapType >
+    static typename MapType::mapped_type*
+                        getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey );
 
     /** Returns the reference to an existing element of the passed map, or the
         passed default value, if an element with the passed key does not exist. */
-    template< typename Type, typename KeyType >
-    static const Type&  getMapElement( const ::std::map< KeyType, Type >& rMap, KeyType nKey, const Type& rDefault );
+    template< typename MapType >
+    static const typename MapType::mapped_type&
+                        getMapElement( const MapType& rMap, const typename MapType::key_type& rKey, const typename MapType::mapped_type& rDefault );
 
     /** Returns the reference to an existing element of the passed map, or the
         passed default value, if an element with the passed key does not exist. */
-    template< typename Type, typename KeyType >
-    static Type&        getMapElement( ::std::map< KeyType, Type >& rMap, KeyType nKey, Type& rDefault );
+    template< typename MapType >
+    static typename MapType::mapped_type&
+                        getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey, typename MapType::mapped_type& rDefault );
 
-    // vector/matrix to Sequence ----------------------------------------------
+    // vector/map/matrix to UNO sequence --------------------------------------
 
     /** Creates a UNO sequence from a std::vector with copies of all elements.
 
@@ -580,9 +288,20 @@ public:
         @return  A com.sun.star.uno.Sequence object with copies of all objects
             contained in the passed vector.
      */
-    template< typename Type >
-    static ::com::sun::star::uno::Sequence< Type >
-                            vectorToSequence( const ::std::vector< Type >& rVector );
+    template< typename VectorType >
+    static ::com::sun::star::uno::Sequence< typename VectorType::value_type >
+                            vectorToSequence( const VectorType& rVector );
+
+    /** Creates a UNO sequence from a std::map with copies of all elements.
+
+        @param rMap  The map to be converted to a sequence.
+
+        @return  A com.sun.star.uno.Sequence object with copies of all objects
+            contained in the passed map.
+     */
+    template< typename MapType >
+    static ::com::sun::star::uno::Sequence< typename MapType::mapped_type >
+                            mapToSequence( const MapType& rMap );
 
     /** Creates a UNO sequence of sequences from a matrix with copies of all elements.
 
@@ -592,127 +311,106 @@ public:
             com.sun.star.uno.Sequence objects with copies of all objects
             contained in the passed matrix.
      */
-    template< typename Type >
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Type > >
-                            matrixToSequenceSequence( const Matrix< Type >& rMatrix );
+    template< typename MatrixType >
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > >
+                            matrixToSequenceSequence( const MatrixType& rMatrix );
 };
 
 // ----------------------------------------------------------------------------
 
-template< typename Type >
-const Type* ContainerHelper::getVectorElement( const ::std::vector< Type >& rVector, sal_Int32 nIndex )
+template< typename VectorType >
+/*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex )
 {
     return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? &rVector[ static_cast< size_t >( nIndex ) ] : 0;
 }
 
-template< typename Type >
-Type* ContainerHelper::getVectorElement( ::std::vector< Type >& rVector, sal_Int32 nIndex )
+template< typename VectorType >
+/*static*/ typename VectorType::value_type* ContainerHelper::getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex )
 {
     return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? &rVector[ static_cast< size_t >( nIndex ) ] : 0;
 }
 
-template< typename Type >
-const Type& ContainerHelper::getVectorElement( const ::std::vector< Type >& rVector, sal_Int32 nIndex, const Type& rDefault )
+template< typename VectorType >
+/*static*/ const typename VectorType::value_type& ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex, const typename VectorType::value_type& rDefault )
 {
     return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? rVector[ static_cast< size_t >( nIndex ) ] : rDefault;
 }
 
-template< typename Type >
-Type& ContainerHelper::getVectorElement( ::std::vector< Type >& rVector, sal_Int32 nIndex, Type& rDefault )
+template< typename VectorType >
+/*static*/ typename VectorType::value_type& ContainerHelper::getVectorElementAccess( VectorType& rVector, sal_Int32 nIndex, typename VectorType::value_type& rDefault )
 {
     return ((0 <= nIndex) && (static_cast< size_t >( nIndex ) < rVector.size())) ? rVector[ static_cast< size_t >( nIndex ) ] : rDefault;
 }
 
-template< typename Type, typename KeyType >
-const Type* ContainerHelper::getMapElement( const ::std::map< KeyType, Type >& rMap, KeyType nKey )
+template< typename MapType >
+/*static*/ const typename MapType::mapped_type* ContainerHelper::getMapElement( const MapType& rMap, const typename MapType::key_type& rKey )
 {
-    typename ::std::map< KeyType, Type >::const_iterator aIt = rMap.find( nKey );
+    typename MapType::const_iterator aIt = rMap.find( rKey );
     return (aIt == rMap.end()) ? 0 : &aIt->second;
 }
 
-template< typename Type, typename KeyType >
-Type* ContainerHelper::getMapElement( ::std::map< KeyType, Type >& rMap, KeyType nKey )
+template< typename MapType >
+/*static*/ typename MapType::mapped_type* ContainerHelper::getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey )
 {
-    typename ::std::map< KeyType, Type >::iterator aIt = rMap.find( nKey );
+    typename MapType::iterator aIt = rMap.find( rKey );
     return (aIt == rMap.end()) ? 0 : &aIt->second;
 }
 
-template< typename Type, typename KeyType >
-const Type& ContainerHelper::getMapElement( const ::std::map< KeyType, Type >& rMap, KeyType nKey, const Type& rDefault )
+template< typename MapType >
+/*static*/ const typename MapType::mapped_type& ContainerHelper::getMapElement( const MapType& rMap, const typename MapType::key_type& rKey, const typename MapType::mapped_type& rDefault )
 {
-    typename ::std::map< KeyType, Type >::const_iterator aIt = rMap.find( nKey );
+    typename MapType::const_iterator aIt = rMap.find( rKey );
     return (aIt == rMap.end()) ? rDefault : aIt->second;
 }
 
-template< typename Type, typename KeyType >
-Type& ContainerHelper::getMapElement( ::std::map< KeyType, Type >& rMap, KeyType nKey, Type& rDefault )
+template< typename MapType >
+/*static*/ typename MapType::mapped_type& ContainerHelper::getMapElementAccess( MapType& rMap, const typename MapType::key_type& rKey, typename MapType::mapped_type& rDefault )
 {
-    typename ::std::map< KeyType, Type >::iterator aIt = rMap.find( nKey );
+    typename MapType::iterator aIt = rMap.find( rKey );
     return (aIt == rMap.end()) ? rDefault : aIt->second;
 }
 
-template< typename Type >
-::com::sun::star::uno::Sequence< Type > ContainerHelper::vectorToSequence( const ::std::vector< Type >& rVector )
+template< typename VectorType >
+/*static*/ ::com::sun::star::uno::Sequence< typename VectorType::value_type > ContainerHelper::vectorToSequence( const VectorType& rVector )
 {
+    typedef typename VectorType::value_type ValueType;
     if( rVector.empty() )
-        return ::com::sun::star::uno::Sequence< Type >();
-    return ::com::sun::star::uno::Sequence< Type >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
+        return ::com::sun::star::uno::Sequence< ValueType >();
+    return ::com::sun::star::uno::Sequence< ValueType >( &rVector.front(), static_cast< sal_Int32 >( rVector.size() ) );
 }
 
-template< typename Type >
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Type > > ContainerHelper::matrixToSequenceSequence( const Matrix< Type >& rMatrix )
+template< typename MapType >
+/*static*/ ::com::sun::star::uno::Sequence< typename MapType::mapped_type > ContainerHelper::mapToSequence( const MapType& rMap )
+{
+    typedef typename MapType::mapped_type ValueType;
+    if( rMap.empty() )
+        return ::com::sun::star::uno::Sequence< ValueType >();
+    ::com::sun::star::uno::Sequence< ValueType > aSeq( static_cast< sal_Int32 >( rMap.size() ) );
+    sal_Int32 nIndex = 0;
+    for( typename MapType::const_iterator aIt = rMap.begin(), aEnd = rMap.end(); aIt != aEnd; ++aIt, ++nIndex )
+        aSeq[ nIndex ] = *aIt;
+    return aSeq;
+}
+
+template< typename MatrixType >
+/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< typename MatrixType::value_type > > ContainerHelper::matrixToSequenceSequence( const MatrixType& rMatrix )
 {
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Type > > aSeq;
+    typedef typename MatrixType::value_type ValueType;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ValueType > > aSeq;
     if( !rMatrix.empty() )
     {
         aSeq.realloc( static_cast< sal_Int32 >( rMatrix.height() ) );
         for( size_t nRow = 0, nHeight = rMatrix.height(); nRow < nHeight; ++nRow )
             aSeq[ static_cast< sal_Int32 >( nRow ) ] =
-                ::com::sun::star::uno::Sequence< Type >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
+                ::com::sun::star::uno::Sequence< ValueType >( &rMatrix.row_front( nRow ), static_cast< sal_Int32 >( rMatrix.width() ) );
     }
     return aSeq;
 }
 
 // ============================================================================
 
-/** This helper manages named objects in a container, which is created on demand.
- */
-class ObjectContainer
-{
-public:
-    explicit            ObjectContainer(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
-                            const ::rtl::OUString& rServiceName );
-                        ~ObjectContainer();
-
-    /** Returns true, if the object with the passed name exists in the container. */
-    bool                hasObject( const ::rtl::OUString& rObjName ) const;
-
-    /** Returns the object with the passed name from the container. */
-    ::com::sun::star::uno::Any getObject( const ::rtl::OUString& rObjName ) const;
-
-    /** Inserts the passed object into the container, returns its final name. */
-    ::rtl::OUString     insertObject(
-                            const ::rtl::OUString& rObjName,
-                            const ::com::sun::star::uno::Any& rObj,
-                            bool bInsertByUnusedName );
-
-private:
-    void                createContainer() const;
-
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        mxFactory;              /// Factory to create the container.
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
-                        mxContainer;            /// Container for the objects.
-    ::rtl::OUString     maServiceName;          /// Service name to create the container.
-    sal_Int32           mnIndex;                /// Index to create unique identifiers.
-};
-
-// ============================================================================
-
 } // namespace oox
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index b6f09a25316b..78bd38566943 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -46,7 +46,6 @@ namespace com { namespace sun { namespace star {
     namespace graphic { class XGraphic; }
     namespace graphic { class XGraphicObject; }
     namespace graphic { class XGraphicProvider; }
-    namespace lang { class XMultiServiceFactory; }
     namespace uno { class XComponentContext; }
 } } }
 
@@ -69,7 +68,7 @@ class OOX_DLLPUBLIC GraphicHelper
 {
 public:
     explicit            GraphicHelper(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxTargetFrame,
                             const StorageRef& rxStorage );
     virtual             ~GraphicHelper();
@@ -149,6 +148,10 @@ public:
         @return  The URL of the created and internally cached graphic object. */
     ::rtl::OUString     importEmbeddedGraphicObject( const ::rtl::OUString& rStreamName ) const;
 
+    /** calculates the orignal size of a graphic which is necessary to be able to calculate cropping values
+        @return The original Graphic size in 100thmm */
+    ::com::sun::star::awt::Size getOriginalSize( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const;
+
     // ------------------------------------------------------------------------
 private:
     typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette;
@@ -174,4 +177,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index 2e34090ac7dc..687891bd36c5 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -328,4 +328,4 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData )
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx
index 56e98812ead0..9bac77718a58 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -30,19 +30,55 @@
 #define OOX_HELPER_MODELOBJECTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include "oox/helper/containerhelper.hxx"
 
 namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
     namespace awt { struct Gradient; }
+    namespace container { class XNameContainer; }
     namespace drawing { struct LineDash; }
     namespace drawing { struct PolyPolygonBezierCoords; }
+    namespace lang { class XMultiServiceFactory; }
 } } }
 
 namespace oox {
 
 // ============================================================================
 
+/** This helper manages named objects in a container, which is created on demand.
+ */
+class ObjectContainer
+{
+public:
+    explicit            ObjectContainer(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory,
+                            const ::rtl::OUString& rServiceName );
+                        ~ObjectContainer();
+
+    /** Returns true, if the object with the passed name exists in the container. */
+    bool                hasObject( const ::rtl::OUString& rObjName ) const;
+
+    /** Returns the object with the passed name from the container. */
+    ::com::sun::star::uno::Any getObject( const ::rtl::OUString& rObjName ) const;
+
+    /** Inserts the passed object into the container, returns its final name. */
+    ::rtl::OUString     insertObject(
+                            const ::rtl::OUString& rObjName,
+                            const ::com::sun::star::uno::Any& rObj,
+                            bool bInsertByUnusedName );
+
+private:
+    void                createContainer() const;
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+                        mxFactory;              /// Factory to create the container.
+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+                        mxContainer;            /// Container for the objects.
+    ::rtl::OUString     maServiceName;          /// Service name to create the container.
+    sal_Int32           mnIndex;                /// Index to create unique identifiers.
+};
+
+// ============================================================================
+
 /** Contains tables for named drawing objects for a document model.
 
     Contains tables for named line markers, line dashes, fill gradients, and
@@ -78,13 +114,13 @@ public:
     ::rtl::OUString     insertFillBitmap( const ::rtl::OUString& rGraphicUrl );
 
 private:
-    ObjectContainer     maMarkerContainer;
-    ObjectContainer     maDashContainer;
-    ObjectContainer     maGradientContainer;
-    ObjectContainer     maBitmapContainer;
-    const ::rtl::OUString maDashNameBase;
-    const ::rtl::OUString maGradientNameBase;
-    const ::rtl::OUString maBitmapNameBase;
+    ObjectContainer     maMarkerContainer;      /// Contains all named line markers (line end polygons).
+    ObjectContainer     maDashContainer;        /// Contains all named line dsahes.
+    ObjectContainer     maGradientContainer;    /// Contains all named fill gradients.
+    ObjectContainer     maBitmapContainer;      /// Contains all named fill bitmaps.
+    const ::rtl::OUString maDashNameBase;       /// Base name for all named line dashes.
+    const ::rtl::OUString maGradientNameBase;   /// Base name for all named fill gradients.
+    const ::rtl::OUString maBitmapNameBase;     /// Base name for all named fill bitmaps.
 };
 
 // ============================================================================
@@ -93,4 +129,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/progressbar.hxx b/oox/inc/oox/helper/progressbar.hxx
index 898ede10f20b..89d28962c8c7 100644
--- a/oox/inc/oox/helper/progressbar.hxx
+++ b/oox/inc/oox/helper/progressbar.hxx
@@ -144,4 +144,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index 07408f71f752..31d92a14b639 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -31,9 +31,10 @@
 
 #include <vector>
 #include <map>
-#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/ustring.hxx>
+#include "oox/token/properties.hxx"
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct PropertyValue;
@@ -42,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace beans {
 
 namespace oox {
 
-struct PropertyList;
+struct PropertyNameVector;
 
 // ============================================================================
 
@@ -90,13 +91,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         makePropertySet() const;
 
-#if OSL_DEBUG_LEVEL > 0
-  static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
-  void dump();
-#endif
-
 private:
-    const PropertyList* mpPropNames;
+    const PropertyNameVector* mpPropNames;
 };
 
 // ============================================================================
@@ -105,4 +101,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index 54a2a0c4f8be..55792a1bfa60 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -31,6 +31,7 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include "oox/token/properties.hxx"
 
 namespace oox {
 
@@ -128,10 +129,6 @@ public:
         @param rPropertyMap  The property map. */
     void                setProperties( const PropertyMap& rPropertyMap );
 
-#if OSL_DEBUG_LEVEL > 0
-    void dump();
-#endif
-
     // ------------------------------------------------------------------------
 private:
     /** Gets the specified property from the property set.
@@ -169,4 +166,4 @@ inline void PropertySet::setProperty( sal_Int32 nPropId, const Type& rValue )
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/refmap.hxx b/oox/inc/oox/helper/refmap.hxx
new file mode 100755
index 000000000000..e833e1196c81
--- /dev/null
+++ b/oox/inc/oox/helper/refmap.hxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_HELPER_REFMAP_HXX
+#define OOX_HELPER_REFMAP_HXX
+
+#include <map>
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+#include <sal/types.h>
+
+namespace oox {
+
+// ============================================================================
+
+/** Template for a map of ref-counted objects with additional accessor functions.
+
+    An instance of the class RefMap< Type > stores elements of the type
+    ::boost::shared_ptr< Type >. The new accessor functions has() and get()
+    work correctly for nonexisting keys, there is no need to check the passed
+    key before.
+ */
+template< typename KeyType, typename ObjType, typename CompType = ::std::less< KeyType > >
+class RefMap : public ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType >
+{
+public:
+    typedef ::std::map< KeyType, ::boost::shared_ptr< ObjType >, CompType > container_type;
+    typedef typename container_type::key_type                               key_type;
+    typedef typename container_type::mapped_type                            mapped_type;
+    typedef typename container_type::value_type                             value_type;
+    typedef typename container_type::key_compare                            key_compare;
+
+public:
+    /** Returns true, if the object accossiated to the passed key exists.
+        Returns false, if the key exists but points to an empty reference. */
+    inline bool         has( key_type nKey ) const
+                        {
+                            const mapped_type* pxRef = getRef( nKey );
+                            return pxRef && pxRef->get();
+                        }
+
+    /** Returns a reference to the object accossiated to the passed key, or an
+        empty reference on error. */
+    inline mapped_type  get( key_type nKey ) const
+                        {
+                            if( const mapped_type* pxRef = getRef( nKey ) ) return *pxRef;
+                            return mapped_type();
+                        }
+
+    /** Calls the passed functor for every contained object, automatically
+        skips all elements that are empty references. */
+    template< typename FunctorType >
+    inline void         forEach( const FunctorType& rFunctor ) const
+                        {
+                            ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType >
+    inline void         forEachMem( FuncType pFunc ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType >
+    inline void         forEachMem( FuncType pFunc, ParamType aParam ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
+                        }
+    /** Calls the passed functor for every contained object. Passes the key as
+        first argument and the object reference as second argument to rFunctor. */
+    template< typename FunctorType >
+    inline void         forEachWithKey( const FunctorType& rFunctor ) const
+                        {
+                            ::std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the object key as argument to the member function. */
+    template< typename FuncType >
+    inline void         forEachMemWithKey( FuncType pFunc ) const
+                        {
+                            forEachWithKey( ::boost::bind( pFunc, _2, _1 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the object key as first argument to the member function. */
+    template< typename FuncType, typename ParamType >
+    inline void         forEachMemWithKey( FuncType pFunc, ParamType aParam ) const
+                        {
+                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the object key as first argument to the member function. */
+    template< typename FuncType, typename ParamType1, typename ParamType2 >
+    inline void         forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
+                        {
+                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the object key as first argument to the member function. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
+    inline void         forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
+                        {
+                            forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) );
+                        }
+
+private:
+    template< typename FunctorType >
+    struct ForEachFunctor
+    {
+        FunctorType         maFunctor;
+        inline explicit     ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
+        inline void         operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( *rValue.second ); }
+    };
+
+    template< typename FunctorType >
+    struct ForEachFunctorWithKey
+    {
+        FunctorType         maFunctor;
+        inline explicit     ForEachFunctorWithKey( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
+        inline void         operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( rValue.first, *rValue.second ); }
+    };
+
+    inline const mapped_type* getRef( key_type nKey ) const
+                        {
+                            typename container_type::const_iterator aIt = find( nKey );
+                            return (aIt == this->end()) ? 0 : &aIt->second;
+                        }
+};
+
+// ============================================================================
+
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/helper/refvector.hxx b/oox/inc/oox/helper/refvector.hxx
new file mode 100755
index 000000000000..0a2d8be62e2f
--- /dev/null
+++ b/oox/inc/oox/helper/refvector.hxx
@@ -0,0 +1,201 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_HELPER_REFVECTOR_HXX
+#define OOX_HELPER_REFVECTOR_HXX
+
+#include <vector>
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+#include <sal/types.h>
+
+namespace oox {
+
+// ============================================================================
+
+/** Template for a vector of ref-counted objects with additional accessor functions.
+
+    An instance of the class RefVector< Type > stores elements of the type
+    ::boost::shared_ptr< Type >. The new accessor functions has() and get()
+    work correctly for indexes out of the current range, there is no need to
+    check the passed index before.
+ */
+template< typename ObjType >
+class RefVector : public ::std::vector< ::boost::shared_ptr< ObjType > >
+{
+public:
+    typedef ::std::vector< ::boost::shared_ptr< ObjType > > container_type;
+    typedef typename container_type::value_type             value_type;
+    typedef typename container_type::size_type              size_type;
+
+public:
+    /** Returns true, if the object with the passed index exists. Returns
+        false, if the vector element exists but is an empty reference. */
+    inline bool         has( sal_Int32 nIndex ) const
+                        {
+                            const value_type* pxRef = getRef( nIndex );
+                            return pxRef && pxRef->get();
+                        }
+
+    /** Returns a reference to the object with the passed index, or 0 on error. */
+    inline value_type   get( sal_Int32 nIndex ) const
+                        {
+                            if( const value_type* pxRef = getRef( nIndex ) ) return *pxRef;
+                            return value_type();
+                        }
+
+    /** Returns the index of the last element, or -1, if the vector is empty.
+        Does *not* check whether the last element is an empty reference. */
+    inline sal_Int32    getLastIndex() const { return static_cast< sal_Int32 >( this->size() ) - 1; }
+
+    /** Calls the passed functor for every contained object, automatically
+        skips all elements that are empty references. */
+    template< typename FunctorType >
+    inline void         forEach( FunctorType aFunctor ) const
+                        {
+                            ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( aFunctor ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType >
+    inline void         forEachMem( FuncType pFunc ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType >
+    inline void         forEachMem( FuncType pFunc, ParamType aParam ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
+                        }
+
+    /** Calls the passed functor for every contained object. Passes the index as
+        first argument and the object reference as second argument to rFunctor. */
+    template< typename FunctorType >
+    inline void         forEachWithIndex( const FunctorType& rFunctor ) const
+                        {
+                            ::std::for_each( this->begin(), this->end(), ForEachFunctorWithIndex< FunctorType >( rFunctor ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the vector index to the member function. */
+    template< typename FuncType >
+    inline void         forEachMemWithIndex( FuncType pFunc ) const
+                        {
+                            forEachWithIndex( ::boost::bind( pFunc, _2, _1 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the vector index as first argument to the member function. */
+    template< typename FuncType, typename ParamType >
+    inline void         forEachMemWithIndex( FuncType pFunc, ParamType aParam ) const
+                        {
+                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the vector index as first argument to the member function. */
+    template< typename FuncType, typename ParamType1, typename ParamType2 >
+    inline void         forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const
+                        {
+                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) );
+                        }
+
+    /** Calls the passed member function of ObjType on every contained object.
+        Passes the vector index as first argument to the member function. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 >
+    inline void         forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const
+                        {
+                            forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) );
+                        }
+
+    /** Searches for an element by using the passed functor that takes a
+        constant reference of the object type (const ObjType&). */
+    template< typename FunctorType >
+    inline value_type   findIf( const FunctorType& rFunctor ) const
+                        {
+                            typename container_type::const_iterator aIt = ::std::find_if( this->begin(), this->end(), FindFunctor< FunctorType >( rFunctor ) );
+                            return (aIt == this->end()) ? value_type() : *aIt;
+                        }
+
+private:
+    template< typename FunctorType >
+    struct ForEachFunctor
+    {
+        FunctorType         maFunctor;
+        inline explicit     ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
+        inline void         operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( *rxValue ); }
+    };
+
+    template< typename FunctorType >
+    struct ForEachFunctorWithIndex
+    {
+        FunctorType         maFunctor;
+        sal_Int32           mnIndex;
+        inline explicit     ForEachFunctorWithIndex( const FunctorType& rFunctor ) : maFunctor( rFunctor ), mnIndex( 0 ) {}
+        inline void         operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( mnIndex, *rxValue ); ++mnIndex; }
+    };
+
+    template< typename FunctorType >
+    struct FindFunctor
+    {
+        FunctorType         maFunctor;
+        inline explicit     FindFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {}
+        inline bool         operator()( const value_type& rxValue ) { return rxValue.get() && maFunctor( *rxValue ); }
+    };
+
+    inline const value_type* getRef( sal_Int32 nIndex ) const
+                        {
+                            return ((0 <= nIndex) && (static_cast< size_type >( nIndex ) < this->size())) ?
+                                &(*this)[ static_cast< size_type >( nIndex ) ] : 0;
+                        }
+};
+
+// ============================================================================
+
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/helper/storagebase.hxx b/oox/inc/oox/helper/storagebase.hxx
index 84bf05e4f042..dbb929c3fdb0 100644
--- a/oox/inc/oox/helper/storagebase.hxx
+++ b/oox/inc/oox/helper/storagebase.hxx
@@ -29,8 +29,10 @@
 #ifndef OOX_HELPER_STORAGEBASE_HXX
 #define OOX_HELPER_STORAGEBASE_HXX
 
+#include <vector>
+#include <com/sun/star/uno/Reference.hxx>
+#include "oox/helper/refmap.hxx"
 #include "oox/dllapi.h"
-#include "oox/helper/containerhelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace embed { class XStorage; }
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx
index 5b1d1424cf8e..b3256bd33235 100644
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/oox/inc/oox/helper/textinputstream.hxx
@@ -57,4 +57,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx
index cf55d371bdce..811e7937d236 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -31,7 +31,7 @@
 
 #include <utility>
 #include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/refvector.hxx"
 
 namespace oox {
 namespace ole {
@@ -93,6 +93,8 @@ typedef ::std::vector< ::rtl::OUString > AxStringArray;
 
 // ============================================================================
 
+const sal_Char* const AX_GUID_CFONT         = "{AFC20920-DA4E-11CE-B943-00AA006887B4}";
+
 const sal_uInt32 AX_FONTDATA_BOLD           = 0x00000001;
 const sal_uInt32 AX_FONTDATA_ITALIC         = 0x00000002;
 const sal_uInt32 AX_FONTDATA_UNDERLINE      = 0x00000004;
@@ -112,6 +114,7 @@ struct AxFontData
     sal_Int32           mnFontHeight;       /// Height of the font (not really twips, see code).
     sal_Int32           mnFontCharSet;      /// Windows character set of the font.
     sal_Int32           mnHorAlign;         /// Horizontal text alignment.
+    bool                mbDblUnderline;     /// True = double underline style (legacy VML drawing controls only).
 
     explicit            AxFontData();
 
@@ -295,4 +298,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index ae4305b5ae7a..273bacd5121a 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -59,6 +59,9 @@ namespace ole {
 #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}"
 #define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}"
 
+const sal_uInt16 COMCTL_VERSION_50          = 5;
+const sal_uInt16 COMCTL_VERSION_60          = 6;
+
 // ----------------------------------------------------------------------------
 
 #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-A777-00DD01143C57}"
@@ -80,6 +83,28 @@ const sal_uInt32 AX_SYSCOLOR_WINDOWTEXT     = 0x80000008;
 const sal_uInt32 AX_SYSCOLOR_BUTTONFACE     = 0x8000000F;
 const sal_uInt32 AX_SYSCOLOR_BUTTONTEXT     = 0x80000012;
 
+const sal_uInt32 AX_FLAGS_ENABLED           = 0x00000002;
+const sal_uInt32 AX_FLAGS_LOCKED            = 0x00000004;
+const sal_uInt32 AX_FLAGS_OPAQUE            = 0x00000008;
+const sal_uInt32 AX_FLAGS_COLUMNHEADS       = 0x00000400;
+const sal_uInt32 AX_FLAGS_ENTIREROWS        = 0x00000800;
+const sal_uInt32 AX_FLAGS_EXISTINGENTRIES   = 0x00001000;
+const sal_uInt32 AX_FLAGS_CAPTIONLEFT       = 0x00002000;
+const sal_uInt32 AX_FLAGS_EDITABLE          = 0x00004000;
+const sal_uInt32 AX_FLAGS_IMEMODE_MASK      = 0x00078000;
+const sal_uInt32 AX_FLAGS_DRAGENABLED       = 0x00080000;
+const sal_uInt32 AX_FLAGS_ENTERASNEWLINE    = 0x00100000;
+const sal_uInt32 AX_FLAGS_KEEPSELECTION     = 0x00200000;
+const sal_uInt32 AX_FLAGS_TABASCHARACTER    = 0x00400000;
+const sal_uInt32 AX_FLAGS_WORDWRAP          = 0x00800000;
+const sal_uInt32 AX_FLAGS_BORDERSSUPPRESSED = 0x02000000;
+const sal_uInt32 AX_FLAGS_SELECTLINE        = 0x04000000;
+const sal_uInt32 AX_FLAGS_SINGLECHARSELECT  = 0x08000000;
+const sal_uInt32 AX_FLAGS_AUTOSIZE          = 0x10000000;
+const sal_uInt32 AX_FLAGS_HIDESELECTION     = 0x20000000;
+const sal_uInt32 AX_FLAGS_MAXLENAUTOTAB     = 0x40000000;
+const sal_uInt32 AX_FLAGS_MULTILINE         = 0x80000000;
+
 const sal_Int32 AX_BORDERSTYLE_NONE         = 0;
 const sal_Int32 AX_BORDERSTYLE_SINGLE       = 1;
 
@@ -99,6 +124,26 @@ const sal_Int32 AX_PICALIGN_CENTER          = 2;
 const sal_Int32 AX_PICALIGN_BOTTOMLEFT      = 3;
 const sal_Int32 AX_PICALIGN_BOTTOMRIGHT     = 4;
 
+const sal_Int32 AX_DISPLAYSTYLE_TEXT        = 1;
+const sal_Int32 AX_DISPLAYSTYLE_LISTBOX     = 2;
+const sal_Int32 AX_DISPLAYSTYLE_COMBOBOX    = 3;
+const sal_Int32 AX_DISPLAYSTYLE_CHECKBOX    = 4;
+const sal_Int32 AX_DISPLAYSTYLE_OPTBUTTON   = 5;
+const sal_Int32 AX_DISPLAYSTYLE_TOGGLE      = 6;
+const sal_Int32 AX_DISPLAYSTYLE_DROPDOWN    = 7;
+
+const sal_Int32 AX_SELCTION_SINGLE          = 0;
+const sal_Int32 AX_SELCTION_MULTI           = 1;
+const sal_Int32 AX_SELCTION_EXTENDED        = 2;
+
+const sal_Int32 AX_SHOWDROPBUTTON_NEVER     = 0;
+const sal_Int32 AX_SHOWDROPBUTTON_FOCUS     = 1;
+const sal_Int32 AX_SHOWDROPBUTTON_ALWAYS    = 2;
+
+const sal_Int32 AX_SCROLLBAR_NONE           = 0x00;
+const sal_Int32 AX_SCROLLBAR_HORIZONTAL     = 0x01;
+const sal_Int32 AX_SCROLLBAR_VERTICAL       = 0x02;
+
 // ----------------------------------------------------------------------------
 
 /** Enumerates all UNO API control types supported by these filters. */
@@ -110,6 +155,7 @@ enum ApiControlType
     API_CONTROL_CHECKBOX,
     API_CONTROL_RADIOBUTTON,
     API_CONTROL_EDIT,
+    API_CONTROL_NUMERIC,
     API_CONTROL_LISTBOX,
     API_CONTROL_COMBOBOX,
     API_CONTROL_SPINBUTTON,
@@ -183,6 +229,11 @@ public:
                             PropertyMap& rPropMap,
                             bool bHorizontal ) const;
 
+    /** Converts the vertical alignment to UNO properties. */
+    void                convertVerticalAlign(
+                            PropertyMap& rPropMap,
+                            sal_Int32 nVerticalAlign ) const;
+
     /** Converts common scrollbar settings to UNO properties. */
     void                convertScrollBar(
                             PropertyMap& rPropMap,
@@ -290,8 +341,10 @@ public:
     /** Converts the control size to UNO properties. */
     void                convertSize( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-protected:
+public: // direct access needed for legacy VML drawing controls
     AxPairData          maSize;         /// Size of the control in 1/100 mm.
+
+protected:
     bool                mbAwtModel;     /// True = AWT control model, false = form component.
 };
 
@@ -411,8 +464,10 @@ public:
     /** Returns the font height in points. */
     inline sal_Int16    getFontHeight() const { return maFontData.getHeightPoints(); }
 
-protected:
+public: // direct access needed for legacy VML drawing controls
     AxFontData          maFontData;         /// The font settings.
+
+private:
     bool                mbSupportsAlign;    /// True = UNO model supports Align property.
 };
 
@@ -431,13 +486,14 @@ public:
     virtual ApiControlType getControlType() const;
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-private:
+public: // direct access needed for legacy VML drawing controls
     StreamDataSequence  maPictureData;      /// Binary picture stream.
     ::rtl::OUString     maCaption;          /// Visible caption of the button.
     sal_uInt32          mnTextColor;        /// Text color.
     sal_uInt32          mnBackColor;        /// Fill color.
     sal_uInt32          mnFlags;            /// Various flags.
     sal_uInt32          mnPicturePos;       /// Position of the picture relative to text.
+    sal_Int32           mnVerticalAlign;    /// Vertical alignment (legacy VML drawing controls only).
     bool                mbFocusOnClick;     /// True = take focus on click.
 };
 
@@ -455,7 +511,7 @@ public:
     virtual ApiControlType getControlType() const;
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-private:
+public: // direct access needed for legacy VML drawing controls
     ::rtl::OUString     maCaption;          /// Visible caption of the button.
     sal_uInt32          mnTextColor;        /// Text color.
     sal_uInt32          mnBackColor;        /// Fill color.
@@ -463,6 +519,7 @@ private:
     sal_uInt32          mnBorderColor;      /// Flat border color.
     sal_Int32           mnBorderStyle;      /// Flat border style.
     sal_Int32           mnSpecialEffect;    /// 3D border effect.
+    sal_Int32           mnVerticalAlign;    /// Vertical alignment (legacy VML drawing controls only).
 };
 
 // ============================================================================
@@ -505,7 +562,7 @@ public:
     virtual bool        importBinaryModel( BinaryInputStream& rInStrm );
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-protected:
+public: // direct access needed for legacy VML drawing controls
     StreamDataSequence  maPictureData;      /// Binary picture stream.
     ::rtl::OUString     maCaption;          /// Visible caption of the button.
     ::rtl::OUString     maValue;            /// Current value of the control.
@@ -525,6 +582,7 @@ protected:
     sal_Int32           mnMaxLength;        /// Maximum character count.
     sal_Int32           mnPasswordChar;     /// Password character in edit fields.
     sal_Int32           mnListRows;         /// Number of rows in dropdown box.
+    sal_Int32           mnVerticalAlign;    /// Vertical alignment (legacy VML drawing controls only).
 };
 
 // ============================================================================
@@ -580,6 +638,18 @@ public:
 
 // ============================================================================
 
+/** Model for a numeric field (legacy drawing controls only). */
+class AxNumericFieldModel : public AxMorphDataModelBase
+{
+public:
+    explicit            AxNumericFieldModel();
+
+    virtual ApiControlType getControlType() const;
+    virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
+};
+
+// ============================================================================
+
 /** Model for a Forms 2.0 list box. */
 class AxListBoxModel : public AxMorphDataModelBase
 {
@@ -616,7 +686,7 @@ public:
     virtual ApiControlType getControlType() const;
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-private:
+public: // direct access needed for legacy VML drawing controls
     sal_uInt32          mnArrowColor;       /// Button arrow color.
     sal_uInt32          mnBackColor;        /// Fill color.
     sal_uInt32          mnFlags;            /// Various flags.
@@ -642,7 +712,7 @@ public:
     virtual ApiControlType getControlType() const;
     virtual void        convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const;
 
-private:
+public: // direct access needed for legacy VML drawing controls
     sal_uInt32          mnArrowColor;       /// Button arrow color.
     sal_uInt32          mnBackColor;        /// Fill color.
     sal_uInt32          mnFlags;            /// Various flags.
@@ -706,7 +776,7 @@ public:
         model from the 'f' stream. */
     bool                importClassTable( BinaryInputStream& rInStrm, AxClassTable& orClassTable );
 
-protected:
+public: // direct access needed for legacy VML drawing controls
     StreamDataSequence  maPictureData;      /// Binary picture stream.
     ::rtl::OUString     maCaption;          /// Visible caption of the form.
     AxPairData          maLogicalSize;      /// Logical form size (scroll area).
@@ -791,14 +861,27 @@ class EmbeddedControl
 {
 public:
     explicit            EmbeddedControl( const ::rtl::OUString& rName );
-                        ~EmbeddedControl();
+    virtual             ~EmbeddedControl();
+
+    /** Creates and returns the internal control model of the specified type. */
+    template< typename ModelType >
+    inline ModelType&   createModel();
+
+    /** Creates and returns the internal control model of the specified type. */
+    template< typename ModelType, typename ParamType >
+    inline ModelType&   createModel( const ParamType& rParam );
 
     /** Creates and returns the internal control model according to the passed
         MS class identifier. */
-    ControlModelRef     createModel( const ::rtl::OUString& rClassId );
+    ControlModelBase*   createModelFromGuid( const ::rtl::OUString& rClassId );
 
     /** Returns true, if the internal control model exists. */
     inline bool         hasModel() const { return mxModel.get() != 0; }
+    /** Returns read-only access to the internal control model. */
+    inline const ControlModelBase* getModel() const { return mxModel.get(); }
+    /** Returns read/write access to the internal control model. */
+    inline ControlModelBase* getModel() { return mxModel.get(); }
+
     /** Returns the UNO service name needed to construct the control model. */
     ::rtl::OUString     getServiceName() const;
 
@@ -812,10 +895,30 @@ private:
     ::rtl::OUString     maName;             /// Name of the control.
 };
 
+// ----------------------------------------------------------------------------
+
+template< typename ModelType >
+inline ModelType& EmbeddedControl::createModel()
+{
+    ::boost::shared_ptr< ModelType > xModel( new ModelType );
+    mxModel = xModel;
+    xModel->setFormComponentMode();
+    return *xModel;
+}
+
+template< typename ModelType, typename ParamType >
+inline ModelType& EmbeddedControl::createModel( const ParamType& rParam )
+{
+    ::boost::shared_ptr< ModelType > xModel( new ModelType( rParam ) );
+    mxModel = xModel;
+    xModel->setFormComponentMode();
+    return *xModel;
+}
+
 // ============================================================================
 
 /** A wrapper for a control form embedded directly in a draw page. */
-class EmbeddedForm : public ControlConverter
+class EmbeddedForm
 {
 public:
     explicit            EmbeddedForm(
@@ -824,20 +927,22 @@ public:
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
 
-    /** Converts the passed ActiveX control and inserts it into the form.
+    /** Converts the passed control and inserts the control model into the form.
         @return  The API control model, if conversion was successful. */
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
-                        convertAndInsert( const EmbeddedControl& rControl );
+                        convertAndInsert( const EmbeddedControl& rControl, sal_Int32& rnCtrlIndex );
 
-private:
-    /** Tries to insert the passed control model into the form. */
-    bool                insertControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel );
+    /** Returns the XIndexContainer interface of the UNO control form, if existing. */
+    inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
+                        getXForm() const { return mxFormIC; }
 
+private:
     /** Creates the form that will hold the form controls. */
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
-                        createForm();
+                        createXForm();
 
 private:
+    ControlConverter    maControlConv;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxModelFactory;
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier > mxFormsSupp;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC;
diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/oox/inc/oox/ole/axcontrolfragment.hxx
index ce9fc5436cd2..8688cabe68a9 100644
--- a/oox/inc/oox/ole/axcontrolfragment.hxx
+++ b/oox/inc/oox/ole/axcontrolfragment.hxx
@@ -80,4 +80,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 9bfd290e1211..ffaaf8328636 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -101,6 +101,10 @@ public:
                             sal_uInt32 nOleColor,
                             bool bDefaultColorBgr = true );
 
+    /** Returns the OLE color from the passed UNO RGB color.
+     */
+    static sal_uInt32   encodeOleColor( sal_Int32 nRgbColor );
+
     /** Imports a GUID from the passed binary stream and returns its string
         representation (in uppercase characters).
      */
@@ -142,4 +146,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/oox/inc/oox/ole/oleobjecthelper.hxx
index 56f2c8b7c8c6..659e927d203b 100644
--- a/oox/inc/oox/ole/oleobjecthelper.hxx
+++ b/oox/inc/oox/ole/oleobjecthelper.hxx
@@ -33,8 +33,8 @@
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Size; }
-    namespace lang { class XMultiServiceFactory; }
     namespace document { class XEmbeddedObjectResolver; }
+    namespace lang { class XMultiServiceFactory; }
 } } }
 
 namespace oox { class PropertyMap; }
@@ -85,4 +85,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx
index e76cb7e89d6b..d2c22f5aa0f6 100644
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/oox/inc/oox/ole/olestorage.hxx
@@ -32,8 +32,8 @@
 #include "oox/helper/storagebase.hxx"
 
 namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
     namespace container { class XNameContainer; }
+    namespace lang { class XMultiServiceFactory; }
 } } }
 
 namespace oox {
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index df25e746bc6d..11b2a0f78779 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -34,6 +34,7 @@
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox { class StorageBase; }
@@ -188,7 +189,7 @@ class VbaUserForm : public VbaFormControl
 {
 public:
     explicit            VbaUserForm(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
@@ -203,7 +204,7 @@ public:
                             rtl_TextEncoding eTextEnc );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxGlobalFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCompContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
     ControlConverter    maConverter;
 };
diff --git a/oox/inc/oox/ole/vbainputstream.hxx b/oox/inc/oox/ole/vbainputstream.hxx
index 86b09efa87a6..0dc644d3bc24 100644
--- a/oox/inc/oox/ole/vbainputstream.hxx
+++ b/oox/inc/oox/ole/vbainputstream.hxx
@@ -71,4 +71,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 52d04c0e5d45..a0fc68a6c3f5 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_OLE_VBAMODULE_HXX
 #define OOX_OLE_VBAMODULE_HXX
 
-#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameAccess; }
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index 24863c2bd314..94af918b71e2 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -31,6 +31,7 @@
 
 #include <map>
 #include <com/sun/star/uno/XInterface.hpp>
+#include "oox/helper/refvector.hxx"
 #include "oox/helper/storagebase.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -38,7 +39,8 @@ namespace com { namespace sun { namespace star {
     namespace document { class XEventsSupplier; }
     namespace frame { class XModel; }
     namespace script { class XLibraryContainer; }
-    namespace lang { class XMultiServiceFactory; }
+    namespace script { namespace vba { class XVBAMacroResolver; } }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox { class GraphicHelper; }
@@ -52,7 +54,7 @@ class VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rConfigCompName );
                         ~VbaFilterConfig();
 
@@ -70,11 +72,52 @@ private:
 
 // ============================================================================
 
+/** Base class for objects that attach a amcro to a specific action.
+
+    Purpose is to collect objects that need to attach a VBA macro to an action.
+    The VBA project will be loaded at a very late point of the document import
+    process, because it depends on an initialized core document model (e.g.
+    spreadsheet codenames). Some objects that want to attach a VBA macro to an
+    action (e.g. mouse click action for drawing shapes) are loaded long before
+    the VBA project. The drawback is that in most cases macros are specified
+    without module name, or the VBA project name is part of the macro name.
+    In the former case, all code modules have to be scanned for the macro to be
+    able to create a valid script URL.
+
+    The import code will register these requests to attach a VBA macro with an
+    instance of a class derived from this base class. The derived class will
+    store all information needed to finally attach the macro to the action,
+    once the VBA project has been imported.
+ */
+class VbaMacroAttacherBase
+{
+public:
+    explicit            VbaMacroAttacherBase( const ::rtl::OUString& rMacroName );
+    virtual             ~VbaMacroAttacherBase();
+
+    /** Resolves the internal macro name to the related macro URL, and attaches
+        the macro to the object. */
+    void                resolveAndAttachMacro(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAMacroResolver >& rxResolver );
+
+private:
+    /** Called after the VBA project has been imported. Derived classes will
+        attach the passed script to the object represented by this instance. */
+    virtual void        attachMacro( const ::rtl::OUString& rScriptUrl ) = 0;
+
+private:
+    ::rtl::OUString     maMacroName;
+};
+
+typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef;
+
+// ============================================================================
+
 class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
 {
 public:
     explicit            VbaProject(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const ::rtl::OUString& rConfigCompName );
     virtual             ~VbaProject();
@@ -88,6 +131,10 @@ public:
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
 
+    /** Registers a macro atatcher object. For details, see description of the
+        VbaMacroAttacherBase class. */
+    void                registerMacroAttacher( const VbaMacroAttacherRef& rxAttacher );
+
     /** Returns true, if the document contains at least one code module. */
     bool                hasModules() const;
     /** Returns true, if the document contains the specified code module. */
@@ -100,6 +147,16 @@ public:
 
     void                setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >&  rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
 
+protected:
+    /** Registers a dummy module that will be created when the VBA project is
+        imported. */
+    void                addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType );
+
+    /** Called when the import process of the VBA project has been started. */
+    virtual void        prepareImport();
+    /** Called when the import process of the VBA project is finished. */
+    virtual void        finalizeImport();
+
 private:
                         VbaProject( const VbaProject& );
     VbaProject&         operator=( const VbaProject& );
@@ -116,38 +173,36 @@ private:
     /** Creates and returns the dialog library of the document used for import. */
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         createDialogLibrary();
+
     /** Imports the VBA code modules and forms. */
     void                importVba(
                             StorageBase& rVbaPrjStrg,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr );
 
+    /** Attaches VBA macros to objects registered via registerMacroAttacher(). */
+    void                attachMacros();
+
     /** Copies the entire VBA project storage to the passed document model. */
     void                copyStorage( StorageBase& rVbaPrjStrg );
 
-
-protected:
-    /** Registers a dummy module that will be created when the VBA project is
-        imported. */
-    void                addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType );
-
-    /** Called when the import process of the VBA code modules starts. */
-    virtual void        prepareModuleImport();
-
 private:
-    typedef ::std::map< ::rtl::OUString, sal_Int32 > DummyModuleMap;
+    typedef RefVector< VbaMacroAttacherBase >           MacroAttacherVector;
+    typedef ::std::map< ::rtl::OUString, sal_Int32 >    DummyModuleMap;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        mxGlobalFactory;    /// Global service factory.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                        mxCompContext;      /// Component context with service manager.
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
                         mxDocModel;         /// Document model used to import/export the VBA project.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxBasicLib;         /// The Basic library of the document used for import.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxDialogLib;        /// The dialog library of the document used for import.
+    MacroAttacherVector maMacroAttachers;   /// Objects that want to attach a VBA macro to an action.
+    DummyModuleMap      maDummyModules;     /// Additional empty modules created on import.
+    ::rtl::OUString     maPrjName;          /// Name of the VBA project.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxOleOverridesSink;
-    DummyModuleMap      maDummyModules;     /// Additional empty modules created on import.
     ::rtl::OUString     maPrjName;          /// Name of the VBA project.
 };
 
diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx b/oox/inc/oox/ole/vbaprojectfilter.hxx
index c2baaf6c551b..03d49dfb71f1 100644
--- a/oox/inc/oox/ole/vbaprojectfilter.hxx
+++ b/oox/inc/oox/ole/vbaprojectfilter.hxx
@@ -40,14 +40,18 @@ class VbaProjectFilterBase : public ::oox::core::BinaryFilterBase
 {
 public:
     explicit            VbaProjectFilterBase(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                             const ::rtl::OUString& rAppName,
-                            const ::rtl::OUString& rStorageName );
+                            const ::rtl::OUString& rStorageName )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual bool        importDocument() throw();
     virtual bool        exportDocument() throw();
 
 private:
+    virtual VbaProject* implCreateVbaProject() const;
+
+private:
     ::rtl::OUString     maAppName;
     ::rtl::OUString     maStorageName;
 };
@@ -58,7 +62,8 @@ class WordVbaProjectFilter : public VbaProjectFilterBase
 {
 public:
     explicit            WordVbaProjectFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
 private:
     virtual ::rtl::OUString implGetImplementationName() const;
diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx
index 9c87c66a97e4..06f345ba0f8c 100644
--- a/oox/inc/oox/ppt/pptimport.hxx
+++ b/oox/inc/oox/ppt/pptimport.hxx
@@ -35,7 +35,6 @@
 #include <oox/drawingml/theme.hxx>
 #include "oox/ppt/presentationfragmenthandler.hxx"
 #include "oox/ppt/slidepersist.hxx"
-#include "tokens.hxx"
 #include <vector>
 #include <map>
 
@@ -47,7 +46,8 @@ class PowerPointImport : public oox::core::XmlFilterBase
 {
 public:
 
-    PowerPointImport( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr  );
+    PowerPointImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
+        throw( ::com::sun::star::uno::RuntimeException );
     virtual ~PowerPointImport();
 
     // from FilterBase
@@ -76,6 +76,7 @@ public:
 
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const;
+    virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
     virtual ::rtl::OUString implGetImplementationName() const;
 
 private:
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index 3e1bee7c7469..104a1c210d6e 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -49,7 +49,7 @@ public:
     using oox::drawingml::Shape::addShape;
     // addShape is creating and inserting the corresponding XShape.
     void addShape(
-            const oox::core::XmlFilterBase& rFilterBase,
+            oox::core::XmlFilterBase& rFilterBase,
             const SlidePersist& rPersist,
             const oox::drawingml::Theme* pTheme,
             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index 0aa95dde5f5a..0a197e1d4135 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -29,7 +29,6 @@
 #ifndef OOX_POWERPOINT_SLIDEPERSIST_HXX
 #define OOX_POWERPOINT_SLIDEPERSIST_HXX
 
-#include "tokens.hxx"
 #include <boost/shared_ptr.hpp>
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/theme.hxx"
@@ -96,6 +95,7 @@ public:
 
     void setBackgroundProperties( const oox::drawingml::FillPropertiesPtr pFillPropertiesPtr ){ mpBackgroundPropertiesPtr = pFillPropertiesPtr; }
     oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; }
+    oox::drawingml::Color& getBackgroundColorRef() { return maBackgroundColorRef; }
 
     sal_Bool isMasterPage() const { return mbMaster; }
     sal_Bool isNotesPage() const { return mbNotes; }
@@ -116,7 +116,7 @@ public:
 
     oox::vml::Drawing* getDrawing() { return mpDrawingPtr.get(); }
 
-    void createXShapes( const oox::core::XmlFilterBase& rFilterBase );
+    void createXShapes( oox::core::XmlFilterBase& rFilterBase );
     void createBackground( const oox::core::XmlFilterBase& rFilterBase );
     void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
 
@@ -135,6 +135,7 @@ private:
     SlidePersistPtr                                                         mpMasterPagePtr;
 
     oox::drawingml::ShapePtr                                                maShapesPtr;
+    oox::drawingml::Color                                                   maBackgroundColorRef;
     oox::drawingml::FillPropertiesPtr                                       mpBackgroundPropertiesPtr;
     ::std::list< boost::shared_ptr< TimeNode > >                            maTimeNodeList;
 
diff --git a/oox/inc/oox/token/namespacemap.hxx b/oox/inc/oox/token/namespacemap.hxx
new file mode 100755
index 000000000000..e4daa18f6b56
--- /dev/null
+++ b/oox/inc/oox/token/namespacemap.hxx
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_TOKEN_NAMESPACEMAP_HXX
+#define OOX_TOKEN_NAMESPACEMAP_HXX
+
+#include <map>
+#include <rtl/instance.hxx>
+#include <rtl/ustring.hxx>
+
+namespace oox {
+
+// ============================================================================
+
+/** A map that contains all XML namespace URLs used in the filters. */
+struct NamespaceMap : public ::std::map< sal_Int32, ::rtl::OUString > { NamespaceMap(); };
+
+/** Thread-save singleton of a map of all supported XML namespace URLs. */
+struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {};
+
+// ============================================================================
+
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/token/propertylist.hxx b/oox/inc/oox/token/propertynames.hxx
index 94c643b2f6b8..3beaa76ccf90 100644
--- a/oox/inc/oox/token/propertylist.hxx
+++ b/oox/inc/oox/token/propertynames.hxx
@@ -26,10 +26,11 @@
  *
  ************************************************************************/
 
-#ifndef OOX_TOKEN_PROPERTYLIST_HXX
-#define OOX_TOKEN_PROPERTYLIST_HXX
+#ifndef OOX_TOKEN_PROPERTYNAMES_HXX
+#define OOX_TOKEN_PROPERTYNAMES_HXX
 
 #include <vector>
+#include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
 
 namespace oox {
@@ -37,11 +38,10 @@ namespace oox {
 // ============================================================================
 
 /** A vector that contains all predefined property names used in the filters. */
-struct PropertyList : public ::std::vector< ::rtl::OUString >
-{
-    explicit            PropertyList();
-                        ~PropertyList();
-};
+struct PropertyNameVector : public ::std::vector< ::rtl::OUString > { PropertyNameVector(); };
+
+/** Thread-save singleton of a vector of all supported property names. */
+struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {};
 
 // ============================================================================
 
@@ -49,4 +49,4 @@ struct PropertyList : public ::std::vector< ::rtl::OUString >
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/token/tokenmap.hxx b/oox/inc/oox/token/tokenmap.hxx
index c7a8f42bd74a..153711195825 100644
--- a/oox/inc/oox/token/tokenmap.hxx
+++ b/oox/inc/oox/token/tokenmap.hxx
@@ -67,7 +67,6 @@ private:
     typedef ::std::vector< TokenName > TokenNameVector;
 
     TokenNameVector     maTokenNames;
-
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 929d77d84dea..ed01461f4e51 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -31,7 +31,7 @@
 
 #include <map>
 #include <memory>
-
+#include <vector>
 #include <oox/ole/oleobjecthelper.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -39,17 +39,21 @@ namespace com { namespace sun { namespace star {
     namespace awt { class XControlModel; }
     namespace drawing { class XDrawPage; }
     namespace drawing { class XShape; }
+    namespace drawing { class XShapes; }
 } } }
 
-namespace oox { namespace core { class XmlFilterBase; } }
-namespace oox { namespace ole { class EmbeddedForm; } }
+namespace oox {
+    namespace core { class XmlFilterBase; }
+    namespace ole { class EmbeddedControl; }
+    namespace ole { class EmbeddedForm; }
+}
 
 namespace oox {
 namespace vml {
 
 class ShapeBase;
 class ShapeContainer;
-struct ShapeClientData;
+struct ClientData;
 
 // ============================================================================
 
@@ -116,6 +120,9 @@ public:
     /** Returns the form object used to process ActiveX form controls. */
     ::oox::ole::EmbeddedForm& getControlForm() const;
 
+    /** Registers a block of shape identifiers reserved by this drawing. Block
+        size is 1024, shape identifiers are one-based (block 1 => 1025-2048). */
+    void                registerBlockId( sal_Int32 nBlockId );
     /** Registers the passed embedded OLE object. The related shape will then
         load the OLE object data from the specified fragment. */
     void                registerOleObject( const OleObjectInfo& rOleObject );
@@ -127,36 +134,65 @@ public:
     void                finalizeFragmentImport();
 
     /** Creates and inserts all UNO shapes into the passed container. The virtual
-        function notifyShapeInserted() will be called for each new shape. */
+        function notifyXShapeInserted() will be called for each new shape. */
     void                convertAndInsert() const;
 
+    /** Returns the local shape index from the passed global shape identifier. */
+    sal_Int32           getLocalShapeIndex( const ::rtl::OUString& rShapeId ) const;
     /** Returns the registered info structure for an OLE object, if extant. */
     const OleObjectInfo* getOleObjectInfo( const ::rtl::OUString& rShapeId ) const;
     /** Returns the registered info structure for a form control, if extant. */
     const ControlInfo*  getControlInfo( const ::rtl::OUString& rShapeId ) const;
 
+    /** Creates a new UNO shape object, inserts it into the passed UNO shape
+        container, and sets the shape position and size. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        createAndInsertXShape(
+                            const ::rtl::OUString& rService,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+    /** Creates a new UNO shape object for a form control, inserts the control
+        model into the form, and the shape into the passed UNO shape container. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        createAndInsertXControlShape(
+                            const ::oox::ole::EmbeddedControl& rControl,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect,
+                            sal_Int32& rnCtrlIndex ) const;
+
     /** Derived classes may disable conversion of specific shapes. */
     virtual bool        isShapeSupported( const ShapeBase& rShape ) const;
 
+    /** Derived classes may return additional base names for automatic shape
+        name creation. */
+    virtual ::rtl::OUString getShapeBaseName( const ShapeBase& rShape ) const;
+
     /** Derived classes may calculate the shape rectangle from a non-standard
         anchor information string. */
-    virtual bool        convertShapeClientAnchor(
+    virtual bool        convertClientAnchor(
                             ::com::sun::star::awt::Rectangle& orShapeRect,
                             const ::rtl::OUString& rShapeAnchor ) const;
 
-    /** Derived classes may convert additional form control properties from the
-        passed VML shape client data. */
-    virtual void        convertControlClientData(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
-                            const ShapeClientData& rClientData ) const;
-
-    /** Derived classes may want to know that a shape has been inserted. Will
-        be called from the convertAndInsert() implementation. */
-    virtual void        notifyShapeInserted(
+    /** Derived classes create a UNO shape according to the passed shape model.
+        Called for shape models that specify being under host control. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        createAndInsertClientXShape(
+                            const ShapeBase& rShape,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
+
+    /** Derived classes may want to know that a UNO shape has been inserted.
+        Will be called from the convertAndInsert() implementation.
+        @param bGroupChild  True = inserted into a group shape,
+            false = inserted directly into this drawing. */
+    virtual void        notifyXShapeInserted(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+                            const ::com::sun::star::awt::Rectangle& rShapeRect,
+                            const ShapeBase& rShape, bool bGroupChild );
 
 private:
+    typedef ::std::vector< sal_Int32 >                      BlockIdVector;
     typedef ::std::auto_ptr< ::oox::ole::EmbeddedForm >     EmbeddedFormPtr;
     typedef ::std::auto_ptr< ShapeContainer >               ShapeContainerPtr;
     typedef ::std::map< ::rtl::OUString, OleObjectInfo >    OleObjectInfoMap;
@@ -165,7 +201,8 @@ private:
     ::oox::core::XmlFilterBase& mrFilter;   /// Filter object that imports/exports the VML drawing.
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
                         mxDrawPage;         /// UNO draw page used to insert the shapes.
-    mutable EmbeddedFormPtr mxCtrlForm;     /// The control form used to process ActiveX controls.
+    mutable EmbeddedFormPtr mxCtrlForm;     /// The control form used to process embedded controls.
+    mutable BlockIdVector maBlockIds;       /// Block identifiers used by this drawing.
     ShapeContainerPtr   mxShapes;           /// All shapes and shape templates.
     OleObjectInfoMap    maOleObjects;       /// Info about all embedded OLE objects, mapped by shape id.
     ControlInfoMap      maControls;         /// Info about all embedded form controls, mapped by control name.
@@ -179,4 +216,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/oox/inc/oox/vml/vmldrawingfragment.hxx
index 2b6be0eac7ff..b2b954c8c96c 100644
--- a/oox/inc/oox/vml/vmldrawingfragment.hxx
+++ b/oox/inc/oox/vml/vmldrawingfragment.hxx
@@ -65,4 +65,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index 49c60d785ac3..a71539a7793d 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -35,6 +35,7 @@ namespace oox {
     class GraphicHelper;
     class ModelObjectHelper;
     class PropertyMap;
+    namespace drawingml { class Color; }
 }
 
 namespace oox {
@@ -113,6 +114,35 @@ public:
                             bool bPixelX,
                             bool bDefaultAsPixel );
 
+    /** Converts VML color attributes to a DrawingML color.
+
+        @param roVmlColor  The VML string representation of the color. If
+            existing, this can be a 3-digit or 6-digit hexadecimal RGB value
+            with leading '#' character, a predefined color name (e.g. 'black',
+            'red', etc.), the index into an application defined color palette
+            in brackets with leading color name (e.g. 'red [9]' or
+            'windowColor [64]'), or a color modifier used in one-color
+            gradients (e.g. 'fill darken(128)' or 'fill lighten(0)').
+
+        @param roVmlOpacity  The opacity of the color. If existing, this should
+            be a floating-point value in the range [0.0;1.0].
+
+        @param nDefaultRgb  Deafult RGB color used if the parameter roVmlColor
+            is empty.
+
+        @param nPrimaryRgb  If set to something else than API_RGB_TRANSPARENT,
+            specifies the color to be used to resolve the color modifiers used
+            in one-color gradients.
+
+        @return  The resulting DrawingML color.
+     */
+    static ::oox::drawingml::Color decodeColor(
+                            const GraphicHelper& rGraphicHelper,
+                            const OptValue< ::rtl::OUString >& roVmlColor,
+                            const OptValue< double >& roVmlOpacity,
+                            sal_Int32 nDefaultRgb,
+                            sal_Int32 nPrimaryRgb = API_RGB_TRANSPARENT );
+
 private:
                         ConversionHelper();
                         ~ConversionHelper();
@@ -189,4 +219,4 @@ struct FillModel
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/oox/inc/oox/vml/vmlinputstream.hxx
index 5e3dd738c2ab..ad46888c3856 100644
--- a/oox/inc/oox/vml/vmlinputstream.hxx
+++ b/oox/inc/oox/vml/vmlinputstream.hxx
@@ -68,4 +68,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 314800c27e43..e2ea06500683 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -46,6 +46,19 @@ namespace vml {
 class Drawing;
 struct ShapeParentAnchor;
 class ShapeContainer;
+class TextBox;
+
+// ============================================================================
+
+const sal_Int32 VML_CLIENTDATA_UNCHECKED        = 0;
+const sal_Int32 VML_CLIENTDATA_CHECKED          = 1;
+const sal_Int32 VML_CLIENTDATA_MIXED            = 2;
+
+const sal_Int32 VML_CLIENTDATA_TEXT             = 0;
+const sal_Int32 VML_CLIENTDATA_INTEGER          = 1;
+const sal_Int32 VML_CLIENTDATA_NUMBER           = 2;
+const sal_Int32 VML_CLIENTDATA_REFERENCE        = 3;
+const sal_Int32 VML_CLIENTDATA_FORMULA          = 4;
 
 // ============================================================================
 
@@ -53,7 +66,7 @@ class ShapeContainer;
 struct ShapeTypeModel
 {
     ::rtl::OUString     maShapeId;              /// Unique identifier of the shape.
-    ::rtl::OUString     maName;                 /// Name of the shape, if present.
+    ::rtl::OUString     maShapeName;            /// Name of the shape, if present.
     OptValue< sal_Int32 > moShapeType;          /// Builtin shape type identifier.
 
     OptValue< Int32Pair > moCoordPos;           /// Top-left position of coordinate system for children scaling.
@@ -94,6 +107,8 @@ public:
 
     /** Returns the shape identifier (which is unique through the containing drawing). */
     inline const ::rtl::OUString& getShapeId() const { return maTypeModel.maShapeId; }
+    /** Returns the application defined shape type. */
+    sal_Int32           getShapeType() const;
     /** Returns the fragment path to the embedded graphic used by this shape. */
     ::rtl::OUString     getGraphicPath() const;
 
@@ -117,19 +132,39 @@ protected:
 // ============================================================================
 
 /** Excel specific shape client data (such as cell anchor). */
-struct ShapeClientData
+struct ClientData
 {
     ::rtl::OUString     maAnchor;           /// Cell anchor as comma-separated string.
-    ::rtl::OUString     maPictureLink;      /// Target cell range of picture links.
-    ::rtl::OUString     maLinkedCell;       /// Link to value cell associated to the control.
-    ::rtl::OUString     maSourceRange;      /// Link to cell range used as data source for the control.
+    ::rtl::OUString     maFmlaMacro;        /// Link to macro associated to the control.
+    ::rtl::OUString     maFmlaPict;         /// Target cell range of picture links.
+    ::rtl::OUString     maFmlaLink;         /// Link to value cell associated to the control.
+    ::rtl::OUString     maFmlaRange;        /// Link to cell range used as data source for the control.
+    ::rtl::OUString     maFmlaGroup;        /// Link to value cell associated to a group of option buttons.
     sal_Int32           mnObjType;          /// Type of the shape.
+    sal_Int32           mnTextHAlign;       /// Horizontal text alignment.
+    sal_Int32           mnTextVAlign;       /// Vertical text alignment.
     sal_Int32           mnCol;              /// Column index for spreadsheet cell note.
     sal_Int32           mnRow;              /// Row index for spreadsheet cell note.
+    sal_Int32           mnChecked;          /// State for checkboxes and option buttons.
+    sal_Int32           mnDropStyle;        /// Drop down box style (read-only or editable).
+    sal_Int32           mnDropLines;        /// Number of lines in drop down box.
+    sal_Int32           mnVal;              /// Current value of spin buttons and scroll bars.
+    sal_Int32           mnMin;              /// Minimum value of spin buttons and scroll bars.
+    sal_Int32           mnMax;              /// Maximum value of spin buttons and scroll bars.
+    sal_Int32           mnInc;              /// Small increment of spin buttons and scroll bars.
+    sal_Int32           mnPage;             /// Large increment of spin buttons and scroll bars.
+    sal_Int32           mnSelType;          /// Listbox selection type.
+    sal_Int32           mnVTEdit;           /// Data type of the textbox.
     bool                mbPrintObject;      /// True = print the object.
     bool                mbVisible;          /// True = cell note is visible.
-
-    explicit            ShapeClientData();
+    bool                mbDde;              /// True = object is linked through DDE.
+    bool                mbNo3D;             /// True = flat style, false = 3D style.
+    bool                mbNo3D2;            /// True = flat style, false = 3D style (listboxes and dropdowns).
+    bool                mbMultiLine;        /// True = textbox allows line breaks.
+    bool                mbVScroll;          /// True = textbox has a vertical scrollbar.
+    bool                mbSecretEdit;       /// True = textbox is a password edit field.
+
+    explicit            ClientData();
 };
 
 // ----------------------------------------------------------------------------
@@ -137,16 +172,21 @@ struct ShapeClientData
 struct ShapeModel
 {
     typedef ::std::vector< ::com::sun::star::awt::Point >   PointVector;
-    typedef ::std::auto_ptr< ShapeClientData >              ShapeClientDataPtr;
+    typedef ::std::auto_ptr< TextBox >                      TextBoxPtr;
+    typedef ::std::auto_ptr< ClientData >                   ClientDataPtr;
 
     ::rtl::OUString     maType;             /// Shape template with default properties.
     PointVector         maPoints;           /// Points for the polyline shape.
-    ShapeClientDataPtr  mxClientData;       /// Excel specific shape client data.
+    TextBoxPtr          mxTextBox;          /// Text contents and properties.
+    ClientDataPtr       mxClientData;       /// Excel specific client data.
 
     explicit            ShapeModel();
+                        ~ShapeModel();
 
+    /** Creates and returns a new shape textbox structure. */
+    TextBox&            createTextBox();
     /** Creates and returns a new shape client data structure. */
-    ShapeClientData&    createClientData();
+    ClientData&         createClientData();
 };
 
 // ----------------------------------------------------------------------------
@@ -161,9 +201,17 @@ public:
     /** Returns read access to the shape model structure. */
     inline const ShapeModel& getShapeModel() const { return maShapeModel; }
 
+    /** Returns read access to the shape textbox. */
+    inline const TextBox* getTextBox() const { return maShapeModel.mxTextBox.get(); }
+    /** Returns read access to the shape client data structure. */
+    inline const ClientData* getClientData() const { return maShapeModel.mxClientData.get(); }
+
     /** Final processing after import of the drawing fragment. */
     virtual void        finalizeFragmentImport();
 
+    /** Returns the real shape name if existing, or a generated shape name. */
+    ::rtl::OUString     getShapeName() const;
+
     /** Returns the shape template with the passed identifier from the child shapes. */
     virtual const ShapeType* getChildTypeById( const ::rtl::OUString& rShapeId ) const;
     /** Returns the shape with the passed identifier from the child shapes. */
@@ -331,4 +379,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/oox/inc/oox/vml/vmlshapecontainer.hxx
index 2ee370473408..16e115f1d2a0 100644
--- a/oox/inc/oox/vml/vmlshapecontainer.hxx
+++ b/oox/inc/oox/vml/vmlshapecontainer.hxx
@@ -30,7 +30,8 @@
 #define OOX_VML_VMLSHAPECONTAINER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/refmap.hxx"
+#include "oox/helper/refvector.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace drawing { class XShapes; }
@@ -60,6 +61,9 @@ public:
     explicit            ShapeContainer( Drawing& rDrawing );
                         ~ShapeContainer();
 
+    /** Returns the drawing this shape container is part of. */
+    inline Drawing&     getDrawing() { return mrDrawing; }
+
     /** Creates and returns a new shape template object. */
     ShapeType&          createShapeType();
     /** Creates and returns a new shape object of the specified type. */
@@ -140,4 +144,4 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmlshapecontext.hxx b/oox/inc/oox/vml/vmlshapecontext.hxx
index 101fefe39a3b..445502791a47 100644
--- a/oox/inc/oox/vml/vmlshapecontext.hxx
+++ b/oox/inc/oox/vml/vmlshapecontext.hxx
@@ -34,10 +34,12 @@
 namespace oox {
 namespace vml {
 
+class Drawing;
+
 struct ShapeTypeModel;
 class ShapeType;
 
-struct ShapeClientData;
+struct ClientData;
 struct ShapeModel;
 class ShapeBase;
 class GroupShape;
@@ -47,20 +49,38 @@ class ShapeContainer;
 
 // ============================================================================
 
-class ShapeClientDataContext : public ::oox::core::ContextHandler2
+class ShapeLayoutContext : public ::oox::core::ContextHandler2
 {
 public:
-    explicit            ShapeClientDataContext(
+    explicit            ShapeLayoutContext(
                             ::oox::core::ContextHandler2Helper& rParent,
-                            const AttributeList& rAttribs,
-                            ShapeClientData& rClientData );
+                            Drawing& rDrawing );
+
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+
+private:
+    Drawing&            mrDrawing;
+};
+
+// ============================================================================
+
+class ClientDataContext : public ::oox::core::ContextHandler2
+{
+public:
+    explicit            ClientDataContext(
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            ClientData& rClientData,
+                            const AttributeList& rAttribs );
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
 private:
-    ShapeClientData&    mrClientData;
+    ClientData&         mrClientData;
+    ::rtl::OUString     maElementText;
 };
 
 // ============================================================================
@@ -71,9 +91,9 @@ public:
     static ::oox::core::ContextHandlerRef
                         createShapeContext(
                             ::oox::core::ContextHandler2Helper& rParent,
+                            ShapeContainer& rShapes,
                             sal_Int32 nElement,
-                            const AttributeList& rAttribs,
-                            ShapeContainer& rShapes );
+                            const AttributeList& rAttribs );
 
 protected:
     explicit            ShapeContextBase( ::oox::core::ContextHandler2Helper& rParent );
@@ -86,8 +106,8 @@ class ShapeTypeContext : public ShapeContextBase
 public:
     explicit            ShapeTypeContext(
                             ::oox::core::ContextHandler2Helper& rParent,
-                            const AttributeList& rAttribs,
-                            ShapeType& rShapeType );
+                            ShapeType& rShapeType,
+                            const AttributeList& rAttribs );
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -110,8 +130,8 @@ class ShapeContext : public ShapeTypeContext
 public:
     explicit            ShapeContext(
                             ::oox::core::ContextHandler2Helper& rParent,
-                            const AttributeList& rAttribs,
-                            ShapeBase& rShape );
+                            ShapeBase& rShape,
+                            const AttributeList& rAttribs );
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -134,8 +154,8 @@ class GroupShapeContext : public ShapeContext
 public:
     explicit            GroupShapeContext(
                             ::oox::core::ContextHandler2Helper& rParent,
-                            const AttributeList& rAttribs,
-                            GroupShape& rShape );
+                            GroupShape& rShape,
+                            const AttributeList& rAttribs );
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -164,4 +184,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
new file mode 100755
index 000000000000..5aedaf86bc74
--- /dev/null
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_VML_VMLTEXTBOX_HXX
+#define OOX_VML_VMLTEXTBOX_HXX
+
+#include <vector>
+#include <rtl/ustring.hxx>
+#include "oox/helper/helper.hxx"
+
+namespace oox {
+namespace vml {
+
+// ============================================================================
+
+/** Font settings for a text portion in a textbox. */
+struct TextFontModel
+{
+    OptValue< ::rtl::OUString > moName;     /// Font name.
+    OptValue< ::rtl::OUString > moColor;    /// Font color, HTML encoded, sort of.
+    OptValue< sal_Int32 > monSize;          /// Font size in twips.
+    OptValue< sal_Int32 > monUnderline;     /// Single or double underline.
+    OptValue< sal_Int32 > monEscapement;    /// Subscript or superscript.
+    OptValue< bool >    mobBold;
+    OptValue< bool >    mobItalic;
+    OptValue< bool >    mobStrikeout;
+
+    explicit            TextFontModel();
+};
+
+// ============================================================================
+
+/** A text portion in a textbox with the same formatting for all characters. */
+struct TextPortionModel
+{
+    TextFontModel       maFont;
+    ::rtl::OUString     maText;
+
+    explicit            TextPortionModel( const TextFontModel& rFont, const ::rtl::OUString& rText );
+};
+
+// ============================================================================
+
+/** The textbox contains all text contents and properties. */
+class TextBox
+{
+public:
+    explicit            TextBox();
+
+    /** Appends a new text portion to the textbox. */
+    void                appendPortion( const TextFontModel& rFont, const ::rtl::OUString& rText );
+
+    /** Returns the current number of text portions. */
+    inline size_t       getPortionCount() const { return maPortions.size(); }
+    /** Returns the font settings of the first text portion. */
+    const TextFontModel* getFirstFont() const;
+    /** Returns the entire text of all text portions. */
+    ::rtl::OUString     getText() const;
+
+private:
+    typedef ::std::vector< TextPortionModel > PortionVector;
+
+    PortionVector       maPortions;
+};
+
+// ============================================================================
+
+} // namespace vml
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/oox/inc/oox/vml/vmltextboxcontext.hxx
new file mode 100755
index 000000000000..1dc8832f9cc4
--- /dev/null
+++ b/oox/inc/oox/vml/vmltextboxcontext.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_VML_VMLTEXTBOXCONTEXT_HXX
+#define OOX_VML_VMLTEXTBOXCONTEXT_HXX
+
+#include "oox/core/contexthandler2.hxx"
+#include "oox/vml/vmltextbox.hxx"
+
+namespace oox {
+namespace vml {
+
+// ============================================================================
+
+class TextPortionContext : public ::oox::core::ContextHandler2
+{
+public:
+    explicit            TextPortionContext(
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            TextBox& rTextBox,
+                            const TextFontModel& rParentFont,
+                            sal_Int32 nElement,
+                            const AttributeList& rAttribs );
+
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
+
+private:
+    TextBox&            mrTextBox;
+    TextFontModel       maFont;
+    size_t              mnInitialPortions;
+};
+
+// ============================================================================
+
+class TextBoxContext : public ::oox::core::ContextHandler2
+{
+public:
+    explicit            TextBoxContext(
+                            ::oox::core::ContextHandler2Helper& rParent,
+                            TextBox& rTextBox,
+                            const AttributeList& rAttribs );
+
+    virtual ::oox::core::ContextHandlerRef
+                        onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+
+private:
+    TextBox&            mrTextBox;
+};
+
+// ============================================================================
+
+} // namespace vml
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/addressconverter.hxx b/oox/inc/oox/xls/addressconverter.hxx
index 6ca688ab7e08..b1d690913eeb 100644
--- a/oox/inc/oox/xls/addressconverter.hxx
+++ b/oox/inc/oox/xls/addressconverter.hxx
@@ -70,7 +70,7 @@ struct BinAddress
     inline void         set( sal_Int32 nCol, sal_Int32 nRow ) { mnCol = nCol; mnRow = nRow; }
     inline void         set( const ::com::sun::star::table::CellAddress& rAddr ) { mnCol = rAddr.Column; mnRow = rAddr.Row; }
 
-    void                read( RecordInputStream& rStrm );
+    void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
     void                write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
 };
@@ -87,7 +87,7 @@ inline bool operator<( const BinAddress& rL, const BinAddress& rR )
     return (rL.mnCol < rR.mnCol) || ((rL.mnCol == rR.mnCol) && (rL.mnRow < rR.mnRow));
 }
 
-inline RecordInputStream& operator>>( RecordInputStream& rStrm, BinAddress& orPos )
+inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinAddress& orPos )
 {
     orPos.read( rStrm );
     return rStrm;
@@ -135,7 +135,7 @@ struct BinRange
     inline sal_Int32    getRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
     bool                contains( const BinAddress& rAddr ) const;
 
-    void                read( RecordInputStream& rStrm );
+    void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
     void                write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
 };
@@ -152,7 +152,7 @@ inline bool operator<( const BinRange& rL, const BinRange& rR )
     return (rL.maFirst < rR.maFirst) || ((rL.maFirst == rR.maFirst) && (rL.maLast < rR.maLast));
 }
 
-inline RecordInputStream& operator>>( RecordInputStream& rStrm, BinRange& orRange )
+inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange )
 {
     orRange.read( rStrm );
     return rStrm;
@@ -180,7 +180,7 @@ public:
 
     BinRange            getEnclosingRange() const;
 
-    void                read( RecordInputStream& rStrm );
+    void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
     void                write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
     void                writeSubList( BiffOutputStream& rStrm,
@@ -189,7 +189,7 @@ public:
 
 // ----------------------------------------------------------------------------
 
-inline RecordInputStream& operator>>( RecordInputStream& rStrm, BinRangeList& orRanges )
+inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList& orRanges )
 {
     orRanges.read( rStrm );
     return rStrm;
@@ -222,7 +222,7 @@ enum BiffTargetType
 // ============================================================================
 // ============================================================================
 
-/** Converter for cell addresses and cell ranges for OOX and BIFF filters.
+/** Converter for cell addresses and cell ranges for OOXML and BIFF filters.
  */
 class AddressConverter : public WorkbookHelper
 {
@@ -691,4 +691,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/autofilterbuffer.hxx b/oox/inc/oox/xls/autofilterbuffer.hxx
new file mode 100755
index 000000000000..ddf083c2ea98
--- /dev/null
+++ b/oox/inc/oox/xls/autofilterbuffer.hxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_AUTOFILTERBUFFER_HXX
+#define OOX_XLS_AUTOFILTERBUFFER_HXX
+
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include "oox/helper/refvector.hxx"
+#include "oox/xls/workbookhelper.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace sheet { struct TableFilterField2; }
+    namespace sheet { class XDatabaseRange; }
+    namespace sheet { class XSheetFilterDescriptor2; }
+} } }
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+/** Contains UNO API filter settings for a column in a filtered range. */
+struct ApiFilterSettings
+{
+    typedef ::std::vector< ::com::sun::star::sheet::TableFilterField2 > FilterFieldVector;
+
+    FilterFieldVector   maFilterFields;     /// List of UNO API filter settings.
+    OptValue< bool >    mobNeedsRegExp;     /// If set, requires regular expressions to be enabled/disabled.
+
+    explicit            ApiFilterSettings();
+
+    void                appendField( bool bAnd, sal_Int32 nOperator, double fValue );
+    void                appendField( bool bAnd, sal_Int32 nOperator, const ::rtl::OUString& rValue );
+};
+
+// ============================================================================
+
+/** Base class for specific filter settings for a column in a filtered range.
+ */
+class FilterSettingsBase : public WorkbookHelper
+{
+public:
+    explicit            FilterSettingsBase( const WorkbookHelper& rHelper );
+
+    /** Derived classes import filter settings from the passed attribute list. */
+    virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
+    /** Derived classes import filter settings from the passed record. */
+    virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    /** Derived classes import filter settings from the FILTERCOLUMN record. */
+    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
+
+    /** Derived classes return converted UNO API filter settings representing all filter settings. */
+    virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
+};
+
+typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef;
+
+// ============================================================================
+
+/** Settings for a discrete filter, specifying a list of values to be shown in
+    the filtered range.
+ */
+class DiscreteFilter : public FilterSettingsBase
+{
+public:
+    explicit            DiscreteFilter( const WorkbookHelper& rHelper );
+
+    /** Imports filter settings from the filters and filter elements. */
+    virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
+    /** Imports filter settings from the FILTERS and FILTER records. */
+    virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
+
+    /** Returns converted UNO API filter settings representing all filter settings. */
+    virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
+
+private:
+    typedef ::std::vector< ::rtl::OUString > FilterValueVector;
+
+    FilterValueVector   maValues;
+    sal_Int32           mnCalendarType;
+    bool                mbShowBlank;
+};
+
+// ============================================================================
+
+/** Settings for a top-10 filter. */
+class Top10Filter : public FilterSettingsBase
+{
+public:
+    explicit            Top10Filter( const WorkbookHelper& rHelper );
+
+    /** Imports filter settings from the filters and filter elements. */
+    virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
+    /** Imports filter settings from the FILTERS and FILTER records. */
+    virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    /** Imports filter settings from the FILTERCOLUMN record. */
+    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
+
+    /** Returns converted UNO API filter settings representing all filter settings. */
+    virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
+
+private:
+    double              mfValue;        /// Number of items or percentage.
+    bool                mbTop;          /// True = show top (greatest) items/percentage.
+    bool                mbPercent;      /// True = percentage, false = number of items.
+};
+
+// ============================================================================
+
+/** A filter criterion for a custom filter. */
+struct FilterCriterionModel
+{
+    ::com::sun::star::uno::Any maValue; /// Comparison operand.
+    sal_Int32           mnOperator;     /// Comparison operator.
+    sal_uInt8           mnDataType;     /// Operand data type (BIFF only).
+    sal_uInt8           mnStrLen;       /// Length of string operand (BIFF5-BIFF8 only).
+
+    explicit            FilterCriterionModel();
+
+    /** Sets the passed BIFF operator constant. */
+    void                setBiffOperator( sal_uInt8 nOperator );
+
+    /** Imports the criterion model from the passed BIFF12 stream. */
+    void                readBiffData( SequenceInputStream& rStrm );
+    /** Imports the initial criterion data from the passed BIFF5/BIFF8 stream. */
+    void                readBiffData( BiffInputStream& rStrm );
+    /** Imports the trailing string data from the passed BIFF5/BIFF8 stream. */
+    void                readString( BiffInputStream& rStrm, BiffType eBiff, rtl_TextEncoding eTextEnc );
+};
+
+// ----------------------------------------------------------------------------
+
+/** Settings for a custom filter, specifying one or two comparison operators
+    associated with some values.
+ */
+class CustomFilter : public FilterSettingsBase
+{
+public:
+    explicit            CustomFilter( const WorkbookHelper& rHelper );
+
+    /** Imports filter settings from the filters and filter elements. */
+    virtual void        importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
+    /** Imports filter settings from the FILTERS and FILTER records. */
+    virtual void        importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    /** Imports filter settings from the FILTERCOLUMN record. */
+    virtual void        importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
+
+    /** Returns converted UNO API filter settings representing all filter settings. */
+    virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
+
+private:
+    /** Apeends the passed filter criteriom, if it contains valid settings. */
+    void                appendCriterion( const FilterCriterionModel& rCriterion );
+
+private:
+    typedef ::std::vector< FilterCriterionModel > FilterCriterionVector;
+
+    FilterCriterionVector maCriteria;
+    bool                mbAnd;
+};
+
+// ============================================================================
+
+/** A column in a filtered range. Contains an object with specific filter
+    settings for the cells in the column.
+ */
+class FilterColumn : public WorkbookHelper
+{
+public:
+    explicit            FilterColumn( const WorkbookHelper& rHelper );
+
+    /** Imports auto filter column settings from the filterColumn element. */
+    void                importFilterColumn( const AttributeList& rAttribs );
+    /** Imports auto filter column settings from the FILTERCOLUMN record. */
+    void                importFilterColumn( SequenceInputStream& rStrm );
+    /** Imports auto filter column settings from the FILTERCOLUMN record. */
+    void                importFilterColumn( BiffInputStream& rStrm );
+
+    /** Creates and returns the specified filter settings object. */
+    template< typename FilterSettingsType >
+    inline FilterSettingsBase& createFilterSettings()
+        { mxSettings.reset( new FilterSettingsType( *this ) ); return *mxSettings; }
+
+    /** Returns the index of the column in the filtered range this object is related to. */
+    inline sal_Int32    getColumnId() const { return mnColId; }
+
+    /** Returns converted UNO API filter settings representing all filter
+        settings of this column. */
+    ApiFilterSettings   finalizeImport( sal_Int32 nMaxCount );
+
+private:
+    FilterSettingsRef   mxSettings;
+    sal_Int32           mnColId;
+    bool                mbHiddenButton;
+    bool                mbShowButton;
+};
+
+// ============================================================================
+
+class AutoFilter : public WorkbookHelper
+{
+public:
+    explicit            AutoFilter( const WorkbookHelper& rHelper );
+
+    /** Imports auto filter settings from the autoFilter element. */
+    void                importAutoFilter( const AttributeList& rAttribs, sal_Int16 nSheet );
+    /** Imports auto filter settings from the AUTOFILTER record. */
+    void                importAutoFilter( SequenceInputStream& rStrm, sal_Int16 nSheet );
+
+    /** Creates a new auto filter column and stores it internally. */
+    FilterColumn&       createFilterColumn();
+
+    /** Applies the filter to the passed filter descriptor. */
+    void                finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor2 >& rxFilterDesc );
+
+private:
+    typedef RefVector< FilterColumn > FilterColumnVector;
+
+    FilterColumnVector  maFilterColumns;
+    ::com::sun::star::table::CellRangeAddress maRange;
+};
+
+// ============================================================================
+
+class AutoFilterBuffer : public WorkbookHelper
+{
+public:
+    explicit            AutoFilterBuffer( const WorkbookHelper& rHelper );
+
+    /** Creates a new auto filter and stores it internally. */
+    AutoFilter&         createAutoFilter();
+
+    /** Applies filter settings to a new database range object (used for sheet
+        autofilter or advanced filter as specified by built-in defined names). */
+    void                finalizeImport( sal_Int16 nSheet );
+
+    /** Applies the filters to the passed database range object.
+        @return  True = this buffer contains valid auto filter settings. */
+    bool                finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange >& rxDatabaseRange );
+
+private:
+    /** Returns the auto filter object used to perform auto filtering. */
+    AutoFilter*         getActiveAutoFilter();
+
+private:
+    typedef RefVector< AutoFilter > AutoFilterVector;
+    AutoFilterVector    maAutoFilters;
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/autofiltercontext.hxx b/oox/inc/oox/xls/autofiltercontext.hxx
index 62d4b114f99c..7860f6047824 100644
--- a/oox/inc/oox/xls/autofiltercontext.hxx
+++ b/oox/inc/oox/xls/autofiltercontext.hxx
@@ -29,126 +29,82 @@
 #ifndef OOX_XLS_AUTOFILTERCONTEXT_HXX
 #define OOX_XLS_AUTOFILTERCONTEXT_HXX
 
-#define USE_SC_MULTI_STRING_FILTER_PATCH 0
-
 #include "oox/xls/excelhandlers.hxx"
-#include <com/sun/star/table/CellRangeAddress.hpp>
-
-#if USE_SC_MULTI_STRING_FILTER_PATCH
-#include <com/sun/star/sheet/TableFilterFieldBase.hpp>
-#else
-#include <com/sun/star/sheet/TableFilterField.hpp>
-#endif
-
-#include <boost/shared_ptr.hpp>
-#include <list>
-
-namespace com { namespace sun { namespace star { namespace sheet {
-#if USE_SC_MULTI_STRING_FILTER_PATCH
-    struct TableFilterFieldBase;
-#else
-    struct TableFilterField;
-#endif
-    struct TableFilterFieldMultiString;
-}}}}
 
 namespace oox {
 namespace xls {
 
+class AutoFilter;
+class FilterColumn;
+class FilterSettingsBase;
+
 // ============================================================================
 
-struct FilterFieldItem
+class FilterSettingsContext : public WorksheetContextBase
 {
-#if USE_SC_MULTI_STRING_FILTER_PATCH
-    typedef ::boost::shared_ptr< ::com::sun::star::sheet::TableFilterFieldBase > TableFilterFieldRef;
-#else
-    typedef ::boost::shared_ptr< ::com::sun::star::sheet::TableFilterField > TableFilterFieldRef;
-#endif
+public:
+    explicit            FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings );
 
-    enum Type { NORMAL, MULTI_STRING };
+protected:
+    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual void        onStartElement( const AttributeList& rAttribs );
 
-    TableFilterFieldRef mpField;
-    Type                meType;
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
-    FilterFieldItem();
-    FilterFieldItem(Type eType);
+private:
+    FilterSettingsBase& mrFilterSettings;
 };
 
 // ============================================================================
 
-class OoxAutoFilterContext : public OoxWorksheetContextBase
+class FilterColumnContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxAutoFilterContext( OoxWorksheetFragmentBase& rFragment );
+    explicit            FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
-
-private:
-    /** Initializes data members to prepare for autofilter parsing.  Call this
-        method when a new autofilter context starts. */
-    void                initialize();
-
-    /** Commits the imported autofilter data to Calc. */
-    void                setAutoFilter();
-
-    /** Check if the shown blank bit is on, if so, add show blank filter to the
-        list. */
-    void                maybeShowBlank();
-
-    /** Packs the collected filter names into a single regex string. */
-    void                setFilterNames();
 
-    void                importAutoFilter( const AttributeList& rAttribs );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
-    void                importFilterColumn( const AttributeList& rAttribs );
-
-    void                importTop10( const AttributeList& rAttribs );
-
-    /** Be sure to check for its 'and' attribute when there are two
-        customFilter's.  If the attribute is not given, assume OR. */
-    void                importCustomFilters( const AttributeList& rAttribs );
+private:
+    FilterColumn&       mrFilterColumn;
+};
 
-    /** Imports custumFilter element.  Note that the standard specifies there
-        can be at most two custom filters specified, but no more than two. When
-        there are two custom filters, then their relationship (AND or OR) must
-        be specified by the parent element <customFilters>. */
-    void                importCustomFilter( const AttributeList& rAttribs );
+// ============================================================================
 
-    void                importFilters( const AttributeList& rAttribs );
+class AutoFilterContext : public WorksheetContextBase
+{
+public:
+    explicit            AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter );
 
-    void                importFilter( const AttributeList& rAttribs );
+protected:
+    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual void        onStartElement( const AttributeList& rAttribs );
 
-    void                importDynamicFilter( const AttributeList& rAttribs );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
-    typedef ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > XCellRef;
-
-    ::std::list< FilterFieldItem >  maFields;
-
-    ::std::list< ::rtl::OUString > maFilterNames;
-    ::com::sun::star::table::CellRangeAddress maAutoFilterRange;
-    sal_Int32 mnCurColID;
+    AutoFilter&         mrAutoFilter;
+};
 
-    /** If this is false (i.e. the given cell range address is not valid), then
-        don't do anything. */
-    bool mbValidAddress:1;
+// ============================================================================
 
-    /** We use regex to compensate for Calc's lack of filtering by individual
-        names (i.e. <filter> tag). */
-    bool mbUseRegex:1;
+class BiffAutoFilterContext : public BiffWorksheetContextBase
+{
+public:
+    explicit            BiffAutoFilterContext( const WorksheetHelper& rHelper, AutoFilter& rAutoFilter );
 
-    /** The <filters> tag may have a 'blank' attribute when the blank values
-        need to be shown.  This flag stores that information. */
-    bool mbShowBlank:1;
+protected:
+    /** Imports all records related to the current auto filter. */
+    virtual void        importRecord( BiffInputStream& rStrm );
 
-    /** true if FilterConnection_AND, or false if FilterConnection_OR.  This
-        flag is used to store the relationship of paired customFilter's. */
-    bool mbConnectionAnd:1;
+private:
+    AutoFilter&         mrAutoFilter;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/biffcodec.hxx b/oox/inc/oox/xls/biffcodec.hxx
index d35c2267f910..69527f0cb454 100644
--- a/oox/inc/oox/xls/biffcodec.hxx
+++ b/oox/inc/oox/xls/biffcodec.hxx
@@ -53,10 +53,9 @@ public:
     /** Derived classes return a clone of the decoder for usage in new streams. */
     inline BiffDecoderBase* clone() { return implClone(); }
 
-    /** Implementation of the ::comphelper::IDocPasswordVerifier interface,
-        calls the new virtual function implVerify(). */
-    virtual ::comphelper::DocPasswordVerifierResult
-                        verifyPassword( const ::rtl::OUString& rPassword );
+    /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */
+    virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData );
+    virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData );
 
     /** Returns true, if the decoder has been initialized correctly. */
     inline bool         isValid() const { return mbValid; }
@@ -74,7 +73,8 @@ private:
 
     /** Derived classes implement password verification and initialization of
         the decoder. */
-    virtual bool        implVerify( const ::rtl::OUString& rPassword ) = 0;
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword ) = 0;
+    virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) = 0;
 
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
@@ -105,7 +105,9 @@ private:
     virtual BiffDecoder_XOR* implClone();
 
     /** Implements password verification and initialization of the decoder. */
-    virtual bool        implVerify( const ::rtl::OUString& rPassword );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword );
+    virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData );
+
 
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
@@ -116,7 +118,7 @@ private:
 
 private:
     ::oox::core::BinaryCodec_XOR maCodec;   /// Cipher algorithm implementation.
-    ::std::vector< sal_uInt8 > maPassword;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData;
     sal_uInt16          mnKey;
     sal_uInt16          mnHash;
 };
@@ -140,7 +142,8 @@ private:
     virtual BiffDecoder_RCF* implClone();
 
     /** Implements password verification and initialization of the decoder. */
-    virtual bool        implVerify( const ::rtl::OUString& rPassword );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const ::rtl::OUString& rPassword );
+    virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData );
 
     /** Implementation of decryption of a memory block. */
     virtual void        implDecode(
@@ -151,7 +154,7 @@ private:
 
 private:
     ::oox::core::BinaryCodec_RCF maCodec;   /// Cipher algorithm implementation.
-    ::std::vector< sal_uInt16 > maPassword;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > maEncryptionData;
     ::std::vector< sal_uInt8 > maSalt;
     ::std::vector< sal_uInt8 > maVerifier;
     ::std::vector< sal_uInt8 > maVerifierHash;
@@ -184,4 +187,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/biffdetector.hxx b/oox/inc/oox/xls/biffdetector.hxx
index 8b9e8b59dca3..93d7338f4847 100644
--- a/oox/inc/oox/xls/biffdetector.hxx
+++ b/oox/inc/oox/xls/biffdetector.hxx
@@ -29,15 +29,15 @@
 #ifndef OOX_XLS_BIFFDETECTOR_HXX
 #define OOX_XLS_BIFFDETECTOR_HXX
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include "oox/helper/storagebase.hxx"
 #include "oox/xls/biffhelper.hxx"
 
 namespace com { namespace sun { namespace star {
-    namespace lang { class XMultiServiceFactory; }
     namespace beans { struct PropertyValue; }
+    namespace uno { class XComponentContext; }
 } } }
 
 namespace oox { class BinaryInputStream; }
@@ -54,7 +54,8 @@ class BiffDetector : public ::cppu::WeakImplHelper2<
 {
 public:
     explicit            BiffDetector(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual             ~BiffDetector();
 
@@ -64,7 +65,7 @@ public:
     /** Detects the BIFF version and workbook stream name of the passed storage. */
     static BiffType     detectStorageBiffVersion(
                             ::rtl::OUString& orWorkbookStreamName,
-                            StorageRef xStorage );
+                            const StorageRef& rxStorage );
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
@@ -85,8 +86,8 @@ public:
                             throw( ::com::sun::star::uno::RuntimeException );
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        mxFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                        mxContext;
 };
 
 // ============================================================================
@@ -96,4 +97,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/biffhelper.hxx b/oox/inc/oox/xls/biffhelper.hxx
index 818186d4a004..328cde3f0c32 100644
--- a/oox/inc/oox/xls/biffhelper.hxx
+++ b/oox/inc/oox/xls/biffhelper.hxx
@@ -31,217 +31,229 @@
 
 #include "oox/helper/binarystreambase.hxx"
 
+namespace oox { class SequenceInputStream; }
+
 namespace oox {
 namespace xls {
 
 class BiffInputStream;
 
-// OOBIN record identifiers ===================================================
-
-const sal_Int32 OOBIN_ID_ARRAY              = 0x01AA;
-const sal_Int32 OOBIN_ID_AUTOFILTER         = 0x00A1;
-const sal_Int32 OOBIN_ID_AUTOSORTSCOPE      = 0x01CB;
-const sal_Int32 OOBIN_ID_BINARYINDEXBLOCK   = 0x002A;
-const sal_Int32 OOBIN_ID_BINARYINDEXROWS    = 0x0028;
-const sal_Int32 OOBIN_ID_BOOKVIEWS          = 0x0087;
-const sal_Int32 OOBIN_ID_BORDER             = 0x002E;
-const sal_Int32 OOBIN_ID_BORDERS            = 0x0265;
-const sal_Int32 OOBIN_ID_BRK                = 0x018C;
-const sal_Int32 OOBIN_ID_CALCPR             = 0x009D;
-const sal_Int32 OOBIN_ID_CELL_BLANK         = 0x0001;
-const sal_Int32 OOBIN_ID_CELL_BOOL          = 0x0004;
-const sal_Int32 OOBIN_ID_CELL_DOUBLE        = 0x0005;
-const sal_Int32 OOBIN_ID_CELL_ERROR         = 0x0003;
-const sal_Int32 OOBIN_ID_CELL_RK            = 0x0002;
-const sal_Int32 OOBIN_ID_CELL_RSTRING       = 0x003E;
-const sal_Int32 OOBIN_ID_CELL_SI            = 0x0007;
-const sal_Int32 OOBIN_ID_CELL_STRING        = 0x0006;
-const sal_Int32 OOBIN_ID_CELLSTYLE          = 0x0030;
-const sal_Int32 OOBIN_ID_CELLSTYLES         = 0x026B;
-const sal_Int32 OOBIN_ID_CELLSTYLEXFS       = 0x0272;
-const sal_Int32 OOBIN_ID_CELLXFS            = 0x0269;
-const sal_Int32 OOBIN_ID_CFCOLOR            = 0x0234;
-const sal_Int32 OOBIN_ID_CFRULE             = 0x01CF;
-const sal_Int32 OOBIN_ID_CHARTPAGESETUP     = 0x028C;
-const sal_Int32 OOBIN_ID_CHARTPROTECTION    = 0x029D;
-const sal_Int32 OOBIN_ID_CHARTSHEETPR       = 0x028B;
-const sal_Int32 OOBIN_ID_CHARTSHEETVIEW     = 0x008D;
-const sal_Int32 OOBIN_ID_CHARTSHEETVIEWS    = 0x008B;
-const sal_Int32 OOBIN_ID_COL                = 0x003C;
-const sal_Int32 OOBIN_ID_COLBREAKS          = 0x018A;
-const sal_Int32 OOBIN_ID_COLOR              = 0x023C;
-const sal_Int32 OOBIN_ID_COLORS             = 0x01D9;
-const sal_Int32 OOBIN_ID_COLORSCALE         = 0x01D5;
-const sal_Int32 OOBIN_ID_COLS               = 0x0186;
-const sal_Int32 OOBIN_ID_COMMENT            = 0x027B;
-const sal_Int32 OOBIN_ID_COMMENTAUTHOR      = 0x0278;
-const sal_Int32 OOBIN_ID_COMMENTAUTHORS     = 0x0276;
-const sal_Int32 OOBIN_ID_COMMENTLIST        = 0x0279;
-const sal_Int32 OOBIN_ID_COMMENTS           = 0x0274;
-const sal_Int32 OOBIN_ID_COMMENTTEXT        = 0x027D;
-const sal_Int32 OOBIN_ID_CONDFORMATTING     = 0x01CD;
-const sal_Int32 OOBIN_ID_CONTROL            = 0x0284;
-const sal_Int32 OOBIN_ID_CONTROLS           = 0x0283;
-const sal_Int32 OOBIN_ID_CUSTOMCHARTVIEW    = 0x028F;
-const sal_Int32 OOBIN_ID_CUSTOMCHARTVIEWS   = 0x028D;
-const sal_Int32 OOBIN_ID_CUSTOMSHEETVIEW    = 0x01A7;
-const sal_Int32 OOBIN_ID_CUSTOMSHEETVIEWS   = 0x01A6;
-const sal_Int32 OOBIN_ID_CUSTOMWORKBOOKVIEW = 0x018D;
-const sal_Int32 OOBIN_ID_DATABAR            = 0x01D3;
-const sal_Int32 OOBIN_ID_DATATABLE          = 0x01AC;
-const sal_Int32 OOBIN_ID_DATAVALIDATION     = 0x0040;
-const sal_Int32 OOBIN_ID_DATAVALIDATIONS    = 0x023D;
-const sal_Int32 OOBIN_ID_DDEITEMVALUES      = 0x0242;
-const sal_Int32 OOBIN_ID_DDEITEM_BOOL       = 0x0248;
-const sal_Int32 OOBIN_ID_DDEITEM_DOUBLE     = 0x0244;
-const sal_Int32 OOBIN_ID_DDEITEM_ERROR      = 0x0245;
-const sal_Int32 OOBIN_ID_DDEITEM_STRING     = 0x0246;
-const sal_Int32 OOBIN_ID_DEFINEDNAME        = 0x0027;
-const sal_Int32 OOBIN_ID_DIMENSION          = 0x0094;
-const sal_Int32 OOBIN_ID_DRAWING            = 0x0226;
-const sal_Int32 OOBIN_ID_DXF                = 0x01FB;
-const sal_Int32 OOBIN_ID_DXFS               = 0x01F9;
-const sal_Int32 OOBIN_ID_EXTCELL_BLANK      = 0x016F;
-const sal_Int32 OOBIN_ID_EXTCELL_BOOL       = 0x0171;
-const sal_Int32 OOBIN_ID_EXTCELL_DOUBLE     = 0x0170;
-const sal_Int32 OOBIN_ID_EXTCELL_ERROR      = 0x0172;
-const sal_Int32 OOBIN_ID_EXTCELL_STRING     = 0x0173;
-const sal_Int32 OOBIN_ID_EXTERNALADDIN      = 0x029B;
-const sal_Int32 OOBIN_ID_EXTERNALBOOK       = 0x0168;
-const sal_Int32 OOBIN_ID_EXTERNALNAME       = 0x0241;
-const sal_Int32 OOBIN_ID_EXTERNALREF        = 0x0163;
-const sal_Int32 OOBIN_ID_EXTERNALREFS       = 0x0161;
-const sal_Int32 OOBIN_ID_EXTERNALSELF       = 0x0165;
-const sal_Int32 OOBIN_ID_EXTERNALSAME       = 0x0166;
-const sal_Int32 OOBIN_ID_EXTERNALSHEETS     = 0x016A;
-const sal_Int32 OOBIN_ID_EXTROW             = 0x016E;
-const sal_Int32 OOBIN_ID_EXTSHEETDATA       = 0x016B;
-const sal_Int32 OOBIN_ID_EXTERNALNAMEFLAGS  = 0x024A;
-const sal_Int32 OOBIN_ID_EXTSHEETNAMES      = 0x0167;
-const sal_Int32 OOBIN_ID_FILESHARING        = 0x0224;
-const sal_Int32 OOBIN_ID_FILEVERSION        = 0x0080;
-const sal_Int32 OOBIN_ID_FILL               = 0x002D;
-const sal_Int32 OOBIN_ID_FILLS              = 0x025B;
-const sal_Int32 OOBIN_ID_FILTERCOLUMN       = 0x00A3;
-const sal_Int32 OOBIN_ID_FONT               = 0x002B;
-const sal_Int32 OOBIN_ID_FONTS              = 0x0263;
-const sal_Int32 OOBIN_ID_FORMULA_STRING     = 0x0008;
-const sal_Int32 OOBIN_ID_FORMULA_DOUBLE     = 0x0009;
-const sal_Int32 OOBIN_ID_FORMULA_BOOL       = 0x000A;
-const sal_Int32 OOBIN_ID_FORMULA_ERROR      = 0x000B;
-const sal_Int32 OOBIN_ID_FUNCTIONGROUP      = 0x0299;
-const sal_Int32 OOBIN_ID_FUNCTIONGROUPS     = 0x0298;
-const sal_Int32 OOBIN_ID_HEADERFOOTER       = 0x01DF;
-const sal_Int32 OOBIN_ID_HYPERLINK          = 0x01EE;
-const sal_Int32 OOBIN_ID_ICONSET            = 0x01D1;
-const sal_Int32 OOBIN_ID_INDEXEDCOLORS      = 0x0235;
-const sal_Int32 OOBIN_ID_INPUTCELLS         = 0x01F8;
-const sal_Int32 OOBIN_ID_LEGACYDRAWING      = 0x0227;
-const sal_Int32 OOBIN_ID_MERGECELL          = 0x00B0;
-const sal_Int32 OOBIN_ID_MERGECELLS         = 0x00B1;
-const sal_Int32 OOBIN_ID_MRUCOLORS          = 0x0239;
-const sal_Int32 OOBIN_ID_MULTCELL_BLANK     = 0x000C;
-const sal_Int32 OOBIN_ID_MULTCELL_BOOL      = 0x000F;
-const sal_Int32 OOBIN_ID_MULTCELL_DOUBLE    = 0x0010;
-const sal_Int32 OOBIN_ID_MULTCELL_ERROR     = 0x000E;
-const sal_Int32 OOBIN_ID_MULTCELL_RK        = 0x000D;
-const sal_Int32 OOBIN_ID_MULTCELL_RSTRING   = 0x003D;
-const sal_Int32 OOBIN_ID_MULTCELL_SI        = 0x0012;
-const sal_Int32 OOBIN_ID_MULTCELL_STRING    = 0x0011;
-const sal_Int32 OOBIN_ID_NUMFMT             = 0x002C;
-const sal_Int32 OOBIN_ID_NUMFMTS            = 0x0267;
-const sal_Int32 OOBIN_ID_OLEOBJECT          = 0x027F;
-const sal_Int32 OOBIN_ID_OLEOBJECTS         = 0x027E;
-const sal_Int32 OOBIN_ID_OLESIZE            = 0x0225;
-const sal_Int32 OOBIN_ID_PAGEMARGINS        = 0x01DC;
-const sal_Int32 OOBIN_ID_PAGESETUP          = 0x01DE;
-const sal_Int32 OOBIN_ID_PANE               = 0x0097;
-const sal_Int32 OOBIN_ID_PCDEFINITION       = 0x00B3;
-const sal_Int32 OOBIN_ID_PCDFDISCRETEPR     = 0x00E1;
-const sal_Int32 OOBIN_ID_PCDFGROUPITEMS     = 0x00DD;
-const sal_Int32 OOBIN_ID_PCDFIELD           = 0x00B7;
-const sal_Int32 OOBIN_ID_PCDFIELDGROUP      = 0x00DB;
-const sal_Int32 OOBIN_ID_PCDFIELDS          = 0x00B5;
-const sal_Int32 OOBIN_ID_PCDFRANGEPR        = 0x00DF;
-const sal_Int32 OOBIN_ID_PCDFSHAREDITEMS    = 0x00BD;
-const sal_Int32 OOBIN_ID_PCDSHEETSOURCE     = 0x00BB;
-const sal_Int32 OOBIN_ID_PCDSOURCE          = 0x00B9;
-const sal_Int32 OOBIN_ID_PCITEM_ARRAY       = 0x00BF;
-const sal_Int32 OOBIN_ID_PCITEM_BOOL        = 0x0016;
-const sal_Int32 OOBIN_ID_PCITEM_DATE        = 0x0019;
-const sal_Int32 OOBIN_ID_PCITEM_DOUBLE      = 0x0015;
-const sal_Int32 OOBIN_ID_PCITEM_ERROR       = 0x0017;
-const sal_Int32 OOBIN_ID_PCITEM_INDEX       = 0x001A;
-const sal_Int32 OOBIN_ID_PCITEM_MISSING     = 0x0014;
-const sal_Int32 OOBIN_ID_PCITEM_STRING      = 0x0018;
-const sal_Int32 OOBIN_ID_PCITEMA_BOOL       = 0x001D;
-const sal_Int32 OOBIN_ID_PCITEMA_DATE       = 0x0020;
-const sal_Int32 OOBIN_ID_PCITEMA_DOUBLE     = 0x001C;
-const sal_Int32 OOBIN_ID_PCITEMA_ERROR      = 0x001E;
-const sal_Int32 OOBIN_ID_PCITEMA_MISSING    = 0x001B;
-const sal_Int32 OOBIN_ID_PCITEMA_STRING     = 0x001F;
-const sal_Int32 OOBIN_ID_PCRECORD           = 0x0021;
-const sal_Int32 OOBIN_ID_PCRECORDDT         = 0x0022;
-const sal_Int32 OOBIN_ID_PCRECORDS          = 0x00C1;
-const sal_Int32 OOBIN_ID_PHONETICPR         = 0x0219;
-const sal_Int32 OOBIN_ID_PICTURE            = 0x0232;
-const sal_Int32 OOBIN_ID_PIVOTAREA          = 0x00F7;
-const sal_Int32 OOBIN_ID_PIVOTCACHE         = 0x0182;
-const sal_Int32 OOBIN_ID_PIVOTCACHES        = 0x0180;
-const sal_Int32 OOBIN_ID_PRINTOPTIONS       = 0x01DD;
-const sal_Int32 OOBIN_ID_PTCOLFIELDS        = 0x0137;
-const sal_Int32 OOBIN_ID_PTDATAFIELD        = 0x0125;
-const sal_Int32 OOBIN_ID_PTDATAFIELDS       = 0x0127;
-const sal_Int32 OOBIN_ID_PTDEFINITION       = 0x0118;
-const sal_Int32 OOBIN_ID_PTFIELD            = 0x011D;
-const sal_Int32 OOBIN_ID_PTFIELDS           = 0x011F;
-const sal_Int32 OOBIN_ID_PTFILTER           = 0x0259;
-const sal_Int32 OOBIN_ID_PTFILTERS          = 0x0257;
-const sal_Int32 OOBIN_ID_PTFITEM            = 0x011A;
-const sal_Int32 OOBIN_ID_PTFITEMS           = 0x011B;
-const sal_Int32 OOBIN_ID_PTLOCATION         = 0x013A;
-const sal_Int32 OOBIN_ID_PTPAGEFIELD        = 0x0121;
-const sal_Int32 OOBIN_ID_PTPAGEFIELDS       = 0x0123;
-const sal_Int32 OOBIN_ID_PTREFERENCE        = 0x00FB;
-const sal_Int32 OOBIN_ID_PTREFERENCEITEM    = 0x017E;
-const sal_Int32 OOBIN_ID_PTREFERENCES       = 0x00F9;
-const sal_Int32 OOBIN_ID_PTROWFIELDS        = 0x0135;
-const sal_Int32 OOBIN_ID_RGBCOLOR           = 0x01DB;
-const sal_Int32 OOBIN_ID_ROW                = 0x0000;
-const sal_Int32 OOBIN_ID_ROWBREAKS          = 0x0188;
-const sal_Int32 OOBIN_ID_SCENARIO           = 0x01F6;
-const sal_Int32 OOBIN_ID_SCENARIOS          = 0x01F4;
-const sal_Int32 OOBIN_ID_SELECTION          = 0x0098;
-const sal_Int32 OOBIN_ID_SHAREDFMLA         = 0x01AB;
-const sal_Int32 OOBIN_ID_SHEET              = 0x009C;
-const sal_Int32 OOBIN_ID_SHEETDATA          = 0x0091;
-const sal_Int32 OOBIN_ID_SHEETFORMATPR      = 0x01E5;
-const sal_Int32 OOBIN_ID_SHEETPR            = 0x0093;
-const sal_Int32 OOBIN_ID_SHEETPROTECTION    = 0x0217;
-const sal_Int32 OOBIN_ID_SHEETS             = 0x008F;
-const sal_Int32 OOBIN_ID_SHEETVIEW          = 0x0089;
-const sal_Int32 OOBIN_ID_SHEETVIEWS         = 0x0085;
-const sal_Int32 OOBIN_ID_SI                 = 0x0013;
-const sal_Int32 OOBIN_ID_SST                = 0x009F;
-const sal_Int32 OOBIN_ID_STYLESHEET         = 0x0116;
-const sal_Int32 OOBIN_ID_TABLE              = 0x0157;
-const sal_Int32 OOBIN_ID_TABLEPART          = 0x0295;
-const sal_Int32 OOBIN_ID_TABLEPARTS         = 0x0294;
-const sal_Int32 OOBIN_ID_TABLESTYLEINFO     = 0x0201;
-const sal_Int32 OOBIN_ID_TABLESTYLES        = 0x01FC;
-const sal_Int32 OOBIN_ID_TOP10FILTER        = 0x00AA;
-const sal_Int32 OOBIN_ID_VOLTYPE            = 0x0204;
-const sal_Int32 OOBIN_ID_VOLTYPEMAIN        = 0x0206;
-const sal_Int32 OOBIN_ID_VOLTYPES           = 0x0202;
-const sal_Int32 OOBIN_ID_VOLTYPESTP         = 0x020A;
-const sal_Int32 OOBIN_ID_VOLTYPETR          = 0x020B;
-const sal_Int32 OOBIN_ID_WORKBOOK           = 0x0083;
-const sal_Int32 OOBIN_ID_WORKBOOKPR         = 0x0099;
-const sal_Int32 OOBIN_ID_WORKBOOKVIEW       = 0x009E;
-const sal_Int32 OOBIN_ID_WORKSHEET          = 0x0081;
-const sal_Int32 OOBIN_ID_XF                 = 0x002F;
+// BIFF12 record identifiers ==================================================
 
-// ============================================================================
+const sal_Int32 BIFF12_ID_ARRAY             = 0x01AA;
+const sal_Int32 BIFF12_ID_AUTOFILTER        = 0x00A1;
+const sal_Int32 BIFF12_ID_AUTOSORTSCOPE     = 0x01CB;
+const sal_Int32 BIFF12_ID_BINARYINDEXBLOCK  = 0x002A;
+const sal_Int32 BIFF12_ID_BINARYINDEXROWS   = 0x0028;
+const sal_Int32 BIFF12_ID_BOOKVIEWS         = 0x0087;
+const sal_Int32 BIFF12_ID_BORDER            = 0x002E;
+const sal_Int32 BIFF12_ID_BORDERS           = 0x0265;
+const sal_Int32 BIFF12_ID_BRK               = 0x018C;
+const sal_Int32 BIFF12_ID_CALCPR            = 0x009D;
+const sal_Int32 BIFF12_ID_CELL_BLANK        = 0x0001;
+const sal_Int32 BIFF12_ID_CELL_BOOL         = 0x0004;
+const sal_Int32 BIFF12_ID_CELL_DOUBLE       = 0x0005;
+const sal_Int32 BIFF12_ID_CELL_ERROR        = 0x0003;
+const sal_Int32 BIFF12_ID_CELL_RK           = 0x0002;
+const sal_Int32 BIFF12_ID_CELL_RSTRING      = 0x003E;
+const sal_Int32 BIFF12_ID_CELL_SI           = 0x0007;
+const sal_Int32 BIFF12_ID_CELL_STRING       = 0x0006;
+const sal_Int32 BIFF12_ID_CELLSTYLE         = 0x0030;
+const sal_Int32 BIFF12_ID_CELLSTYLES        = 0x026B;
+const sal_Int32 BIFF12_ID_CELLSTYLEXFS      = 0x0272;
+const sal_Int32 BIFF12_ID_CELLXFS           = 0x0269;
+const sal_Int32 BIFF12_ID_CFCOLOR           = 0x0234;
+const sal_Int32 BIFF12_ID_CFRULE            = 0x01CF;
+const sal_Int32 BIFF12_ID_CHARTPAGESETUP    = 0x028C;
+const sal_Int32 BIFF12_ID_CHARTPROTECTION   = 0x029D;
+const sal_Int32 BIFF12_ID_CHARTSHEETPR      = 0x028B;
+const sal_Int32 BIFF12_ID_CHARTSHEETVIEW    = 0x008D;
+const sal_Int32 BIFF12_ID_CHARTSHEETVIEWS   = 0x008B;
+const sal_Int32 BIFF12_ID_COL               = 0x003C;
+const sal_Int32 BIFF12_ID_COLBREAKS         = 0x018A;
+const sal_Int32 BIFF12_ID_COLOR             = 0x023C;
+const sal_Int32 BIFF12_ID_COLORS            = 0x01D9;
+const sal_Int32 BIFF12_ID_COLORSCALE        = 0x01D5;
+const sal_Int32 BIFF12_ID_COLS              = 0x0186;
+const sal_Int32 BIFF12_ID_COMMENT           = 0x027B;
+const sal_Int32 BIFF12_ID_COMMENTAUTHOR     = 0x0278;
+const sal_Int32 BIFF12_ID_COMMENTAUTHORS    = 0x0276;
+const sal_Int32 BIFF12_ID_COMMENTLIST       = 0x0279;
+const sal_Int32 BIFF12_ID_COMMENTS          = 0x0274;
+const sal_Int32 BIFF12_ID_COMMENTTEXT       = 0x027D;
+const sal_Int32 BIFF12_ID_CONDFORMATTING    = 0x01CD;
+const sal_Int32 BIFF12_ID_CONNECTION        = 0x00C9;
+const sal_Int32 BIFF12_ID_CONNECTIONS       = 0x01AD;
+const sal_Int32 BIFF12_ID_CONTROL           = 0x0284;
+const sal_Int32 BIFF12_ID_CONTROLS          = 0x0283;
+const sal_Int32 BIFF12_ID_CUSTOMCHARTVIEW   = 0x028F;
+const sal_Int32 BIFF12_ID_CUSTOMCHARTVIEWS  = 0x028D;
+const sal_Int32 BIFF12_ID_CUSTOMFILTER      = 0x00AE;
+const sal_Int32 BIFF12_ID_CUSTOMFILTERS     = 0x00AC;
+const sal_Int32 BIFF12_ID_CUSTOMSHEETVIEW   = 0x01A7;
+const sal_Int32 BIFF12_ID_CUSTOMSHEETVIEWS  = 0x01A6;
+const sal_Int32 BIFF12_ID_CUSTOMWORKBOOKVIEW= 0x018D;
+const sal_Int32 BIFF12_ID_DATABAR           = 0x01D3;
+const sal_Int32 BIFF12_ID_DATATABLE         = 0x01AC;
+const sal_Int32 BIFF12_ID_DATAVALIDATION    = 0x0040;
+const sal_Int32 BIFF12_ID_DATAVALIDATIONS   = 0x023D;
+const sal_Int32 BIFF12_ID_DDEITEMVALUES     = 0x0242;
+const sal_Int32 BIFF12_ID_DDEITEM_BOOL      = 0x0248;
+const sal_Int32 BIFF12_ID_DDEITEM_DOUBLE    = 0x0244;
+const sal_Int32 BIFF12_ID_DDEITEM_ERROR     = 0x0245;
+const sal_Int32 BIFF12_ID_DDEITEM_STRING    = 0x0246;
+const sal_Int32 BIFF12_ID_DEFINEDNAME       = 0x0027;
+const sal_Int32 BIFF12_ID_DIMENSION         = 0x0094;
+const sal_Int32 BIFF12_ID_DISCRETEFILTER    = 0x00A7;
+const sal_Int32 BIFF12_ID_DISCRETEFILTERS   = 0x00A5;
+const sal_Int32 BIFF12_ID_DRAWING           = 0x0226;
+const sal_Int32 BIFF12_ID_DXF               = 0x01FB;
+const sal_Int32 BIFF12_ID_DXFS              = 0x01F9;
+const sal_Int32 BIFF12_ID_EXTCELL_BLANK     = 0x016F;
+const sal_Int32 BIFF12_ID_EXTCELL_BOOL      = 0x0171;
+const sal_Int32 BIFF12_ID_EXTCELL_DOUBLE    = 0x0170;
+const sal_Int32 BIFF12_ID_EXTCELL_ERROR     = 0x0172;
+const sal_Int32 BIFF12_ID_EXTCELL_STRING    = 0x0173;
+const sal_Int32 BIFF12_ID_EXTERNALADDIN     = 0x029B;
+const sal_Int32 BIFF12_ID_EXTERNALBOOK      = 0x0168;
+const sal_Int32 BIFF12_ID_EXTERNALNAME      = 0x0241;
+const sal_Int32 BIFF12_ID_EXTERNALREF       = 0x0163;
+const sal_Int32 BIFF12_ID_EXTERNALREFS      = 0x0161;
+const sal_Int32 BIFF12_ID_EXTERNALSELF      = 0x0165;
+const sal_Int32 BIFF12_ID_EXTERNALSAME      = 0x0166;
+const sal_Int32 BIFF12_ID_EXTERNALSHEETS    = 0x016A;
+const sal_Int32 BIFF12_ID_EXTROW            = 0x016E;
+const sal_Int32 BIFF12_ID_EXTSHEETDATA      = 0x016B;
+const sal_Int32 BIFF12_ID_EXTERNALNAMEFLAGS = 0x024A;
+const sal_Int32 BIFF12_ID_EXTSHEETNAMES     = 0x0167;
+const sal_Int32 BIFF12_ID_FILESHARING       = 0x0224;
+const sal_Int32 BIFF12_ID_FILEVERSION       = 0x0080;
+const sal_Int32 BIFF12_ID_FILL              = 0x002D;
+const sal_Int32 BIFF12_ID_FILLS             = 0x025B;
+const sal_Int32 BIFF12_ID_FILTERCOLUMN      = 0x00A3;
+const sal_Int32 BIFF12_ID_FONT              = 0x002B;
+const sal_Int32 BIFF12_ID_FONTS             = 0x0263;
+const sal_Int32 BIFF12_ID_FORMULA_STRING    = 0x0008;
+const sal_Int32 BIFF12_ID_FORMULA_DOUBLE    = 0x0009;
+const sal_Int32 BIFF12_ID_FORMULA_BOOL      = 0x000A;
+const sal_Int32 BIFF12_ID_FORMULA_ERROR     = 0x000B;
+const sal_Int32 BIFF12_ID_FUNCTIONGROUP     = 0x0299;
+const sal_Int32 BIFF12_ID_FUNCTIONGROUPS    = 0x0298;
+const sal_Int32 BIFF12_ID_HEADERFOOTER      = 0x01DF;
+const sal_Int32 BIFF12_ID_HYPERLINK         = 0x01EE;
+const sal_Int32 BIFF12_ID_ICONSET           = 0x01D1;
+const sal_Int32 BIFF12_ID_INDEXEDCOLORS     = 0x0235;
+const sal_Int32 BIFF12_ID_INPUTCELLS        = 0x01F8;
+const sal_Int32 BIFF12_ID_LEGACYDRAWING     = 0x0227;
+const sal_Int32 BIFF12_ID_MERGECELL         = 0x00B0;
+const sal_Int32 BIFF12_ID_MERGECELLS        = 0x00B1;
+const sal_Int32 BIFF12_ID_MRUCOLORS         = 0x0239;
+const sal_Int32 BIFF12_ID_MULTCELL_BLANK    = 0x000C;
+const sal_Int32 BIFF12_ID_MULTCELL_BOOL     = 0x000F;
+const sal_Int32 BIFF12_ID_MULTCELL_DOUBLE   = 0x0010;
+const sal_Int32 BIFF12_ID_MULTCELL_ERROR    = 0x000E;
+const sal_Int32 BIFF12_ID_MULTCELL_RK       = 0x000D;
+const sal_Int32 BIFF12_ID_MULTCELL_RSTRING  = 0x003D;
+const sal_Int32 BIFF12_ID_MULTCELL_SI       = 0x0012;
+const sal_Int32 BIFF12_ID_MULTCELL_STRING   = 0x0011;
+const sal_Int32 BIFF12_ID_NUMFMT            = 0x002C;
+const sal_Int32 BIFF12_ID_NUMFMTS           = 0x0267;
+const sal_Int32 BIFF12_ID_OLEOBJECT         = 0x027F;
+const sal_Int32 BIFF12_ID_OLEOBJECTS        = 0x027E;
+const sal_Int32 BIFF12_ID_OLESIZE           = 0x0225;
+const sal_Int32 BIFF12_ID_PAGEMARGINS       = 0x01DC;
+const sal_Int32 BIFF12_ID_PAGESETUP         = 0x01DE;
+const sal_Int32 BIFF12_ID_PANE              = 0x0097;
+const sal_Int32 BIFF12_ID_PCDEFINITION      = 0x00B3;
+const sal_Int32 BIFF12_ID_PCDFDISCRETEPR    = 0x00E1;
+const sal_Int32 BIFF12_ID_PCDFGROUPITEMS    = 0x00DD;
+const sal_Int32 BIFF12_ID_PCDFIELD          = 0x00B7;
+const sal_Int32 BIFF12_ID_PCDFIELDGROUP     = 0x00DB;
+const sal_Int32 BIFF12_ID_PCDFIELDS         = 0x00B5;
+const sal_Int32 BIFF12_ID_PCDFRANGEPR       = 0x00DF;
+const sal_Int32 BIFF12_ID_PCDFSHAREDITEMS   = 0x00BD;
+const sal_Int32 BIFF12_ID_PCDSHEETSOURCE    = 0x00BB;
+const sal_Int32 BIFF12_ID_PCDSOURCE         = 0x00B9;
+const sal_Int32 BIFF12_ID_PCITEM_ARRAY      = 0x00BF;
+const sal_Int32 BIFF12_ID_PCITEM_BOOL       = 0x0016;
+const sal_Int32 BIFF12_ID_PCITEM_DATE       = 0x0019;
+const sal_Int32 BIFF12_ID_PCITEM_DOUBLE     = 0x0015;
+const sal_Int32 BIFF12_ID_PCITEM_ERROR      = 0x0017;
+const sal_Int32 BIFF12_ID_PCITEM_INDEX      = 0x001A;
+const sal_Int32 BIFF12_ID_PCITEM_MISSING    = 0x0014;
+const sal_Int32 BIFF12_ID_PCITEM_STRING     = 0x0018;
+const sal_Int32 BIFF12_ID_PCITEMA_BOOL      = 0x001D;
+const sal_Int32 BIFF12_ID_PCITEMA_DATE      = 0x0020;
+const sal_Int32 BIFF12_ID_PCITEMA_DOUBLE    = 0x001C;
+const sal_Int32 BIFF12_ID_PCITEMA_ERROR     = 0x001E;
+const sal_Int32 BIFF12_ID_PCITEMA_MISSING   = 0x001B;
+const sal_Int32 BIFF12_ID_PCITEMA_STRING    = 0x001F;
+const sal_Int32 BIFF12_ID_PCRECORD          = 0x0021;
+const sal_Int32 BIFF12_ID_PCRECORDDT        = 0x0022;
+const sal_Int32 BIFF12_ID_PCRECORDS         = 0x00C1;
+const sal_Int32 BIFF12_ID_PHONETICPR        = 0x0219;
+const sal_Int32 BIFF12_ID_PICTURE           = 0x0232;
+const sal_Int32 BIFF12_ID_PIVOTAREA         = 0x00F7;
+const sal_Int32 BIFF12_ID_PIVOTCACHE        = 0x0182;
+const sal_Int32 BIFF12_ID_PIVOTCACHES       = 0x0180;
+const sal_Int32 BIFF12_ID_PRINTOPTIONS      = 0x01DD;
+const sal_Int32 BIFF12_ID_PTCOLFIELDS       = 0x0137;
+const sal_Int32 BIFF12_ID_PTDATAFIELD       = 0x0125;
+const sal_Int32 BIFF12_ID_PTDATAFIELDS      = 0x0127;
+const sal_Int32 BIFF12_ID_PTDEFINITION      = 0x0118;
+const sal_Int32 BIFF12_ID_PTFIELD           = 0x011D;
+const sal_Int32 BIFF12_ID_PTFIELDS          = 0x011F;
+const sal_Int32 BIFF12_ID_PTFILTER          = 0x0259;
+const sal_Int32 BIFF12_ID_PTFILTERS         = 0x0257;
+const sal_Int32 BIFF12_ID_PTFITEM           = 0x011A;
+const sal_Int32 BIFF12_ID_PTFITEMS          = 0x011B;
+const sal_Int32 BIFF12_ID_PTLOCATION        = 0x013A;
+const sal_Int32 BIFF12_ID_PTPAGEFIELD       = 0x0121;
+const sal_Int32 BIFF12_ID_PTPAGEFIELDS      = 0x0123;
+const sal_Int32 BIFF12_ID_PTREFERENCE       = 0x00FB;
+const sal_Int32 BIFF12_ID_PTREFERENCEITEM   = 0x017E;
+const sal_Int32 BIFF12_ID_PTREFERENCES      = 0x00F9;
+const sal_Int32 BIFF12_ID_PTROWFIELDS       = 0x0135;
+const sal_Int32 BIFF12_ID_QUERYTABLE        = 0x01BF;
+const sal_Int32 BIFF12_ID_QUERYTABLEREFRESH = 0x01C1;
+const sal_Int32 BIFF12_ID_RGBCOLOR          = 0x01DB;
+const sal_Int32 BIFF12_ID_ROW               = 0x0000;
+const sal_Int32 BIFF12_ID_ROWBREAKS         = 0x0188;
+const sal_Int32 BIFF12_ID_SCENARIO          = 0x01F6;
+const sal_Int32 BIFF12_ID_SCENARIOS         = 0x01F4;
+const sal_Int32 BIFF12_ID_SELECTION         = 0x0098;
+const sal_Int32 BIFF12_ID_SHAREDFMLA        = 0x01AB;
+const sal_Int32 BIFF12_ID_SHEET             = 0x009C;
+const sal_Int32 BIFF12_ID_SHEETDATA         = 0x0091;
+const sal_Int32 BIFF12_ID_SHEETFORMATPR     = 0x01E5;
+const sal_Int32 BIFF12_ID_SHEETPR           = 0x0093;
+const sal_Int32 BIFF12_ID_SHEETPROTECTION   = 0x0217;
+const sal_Int32 BIFF12_ID_SHEETS            = 0x008F;
+const sal_Int32 BIFF12_ID_SHEETVIEW         = 0x0089;
+const sal_Int32 BIFF12_ID_SHEETVIEWS        = 0x0085;
+const sal_Int32 BIFF12_ID_SI                = 0x0013;
+const sal_Int32 BIFF12_ID_SST               = 0x009F;
+const sal_Int32 BIFF12_ID_STYLESHEET        = 0x0116;
+const sal_Int32 BIFF12_ID_TABLE             = 0x0157;
+const sal_Int32 BIFF12_ID_TABLEPART         = 0x0295;
+const sal_Int32 BIFF12_ID_TABLEPARTS        = 0x0294;
+const sal_Int32 BIFF12_ID_TABLESTYLEINFO    = 0x0201;
+const sal_Int32 BIFF12_ID_TABLESTYLES       = 0x01FC;
+const sal_Int32 BIFF12_ID_TOP10FILTER       = 0x00AA;
+const sal_Int32 BIFF12_ID_VOLTYPE           = 0x0204;
+const sal_Int32 BIFF12_ID_VOLTYPEMAIN       = 0x0206;
+const sal_Int32 BIFF12_ID_VOLTYPES          = 0x0202;
+const sal_Int32 BIFF12_ID_VOLTYPESTP        = 0x020A;
+const sal_Int32 BIFF12_ID_VOLTYPETR         = 0x020B;
+const sal_Int32 BIFF12_ID_WEBPR             = 0x0105;
+const sal_Int32 BIFF12_ID_WEBPRTABLES       = 0x0107;
+const sal_Int32 BIFF12_ID_WORKBOOK          = 0x0083;
+const sal_Int32 BIFF12_ID_WORKBOOKPR        = 0x0099;
+const sal_Int32 BIFF12_ID_WORKBOOKVIEW      = 0x009E;
+const sal_Int32 BIFF12_ID_WORKSHEET         = 0x0081;
+const sal_Int32 BIFF12_ID_XF                = 0x002F;
+
+// BIFF2-BIFF8 record identifiers =============================================
 
 /** An enumeration for all binary Excel file format types (BIFF types). */
 enum BiffType
@@ -261,6 +273,7 @@ const sal_uInt16 BIFF8_MAXRECSIZE           = 8224;
 
 const sal_uInt16 BIFF2_ID_ARRAY             = 0x0021;
 const sal_uInt16 BIFF3_ID_ARRAY             = 0x0221;
+const sal_uInt16 BIFF_ID_AUTOFILTER         = 0x009D;
 const sal_uInt16 BIFF2_ID_BLANK             = 0x0001;
 const sal_uInt16 BIFF3_ID_BLANK             = 0x0201;
 const sal_uInt16 BIFF2_ID_BOF               = 0x0009;
@@ -291,6 +304,7 @@ const sal_uInt16 BIFF_ID_CHCHART            = 0x1002;
 const sal_uInt16 BIFF_ID_CHCHART3D          = 0x103A;
 const sal_uInt16 BIFF_ID_CHCHARTLINE        = 0x101C;
 const sal_uInt16 BIFF_ID_CHDATAFORMAT       = 0x1006;
+const sal_uInt16 BIFF_ID_CHDATERANGE        = 0x1062;
 const sal_uInt16 BIFF_ID_CHDEFAULTTEXT      = 0x1024;
 const sal_uInt16 BIFF_ID_CHDROPBAR          = 0x103D;
 const sal_uInt16 BIFF_ID_CHECKCOMPAT        = 0x088C;
@@ -315,7 +329,6 @@ const sal_uInt16 BIFF_ID_CHFRTEXTPROPS      = 0x08A5;
 const sal_uInt16 BIFF_ID_CHFRUNITPROPS      = 0x0857;
 const sal_uInt16 BIFF_ID_CHFRWRAPPER        = 0x0851;
 const sal_uInt16 BIFF_ID_CHLABELRANGE       = 0x1020;
-const sal_uInt16 BIFF_ID_CHLABELRANGE2      = 0x1062;
 const sal_uInt16 BIFF_ID_CHLEGEND           = 0x1015;
 const sal_uInt16 BIFF_ID_CHLINE             = 0x1018;
 const sal_uInt16 BIFF_ID_CHLINEFORMAT       = 0x1007;
@@ -353,6 +366,7 @@ const sal_uInt16 BIFF_ID_COLINFO            = 0x007D;
 const sal_uInt16 BIFF_ID_COLUMNDEFAULT      = 0x0020;
 const sal_uInt16 BIFF_ID_COLWIDTH           = 0x0024;
 const sal_uInt16 BIFF_ID_COMPRESSPICS       = 0x089B;
+const sal_uInt16 BIFF_ID_CONNECTION         = 0x0876;
 const sal_uInt16 BIFF_ID_CONT               = 0x003C;
 const sal_uInt16 BIFF_ID_COORDLIST          = 0x00A9;
 const sal_uInt16 BIFF_ID_COUNTRY            = 0x008C;
@@ -364,6 +378,7 @@ const sal_uInt16 BIFF_ID_DATAVALIDATION     = 0x01BE;
 const sal_uInt16 BIFF_ID_DATAVALIDATIONS    = 0x01B2;
 const sal_uInt16 BIFF_ID_DATEMODE           = 0x0022;
 const sal_uInt16 BIFF_ID_DBCELL             = 0x00D7;
+const sal_uInt16 BIFF_ID_DBQUERY            = 0x00DC;
 const sal_uInt16 BIFF_ID_DCONBINAME         = 0x01B5;
 const sal_uInt16 BIFF_ID_DCONNAME           = 0x0052;
 const sal_uInt16 BIFF_ID_DCONREF            = 0x0051;
@@ -386,6 +401,8 @@ const sal_uInt16 BIFF_ID_EXTERNSHEET        = 0x0017;
 const sal_uInt16 BIFF_ID_EXTSST             = 0x00FF;
 const sal_uInt16 BIFF_ID_FILEPASS           = 0x002F;
 const sal_uInt16 BIFF_ID_FILESHARING        = 0x005B;
+const sal_uInt16 BIFF_ID_FILTERCOLUMN       = 0x009E;
+const sal_uInt16 BIFF_ID_FILTERMODE         = 0x009B;
 const sal_uInt16 BIFF2_ID_FONT              = 0x0031;
 const sal_uInt16 BIFF3_ID_FONT              = 0x0231;
 const sal_uInt16 BIFF5_ID_FONT              = 0x0031;
@@ -435,6 +452,7 @@ const sal_uInt16 BIFF_ID_PAGELAYOUTVIEW     = 0x088B;
 const sal_uInt16 BIFF_ID_PAGESETUP          = 0x00A1;
 const sal_uInt16 BIFF_ID_PALETTE            = 0x0092;
 const sal_uInt16 BIFF_ID_PANE               = 0x0041;
+const sal_uInt16 BIFF_ID_PARAMQUERY         = 0x00DC;
 const sal_uInt16 BIFF_ID_PASSWORD           = 0x0013;
 const sal_uInt16 BIFF_ID_PCDEFINITION       = 0x00C6;
 const sal_uInt16 BIFF_ID_PCDEFINITION2      = 0x0122;
@@ -470,6 +488,10 @@ const sal_uInt16 BIFF_ID_PTFITEM            = 0x00B2;
 const sal_uInt16 BIFF_ID_PTPAGEFIELDS       = 0x00B6;
 const sal_uInt16 BIFF_ID_PTROWCOLFIELDS     = 0x00B4;
 const sal_uInt16 BIFF_ID_PTROWCOLITEMS      = 0x00B5;
+const sal_uInt16 BIFF_ID_QUERYTABLE         = 0x01AD;
+const sal_uInt16 BIFF_ID_QUERYTABLEREFRESH  = 0x0802;
+const sal_uInt16 BIFF_ID_QUERYTABLESETTINGS = 0x0803;
+const sal_uInt16 BIFF_ID_QUERYTABLESTRING   = 0x0804;
 const sal_uInt16 BIFF_ID_RECALCID           = 0x01C1;
 const sal_uInt16 BIFF_ID_REFMODE            = 0x000F;
 const sal_uInt16 BIFF_ID_RIGHTMARGIN        = 0x0027;
@@ -496,7 +518,6 @@ const sal_uInt16 BIFF2_ID_STRING            = 0x0007;
 const sal_uInt16 BIFF3_ID_STRING            = 0x0207;
 const sal_uInt16 BIFF_ID_STYLE              = 0x0293;
 const sal_uInt16 BIFF_ID_STYLEEXT           = 0x0892;
-const sal_uInt16 BIFF_ID_SXEXT              = 0x00DC;
 const sal_uInt16 BIFF_ID_TABLESTYLES        = 0x088E;
 const sal_uInt16 BIFF_ID_THEME              = 0x0896;
 const sal_uInt16 BIFF_ID_TOPMARGIN          = 0x0028;
@@ -521,6 +542,8 @@ const sal_uInt16 BIFF_ID_XFEXT              = 0x087D;
 
 const sal_uInt16 BIFF_ID_UNKNOWN            = SAL_MAX_UINT16;
 
+// OBJ subrecord identifiers --------------------------------------------------
+
 const sal_uInt16 BIFF_ID_OBJEND             = 0x0000;   /// End of OBJ.
 const sal_uInt16 BIFF_ID_OBJMACRO           = 0x0004;   /// Macro link.
 const sal_uInt16 BIFF_ID_OBJBUTTON          = 0x0005;   /// Button data.
@@ -563,7 +586,10 @@ const sal_uInt8 BIFF_DATATYPE_STRING        = 2;
 const sal_uInt8 BIFF_DATATYPE_BOOL          = 4;
 const sal_uInt8 BIFF_DATATYPE_ERROR         = 16;
 
-// unicode strings ------------------------------------------------------------
+const sal_uInt8 BIFF_BOOLERR_BOOL           = 0;
+const sal_uInt8 BIFF_BOOLERR_ERROR          = 1;
+
+// BIFF8 unicode strings ------------------------------------------------------
 
 const sal_uInt8 BIFF_STRF_16BIT             = 0x01;
 const sal_uInt8 BIFF_STRF_PHONETIC          = 0x04;
@@ -592,6 +618,32 @@ public:
     /** Returns a Windows code page from a text encoding. */
     static sal_uInt16   calcCodePageFromTextEncoding( rtl_TextEncoding eTextEnc );
 
+    // BIFF12 import ----------------------------------------------------------
+
+    /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */
+    static ::rtl::OUString readString( SequenceInputStream& rStrm, bool b32BitLen = true );
+
+    // BIFF2-BIFF8 import -----------------------------------------------------
+
+    /** Returns true, if the current record of the stream is a BOF record. */
+    static bool         isBofRecord( BiffInputStream& rStrm );
+
+    /** Skips a block of records up to the specified end record.
+
+        Skips all records until next end record. When this function returns,
+        the stream points to the end record, and the next call of the function
+        startNextRecord() at the stream will start the record following the end
+        record.
+
+        The identifier of the record that is active while this function is
+        called is used as start record identifier. This identifier is used to
+        correctly skip embedded record blocks with the same start and end
+        record identifier.
+
+        @return  True = stream points to the end record.
+     */
+    static bool         skipRecordBlock( BiffInputStream& rStrm, sal_uInt16 nEndRecId );
+
     /** Imports a picture from an IMGDATA record. */
     static void         importImgData( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, BiffType eBiff );
 
@@ -600,6 +652,15 @@ private:
                         ~BiffHelper();  // not implemented
 };
 
+// ----------------------------------------------------------------------------
+
+/** BIFF12 stream operator for an ::rtl::OUString, reads 32-bit string length and Unicode array. */
+inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, ::rtl::OUString& orString )
+{
+    orString = BiffHelper::readString( rStrm );
+    return rStrm;
+}
+
 // ============================================================================
 
 } // namespace xls
@@ -607,4 +668,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/biffinputstream.hxx b/oox/inc/oox/xls/biffinputstream.hxx
index 5b6520339d3b..3fd8d4d8fbdc 100644
--- a/oox/inc/oox/xls/biffinputstream.hxx
+++ b/oox/inc/oox/xls/biffinputstream.hxx
@@ -446,4 +446,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/biffoutputstream.hxx b/oox/inc/oox/xls/biffoutputstream.hxx
index aab816f65f3e..6f56bac31c8d 100644
--- a/oox/inc/oox/xls/biffoutputstream.hxx
+++ b/oox/inc/oox/xls/biffoutputstream.hxx
@@ -164,4 +164,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/chartsheetfragment.hxx b/oox/inc/oox/xls/chartsheetfragment.hxx
index 7c5a33d08173..3e2f3b4feb0f 100644
--- a/oox/inc/oox/xls/chartsheetfragment.hxx
+++ b/oox/inc/oox/xls/chartsheetfragment.hxx
@@ -36,24 +36,20 @@ namespace xls {
 
 // ============================================================================
 
-class OoxChartsheetFragment : public OoxWorksheetFragmentBase
+class ChartsheetFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxChartsheetFragment(
+    explicit            ChartsheetFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             sal_Int16 nSheet );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
-
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        initializeImport();
@@ -63,7 +59,7 @@ private:
     /** Imports the the relation identifier for the DrawingML part. */
     void                importDrawing( const AttributeList& rAttribs );
     /** Imports the DRAWING record containing the relation identifier for the DrawingML part. */
-    void                importDrawing( RecordInputStream& rStrm );
+    void                importDrawing( SequenceInputStream& rStrm );
 };
 
 // ============================================================================
@@ -73,7 +69,7 @@ class BiffChartsheetFragment : public BiffWorksheetFragmentBase
 public:
     explicit            BiffChartsheetFragment(
                             const BiffWorkbookFragmentBase& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             sal_Int16 nSheet );
 
     /** Imports the entire sheet fragment, returns true, if EOF record has been reached. */
@@ -87,4 +83,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/commentsbuffer.hxx b/oox/inc/oox/xls/commentsbuffer.hxx
index 4a96683a3571..85ae32ee9b1a 100644
--- a/oox/inc/oox/xls/commentsbuffer.hxx
+++ b/oox/inc/oox/xls/commentsbuffer.hxx
@@ -71,7 +71,7 @@ public:
     /** Imports the anchor points in CommentPr */
     void                importAnchor( bool bFrom, sal_Int32 nWhich, const ::rtl::OUString &rChars );
     /** Imports a cell comment from the passed stream of a COMMENT record. */
-    void                importComment( RecordInputStream& rStrm );
+    void                importComment( SequenceInputStream& rStrm );
 
     /** Creates and returns a new rich-string object for the comment text. */
     RichStringRef       createText();
@@ -115,4 +115,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/commentsfragment.hxx b/oox/inc/oox/xls/commentsfragment.hxx
index e9fb6d69d578..c549c3bc7461 100644
--- a/oox/inc/oox/xls/commentsfragment.hxx
+++ b/oox/inc/oox/xls/commentsfragment.hxx
@@ -37,30 +37,27 @@ namespace xls {
 
 // ============================================================================
 
-class OoxCommentsFragment : public OoxWorksheetFragmentBase
+class CommentsFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxCommentsFragment(
+    explicit            CommentsFragment(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual void        onEndRecord();
 
-    // oox.core.FragmentHandler2 interface ------------------------------------
-
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
 
 private:
     /** Imports comment data from the comment element. */
     void                importComment( const AttributeList& rAttribs );
     /** Imports comment data from the COMMENT record. */
-    void                importComment( RecordInputStream& rStrm );
+    void                importComment( SequenceInputStream& rStrm );
 
 private:
     CommentRef          mxComment;
@@ -73,4 +70,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/condformatbuffer.hxx b/oox/inc/oox/xls/condformatbuffer.hxx
index ef5ab1d1f154..08d318e0a3c3 100644
--- a/oox/inc/oox/xls/condformatbuffer.hxx
+++ b/oox/inc/oox/xls/condformatbuffer.hxx
@@ -30,7 +30,6 @@
 #define OOX_XLS_CONDFORMATBUFFER_HXX
 
 #include <com/sun/star/sheet/ConditionOperator2.hpp>
-#include "oox/helper/containerhelper.hxx"
 #include "oox/xls/formulaparser.hxx"
 #include "oox/xls/worksheethelper.hxx"
 
@@ -65,11 +64,11 @@ struct CondFormatRuleModel
 
     explicit            CondFormatRuleModel();
 
-    /** Sets the passed OOBIN or BIFF operator for condition type cellIs. */
-    void                setBinOperator( sal_Int32 nOperator );
+    /** Sets the passed BIFF operator for condition type cellIs. */
+    void                setBiffOperator( sal_Int32 nOperator );
 
-    /** Sets the passed OOBIN text comparison type and operator. */
-    void                setOobTextType( sal_Int32 nOperator );
+    /** Sets the passed BIFF12 text comparison type and operator. */
+    void                setBiff12TextType( sal_Int32 nOperator );
 };
 
 // ============================================================================
@@ -88,7 +87,7 @@ public:
     void                appendFormula( const ::rtl::OUString& rFormula );
 
     /** Imports rule settings from a CFRULE record. */
-    void                importCfRule( RecordInputStream& rStrm );
+    void                importCfRule( SequenceInputStream& rStrm );
 
     /** Imports rule settings from a CFRULE record. */
     void                importCfRule( BiffInputStream& rStrm, sal_Int32 nPriority );
@@ -132,9 +131,9 @@ public:
     CondFormatRuleRef   importCfRule( const AttributeList& rAttribs );
 
     /** Imports settings from the CONDFORMATTING record. */
-    void                importCondFormatting( RecordInputStream& rStrm );
+    void                importCondFormatting( SequenceInputStream& rStrm );
     /** Imports a conditional formatting rule from the CFRULE record. */
-    void                importCfRule( RecordInputStream& rStrm );
+    void                importCfRule( SequenceInputStream& rStrm );
 
     /** Imports settings from the CFHEADER record. */
     void                importCfHeader( BiffInputStream& rStrm );
@@ -168,7 +167,7 @@ public:
     /** Imports settings from the conditionalFormatting element. */
     CondFormatRef       importConditionalFormatting( const AttributeList& rAttribs );
     /** Imports settings from the CONDFORMATTING record. */
-    CondFormatRef       importCondFormatting( RecordInputStream& rStrm );
+    CondFormatRef       importCondFormatting( SequenceInputStream& rStrm );
     /** Imports settings from the CFHEADER record. */
     void                importCfHeader( BiffInputStream& rStrm );
 
@@ -193,4 +192,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/condformatcontext.hxx b/oox/inc/oox/xls/condformatcontext.hxx
index e6b402d21ef5..bd383c89af8b 100644
--- a/oox/inc/oox/xls/condformatcontext.hxx
+++ b/oox/inc/oox/xls/condformatcontext.hxx
@@ -37,20 +37,18 @@ namespace xls {
 
 // ============================================================================
 
-class OoxCondFormatContext : public OoxWorksheetContextBase
+class CondFormatContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxCondFormatContext( OoxWorksheetFragmentBase& rFragment );
+    explicit            CondFormatContext( WorksheetFragmentBase& rFragment );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     CondFormatRef       mxCondFmt;
@@ -64,4 +62,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/connectionsbuffer.hxx b/oox/inc/oox/xls/connectionsbuffer.hxx
new file mode 100755
index 000000000000..98a5bea17bc6
--- /dev/null
+++ b/oox/inc/oox/xls/connectionsbuffer.hxx
@@ -0,0 +1,186 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_CONNECTIONSBUFFER_HXX
+#define OOX_XLS_CONNECTIONSBUFFER_HXX
+
+#include "oox/helper/refvector.hxx"
+#include "oox/xls/workbookhelper.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+const sal_Int32 BIFF12_CONNECTION_UNKNOWN               = 0;
+const sal_Int32 BIFF12_CONNECTION_ODBC                  = 1;
+const sal_Int32 BIFF12_CONNECTION_DAO                   = 2;
+const sal_Int32 BIFF12_CONNECTION_FILE                  = 3;
+const sal_Int32 BIFF12_CONNECTION_HTML                  = 4;
+const sal_Int32 BIFF12_CONNECTION_OLEDB                 = 5;
+const sal_Int32 BIFF12_CONNECTION_TEXT                  = 6;
+const sal_Int32 BIFF12_CONNECTION_ADO                   = 7;
+const sal_Int32 BIFF12_CONNECTION_DSP                   = 8;
+
+// ============================================================================
+
+/** Special properties for data connections representing web queries. */
+struct WebPrModel
+{
+    typedef ::std::vector< ::com::sun::star::uno::Any > TablesVector;
+
+    TablesVector        maTables;           /// Names or indexes of the web query tables.
+    ::rtl::OUString     maUrl;              /// Source URL to refresh the data.
+    ::rtl::OUString     maPostMethod;       /// POST method to query data.
+    ::rtl::OUString     maEditPage;         /// Web page showing query data (for XML queries).
+    sal_Int32           mnHtmlFormat;       /// Plain text, rich text, or HTML.
+    bool                mbXml;              /// True = XML query, false = HTML query.
+    bool                mbSourceData;       /// True = import XML source data referred by HTML table.
+    bool                mbParsePre;         /// True = parse preformatted sections (<pre> tag).
+    bool                mbConsecutive;      /// True = join consecutive delimiters.
+    bool                mbFirstRow;         /// True = use column withs of first row for entire <pre> tag.
+    bool                mbXl97Created;      /// True = web query created with Excel 97.
+    bool                mbTextDates;        /// True = read date values as text, false = parse dates.
+    bool                mbXl2000Refreshed;  /// True = refreshed with Excel 2000 or newer.
+    bool                mbHtmlTables;       /// True = HTML tables, false = entire document.
+
+    explicit            WebPrModel();
+};
+
+// ----------------------------------------------------------------------------
+
+/** Common properties of an external data connection. */
+struct ConnectionModel
+{
+    typedef ::std::auto_ptr< WebPrModel > WebPrModelPtr;
+
+    WebPrModelPtr       mxWebPr;            /// Special settings for web queries.
+    ::rtl::OUString     maName;             /// Unique name of this connection.
+    ::rtl::OUString     maDescription;      /// User description of this connection.
+    ::rtl::OUString     maSourceFile;       /// URL of a source data file.
+    ::rtl::OUString     maSourceConnFile;   /// URL of a source connection file.
+    ::rtl::OUString     maSsoId;            /// Single sign-on identifier.
+    sal_Int32           mnId;               /// Unique connection identifier.
+    sal_Int32           mnType;             /// Data source type.
+    sal_Int32           mnReconnectMethod;  /// Reconnection method.
+    sal_Int32           mnCredentials;      /// Credentials method.
+    sal_Int32           mnInterval;         /// Refresh interval in minutes.
+    bool                mbKeepAlive;        /// True = keep connection open after import.
+    bool                mbNew;              /// True = new connection, never updated.
+    bool                mbDeleted;          /// True = connection has been deleted.
+    bool                mbOnlyUseConnFile;  /// True = use maSourceConnFile, ignore mnReconnectMethod.
+    bool                mbBackground;       /// True = background refresh enabled.
+    bool                mbRefreshOnLoad;    /// True = refresh connection on import.
+    bool                mbSaveData;         /// True = save cached data with connection.
+    bool                mbSavePassword;     /// True = save password in connection string.
+
+    explicit            ConnectionModel();
+
+    WebPrModel&         createWebPr();
+};
+
+// ----------------------------------------------------------------------------
+
+/** An external data connection (database, web query, etc.). */
+class Connection : public WorkbookHelper
+{
+public:
+    explicit            Connection( const WorkbookHelper& rHelper, sal_Int32 nConnId = -1 );
+
+    /** Imports connection settings from the connection element. */
+    void                importConnection( const AttributeList& rAttribs );
+    /** Imports web query settings from the webPr element. */
+    void                importWebPr( const AttributeList& rAttribs );
+    /** Imports web query table settings from the tables element. */
+    void                importTables( const AttributeList& rAttribs );
+    /** Imports a web query table identifier from the m, s, or x element. */
+    void                importTable( const AttributeList& rAttribs, sal_Int32 nElement );
+
+    /** Imports connection settings from the CONNECTION record. */
+    void                importConnection( SequenceInputStream& rStrm );
+    /** Imports web query settings from the WEBPR record. */
+    void                importWebPr( SequenceInputStream& rStrm );
+    /** Imports web query table settings from the WEBPRTABLES record. */
+    void                importWebPrTables( SequenceInputStream& rStrm );
+    /** Imports a web query table identifier from the PCITEM_MISSING, PCITEM_STRING, or PCITEM_INDEX record. */
+    void                importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId );
+
+    /** Imports connection settings from the DBQUERY record. */
+    void                importDbQuery( BiffInputStream& rStrm );
+    /** Imports connection settings from the QUERYTABLESETTINGS record. */
+    void                importQueryTableSettings( BiffInputStream& rStrm );
+
+    /** Returns the unique connection identifier. */
+    inline sal_Int32    getConnectionId() const { return maModel.mnId; }
+    /** Returns the source data type of the connection. */
+    inline sal_Int32    getConnectionType() const { return maModel.mnType; }
+    /** Returns read-only access to the connection model data. */
+    const ConnectionModel& getModel() const { return maModel; }
+
+private:
+    ConnectionModel     maModel;
+};
+
+typedef ::boost::shared_ptr< Connection > ConnectionRef;
+
+// ============================================================================
+
+class ConnectionsBuffer : public WorkbookHelper
+{
+public:
+    explicit            ConnectionsBuffer( const WorkbookHelper& rHelper );
+
+    /** Creates a new empty connection. */
+    Connection&         createConnection();
+    /** Creates a new empty connection with a valid but unused identifier. */
+    Connection&         createConnectionWithId();
+
+    /** Maps all connections by their identifier. */
+    void                finalizeImport();
+
+    /** Returns a data connection by its unique identifier. */
+    ConnectionRef       getConnection( sal_Int32 nConnId ) const;
+
+private:
+    /** Inserts the passed connection into the map according to its identifier. */
+    void                insertConnectionToMap( const ConnectionRef& rxConnection );
+
+private:
+    typedef RefVector< Connection >         ConnectionVector;
+    typedef RefMap< sal_Int32, Connection > ConnectionMap;
+
+    ConnectionVector    maConnections;
+    ConnectionMap       maConnectionsById;
+    sal_Int32           mnUnusedId;
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/connectionsfragment.hxx b/oox/inc/oox/xls/connectionsfragment.hxx
index 929f57c0a566..6a0a449ba75d 100644
--- a/oox/inc/oox/xls/connectionsfragment.hxx
+++ b/oox/inc/oox/xls/connectionsfragment.hxx
@@ -30,31 +30,45 @@
 #define OOX_XLS_CONNECTIONSFRAGMENT_HXX
 
 #include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/workbookhelper.hxx"
 
 namespace oox {
 namespace xls {
 
+class Connection;
+
 // ============================================================================
 
-class OoxConnectionsFragment : public OoxWorkbookFragmentBase
+class ConnectionContext : public WorkbookContextBase
 {
 public:
-    explicit            OoxConnectionsFragment(
+    explicit            ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection );
+
+protected:
+    virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual void        onStartElement( const AttributeList& rAttribs );
+
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
+
+private:
+    Connection&         mrConnection;
+};
+
+// ============================================================================
+
+class ConnectionsFragment : public WorkbookFragmentBase
+{
+public:
+    explicit            ConnectionsFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
-private:
-    void                importConnection( const AttributeList& rAttribs );
-    void                importWebPr( const AttributeList& rAttribs );
-    void                importTables( const AttributeList& rAttribs );
-    void                importS( const AttributeList& rAttribs );
-    void                importX( const AttributeList& rAttribs );
+    virtual const ::oox::core::RecordInfo* getRecordInfos() const;
+    virtual void        finalizeImport();
 };
 
 // ============================================================================
@@ -64,4 +78,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/defnamesbuffer.hxx b/oox/inc/oox/xls/defnamesbuffer.hxx
index 474773191d2e..e76c0ad6cf74 100644
--- a/oox/inc/oox/xls/defnamesbuffer.hxx
+++ b/oox/inc/oox/xls/defnamesbuffer.hxx
@@ -29,8 +29,6 @@
 #ifndef OOX_XLS_DEFINEDNAMESBUFFER_HXX
 #define OOX_XLS_DEFINEDNAMESBUFFER_HXX
 
-#include "oox/helper/containerhelper.hxx"
-#include "oox/helper/recordinputstream.hxx"
 #include "oox/xls/formulabase.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -46,21 +44,21 @@ class BiffInputStreamPos;
 // ============================================================================
 
 // codes for built-in names
-const sal_Unicode OOX_DEFNAME_CONSOLIDATEAREA   = '\x00';
-const sal_Unicode OOX_DEFNAME_AUTOOPEN          = '\x01';
-const sal_Unicode OOX_DEFNAME_AUTOCLOSE         = '\x02';
-const sal_Unicode OOX_DEFNAME_EXTRACT           = '\x03';
-const sal_Unicode OOX_DEFNAME_DATABASE          = '\x04';
-const sal_Unicode OOX_DEFNAME_CRITERIA          = '\x05';
-const sal_Unicode OOX_DEFNAME_PRINTAREA         = '\x06';
-const sal_Unicode OOX_DEFNAME_PRINTTITLES       = '\x07';
-const sal_Unicode OOX_DEFNAME_RECORDER          = '\x08';
-const sal_Unicode OOX_DEFNAME_DATAFORM          = '\x09';
-const sal_Unicode OOX_DEFNAME_AUTOACTIVATE      = '\x0A';
-const sal_Unicode OOX_DEFNAME_AUTODEACTIVATE    = '\x0B';
-const sal_Unicode OOX_DEFNAME_SHEETTITLE        = '\x0C';
-const sal_Unicode OOX_DEFNAME_FILTERDATABASE    = '\x0D';
-const sal_Unicode OOX_DEFNAME_UNKNOWN           = '\x0E';
+const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA  = '\x00';
+const sal_Unicode BIFF_DEFNAME_AUTOOPEN         = '\x01';   // Sheet macro executed when workbook is opened.
+const sal_Unicode BIFF_DEFNAME_AUTOCLOSE        = '\x02';   // Sheet macro executed when workbook is closed.
+const sal_Unicode BIFF_DEFNAME_EXTRACT          = '\x03';   // Filter output destination for advanced filter.
+const sal_Unicode BIFF_DEFNAME_DATABASE         = '\x04';
+const sal_Unicode BIFF_DEFNAME_CRITERIA         = '\x05';   // Filter criteria source range for advanced filter.
+const sal_Unicode BIFF_DEFNAME_PRINTAREA        = '\x06';   // Print ranges.
+const sal_Unicode BIFF_DEFNAME_PRINTTITLES      = '\x07';   // Rows/columns repeated on each page when printing.
+const sal_Unicode BIFF_DEFNAME_RECORDER         = '\x08';
+const sal_Unicode BIFF_DEFNAME_DATAFORM         = '\x09';
+const sal_Unicode BIFF_DEFNAME_AUTOACTIVATE     = '\x0A';   // Sheet macro executed when workbook is activated.
+const sal_Unicode BIFF_DEFNAME_AUTODEACTIVATE   = '\x0B';   // Sheet macro executed when workbook is deactivated.
+const sal_Unicode BIFF_DEFNAME_SHEETTITLE       = '\x0C';
+const sal_Unicode BIFF_DEFNAME_FILTERDATABASE   = '\x0D';   // Sheet range autofilter or advanced filter works on.
+const sal_Unicode BIFF_DEFNAME_UNKNOWN          = '\x0E';
 
 // ============================================================================
 
@@ -70,9 +68,9 @@ struct DefinedNameModel
     ::rtl::OUString     maFormula;      /// The formula string.
     sal_Int32           mnSheet;        /// Sheet index for local names.
     sal_Int32           mnFuncGroupId;  /// Function group identifier.
-    bool                mbMacro;        /// True = Macro name (VBasic or sheet macro).
+    bool                mbMacro;        /// True = Macro name (VBA or sheet macro).
     bool                mbFunction;     /// True = function, false = command.
-    bool                mbVBName;       /// True = VBasic macro, false = sheet macro.
+    bool                mbVBName;       /// True = VBA macro, false = sheet macro.
     bool                mbHidden;       /// True = name hidden in UI.
 
     explicit            DefinedNameModel();
@@ -97,10 +95,10 @@ public:
     ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddress ) const;
 
 protected:
-    /** Imports the OOX formula string, using the passed formula context. */
+    /** Imports the OOXML formula string, using the passed formula context. */
     void                importOoxFormula( FormulaContext& rContext, sal_Int16 nBaseSheet );
-    /** Imports the OOBIN formula, using the passed formula context. */
-    void                importOobFormula( FormulaContext& rContext, sal_Int16 nBaseSheet, RecordInputStream& rStrm );
+    /** Imports the BIFF12 formula, using the passed formula context. */
+    void                importBiff12Formula( FormulaContext& rContext, sal_Int16 nBaseSheet, SequenceInputStream& rStrm );
     /** Imports the BIFF formula, using the passed formula context. */
     void                importBiffFormula( FormulaContext& rContext, sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 );
 
@@ -126,7 +124,7 @@ public:
     /** Sets the formula string from the body of the definedName element. */
     void                setFormula( const ::rtl::OUString& rFormula );
     /** Imports the defined name from a DEFINEDNAME record in the passed stream. */
-    void                importDefinedName( RecordInputStream& rStrm );
+    void                importDefinedName( SequenceInputStream& rStrm );
     /** Imports the defined name from a DEFINEDNAME record in the passed BIFF stream. */
     void                importDefinedName( BiffInputStream& rStrm, sal_Int16 nCalcSheet );
 
@@ -135,22 +133,26 @@ public:
     /** Converts the formula string or BIFF token array for this defined name. */
     void                convertFormula();
 
+    /** Returns true, if this defined name is global in the document. */
+    inline bool         isGlobalName() const { return mnCalcSheet < 0; }
     /** Returns true, if this defined name is a special builtin name. */
-    inline bool         isBuiltinName() const { return mcBuiltinId != OOX_DEFNAME_UNKNOWN; }
+    inline bool         isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; }
     /** Returns true, if this defined name is a macro function call. */
     inline bool         isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; }
-    /** Returns true, if this defined name is global in the document. */
-    inline bool         isGlobalName() const { return mnCalcSheet < 0; }
+    /** Returns true, if this defined name is a reference to a VBA macro. */
+    inline bool         isVBName() const { return maModel.mbMacro && maModel.mbVBName; }
 
-    /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
-    inline sal_Int32    getTokenIndex() const { return mnTokenIndex; }
     /** Returns the 0-based sheet index for local names, or -1 for global names. */
     inline sal_Int16    getLocalCalcSheet() const { return mnCalcSheet; }
+    /** Returns the built-in identifier of the defined name. */
+    inline sal_Unicode  getBuiltinId() const { return mcBuiltinId; }
+    /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
+    inline sal_Int32    getTokenIndex() const { return mnTokenIndex; }
     /** Tries to resolve the defined name to an absolute cell range. */
     bool                getAbsoluteRange( ::com::sun::star::table::CellRangeAddress& orRange ) const;
 
 private:
-    /** Imports the OOX or OOBIN formula, using the passed formula context. */
+    /** Imports the OOXML or BIFF12 formula, using the passed formula context. */
     void                implImportOoxFormula( FormulaContext& rContext );
     /** Imports the BIFF formula, using the passed formula context. */
     void                implImportBiffFormula( FormulaContext& rContext );
@@ -164,7 +166,7 @@ private:
     sal_Int32           mnTokenIndex;       /// Name index used in API token array.
     sal_Int16           mnCalcSheet;        /// Calc sheet index for sheet-local names.
     sal_Unicode         mcBuiltinId;        /// Identifier for built-in defined names.
-    StreamDataSeqPtr    mxFormula;          /// Formula data for OOBIN import.
+    StreamDataSeqPtr    mxFormula;          /// Formula data for BIFF12 import.
     BiffStreamPosPtr    mxBiffStrm;         /// Cached BIFF stream for formula import.
     sal_uInt16          mnFmlaSize;         /// Cached BIFF formula size for formula import.
 };
@@ -184,7 +186,7 @@ public:
     /** Imports a defined name from the passed attribute set. */
     DefinedNameRef      importDefinedName( const AttributeList& rAttribs );
     /** Imports a defined name from a DEFINEDNAME record in the passed stream. */
-    void                importDefinedName( RecordInputStream& rStrm );
+    void                importDefinedName( SequenceInputStream& rStrm );
     /** Imports a defined name from a DEFINEDNAME record in the passed BIFF stream. */
     void                importDefinedName( BiffInputStream& rStrm );
 
@@ -200,16 +202,27 @@ public:
             If no local name is found, tries to find a matching global name.
         @return  Reference to the defined name or empty reference. */
     DefinedNameRef      getByModelName( const ::rtl::OUString& rModelName, sal_Int16 nCalcSheet = -1 ) const;
+    /** Returns a built-in defined name by its built-in identifier.
+        @param nSheet  The sheet index of the built-in name.
+        @return  Reference to the defined name or empty reference. */
+    DefinedNameRef      getByBuiltinId( sal_Unicode cBuiltinId, sal_Int16 nCalcSheet ) const;
 
 private:
     DefinedNameRef      createDefinedName();
 
 private:
+    typedef ::std::pair< sal_Int16, ::rtl::OUString >   SheetNameKey;
+    typedef ::std::pair< sal_Int16, sal_Unicode >       BuiltinKey;
+
     typedef RefVector< DefinedName >            DefNameVector;
-    typedef RefMap< sal_Int32, DefinedName >    DefNameMap;
+    typedef RefMap< SheetNameKey, DefinedName > DefNameNameMap;
+    typedef RefMap< BuiltinKey, DefinedName >   DefNameBuiltinMap;
+    typedef RefMap< sal_Int32, DefinedName >    DefNameTokenIdMap;
 
     DefNameVector       maDefNames;         /// List of all defined names in insertion order.
-    DefNameMap          maDefNameMap;       /// Maps all defined names by API token index.
+    DefNameNameMap      maModelNameMap;     /// Maps all defined names by sheet index and model name.
+    DefNameBuiltinMap   maBuiltinMap;       /// Maps all defined names by sheet index and built-in identifier.
+    DefNameTokenIdMap   maTokenIdMap;       /// Maps all defined names by API token index.
     sal_Int16           mnCalcSheet;        /// Current sheet index for BIFF2-BIFF4 names (always sheet-local).
 };
 
@@ -220,4 +233,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/drawingfragment.hxx b/oox/inc/oox/xls/drawingfragment.hxx
index 71d60433e4c6..d78b038cd3b4 100644
--- a/oox/inc/oox/xls/drawingfragment.hxx
+++ b/oox/inc/oox/xls/drawingfragment.hxx
@@ -32,15 +32,25 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include "oox/drawingml/shape.hxx"
+#include "oox/drawingml/shapegroupcontext.hxx"
 #include "oox/ole/axcontrol.hxx"
+#include "oox/ole/vbaproject.hxx"
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmldrawingfragment.hxx"
+#include "oox/vml/vmltextbox.hxx"
 #include "oox/xls/excelhandlers.hxx"
 
+namespace oox { namespace ole {
+    struct AxFontData;
+    class AxMorphDataModelBase;
+} }
+
 namespace oox {
 namespace xls {
 
 // ============================================================================
+// DrawingML
+// ============================================================================
 
 /** Absolute position in spreadsheet (in EMUs) independent from cells. */
 struct AnchorPosModel : public ::oox::drawingml::EmuPoint
@@ -102,6 +112,7 @@ public:
     void                importClientData( const AttributeList& rAttribs );
     /** Sets an attribute of the cell-dependent anchor position from xdr:from and xdr:to elements. */
     void                setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
+    /** Imports and converts the VML specific client anchor. */
     void                importVmlAnchor( const ::rtl::OUString& rAnchor );
 
     /** Returns true, if the anchor contains valid position and size settings. */
@@ -133,19 +144,81 @@ typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef;
 
 // ============================================================================
 
+class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase
+{
+public:
+    explicit            ShapeMacroAttacher( const ::rtl::OUString& rMacroName,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape );
+
+private:
+    virtual void        attachMacro( const ::rtl::OUString& rMacroUrl );
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
+};
+
+// ============================================================================
+
+class Shape : public ::oox::drawingml::Shape, public WorksheetHelper
+{
+public:
+    explicit            Shape(
+                            const WorksheetHelper& rHelper,
+                            const AttributeList& rAttribs,
+                            const sal_Char* pcServiceName = 0 );
+
+protected:
+    virtual void        finalizeXShape(
+                            ::oox::core::XmlFilterBase& rFilter,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+
+private:
+    ::rtl::OUString     maMacroName;
+};
+
+// ============================================================================
+
+/** Context handler for creation of shapes embedded in group shapes. */
+class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper
+{
+public:
+    explicit            GroupShapeContext(
+                            ::oox::core::ContextHandler& rParent,
+                            const WorksheetHelper& rHelper,
+                            const ::oox::drawingml::ShapePtr& rxParentShape,
+                            const ::oox::drawingml::ShapePtr& rxShape );
+
+    static ::oox::core::ContextHandlerRef
+                        createShapeContext(
+                            ::oox::core::ContextHandler& rParent,
+                            const WorksheetHelper& rHelper,
+                            sal_Int32 nElement,
+                            const AttributeList& rAttribs,
+                            const ::oox::drawingml::ShapePtr& rxParentShape,
+                            ::oox::drawingml::ShapePtr* pxShape = 0 );
+
+protected:
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
+                        createFastChildContext(
+                            sal_Int32 nElement,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs )
+                        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+};
+
+// ============================================================================
+
 /** Fragment handler for a complete sheet drawing. */
-class OoxDrawingFragment : public OoxWorksheetFragmentBase
+class DrawingFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxDrawingFragment(
+    explicit            DrawingFragment(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
@@ -157,6 +230,27 @@ private:
 };
 
 // ============================================================================
+// VML
+// ============================================================================
+
+class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase
+{
+public:
+    explicit            VmlControlMacroAttacher( const ::rtl::OUString& rMacroName,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxCtrlFormIC,
+                            sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle );
+
+private:
+    virtual void        attachMacro( const ::rtl::OUString& rMacroUrl );
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC;
+    sal_Int32           mnCtrlIndex;
+    sal_Int32           mnCtrlType;
+    sal_Int32           mnDropStyle;
+};
+
+// ============================================================================
 
 class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper
 {
@@ -169,33 +263,55 @@ public:
     /** Filters cell note shapes. */
     virtual bool        isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const;
 
+    /** Returns additional base names for automatic shape name creation. */
+    virtual ::rtl::OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const;
+
     /** Calculates the shape rectangle from a cell anchor string. */
-    virtual bool        convertShapeClientAnchor(
+    virtual bool        convertClientAnchor(
                             ::com::sun::star::awt::Rectangle& orShapeRect,
                             const ::rtl::OUString& rShapeAnchor ) const;
 
-    /** Converts additional form control properties from the passed VML shape
-        client data. */
-    virtual void        convertControlClientData(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
-                            const ::oox::vml::ShapeClientData& rClientData ) const;
+    /** Creates a UNO control shape for legacy drawing controls. */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        createAndInsertClientXShape(
+                            const ::oox::vml::ShapeBase& rShape,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
 
     /** Updates the bounding box covering all shapes of this drawing. */
-    virtual void        notifyShapeInserted(
+    virtual void        notifyXShapeInserted(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+                            const ::com::sun::star::awt::Rectangle& rShapeRect,
+                            const ::oox::vml::ShapeBase& rShape, bool bGroupChild );
 
 private:
-    ::oox::ole::ControlConverter maControlConv;
+    /** Converts the passed VML textbox text color to an OLE color. */
+    sal_uInt32          convertControlTextColor( const ::rtl::OUString& rTextColor ) const;
+    /** Converts the passed VML textbox font to an ActiveX form control font. */
+    void                convertControlFontData(
+                            ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor,
+                            const ::oox::vml::TextFontModel& rFontModel ) const;
+    /** Converts the caption, the font settings, and the horizontal alignment
+        from the passed VML textbox to ActiveX form control settings. */
+    void                convertControlText(
+                            ::oox::ole::AxFontData& rAxFontData, sal_uInt32& rnOleTextColor, ::rtl::OUString& rCaption,
+                            const ::oox::vml::TextBox* pTextBox, sal_Int32 nTextHAlign ) const;
+    /** Converts the passed VML shape background formatting to ActiveX control formatting. */
+    void                convertControlBackground(
+                            ::oox::ole::AxMorphDataModelBase& rAxModel,
+                            const ::oox::vml::ShapeBase& rShape ) const;
 
+private:
+    ::oox::ole::ControlConverter maControlConv;
+    ::oox::vml::TextFontModel maListBoxFont;
 };
 
 // ============================================================================
 
-class OoxVmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper
+class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper
 {
 public:
-    explicit            OoxVmlDrawingFragment(
+    explicit            VmlDrawingFragment(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
@@ -210,4 +326,4 @@ protected:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/excelchartconverter.hxx b/oox/inc/oox/xls/excelchartconverter.hxx
index 9d0562dab7b8..2a4d44325f72 100644
--- a/oox/inc/oox/xls/excelchartconverter.hxx
+++ b/oox/inc/oox/xls/excelchartconverter.hxx
@@ -61,4 +61,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/excelfilter.hxx b/oox/inc/oox/xls/excelfilter.hxx
index f3e4a571653c..aa4e1f7a449e 100644
--- a/oox/inc/oox/xls/excelfilter.hxx
+++ b/oox/inc/oox/xls/excelfilter.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_EXCELFILTER_HXX
 #define OOX_XLS_EXCELFILTER_HXX
 
-#include "oox/core/xmlfilterbase.hxx"
 #include "oox/core/binaryfilterbase.hxx"
+#include "oox/core/xmlfilterbase.hxx"
 #include "oox/ole/vbaprojectfilter.hxx"
 
 namespace oox {
@@ -61,7 +61,8 @@ class ExcelFilter : public ::oox::core::XmlFilterBase, public ExcelFilterBase
 {
 public:
     explicit            ExcelFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
     virtual             ~ExcelFilter();
 
     virtual bool        importDocument() throw();
@@ -76,6 +77,7 @@ public:
 
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const;
+    virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
     virtual ::rtl::OUString implGetImplementationName() const;
 };
 
@@ -85,7 +87,8 @@ class ExcelBiffFilter : public ::oox::core::BinaryFilterBase, public ExcelFilter
 {
 public:
     explicit            ExcelBiffFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
     virtual             ~ExcelBiffFilter();
 
     virtual bool        importDocument() throw();
@@ -93,6 +96,7 @@ public:
 
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const;
+    virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
     virtual ::rtl::OUString implGetImplementationName() const;
 };
 
@@ -102,19 +106,20 @@ class ExcelVbaProjectFilter : public ExcelBiffFilter
 {
 public:
     explicit            ExcelVbaProjectFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+                            throw( ::com::sun::star::uno::RuntimeException );
 
     virtual bool        importDocument() throw();
+    virtual bool        exportDocument() throw();
 
 private:
     virtual ::rtl::OUString implGetImplementationName() const;
 };
-
-// ============================================================================
+ // ============================================================================
 
 } // namespace xls
 } // namespace oox
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/excelhandlers.hxx b/oox/inc/oox/xls/excelhandlers.hxx
index 25e5f5e7f2ed..28d8c527c878 100644
--- a/oox/inc/oox/xls/excelhandlers.hxx
+++ b/oox/inc/oox/xls/excelhandlers.hxx
@@ -42,17 +42,17 @@ namespace xls {
 
     Used to import contexts in global workbook fragments.
  */
-class OoxWorkbookContextBase : public ::oox::core::ContextHandler2, public WorkbookHelper
+class WorkbookContextBase : public ::oox::core::ContextHandler2, public WorkbookHelper
 {
 public:
     template< typename ParentType >
-    explicit            OoxWorkbookContextBase( ParentType& rParent );
+    explicit            WorkbookContextBase( ParentType& rParent );
 };
 
 // ----------------------------------------------------------------------------
 
 template< typename ParentType >
-OoxWorkbookContextBase::OoxWorkbookContextBase( ParentType& rParent ) :
+WorkbookContextBase::WorkbookContextBase( ParentType& rParent ) :
     ::oox::core::ContextHandler2( rParent ),
     WorkbookHelper( rParent )
 {
@@ -64,32 +64,32 @@ OoxWorkbookContextBase::OoxWorkbookContextBase( ParentType& rParent ) :
 
     Used to import contexts in sheet fragments.
  */
-class OoxWorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelperRoot
+class WorksheetContextBase : public ::oox::core::ContextHandler2, public WorksheetHelperRoot
 {
 public:
     template< typename ParentType >
-    explicit            OoxWorksheetContextBase(
+    explicit            WorksheetContextBase(
                             ParentType& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 
     template< typename ParentType >
-    explicit            OoxWorksheetContextBase( ParentType& rParent );
+    explicit            WorksheetContextBase( ParentType& rParent );
 };
 
 // ----------------------------------------------------------------------------
 
 template< typename ParentType >
-OoxWorksheetContextBase::OoxWorksheetContextBase( ParentType& rParent,
-        ISegmentProgressBarRef xProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
+WorksheetContextBase::WorksheetContextBase( ParentType& rParent,
+        const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
     ::oox::core::ContextHandler2( rParent ),
-    WorksheetHelperRoot( rParent, xProgressBar, eSheetType, nSheet )
+    WorksheetHelperRoot( rParent, rxProgressBar, eSheetType, nSheet )
 {
 }
 
 template< typename ParentType >
-OoxWorksheetContextBase::OoxWorksheetContextBase( ParentType& rParent ) :
+WorksheetContextBase::WorksheetContextBase( ParentType& rParent ) :
     ::oox::core::ContextHandler2( rParent ),
     WorksheetHelperRoot( rParent )
 {
@@ -101,10 +101,10 @@ OoxWorksheetContextBase::OoxWorksheetContextBase( ParentType& rParent ) :
 
     Used to import global workbook fragments.
  */
-class OoxWorkbookFragmentBase : public ::oox::core::FragmentHandler2, public WorkbookHelper
+class WorkbookFragmentBase : public ::oox::core::FragmentHandler2, public WorkbookHelper
 {
 public:
-    explicit            OoxWorkbookFragmentBase(
+    explicit            WorkbookFragmentBase(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 };
@@ -115,17 +115,17 @@ public:
 
     Used to import sheet fragments.
  */
-class OoxWorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelperRoot
+class WorksheetFragmentBase : public ::oox::core::FragmentHandler2, public WorksheetHelperRoot
 {
 public:
-    explicit            OoxWorksheetFragmentBase(
+    explicit            WorksheetFragmentBase(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 
-    explicit            OoxWorksheetFragmentBase(
+    explicit            WorksheetFragmentBase(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 };
@@ -133,72 +133,21 @@ public:
 // ============================================================================
 // ============================================================================
 
-/** An enumeration for all types of fragments in a BIFF workbook stream. */
-enum BiffFragmentType
-{
-    BIFF_FRAGMENT_GLOBALS,      /// Workbook globals fragment.
-    BIFF_FRAGMENT_WORKSHEET,    /// Worksheet fragment.
-    BIFF_FRAGMENT_CHARTSHEET,   /// Chart sheet fragment.
-    BIFF_FRAGMENT_MACROSHEET,   /// Macro sheet fragment.
-    BIFF_FRAGMENT_MODULESHEET,  /// BIFF5 VB module fragment.
-    BIFF_FRAGMENT_EMPTYSHEET,   /// Sheet fragment of unsupported type.
-    BIFF_FRAGMENT_WORKSPACE,    /// BIFF4 workspace/workbook globals.
-    BIFF_FRAGMENT_UNKNOWN       /// Unknown fragment/error.
-};
-
-// ============================================================================
-
-/** Base class for all BIFF context handlers and fragment handlers.
-
-    This base class holds a reference to the BIFF input stream which can be
-    accessed in all derived classes.
- */
-class BiffHandlerBase
-{
-protected:
-    inline explicit     BiffHandlerBase( BiffInputStream& rStrm ) : mrStrm( rStrm ) {}
-    virtual             ~BiffHandlerBase();
-
-    /** Skips a block of records up to the specified end record.
-
-        Skips all records until next end record. When this function returns,
-        stream points to the end record, and the next call of startNextRecord()
-        at the stream will start the record following the end record.
-
-        The identifier of the record that is active while this function is
-        called is used as start record identifier. This identifier is used to
-        correctly skip embedded record blocks with the same start and end
-        record identifier.
-
-        @return  True = stream points to the end record.
-     */
-    bool                skipRecordBlock( sal_uInt16 nEndRecId );
-
-    /** @return  True = current record identifier is a BOF record. */
-    bool                isBofRecord() const;
-
-protected:
-    BiffInputStream&    mrStrm;
-};
-
-// ============================================================================
-
 /** Base class for all BIFF context handlers.
 
     Derived handlers have to implement the importRecord() function that has to
-    import the record the BIFF input stream currently points to.
+    import the record the passed BIFF input stream currently points to.
  */
-class BiffContextHandler : public BiffHandlerBase
+class BiffContextHandler
 {
 public:
-    /** Derived classes have to implement importing the current record. */
-    virtual void        importRecord() = 0;
+    virtual             ~BiffContextHandler();
 
-protected:
-    explicit            BiffContextHandler( const BiffHandlerBase& rParent );
+    /** Derived classes have to implement importing the current record. */
+    virtual void        importRecord( BiffInputStream& rStrm ) = 0;
 };
 
-// ============================================================================
+// ----------------------------------------------------------------------------
 
 /** Context handler derived from the WorkbookHelper helper class.
 
@@ -207,21 +156,11 @@ protected:
 class BiffWorkbookContextBase : public BiffContextHandler, public WorkbookHelper
 {
 protected:
-    template< typename ParentType >
-    explicit            BiffWorkbookContextBase( const ParentType& rParent );
+    explicit            BiffWorkbookContextBase( const WorkbookHelper& rHelper );
 };
 
 // ----------------------------------------------------------------------------
 
-template< typename ParentType >
-BiffWorkbookContextBase::BiffWorkbookContextBase( const ParentType& rParent ) :
-    BiffContextHandler( rParent ),
-    WorkbookHelper( rParent )
-{
-}
-
-// ============================================================================
-
 /** Context handler derived from the WorksheetHelper helper class.
 
     Used to import contexts in sheet fragments.
@@ -229,68 +168,48 @@ BiffWorkbookContextBase::BiffWorkbookContextBase( const ParentType& rParent ) :
 class BiffWorksheetContextBase : public BiffContextHandler, public WorksheetHelperRoot
 {
 protected:
-    template< typename ParentType >
     explicit            BiffWorksheetContextBase(
-                            const ParentType& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const WorkbookHelper& rHelper,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 
-    template< typename ParentType >
-    explicit            BiffWorksheetContextBase( const ParentType& rParent );
+    explicit            BiffWorksheetContextBase( const WorksheetHelper& rHelper );
 };
 
-// ----------------------------------------------------------------------------
-
-template< typename ParentType >
-BiffWorksheetContextBase::BiffWorksheetContextBase( const ParentType& rParent,
-        ISegmentProgressBarRef xProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
-    BiffContextHandler( rParent ),
-    WorksheetHelperRoot( rParent, xProgressBar, eSheetType, nSheet )
-{
-}
-
-template< typename ParentType >
-BiffWorksheetContextBase::BiffWorksheetContextBase( const ParentType& rParent ) :
-    BiffContextHandler( rParent ),
-    WorksheetHelperRoot( rParent )
-{
-}
-
 // ============================================================================
 
-namespace prv {
-
-struct BiffFragmentStreamOwner
+/** An enumeration for all types of fragments in a BIFF workbook stream. */
+enum BiffFragmentType
 {
-    typedef ::boost::shared_ptr< BinaryXInputStream >   XInputStreamRef;
-    typedef ::boost::shared_ptr< BiffInputStream >      BiffInputStreamRef;
-
-    XInputStreamRef     mxXInStrm;
-    BiffInputStreamRef  mxBiffStrm;
-
-    explicit            BiffFragmentStreamOwner( const ::oox::core::FilterBase& rFilter, const ::rtl::OUString& rStrmName );
-    virtual             ~BiffFragmentStreamOwner();
+    BIFF_FRAGMENT_GLOBALS,      /// Workbook globals fragment.
+    BIFF_FRAGMENT_WORKSHEET,    /// Worksheet fragment.
+    BIFF_FRAGMENT_CHARTSHEET,   /// Chart sheet fragment.
+    BIFF_FRAGMENT_MACROSHEET,   /// Macro sheet fragment.
+    BIFF_FRAGMENT_MODULESHEET,  /// BIFF5 VB module fragment.
+    BIFF_FRAGMENT_EMPTYSHEET,   /// Sheet fragment of unsupported type.
+    BIFF_FRAGMENT_WORKSPACE,    /// BIFF4 workspace/workbook globals.
+    BIFF_FRAGMENT_UNKNOWN       /// Unknown fragment/error.
 };
 
-} // namespace prv
-
 // ----------------------------------------------------------------------------
 
-class BiffFragmentHandler : private prv::BiffFragmentStreamOwner, public BiffHandlerBase
+class BiffFragmentHandler
 {
 public:
-    /** Imports the fragment, returns true, if EOF record has been reached. */
-    virtual bool        importFragment() = 0;
-
-protected:
     /** Opens the stream with the passed full name. */
     explicit            BiffFragmentHandler(
                             const ::oox::core::FilterBase& rFilter,
                             const ::rtl::OUString& rStrmName );
 
-    /** Reuses the stream of the passed fragment. */
-    explicit            BiffFragmentHandler( const BiffFragmentHandler& rHandler );
+    virtual             ~BiffFragmentHandler();
+
+    /** Imports the fragment, returns true, if EOF record has been reached. */
+    virtual bool        importFragment() = 0;
+
+protected:
+    /** Returns the BIFF input stream of this fragment. */
+    inline BiffInputStream& getInputStream() { return *mxBiffStrm; }
 
     /** Starts a new fragment in a workbbok stream and returns the fragment type.
 
@@ -327,11 +246,14 @@ protected:
     bool                skipFragment();
 
 private:
-    /** Implementation helper for the startFragment() functions. */
-    BiffFragmentType    implStartFragment( BiffType eBiff );
+    typedef ::boost::shared_ptr< BinaryXInputStream >   XInputStreamRef;
+    typedef ::boost::shared_ptr< BiffInputStream >      BiffInputStreamRef;
+
+    XInputStreamRef     mxXInStrm;
+    BiffInputStreamRef  mxBiffStrm;
 };
 
-// ============================================================================
+// ----------------------------------------------------------------------------
 
 /** Fragment handler derived from the WorkbookHelper helper class.
 
@@ -346,7 +268,7 @@ protected:
                             bool bCloneDecoder = false );
 };
 
-// ============================================================================
+// ----------------------------------------------------------------------------
 
 /** Fragment handler derived from the WorksheetHelper helper class.
 
@@ -357,12 +279,12 @@ class BiffWorksheetFragmentBase : public BiffFragmentHandler, public WorksheetHe
 protected:
     explicit            BiffWorksheetFragmentBase(
                             const BiffWorkbookFragmentBase& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 };
 
-// ============================================================================
+// ----------------------------------------------------------------------------
 
 /** Special fragment handler for worksheets that have to be skipped.
  */
@@ -371,7 +293,7 @@ class BiffSkipWorksheetFragment : public BiffWorksheetFragmentBase
 public:
     explicit            BiffSkipWorksheetFragment(
                             const BiffWorkbookFragmentBase& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             sal_Int16 nSheet );
 
     virtual bool        importFragment();
@@ -385,4 +307,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/helper/recordinputstream.hxx b/oox/inc/oox/xls/excelvbaproject.hxx
index 4fe8f0d21bfa..016e63e7b7b0 100644..100755
--- a/oox/inc/oox/helper/recordinputstream.hxx
+++ b/oox/inc/oox/xls/excelvbaproject.hxx
@@ -26,35 +26,43 @@
  *
  ************************************************************************/
 
-#ifndef OOX_HELPER_RECORDINPUTSTREAM_HXX
-#define OOX_HELPER_RECORDINPUTSTREAM_HXX
+#ifndef OOX_XLS_EXCELVBAPROJECT_HXX
+#define OOX_XLS_EXCELVBAPROJECT_HXX
 
-#include "oox/helper/binaryinputstream.hxx"
+#include "oox/ole/vbaproject.hxx"
+#include "oox/dllapi.h"
+
+namespace com { namespace sun { namespace star {
+        namespace sheet { class XSpreadsheetDocument; }
+} } }
 
 namespace oox {
+namespace xls {
 
 // ============================================================================
 
-/** Reads the contents of a record from a binary OOBIN stream. */
-class RecordInputStream : public SequenceInputStream
+/** Special implementation of the VBA project for the Excel filters. */
+class OOX_DLLPUBLIC ExcelVbaProject : public ::oox::ole::VbaProject
 {
 public:
-    explicit            RecordInputStream( const StreamDataSequence& rData );
+    explicit            ExcelVbaProject(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& rxDocument );
 
-    /** Reads a string with leading 16-bit or 32-bit length field. */
-    ::rtl::OUString     readString( bool b32BitLen = true );
+protected:
+    /** Adds dummy modules for sheets without imported code name. */
+    virtual void        prepareImport();
 
-    /** Stream operator for integral types. */
-    template< typename Type >
-    inline RecordInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; }
-    /** Stream operator for an ::rtl::OUString, reads 32-bit string length and Unicode array. */
-    inline RecordInputStream& operator>>( ::rtl::OUString& orString ) { orString = readString(); return *this; }
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >
+                        mxDocument;
 };
 
 // ============================================================================
 
+} // namespace xls
 } // namespace oox
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx b/oox/inc/oox/xls/externallinkbuffer.hxx
index 38edd028c6d8..cb20e1987c8c 100644
--- a/oox/inc/oox/xls/externallinkbuffer.hxx
+++ b/oox/inc/oox/xls/externallinkbuffer.hxx
@@ -85,19 +85,19 @@ public:
     void                importOleItem( const AttributeList& rAttribs );
 
     /** Imports the EXTERNALNAME record containing the name (only). */
-    void                importExternalName( RecordInputStream& rStrm );
+    void                importExternalName( SequenceInputStream& rStrm );
     /** Imports the EXTERNALNAMEFLAGS record containing the settings of an external name. */
-    void                importExternalNameFlags( RecordInputStream& rStrm );
+    void                importExternalNameFlags( SequenceInputStream& rStrm );
     /** Imports the DDEITEMVALUES record containing the size of the DDE result matrix. */
-    void                importDdeItemValues( RecordInputStream& rStrm );
+    void                importDdeItemValues( SequenceInputStream& rStrm );
     /** Imports the DDEITEM_BOOL record containing a boolean value in a link result. */
-    void                importDdeItemBool( RecordInputStream& rStrm );
+    void                importDdeItemBool( SequenceInputStream& rStrm );
     /** Imports the DDEITEM_DOUBLE record containing a double value in a link result. */
-    void                importDdeItemDouble( RecordInputStream& rStrm );
+    void                importDdeItemDouble( SequenceInputStream& rStrm );
     /** Imports the DDEITEM_ERROR record containing an error code in a link result. */
-    void                importDdeItemError( RecordInputStream& rStrm );
+    void                importDdeItemError( SequenceInputStream& rStrm );
     /** Imports the DDEITEM_STRING record containing a string in a link result. */
-    void                importDdeItemString( RecordInputStream& rStrm );
+    void                importDdeItemString( SequenceInputStream& rStrm );
 
     /** Imports the EXTERNALNAME record from the passed stream. */
     void                importExternalName( BiffInputStream& rStrm );
@@ -228,19 +228,19 @@ public:
     ExternalNameRef     importOleItem( const AttributeList& rAttribs );
 
     /** Imports the EXTERNALBOOK record describing an externally linked document, DDE link, or OLE link. */
-    void                importExternalBook( const ::oox::core::Relations& rRelations, RecordInputStream& rStrm );
+    void                importExternalBook( const ::oox::core::Relations& rRelations, SequenceInputStream& rStrm );
     /** Imports the EXTSHEETNAMES record containing the sheet names in an externally linked document. */
-    void                importExtSheetNames( RecordInputStream& rStrm );
+    void                importExtSheetNames( SequenceInputStream& rStrm );
     /** Imports the EXTERNALNAME record describing an external name. */
-    ExternalNameRef     importExternalName( RecordInputStream& rStrm );
+    ExternalNameRef     importExternalName( SequenceInputStream& rStrm );
     /** Imports the EXTERNALREF record from the passed stream. */
-    void                importExternalRef( RecordInputStream& rStrm );
+    void                importExternalRef( SequenceInputStream& rStrm );
     /** Imports the EXTERNALSELF record from the passed stream. */
-    void                importExternalSelf( RecordInputStream& rStrm );
+    void                importExternalSelf( SequenceInputStream& rStrm );
     /** Imports the EXTERNALSAME record from the passed stream. */
-    void                importExternalSame( RecordInputStream& rStrm );
+    void                importExternalSame( SequenceInputStream& rStrm );
     /** Imports the EXTERNALADDIN record from the passed stream. */
-    void                importExternalAddin( RecordInputStream& rStrm );
+    void                importExternalAddin( SequenceInputStream& rStrm );
 
     /** Imports the EXTERNSHEET record from the passed stream. */
     void                importExternSheet( BiffInputStream& rStrm );
@@ -249,6 +249,9 @@ public:
     /** Imports the EXTERNALNAME record from the passed stream. */
     void                importExternalName( BiffInputStream& rStrm );
 
+    /** Sets the link type to 'self reference'. */
+    inline void         setSelfLinkType() { meLinkType = LINKTYPE_SELF; }
+
     /** Returns the type of this external link. */
     inline ExternalLinkType getLinkType() const { return meLinkType; }
     /** Returns true, if the link refers to the current workbook. */
@@ -315,10 +318,10 @@ typedef ::boost::shared_ptr< ExternalLink > ExternalLinkRef;
 
 // ============================================================================
 
-/** Represents a REF entry in the OOBIN EXTERNALSHEETS or in the BIFF8
+/** Represents a REF entry in the BIFF12 EXTERNALSHEETS or in the BIFF8
     EXTERNSHEET record.
 
-    This struct is used to map ref identifiers to external books (OOBIN:
+    This struct is used to map ref identifiers to external books (BIFF12:
     EXTERNALREF records, BIFF8: EXTERNALBOOK records), and provides sheet
     indexes into the sheet list of the external document.
  */
@@ -330,7 +333,7 @@ struct RefSheetsModel
 
     explicit            RefSheetsModel();
 
-    void                readOobData( RecordInputStream& rStrm );
+    void                readBiff12Data( SequenceInputStream& rStrm );
     void                readBiff8Data( BiffInputStream& rStrm );
 };
 
@@ -345,15 +348,15 @@ public:
     ExternalLinkRef     importExternalReference( const AttributeList& rAttribs );
 
     /** Imports the EXTERNALREF record from the passed stream. */
-    ExternalLinkRef     importExternalRef( RecordInputStream& rStrm );
+    ExternalLinkRef     importExternalRef( SequenceInputStream& rStrm );
     /** Imports the EXTERNALSELF record from the passed stream. */
-    void                importExternalSelf( RecordInputStream& rStrm );
+    void                importExternalSelf( SequenceInputStream& rStrm );
     /** Imports the EXTERNALSAME record from the passed stream. */
-    void                importExternalSame( RecordInputStream& rStrm );
+    void                importExternalSame( SequenceInputStream& rStrm );
     /** Imports the EXTERNALADDIN record from the passed stream. */
-    void                importExternalAddin( RecordInputStream& rStrm );
+    void                importExternalAddin( SequenceInputStream& rStrm );
     /** Imports the EXTERNALSHEETS record from the passed stream. */
-    void                importExternalSheets( RecordInputStream& rStrm );
+    void                importExternalSheets( SequenceInputStream& rStrm );
 
     /** Imports the EXTERNSHEET record from the passed stream. */
     ExternalLinkRef     importExternSheet( BiffInputStream& rStrm );
@@ -369,7 +372,7 @@ public:
                         getLinkInfos() const;
 
     /** Returns the external link for the passed reference identifier. */
-    ExternalLinkRef     getExternalLink( sal_Int32 nRefId ) const;
+    ExternalLinkRef     getExternalLink( sal_Int32 nRefId, bool bUseRefSheets = true ) const;
 
     /** Returns the sheet range for the specified reference (BIFF2-BIFF5 only). */
     LinkSheetRange      getSheetRange( sal_Int32 nRefId, sal_Int16 nTabId1, sal_Int16 nTabId2 ) const;
@@ -387,10 +390,11 @@ private:
     typedef RefVector< ExternalLink >       ExternalLinkVec;
     typedef ::std::vector< RefSheetsModel > RefSheetsModelVec;
 
+    ExternalLinkRef     mxSelfRef;          /// Implicit self reference at index 0.
     ExternalLinkVec     maLinks;            /// List of link structures for all kinds of links.
     ExternalLinkVec     maExtLinks;         /// Real external links needed for formula parser.
     RefSheetsModelVec   maRefSheets;        /// Sheet indexes for reference ids.
-    bool                mbUseRefSheets;     /// True = use maRefSheets list (OOBIN only).
+    bool                mbUseRefSheets;     /// True = use maRefSheets list (BIFF12 only).
 };
 
 // ============================================================================
@@ -400,4 +404,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/externallinkfragment.hxx b/oox/inc/oox/xls/externallinkfragment.hxx
index 8ae6e16f836f..e1fecb6703be 100644
--- a/oox/inc/oox/xls/externallinkfragment.hxx
+++ b/oox/inc/oox/xls/externallinkfragment.hxx
@@ -38,41 +38,40 @@ namespace xls {
 class ExternalLink;
 
 // ============================================================================
+// ============================================================================
 
 /** This class implements importing the sheetData element in external sheets.
 
     The sheetData element embedded in the externalBook element contains cached
     cells from externally linked sheets.
  */
-class OoxExternalSheetDataContext : public OoxWorkbookContextBase
+class ExternalSheetDataContext : public WorkbookContextBase
 {
 public:
-    explicit            OoxExternalSheetDataContext(
-                            OoxWorkbookFragmentBase& rFragment,
+    explicit            ExternalSheetDataContext(
+                            WorkbookFragmentBase& rFragment,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
 private:
     /** Imports cell settings from a c element. */
     void                importCell( const AttributeList& rAttribs );
 
     /** Imports the EXTCELL_BLANK from the passed stream. */
-    void                importExtCellBlank( RecordInputStream& rStrm );
+    void                importExtCellBlank( SequenceInputStream& rStrm );
     /** Imports the EXTCELL_BOOL from the passed stream. */
-    void                importExtCellBool( RecordInputStream& rStrm );
+    void                importExtCellBool( SequenceInputStream& rStrm );
     /** Imports the EXTCELL_DOUBLE from the passed stream. */
-    void                importExtCellDouble( RecordInputStream& rStrm );
+    void                importExtCellDouble( SequenceInputStream& rStrm );
     /** Imports the EXTCELL_ERROR from the passed stream. */
-    void                importExtCellError( RecordInputStream& rStrm );
+    void                importExtCellError( SequenceInputStream& rStrm );
     /** Imports the EXTCELL_STRING from the passed stream. */
-    void                importExtCellString( RecordInputStream& rStrm );
+    void                importExtCellString( SequenceInputStream& rStrm );
 
     /** Sets the passed cell value to the current position in the sheet cache. */
     void                setCellValue( const ::com::sun::star::uno::Any& rValue );
@@ -86,23 +85,20 @@ private:
 
 // ============================================================================
 
-class OoxExternalLinkFragment : public OoxWorkbookFragmentBase
+class ExternalLinkFragment : public WorkbookFragmentBase
 {
 public:
-    explicit            OoxExternalLinkFragment(
+    explicit            ExternalLinkFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
                             ExternalLink& rExtLink );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
 
@@ -117,29 +113,24 @@ private:
 };
 
 // ============================================================================
+// ============================================================================
 
-class BiffExternalLinkFragment : public BiffWorkbookFragmentBase
+class BiffExternalSheetDataContext : public BiffWorkbookContextBase
 {
 public:
-    explicit            BiffExternalLinkFragment( const BiffWorkbookFragmentBase& rParent, bool bImportDefNames );
-    virtual             ~BiffExternalLinkFragment();
-
-    /** Imports all records related to external links. */
-    virtual bool        importFragment();
+    explicit            BiffExternalSheetDataContext( const WorkbookHelper& rHelper, bool bImportDefNames );
+    virtual             ~BiffExternalSheetDataContext();
 
     /** Tries to import a record related to external links and defined names. */
-    void                importRecord();
-
-    /** Finalizes buffers related to external links and defined names. */
-    void                finalizeImport();
+    virtual void        importRecord( BiffInputStream& rStrm );
 
 private:
-    void                importExternSheet();
-    void                importExternalBook();
-    void                importExternalName();
-    void                importXct();
-    void                importCrn();
-    void                importDefinedName();
+    void                importExternSheet( BiffInputStream& rStrm );
+    void                importExternalBook( BiffInputStream& rStrm );
+    void                importExternalName( BiffInputStream& rStrm );
+    void                importXct( BiffInputStream& rStrm );
+    void                importCrn( BiffInputStream& rStrm );
+    void                importDefinedName( BiffInputStream& rStrm );
 
     /** Sets the passed cell value to the passed position in the sheet cache. */
     void                setCellValue( const BinAddress& rBinAddr, const ::com::sun::star::uno::Any& rValue );
@@ -153,9 +144,21 @@ private:
 
 // ============================================================================
 
+class BiffExternalLinkFragment : public BiffWorkbookFragmentBase
+{
+public:
+    explicit            BiffExternalLinkFragment( const BiffWorkbookFragmentBase& rParent );
+
+    /** Imports all records related to external links. */
+    virtual bool        importFragment();
+};
+
+// ============================================================================
+// ============================================================================
+
 } // namespace xls
 } // namespace oox
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index 58335ed1c006..0baf98b372c7 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -29,19 +29,19 @@
 #ifndef OOX_XLS_FORMULABASE_HXX
 #define OOX_XLS_FORMULABASE_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
+#include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/sheet/FormulaToken.hpp>
-#include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
-#include "oox/helper/containerhelper.hxx"
+#include <com/sun/star/uno/Sequence.hxx>
 #include "oox/helper/propertyset.hxx"
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/addressconverter.hxx"
 
 namespace com { namespace sun { namespace star {
+    namespace sheet { class XFormulaOpCodeMapper; }
     namespace sheet { class XFormulaParser; }
     namespace sheet { class XFormulaTokens; }
-    namespace sheet { class XFormulaOpCodeMapper; }
 } } }
 
 namespace oox { template< typename Type > class Matrix; }
@@ -127,24 +127,14 @@ const sal_uInt8 BIFF_TOKID_AREAERR3D            = 0x1D;     /// Deleted 3D area
 
 // specific token constants ---------------------------------------------------
 
-const sal_uInt8 OOBIN_TOK_ARRAY_DOUBLE          = 0;
-const sal_uInt8 OOBIN_TOK_ARRAY_STRING          = 1;
-const sal_uInt8 OOBIN_TOK_ARRAY_BOOL            = 2;
-const sal_uInt8 OOBIN_TOK_ARRAY_ERROR           = 4;
+const sal_uInt8 BIFF_TOK_ARRAY_DOUBLE           = 0;        /// Double value in an array.
+const sal_uInt8 BIFF_TOK_ARRAY_STRING           = 1;        /// String value in an array.
+const sal_uInt8 BIFF_TOK_ARRAY_BOOL             = 2;        /// Boolean value in an array.
+const sal_uInt8 BIFF_TOK_ARRAY_ERROR            = 4;        /// Error code in an array.
 
 const sal_uInt8 BIFF_TOK_BOOL_FALSE             = 0;        /// FALSE value of a tBool token.
 const sal_uInt8 BIFF_TOK_BOOL_TRUE              = 1;        /// TRUE value of a tBool token.
 
-const sal_uInt8 OOBIN_TOK_ATTR_VOLATILE         = 0x01;     /// Volatile function.
-const sal_uInt8 OOBIN_TOK_ATTR_IF               = 0x02;     /// Start of true condition in IF function.
-const sal_uInt8 OOBIN_TOK_ATTR_CHOOSE           = 0x04;     /// Jump array of CHOOSE function.
-const sal_uInt8 OOBIN_TOK_ATTR_SKIP             = 0x08;     /// Skip tokens.
-const sal_uInt8 OOBIN_TOK_ATTR_SUM              = 0x10;     /// SUM function with one parameter.
-const sal_uInt8 OOBIN_TOK_ATTR_ASSIGN           = 0x20;     /// BASIC style assignment.
-const sal_uInt8 OOBIN_TOK_ATTR_SPACE            = 0x40;     /// Spaces in formula representation.
-const sal_uInt8 OOBIN_TOK_ATTR_SPACE_VOLATILE   = 0x41;     /// Leading spaces and volatile formula.
-const sal_uInt8 OOBIN_TOK_ATTR_IFERROR          = 0x80;     /// Start of condition in IFERROR function.
-
 const sal_uInt8 BIFF_TOK_ATTR_VOLATILE          = 0x01;     /// Volatile function.
 const sal_uInt8 BIFF_TOK_ATTR_IF                = 0x02;     /// Start of true condition in IF function.
 const sal_uInt8 BIFF_TOK_ATTR_CHOOSE            = 0x04;     /// Jump array of CHOOSE function.
@@ -153,6 +143,7 @@ const sal_uInt8 BIFF_TOK_ATTR_SUM               = 0x10;     /// SUM function wit
 const sal_uInt8 BIFF_TOK_ATTR_ASSIGN            = 0x20;     /// BASIC style assignment.
 const sal_uInt8 BIFF_TOK_ATTR_SPACE             = 0x40;     /// Spaces in formula representation.
 const sal_uInt8 BIFF_TOK_ATTR_SPACE_VOLATILE    = 0x41;     /// Leading spaces and volatile formula.
+const sal_uInt8 BIFF_TOK_ATTR_IFERROR           = 0x80;     /// Start of condition in IFERROR function (BIFF12 only).
 
 const sal_uInt8 BIFF_TOK_ATTR_SPACE_SP          = 0x00;     /// Spaces before next token.
 const sal_uInt8 BIFF_TOK_ATTR_SPACE_BR          = 0x01;     /// Line breaks before next token.
@@ -167,27 +158,27 @@ const sal_uInt16 BIFF_TOK_FUNCVAR_FUNCIDMASK    = 0x7FFF;   /// Mask for functio
 const sal_uInt8 BIFF_TOK_FUNCVAR_CMDPROMPT      = 0x80;     /// User prompt for macro commands.
 const sal_uInt8 BIFF_TOK_FUNCVAR_COUNTMASK      = 0x7F;     /// Mask for parameter count.
 
-const sal_uInt16 OOBIN_TOK_REF_COLMASK          = 0x3FFF;   /// Mask to extract column from reference.
-const sal_Int32 OOBIN_TOK_REF_ROWMASK           = 0xFFFFF;  /// Mask to extract row from reference.
-const sal_uInt16 OOBIN_TOK_REF_COLREL           = 0x4000;   /// True = column is relative.
-const sal_uInt16 OOBIN_TOK_REF_ROWREL           = 0x8000;   /// True = row is relative.
+const sal_uInt16 BIFF12_TOK_REF_COLMASK         = 0x3FFF;   /// Mask to extract column from reference (BIFF12).
+const sal_Int32 BIFF12_TOK_REF_ROWMASK          = 0xFFFFF;  /// Mask to extract row from reference (BIFF12).
+const sal_uInt16 BIFF12_TOK_REF_COLREL          = 0x4000;   /// True = column is relative (BIFF12).
+const sal_uInt16 BIFF12_TOK_REF_ROWREL          = 0x8000;   /// True = row is relative (BIFF12).
 
 const sal_uInt16 BIFF_TOK_REF_COLMASK           = 0x00FF;   /// Mask to extract BIFF8 column from reference.
 const sal_uInt16 BIFF_TOK_REF_ROWMASK           = 0x3FFF;   /// Mask to extract BIFF2-BIFF5 row from reference.
 const sal_uInt16 BIFF_TOK_REF_COLREL            = 0x4000;   /// True = column is relative.
 const sal_uInt16 BIFF_TOK_REF_ROWREL            = 0x8000;   /// True = row is relative.
 
-const sal_uInt16 OOBIN_TOK_TABLE_COLUMN         = 0x0001;   /// Table reference: Single column.
-const sal_uInt16 OOBIN_TOK_TABLE_COLRANGE       = 0x0002;   /// Table reference: Range of columns.
-const sal_uInt16 OOBIN_TOK_TABLE_ALL            = 0x0004;   /// Table reference: Special [#All] range.
-const sal_uInt16 OOBIN_TOK_TABLE_HEADERS        = 0x0008;   /// Table reference: Special [#Headers] range.
-const sal_uInt16 OOBIN_TOK_TABLE_DATA           = 0x0010;   /// Table reference: Special [#Data] range.
-const sal_uInt16 OOBIN_TOK_TABLE_TOTALS         = 0x0020;   /// Table reference: Special [#Totals] range.
-const sal_uInt16 OOBIN_TOK_TABLE_THISROW        = 0x0040;   /// Table reference: Special [#This Row] range.
-const sal_uInt16 OOBIN_TOK_TABLE_SP_BRACKETS    = 0x0080;   /// Table reference: Spaces in outer brackets.
-const sal_uInt16 OOBIN_TOK_TABLE_SP_SEP         = 0x0100;   /// Table reference: Spaces after separators.
-const sal_uInt16 OOBIN_TOK_TABLE_ROW            = 0x0200;   /// Table reference: Single row.
-const sal_uInt16 OOBIN_TOK_TABLE_CELL           = 0x0400;   /// Table reference: Single cell.
+const sal_uInt16 BIFF12_TOK_TABLE_COLUMN         = 0x0001;   /// Table reference: Single column.
+const sal_uInt16 BIFF12_TOK_TABLE_COLRANGE       = 0x0002;   /// Table reference: Range of columns.
+const sal_uInt16 BIFF12_TOK_TABLE_ALL            = 0x0004;   /// Table reference: Special [#All] range.
+const sal_uInt16 BIFF12_TOK_TABLE_HEADERS        = 0x0008;   /// Table reference: Special [#Headers] range.
+const sal_uInt16 BIFF12_TOK_TABLE_DATA           = 0x0010;   /// Table reference: Special [#Data] range.
+const sal_uInt16 BIFF12_TOK_TABLE_TOTALS         = 0x0020;   /// Table reference: Special [#Totals] range.
+const sal_uInt16 BIFF12_TOK_TABLE_THISROW        = 0x0040;   /// Table reference: Special [#This Row] range.
+const sal_uInt16 BIFF12_TOK_TABLE_SP_BRACKETS    = 0x0080;   /// Table reference: Spaces in outer brackets.
+const sal_uInt16 BIFF12_TOK_TABLE_SP_SEP         = 0x0100;   /// Table reference: Spaces after separators.
+const sal_uInt16 BIFF12_TOK_TABLE_ROW            = 0x0200;   /// Table reference: Single row.
+const sal_uInt16 BIFF12_TOK_TABLE_CELL           = 0x0400;   /// Table reference: Single cell.
 
 const sal_uInt8 BIFF_TOK_NLR_ERR                = 0x01;     /// NLR: Invalid/deleted.
 const sal_uInt8 BIFF_TOK_NLR_ROWR               = 0x02;     /// NLR: Row index.
@@ -210,23 +201,21 @@ const sal_uInt32 BIFF_TOK_NLR_ADDMASK           = 0x3FFFFFFF;   /// Mask for num
 
 // function constants ---------------------------------------------------------
 
-const sal_uInt8 OOX_MAX_PARAMCOUNT              = 255;      /// Maximum parameter count for OOXML/OOBIN files.
-const sal_uInt8 BIFF_MAX_PARAMCOUNT             = 30;       /// Maximum parameter count for BIFF files.
-
-const sal_uInt16 OOBIN_FUNC_IF                  = 1;        /// OOBIN function id of the IF function.
-const sal_uInt16 OOBIN_FUNC_SUM                 = 4;        /// OOBIN function id of the SUM function.
-const sal_uInt16 OOBIN_FUNC_TRUE                = 34;       /// OOBIN function id of the TRUE function.
-const sal_uInt16 OOBIN_FUNC_FALSE               = 35;       /// OOBIN function id of the FALSE function.
-const sal_uInt16 OOBIN_FUNC_ROWS                = 76;       /// OOBIN function id of the ROWS function.
-const sal_uInt16 OOBIN_FUNC_COLUMNS             = 77;       /// OOBIN function id of the COLUMNS function.
-const sal_uInt16 OOBIN_FUNC_OFFSET              = 78;       /// OOBIN function id of the OFFSET function.
-const sal_uInt16 OOBIN_FUNC_FLOOR               = 285;      /// OOBIN function id of the FLOOR function.
-const sal_uInt16 OOBIN_FUNC_CEILING             = 288;      /// OOBIN function id of the CEILING function.
-const sal_uInt16 OOBIN_FUNC_HYPERLINK           = 359;      /// OOBIN function id of the HYPERLINK function.
-const sal_uInt16 OOBIN_FUNC_WEEKNUM             = 465;      /// OOBIN function id of the WEEKNUM function.
-
-const sal_uInt16 BIFF_FUNC_SUM                  = 4;        /// BIFF function id of the SUM function.
+const sal_uInt8 OOX_MAX_PARAMCOUNT              = 255;      /// Maximum parameter count for OOXML/BIFF12 files.
+const sal_uInt8 BIFF_MAX_PARAMCOUNT             = 30;       /// Maximum parameter count for BIFF2-BIFF8 files.
+
+const sal_uInt16 BIFF_FUNC_IF                   = 1;        /// Function identifier of the IF function.
+const sal_uInt16 BIFF_FUNC_SUM                  = 4;        /// Function identifier of the SUM function.
+const sal_uInt16 BIFF_FUNC_TRUE                 = 34;       /// Function identifier of the TRUE function.
+const sal_uInt16 BIFF_FUNC_FALSE                = 35;       /// Function identifier of the FALSE function.
+const sal_uInt16 BIFF_FUNC_ROWS                 = 76;       /// Function identifier of the ROWS function.
+const sal_uInt16 BIFF_FUNC_COLUMNS              = 77;       /// Function identifier of the COLUMNS function.
+const sal_uInt16 BIFF_FUNC_OFFSET               = 78;       /// Function identifier of the OFFSET function.
 const sal_uInt16 BIFF_FUNC_EXTERNCALL           = 255;      /// BIFF function id of the EXTERN.CALL function.
+const sal_uInt16 BIFF_FUNC_FLOOR                = 285;      /// Function identifier of the FLOOR function.
+const sal_uInt16 BIFF_FUNC_CEILING              = 288;      /// Function identifier of the CEILING function.
+const sal_uInt16 BIFF_FUNC_HYPERLINK            = 359;      /// Function identifier of the HYPERLINK function.
+const sal_uInt16 BIFF_FUNC_WEEKNUM              = 465;      /// Function identifier of the WEEKNUM function.
 
 // reference helpers ==========================================================
 
@@ -240,11 +229,11 @@ struct BinSingleRef2d
 
     explicit            BinSingleRef2d();
 
-    void                setOobData( sal_uInt16 nCol, sal_Int32 nRow, bool bRelativeAsOffset );
+    void                setBiff12Data( sal_uInt16 nCol, sal_Int32 nRow, bool bRelativeAsOffset );
     void                setBiff2Data( sal_uInt8 nCol, sal_uInt16 nRow, bool bRelativeAsOffset );
     void                setBiff8Data( sal_uInt16 nCol, sal_uInt16 nRow, bool bRelativeAsOffset );
 
-    void                readOobData( RecordInputStream& rStrm, bool bRelativeAsOffset );
+    void                readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset );
     void                readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
     void                readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
 };
@@ -257,7 +246,7 @@ struct BinComplexRef2d
     BinSingleRef2d      maRef1;             /// Start (top-left) cell address.
     BinSingleRef2d      maRef2;             /// End (bottom-right) cell address.
 
-    void                readOobData( RecordInputStream& rStrm, bool bRelativeAsOffset );
+    void                readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset );
     void                readBiff2Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
     void                readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset );
 };
@@ -496,8 +485,8 @@ struct FunctionInfo
     ::rtl::OUString     maExtProgName;      /// Programmatic function name for external functions.
     FunctionLibraryType meFuncLibType;      /// The external library this function is part of.
     sal_Int32           mnApiOpCode;        /// API function opcode.
-    sal_uInt16          mnOobFuncId;        /// OOBIN function identifier.
-    sal_uInt16          mnBiffFuncId;       /// BIFF function identifier.
+    sal_uInt16          mnBiff12FuncId;     /// BIFF12 function identifier.
+    sal_uInt16          mnBiffFuncId;       /// BIFF2-BIFF8 function identifier.
     sal_uInt8           mnMinParamCount;    /// Minimum number of parameters.
     sal_uInt8           mnMaxParamCount;    /// Maximum number of parameters.
     sal_uInt8           mnRetClass;         /// BIFF token class of the return value.
@@ -552,13 +541,13 @@ public:
     /** Returns the function info for an ODF function name, or 0 on error. */
     const FunctionInfo* getFuncInfoFromOdfFuncName( const ::rtl::OUString& rFuncName ) const;
 
-    /** Returns the function info for an OOX function name, or 0 on error. */
+    /** Returns the function info for an OOXML function name, or 0 on error. */
     const FunctionInfo* getFuncInfoFromOoxFuncName( const ::rtl::OUString& rFuncName ) const;
 
-    /** Returns the function info for an OOBIN function index, or 0 on error. */
-    const FunctionInfo* getFuncInfoFromOobFuncId( sal_uInt16 nFuncId ) const;
+    /** Returns the function info for a BIFF12 function index, or 0 on error. */
+    const FunctionInfo* getFuncInfoFromBiff12FuncId( sal_uInt16 nFuncId ) const;
 
-    /** Returns the function info for a BIFF function index, or 0 on error. */
+    /** Returns the function info for a BIFF2-BIFF8 function index, or 0 on error. */
     const FunctionInfo* getFuncInfoFromBiffFuncId( sal_uInt16 nFuncId ) const;
 
     /** Returns the function info for a macro function referred by the
@@ -600,7 +589,7 @@ public:
     /** Returns the function info for an API token, or 0 on error. */
     const FunctionInfo* getFuncInfoFromApiToken( const ApiToken& rToken ) const;
 
-    /** Returns the op-code map that is used by the OOX formula parser. */
+    /** Returns the op-code map that is used by the OOXML formula parser. */
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry >
                         getOoxParserMap() const;
 
@@ -935,4 +924,4 @@ public:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/formulaparser.hxx b/oox/inc/oox/xls/formulaparser.hxx
index b9b855c6731f..843a1c3ad3f5 100644
--- a/oox/inc/oox/xls/formulaparser.hxx
+++ b/oox/inc/oox/xls/formulaparser.hxx
@@ -101,9 +101,9 @@ private:
 
 class FormulaParserImpl;
 
-/** Import formula parser for OOX and BIFF filters.
+/** Import formula parser for OOXML and BIFF filters.
 
-    This class implements formula import for the OOX and BIFF filter. One
+    This class implements formula import for the OOXML and BIFF filter. One
     instance is contained in the global filter data to prevent construction and
     destruction of internal buffers for every imported formula.
  */
@@ -113,17 +113,17 @@ public:
     explicit            FormulaParser( const WorkbookHelper& rHelper );
     virtual             ~FormulaParser();
 
-    /** Converts an XML formula string. */
+    /** Converts an OOXML formula string. */
     void                importFormula(
                             FormulaContext& rContext,
                             const ::rtl::OUString& rFormulaString ) const;
 
-    /** Imports and converts a OOBIN token array from the passed stream. */
+    /** Imports and converts a BIFF12 token array from the passed stream. */
     void                importFormula(
                             FormulaContext& rContext,
-                            RecordInputStream& rStrm ) const;
+                            SequenceInputStream& rStrm ) const;
 
-    /** Imports and converts a BIFF token array from the passed stream.
+    /** Imports and converts a BIFF2-BIFF8 token array from the passed stream.
         @param pnFmlaSize  Size of the token array. If null is passed, reads
         it from stream (1 byte in BIFF2, 2 bytes otherwise) first. */
     void                importFormula(
@@ -151,13 +151,16 @@ public:
     ::rtl::OUString     importOleTargetLink( const ::rtl::OUString& rFormulaString );
 
     /** Imports and converts an OLE link target from the passed stream. */
-    ::rtl::OUString     importOleTargetLink( RecordInputStream& rStrm );
+    ::rtl::OUString     importOleTargetLink( SequenceInputStream& rStrm );
 
     /** Imports and converts an OLE link target from the passed stream. */
     ::rtl::OUString     importOleTargetLink(
                             BiffInputStream& rStrm,
                             const sal_uInt16* pnFmlaSize = 0 ) const;
 
+    /** Converts the passed formula to a macro name for a drawing shape. */
+    ::rtl::OUString     importMacroName( const ::rtl::OUString& rFormulaString );
+
 private:
     ::std::auto_ptr< FormulaParserImpl > mxImpl;
 };
@@ -169,4 +172,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/numberformatsbuffer.hxx b/oox/inc/oox/xls/numberformatsbuffer.hxx
index 77bebe3bfde3..431e13cfdd1f 100644
--- a/oox/inc/oox/xls/numberformatsbuffer.hxx
+++ b/oox/inc/oox/xls/numberformatsbuffer.hxx
@@ -30,7 +30,6 @@
 #define OOX_XLS_NUMBERFORMATSBUFFER_HXX
 
 #include <com/sun/star/lang/Locale.hpp>
-#include "oox/helper/containerhelper.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -110,7 +109,7 @@ public:
     /** Inserts a new number format code. */
     NumberFormatRef     importNumFmt( const AttributeList& rAttribs );
     /** Inserts a new number format code from a NUMFMT record. */
-    void                importNumFmt( RecordInputStream& rStrm );
+    void                importNumFmt( SequenceInputStream& rStrm );
     /** Inserts a new number format code from a FORMAT record. */
     void                importFormat( BiffInputStream& rStrm );
 
@@ -139,4 +138,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/ooxformulaparser.hxx b/oox/inc/oox/xls/ooxformulaparser.hxx
index 1e92daf153b2..2eaf8cb09a33 100644
--- a/oox/inc/oox/xls/ooxformulaparser.hxx
+++ b/oox/inc/oox/xls/ooxformulaparser.hxx
@@ -111,4 +111,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/pagesettings.hxx b/oox/inc/oox/xls/pagesettings.hxx
index 23690ab62158..b122ac2d78eb 100644
--- a/oox/inc/oox/xls/pagesettings.hxx
+++ b/oox/inc/oox/xls/pagesettings.hxx
@@ -86,8 +86,8 @@ struct PageSettingsModel
 
     explicit            PageSettingsModel();
 
-    /** Sets the OOBIN or BIFF print errors mode. */
-    void                setBinPrintErrors( sal_uInt8 nPrintErrors );
+    /** Sets the BIFF print errors mode. */
+    void                setBiffPrintErrors( sal_uInt8 nPrintErrors );
 };
 
 // ============================================================================
@@ -113,17 +113,17 @@ public:
     void                importPicture( const ::oox::core::Relations& rRelations, const AttributeList& rAttribs );
 
     /** Imports the PRINTOPTIONS record from the passed stream. */
-    void                importPrintOptions( RecordInputStream& rStrm );
+    void                importPrintOptions( SequenceInputStream& rStrm );
     /** Imports the PAGEMARGINS record from the passed stream. */
-    void                importPageMargins( RecordInputStream& rStrm );
+    void                importPageMargins( SequenceInputStream& rStrm );
     /** Imports the PAGESETUP record from the passed stream. */
-    void                importPageSetup( const ::oox::core::Relations& rRelations, RecordInputStream& rStrm );
+    void                importPageSetup( const ::oox::core::Relations& rRelations, SequenceInputStream& rStrm );
     /** Imports the CHARTPAGESETUP record from the passed stream. */
-    void                importChartPageSetup( const ::oox::core::Relations& rRelations, RecordInputStream& rStrm );
+    void                importChartPageSetup( const ::oox::core::Relations& rRelations, SequenceInputStream& rStrm );
     /** Imports the HEADERFOOTER record from the passed stream. */
-    void                importHeaderFooter( RecordInputStream& rStrm );
+    void                importHeaderFooter( SequenceInputStream& rStrm );
     /** Imports the PICTURE record from the passed stream. */
-    void                importPicture( const ::oox::core::Relations& rRelations, RecordInputStream& rStrm );
+    void                importPicture( const ::oox::core::Relations& rRelations, SequenceInputStream& rStrm );
 
     /** Imports the LEFTMARGIN record from the passed BIFF stream. */
     void                importLeftMargin( BiffInputStream& rStrm );
@@ -221,4 +221,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/pivotcachebuffer.hxx b/oox/inc/oox/xls/pivotcachebuffer.hxx
index 86838eb3124c..1b972c95fa3e 100644
--- a/oox/inc/oox/xls/pivotcachebuffer.hxx
+++ b/oox/inc/oox/xls/pivotcachebuffer.hxx
@@ -29,10 +29,10 @@
 #ifndef OOX_XLS_PIVOTCACHEBUFFER_HXX
 #define OOX_XLS_PIVOTCACHEBUFFER_HXX
 
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/helper/containerhelper.hxx"
+#include <com/sun/star/util/DateTime.hpp>
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -67,17 +67,17 @@ public:
     void                readIndex( const AttributeList& rAttribs );
 
     /** Reads the string value from a pivot cache item. */
-    void                readString( RecordInputStream& rStrm );
+    void                readString( SequenceInputStream& rStrm );
     /** Reads the double value from a pivot cache item. */
-    void                readDouble( RecordInputStream& rStrm );
+    void                readDouble( SequenceInputStream& rStrm );
     /** Reads the date/time value from a pivot cache item. */
-    void                readDate( RecordInputStream& rStrm );
+    void                readDate( SequenceInputStream& rStrm );
     /** Reads the boolean value from a pivot cache item. */
-    void                readBool( RecordInputStream& rStrm );
+    void                readBool( SequenceInputStream& rStrm );
     /** Reads the error code value from a pivot cache item. */
-    void                readError( RecordInputStream& rStrm );
+    void                readError( SequenceInputStream& rStrm );
     /** Reads the index of a shared item. */
-    void                readIndex( RecordInputStream& rStrm );
+    void                readIndex( SequenceInputStream& rStrm );
 
     /** Reads the string value from a pivot cache item. */
     void                readString( BiffInputStream& rStrm, const WorkbookHelper& rHelper );
@@ -101,7 +101,7 @@ public:
 
 private:
     ::com::sun::star::uno::Any maValue;     /// Value of the item.
-    sal_Int32           mnType;             /// Value type (OOX token identifier).
+    sal_Int32           mnType;             /// Value type (OOXML token identifier).
 };
 
 // ----------------------------------------------------------------------------
@@ -114,7 +114,7 @@ public:
     /** Imports the item from the passed attribute list. */
     void                importItem( sal_Int32 nElement, const AttributeList& rAttribs );
     /** Imports the item from the passed stream and record. */
-    void                importItem( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                importItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
     /** Imports a complete item list from the passed stream. */
     void                importItemList( BiffInputStream& rStrm, sal_uInt16 nCount );
 
@@ -132,7 +132,7 @@ private:
     /** Creates and returns a new item at the end of the items list. */
     PivotCacheItem&     createItem();
     /** Imports an array of items from the PCITEM_ARRAY record */
-    void                importArray( RecordInputStream& rStrm );
+    void                importArray( SequenceInputStream& rStrm );
 
 private:
     typedef ::std::vector< PivotCacheItem > CacheItemVector;
@@ -197,8 +197,8 @@ struct PCFieldGroupModel
 
     explicit            PCFieldGroupModel();
 
-    /** Sets the group-by value for BIFF/OOBIN import. */
-    void                setBinGroupBy( sal_uInt8 nGroupBy );
+    /** Sets the group-by value for BIFF import. */
+    void                setBiffGroupBy( sal_uInt8 nGroupBy );
 };
 
 // ----------------------------------------------------------------------------
@@ -238,19 +238,19 @@ public:
     void                importGroupItem( sal_Int32 nElement, const AttributeList& rAttribs );
 
     /** Imports pivot cache field settings from the PCDFIELD record. */
-    void                importPCDField( RecordInputStream& rStrm );
+    void                importPCDField( SequenceInputStream& rStrm );
     /** Imports shared items settings from the PCDFSHAREDITEMS record. */
-    void                importPCDFSharedItems( RecordInputStream& rStrm );
+    void                importPCDFSharedItems( SequenceInputStream& rStrm );
     /** Imports one or more shared items from the passed record. */
-    void                importPCDFSharedItem( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                importPCDFSharedItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
     /** Imports grouping settings from the PCDFIELDGROUP record. */
-    void                importPCDFieldGroup( RecordInputStream& rStrm );
+    void                importPCDFieldGroup( SequenceInputStream& rStrm );
     /** Imports numeric grouping settings from the PCDFRANGEPR record. */
-    void                importPCDFRangePr( RecordInputStream& rStrm );
+    void                importPCDFRangePr( SequenceInputStream& rStrm );
     /** Imports an item of the mapping between group items and base items from the passed record. */
-    void                importPCDFDiscretePrItem( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                importPCDFDiscretePrItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
     /** Imports one or more group items from the passed record. */
-    void                importPCDFGroupItem( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                importPCDFGroupItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     /** Imports pivot cache field settings from the PCDFIELD record. */
     void                importPCDField( BiffInputStream& rStrm );
@@ -305,7 +305,7 @@ public:
                             const PivotCacheItem& rItem ) const;
 
     /** Reads an item from the PCRECORD record and writes it to the passed sheet. */
-    void                importPCRecordItem( RecordInputStream& rStrm,
+    void                importPCRecordItem( SequenceInputStream& rStrm,
                             WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow ) const;
     /** Reads an item index from the PCITEM_INDEXLIST record and writes the item to the passed sheet. */
     void                importPCItemIndex( BiffInputStream& rStrm,
@@ -393,11 +393,11 @@ public:
     void                importWorksheetSource( const AttributeList& rAttribs, const ::oox::core::Relations& rRelations );
 
     /** Reads pivot cache global settings from the PCDEFINITION record. */
-    void                importPCDefinition( RecordInputStream& rStrm );
+    void                importPCDefinition( SequenceInputStream& rStrm );
     /** Reads cache source settings from the PCDSOURCE record. */
-    void                importPCDSource( RecordInputStream& rStrm );
+    void                importPCDSource( SequenceInputStream& rStrm );
     /** Reads sheet source settings from the PCDSHEETSOURCE record. */
-    void                importPCDSheetSource( RecordInputStream& rStrm, const ::oox::core::Relations& rRelations );
+    void                importPCDSheetSource( SequenceInputStream& rStrm, const ::oox::core::Relations& rRelations );
 
     /** Reads cache source settings from the PCDSOURCE record. */
     void                importPCDSource( BiffInputStream& rStrm );
@@ -435,7 +435,7 @@ public:
                             const PivotCacheItem& rItem ) const;
 
     /** Reads a PCRECORD record and writes all item values to the passed sheet. */
-    void                importPCRecord( RecordInputStream& rStrm,
+    void                importPCRecord( SequenceInputStream& rStrm,
                             WorksheetHelper& rSheetHelper, sal_Int32 nRow ) const;
     /** Reads a PCITEM_INDEXLIST record and writes all item values to the passed sheet. */
     void                importPCItemIndexList( BiffInputStream& rStrm,
@@ -480,9 +480,9 @@ class PivotCacheBuffer : public WorkbookHelper
 public:
     explicit            PivotCacheBuffer( const WorkbookHelper& rHelper );
 
-    /** Registers a pivot cache definition fragment. The fragment will be loaded on demand (OOX/OOBIN only). */
+    /** Registers a pivot cache definition fragment. The fragment will be loaded on demand (OOXML/BIFF12 only). */
     void                registerPivotCacheFragment( sal_Int32 nCacheId, const ::rtl::OUString& rFragmentPath );
-    /** Reads the reference to a pivot cache stream. The stream will be loaded on demand (BIFF only). */
+    /** Reads the reference to a pivot cache stream. The stream will be loaded on demand (BIFF2-BIFF8 only). */
     void                importPivotCacheRef( BiffInputStream& rStrm );
 
     /** Imports and stores a pivot cache definition fragment on first call,
@@ -510,4 +510,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/pivotcachefragment.hxx b/oox/inc/oox/xls/pivotcachefragment.hxx
index fde545a6119e..21c625b1a3bc 100644
--- a/oox/inc/oox/xls/pivotcachefragment.hxx
+++ b/oox/inc/oox/xls/pivotcachefragment.hxx
@@ -39,18 +39,18 @@ class PivotCacheField;
 
 // ============================================================================
 
-class OoxPivotCacheFieldContext : public OoxWorkbookContextBase
+class PivotCacheFieldContext : public WorkbookContextBase
 {
 public:
-    explicit            OoxPivotCacheFieldContext(
-                            OoxWorkbookFragmentBase& rFragment,
+    explicit            PivotCacheFieldContext(
+                            WorkbookFragmentBase& rFragment,
                             PivotCacheField& rCacheField );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     PivotCacheField&    mrCacheField;
@@ -58,17 +58,17 @@ private:
 
 // ============================================================================
 
-class OoxPivotCacheDefinitionFragment : public OoxWorkbookFragmentBase
+class PivotCacheDefinitionFragment : public WorkbookFragmentBase
 {
 public:
-    explicit            OoxPivotCacheDefinitionFragment(
+    explicit            PivotCacheDefinitionFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
                             PivotCache& rPivotCache );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        finalizeImport();
 
@@ -78,23 +78,23 @@ private:
 
 // ============================================================================
 
-class OoxPivotCacheRecordsFragment : public OoxWorksheetFragmentBase
+class PivotCacheRecordsFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxPivotCacheRecordsFragment(
+    explicit            PivotCacheRecordsFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
                             const PivotCache& rPivotCache );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
 
 private:
     void                startCacheRecord();
-    void                importPCRecord( RecordInputStream& rStrm );
-    void                importPCRecordItem( sal_Int32 nRecId, RecordInputStream& rStrm );
+    void                importPCRecord( SequenceInputStream& rStrm );
+    void                importPCRecordItem( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
 private:
     const PivotCache&   mrPivotCache;
@@ -127,12 +127,12 @@ class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase
 {
 public:
     explicit            BiffPivotCacheRecordsContext(
-                            const BiffWorkbookFragmentBase& rFragment,
+                            const WorkbookHelper& rHelper,
                             const PivotCache& rPivotCache );
 
     /** Reads the current record from stream and tries to insert a cell into
         the source data sheet. */
-    virtual void        importRecord();
+    virtual void        importRecord( BiffInputStream& rStrm );
 
 private:
     void                startNextRow();
@@ -155,4 +155,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/pivottablebuffer.hxx b/oox/inc/oox/xls/pivottablebuffer.hxx
index 23721784dbd5..bbdc83ffb1ae 100644
--- a/oox/inc/oox/xls/pivottablebuffer.hxx
+++ b/oox/inc/oox/xls/pivottablebuffer.hxx
@@ -30,9 +30,8 @@
 #define OOX_XLS_PIVOTTABLEBUFFER_HXX
 
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/helper/containerhelper.hxx"
 #include "oox/xls/pivotcachebuffer.hxx"
-#include "oox/xls/workbookhelper.hxx"
+#include "oox/xls/stylesbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace sheet { class XDataPilotDescriptor; }
@@ -55,8 +54,8 @@ struct PTFieldItemModel
 
     explicit            PTFieldItemModel();
 
-    /** Sets item type for BIFF/OOBIN import. */
-    void                setBinType( sal_uInt16 nType );
+    /** Sets item type for BIFF import. */
+    void                setBiffType( sal_uInt16 nType );
 };
 
 // ----------------------------------------------------------------------------
@@ -94,8 +93,8 @@ struct PTFieldModel
 
     explicit            PTFieldModel();
 
-    /** Sets axis type for BIFF/OOBIN import. */
-    void                setBinAxis( sal_uInt8 nAxisFlags );
+    /** Sets axis type for BIFF import. */
+    void                setBiffAxis( sal_uInt8 nAxisFlags );
 };
 
 // ----------------------------------------------------------------------------
@@ -123,10 +122,10 @@ struct PTDataFieldModel
 
     explicit            PTDataFieldModel();
 
-    /** Sets the subtotal aggregation function for BIFF/OOBIN import. */
-    void                setBinSubtotal( sal_Int32 nSubtotal );
-    /** Sets the 'show data as' type for BIFF/OOBIN import. */
-    void                setBinShowDataAs( sal_Int32 nShowDataAs );
+    /** Sets the subtotal aggregation function for BIFF import. */
+    void                setBiffSubtotal( sal_Int32 nSubtotal );
+    /** Sets the 'show data as' type for BIFF import. */
+    void                setBiffShowDataAs( sal_Int32 nShowDataAs );
 };
 
 // ----------------------------------------------------------------------------
@@ -146,13 +145,13 @@ public:
     void                importReferenceItem( const AttributeList& rAttribs );
 
     /** Imports pivot field settings from the PTFIELD record. */
-    void                importPTField( RecordInputStream& rStrm );
+    void                importPTField( SequenceInputStream& rStrm );
     /** Imports settings of an item in this pivot field from the PTFITEM record. */
-    void                importPTFItem( RecordInputStream& rStrm );
+    void                importPTFItem( SequenceInputStream& rStrm );
     /** Imports pivot field reference settings from the PTREFERENCE record. */
-    void                importPTReference( RecordInputStream& rStrm );
+    void                importPTReference( SequenceInputStream& rStrm );
     /** Imports pivot field item reference settings from the PTREFERENCEITEM record. */
-    void                importPTReferenceItem( RecordInputStream& rStrm );
+    void                importPTReferenceItem( SequenceInputStream& rStrm );
 
     /** Imports pivot field settings from the PTFIELD and following records. */
     void                importPTField( BiffInputStream& rStrm );
@@ -236,9 +235,9 @@ public:
     void                importTop10( const AttributeList& rAttribs );
 
     /** Reads the settings of a field filter from the PTFILTER record. */
-    void                importPTFilter( RecordInputStream& rStrm );
+    void                importPTFilter( SequenceInputStream& rStrm );
     /** Reads additional settings of a field filter from the TOP10FILTER record. */
-    void                importTop10Filter( RecordInputStream& rStrm );
+    void                importTop10Filter( SequenceInputStream& rStrm );
 
     /** Applies the filter to the associated pivot table field if possible. */
     void                finalizeImport();
@@ -250,7 +249,7 @@ private:
 
 // ============================================================================
 
-struct PTDefinitionModel
+struct PTDefinitionModel : public AutoFormatModel
 {
     ::rtl::OUString     maName;
     ::rtl::OUString     maDataCaption;
@@ -282,6 +281,7 @@ struct PTDefinitionModel
     bool                mbPrintDrill;
     bool                mbEnableDrill;
     bool                mbPreserveFormatting;
+    bool                mbUseAutoFormat;
     bool                mbPageOverThenDown;
     bool                mbSubtotalHiddenItems;
     bool                mbRowGrandTotals;
@@ -334,17 +334,17 @@ public:
     void                importDataField( const AttributeList& rAttribs );
 
     /** Reads global pivot table settings from the PTDEFINITION record. */
-    void                importPTDefinition( RecordInputStream& rStrm );
+    void                importPTDefinition( SequenceInputStream& rStrm );
     /** Reads the location of the pivot table from the PTLOCATION record. */
-    void                importPTLocation( RecordInputStream& rStrm, sal_Int16 nSheet );
+    void                importPTLocation( SequenceInputStream& rStrm, sal_Int16 nSheet );
     /** Reads the indexes of all fields located in the row dimension from a PTROWFIELDS record. */
-    void                importPTRowFields( RecordInputStream& rStrm );
+    void                importPTRowFields( SequenceInputStream& rStrm );
     /** Reads the indexes of all fields located in the column dimension from a PTCOLFIELDS record. */
-    void                importPTColFields( RecordInputStream& rStrm );
+    void                importPTColFields( SequenceInputStream& rStrm );
     /** Reads the settings of a field located in the page dimension from the PTPAGEFIELD record. */
-    void                importPTPageField( RecordInputStream& rStrm );
+    void                importPTPageField( SequenceInputStream& rStrm );
     /** Reads the settings of a field located in the data dimension from the PTDATAFIELD record. */
-    void                importPTDataField( RecordInputStream& rStrm );
+    void                importPTDataField( SequenceInputStream& rStrm );
 
     /** Reads global pivot table settings from the PTDEFINITION record. */
     void                importPTDefinition( BiffInputStream& rStrm, sal_Int16 nSheet );
@@ -404,7 +404,7 @@ private:
     /** Reads a field index for the row or column dimension. */
     static void         importField( IndexVector& orFields, const AttributeList& rAttribs );
     /** Reads an array of field indexes for the row or column dimension. */
-    static void         importFields( IndexVector& orFields, RecordInputStream& rStrm );
+    static void         importFields( IndexVector& orFields, SequenceInputStream& rStrm );
     /** Reads an array of field indexes for the row or column dimension. */
     static void         importFields( IndexVector& orFields, BiffInputStream& rStrm, sal_Int32 nCount );
 
@@ -448,4 +448,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/pivottablefragment.hxx b/oox/inc/oox/xls/pivottablefragment.hxx
index 2639f01596f4..42fe46c51d18 100644
--- a/oox/inc/oox/xls/pivottablefragment.hxx
+++ b/oox/inc/oox/xls/pivottablefragment.hxx
@@ -41,18 +41,18 @@ class PivotTableFilter;
 
 // ============================================================================
 
-class OoxPivotTableFieldContext : public OoxWorksheetContextBase
+class PivotTableFieldContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxPivotTableFieldContext(
-                            OoxWorksheetFragmentBase& rFragment,
+    explicit            PivotTableFieldContext(
+                            WorksheetFragmentBase& rFragment,
                             PivotTableField& rTableField );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     PivotTableField&    mrTableField;
@@ -60,18 +60,18 @@ private:
 
 // ============================================================================
 
-class OoxPivotTableFilterContext : public OoxWorksheetContextBase
+class PivotTableFilterContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxPivotTableFilterContext(
-                            OoxWorksheetFragmentBase& rFragment,
+    explicit            PivotTableFilterContext(
+                            WorksheetFragmentBase& rFragment,
                             PivotTableFilter& rTableFilter );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     PivotTableFilter&   mrTableFilter;
@@ -79,16 +79,16 @@ private:
 
 // ============================================================================
 
-class OoxPivotTableFragment : public OoxWorksheetFragmentBase
+class PivotTableFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxPivotTableFragment(
+    explicit            PivotTableFragment(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
 
 private:
@@ -101,10 +101,10 @@ private:
 class BiffPivotTableContext : public BiffWorksheetContextBase
 {
 public:
-    explicit            BiffPivotTableContext( const BiffWorksheetFragmentBase& rFragment, PivotTable& rPivotTable );
+    explicit            BiffPivotTableContext( const WorksheetHelper& rHelper );
 
     /** Imports all records related to the current pivot table. */
-    virtual void        importRecord();
+    virtual void        importRecord( BiffInputStream& rStrm );
 
 private:
     PivotTable&         mrPivotTable;
@@ -117,4 +117,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/querytablebuffer.hxx b/oox/inc/oox/xls/querytablebuffer.hxx
new file mode 100644
index 000000000000..fa67ca8874c0
--- /dev/null
+++ b/oox/inc/oox/xls/querytablebuffer.hxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_XLS_QUERYTABLEBUFFER_HXX
+#define OOX_XLS_QUERYTABLEBUFFER_HXX
+
+#include "oox/xls/stylesbuffer.hxx"
+#include "oox/xls/worksheethelper.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+struct QueryTableModel : public AutoFormatModel
+{
+    ::rtl::OUString     maDefName;          /// Defined name containing the target cell range.
+    sal_Int32           mnConnId;           /// Identifier of the external connection used to query the data.
+    sal_Int32           mnGrowShrinkType;   /// Behaviour when source data size changes.
+    bool                mbHeaders;          /// True = source data contains a header row.
+    bool                mbRowNumbers;       /// True = first column contains row numbers.
+    bool                mbDisableRefresh;   /// True = refreshing data disabled.
+    bool                mbBackground;       /// True = refresh asynchronously.
+    bool                mbFirstBackground;  /// True = first background refresh not yet finished.
+    bool                mbRefreshOnLoad;    /// True = refresh table after import.
+    bool                mbFillFormulas;     /// True = expand formulas next to range when source data grows.
+    bool                mbRemoveDataOnSave; /// True = remove querried data before saving.
+    bool                mbDisableEdit;      /// True = connection locked for editing.
+    bool                mbPreserveFormat;   /// True = use existing formatting for new rows.
+    bool                mbAdjustColWidth;   /// True = adjust column widths after refresh.
+    bool                mbIntermediate;     /// True = query table defined but not built yet.
+
+    explicit            QueryTableModel();
+};
+
+// ----------------------------------------------------------------------------
+
+class QueryTable : public WorksheetHelper
+{
+public:
+    explicit            QueryTable( const WorksheetHelper& rHelper );
+
+    /** Imports query table settings from the queryTable element. */
+    void                importQueryTable( const AttributeList& rAttribs );
+    /** Imports query table settings from the QUERYTABLE record. */
+    void                importQueryTable( SequenceInputStream& rStrm );
+
+    /** Imports query table settings from the QUERYTABLE record. */
+    void                importQueryTable( BiffInputStream& rStrm );
+    /** Imports query table settings from the QUERYTABLEREFRESH record. */
+    void                importQueryTableRefresh( BiffInputStream& rStrm );
+    /** Imports query table settings from the QUERYTABLESETTINGS record. */
+    void                importQueryTableSettings( BiffInputStream& rStrm );
+
+    /** Inserts a web query into the sheet. */
+    void                finalizeImport();
+
+private:
+    QueryTableModel     maModel;
+};
+
+// ============================================================================
+
+class QueryTableBuffer : public WorksheetHelper
+{
+public:
+    explicit            QueryTableBuffer( const WorksheetHelper& rHelper );
+
+    /** Creates a new query table and stores it into the internal vector. */
+    QueryTable&         createQueryTable();
+
+    /** Inserts all web queries into the sheet. */
+    void                finalizeImport();
+
+private:
+    typedef RefVector< QueryTable > QueryTableVector;
+    QueryTableVector    maQueryTables;
+};
+
+// ============================================================================
+
+} // namespace xls
+} // namespace oox
+
+#endif
diff --git a/oox/inc/oox/xls/querytablefragment.hxx b/oox/inc/oox/xls/querytablefragment.hxx
index 9308c1177c48..4d810aa567a6 100644
--- a/oox/inc/oox/xls/querytablefragment.hxx
+++ b/oox/inc/oox/xls/querytablefragment.hxx
@@ -34,19 +34,39 @@
 namespace oox {
 namespace xls {
 
+class QueryTable;
+
 // ============================================================================
 
-class OoxQueryTableFragment : public OoxWorkbookFragmentBase
+class QueryTableFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxQueryTableFragment(
-                            const WorkbookHelper& rHelper,
+    explicit            QueryTableFragment(
+                            const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+
+    virtual const ::oox::core::RecordInfo* getRecordInfos() const;
+
+private:
+    QueryTable&         mrQueryTable;
+};
+
+// ============================================================================
+
+class BiffQueryTableContext : public BiffWorksheetContextBase
+{
+public:
+    explicit            BiffQueryTableContext( const WorksheetHelper& rHelper );
+
+    /** Imports all records related to the current query table. */
+    virtual void        importRecord( BiffInputStream& rStrm );
+
+private:
+    QueryTable&         mrQueryTable;
 };
 
 // ============================================================================
@@ -56,4 +76,4 @@ protected:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/richstring.hxx b/oox/inc/oox/xls/richstring.hxx
index 1c56901f137a..7d4122aa4eed 100644
--- a/oox/inc/oox/xls/richstring.hxx
+++ b/oox/inc/oox/xls/richstring.hxx
@@ -29,7 +29,7 @@
 #ifndef OOX_XLS_RICHSTRING_HXX
 #define OOX_XLS_RICHSTRING_HXX
 
-#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -115,7 +115,7 @@ struct FontPortionModel
     explicit inline     FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) :
                             mnPos( nPos ), mnFontId( nFontId ) {}
 
-    void                read( RecordInputStream& rStrm );
+    void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm, BiffFontPortionMode eMode );
 };
 
@@ -130,7 +130,7 @@ public:
     /** Appends a rich-string font identifier. */
     void                appendPortion( const FontPortionModel& rPortion );
     /** Reads count and font identifiers from the passed stream. */
-    void                importPortions( RecordInputStream& rStrm );
+    void                importPortions( SequenceInputStream& rStrm );
     /** Reads nCount font identifiers from the passed stream. */
     void                importPortions( BiffInputStream& rStrm, sal_uInt16 nCount, BiffFontPortionMode eMode );
     /** Reads count and font identifiers from the passed stream. */
@@ -148,7 +148,7 @@ struct PhoneticDataModel
     explicit            PhoneticDataModel();
 
     /** Sets the passed data from binary import. */
-    void                setBinData( sal_Int32 nType, sal_Int32 nAlignment );
+    void                setBiffData( sal_Int32 nType, sal_Int32 nAlignment );
 };
 
 // ----------------------------------------------------------------------------
@@ -161,12 +161,12 @@ public:
     /** Imports phonetic settings from the phoneticPr element. */
     void                importPhoneticPr( const AttributeList& rAttribs );
     /** Imports phonetic settings from the PHONETICPR record. */
-    void                importPhoneticPr( RecordInputStream& rStrm );
+    void                importPhoneticPr( SequenceInputStream& rStrm );
     /** Imports phonetic settings from the PHONETICPR record. */
     void                importPhoneticPr( BiffInputStream& rStrm );
 
     /** Imports phonetic settings from a rich string. */
-    void                importStringData( RecordInputStream& rStrm );
+    void                importStringData( SequenceInputStream& rStrm );
     /** Imports phonetic settings from a rich string. */
     void                importStringData( BiffInputStream& rStrm );
 
@@ -211,7 +211,7 @@ struct PhoneticPortionModel
     explicit inline     PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) :
                             mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {}
 
-    void                read( RecordInputStream& rStrm );
+    void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm );
 };
 
@@ -226,7 +226,7 @@ public:
     /** Appends a rich-string phonetic portion. */
     void                appendPortion( const PhoneticPortionModel& rPortion );
     /** Reads all phonetic portions from the passed stream. */
-    void                importPortions( RecordInputStream& rStrm );
+    void                importPortions( SequenceInputStream& rStrm );
     /** Reads phonetic portion data from the passed stream. */
     ::rtl::OUString     importPortions( BiffInputStream& rStrm, sal_Int32 nPhoneticSize );
 };
@@ -249,7 +249,7 @@ public:
     void                importPhoneticPr( const AttributeList& rAttribs );
 
     /** Imports a Unicode rich-string from the passed record stream. */
-    void                importString( RecordInputStream& rStrm, bool bRich );
+    void                importString( SequenceInputStream& rStrm, bool bRich );
 
     /** Imports a byte string from the passed BIFF stream. */
     void                importByteString( BiffInputStream& rStrm, rtl_TextEncoding eDefaultTextEnc, BiffStringFlags nFlags = BIFF_STR_DEFAULT );
@@ -298,4 +298,4 @@ typedef ::boost::shared_ptr< RichString > RichStringRef;
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/richstringcontext.hxx b/oox/inc/oox/xls/richstringcontext.hxx
index 7aa0e11a03b8..d8b9aa3e30aa 100644
--- a/oox/inc/oox/xls/richstringcontext.hxx
+++ b/oox/inc/oox/xls/richstringcontext.hxx
@@ -37,17 +37,15 @@ namespace xls {
 
 // ============================================================================
 
-class OoxRichStringContext : public OoxWorkbookContextBase
+class RichStringContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    explicit            OoxRichStringContext( ParentType& rParent, RichStringRef xString );
+    explicit            RichStringContext( ParentType& rParent, RichStringRef xString );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
 private:
     RichStringRef       mxString;       /// Processed string.
@@ -59,11 +57,11 @@ private:
 // ----------------------------------------------------------------------------
 
 template< typename ParentType >
-OoxRichStringContext::OoxRichStringContext( ParentType& rParent, RichStringRef xString ) :
-    OoxWorkbookContextBase( rParent ),
+RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString ) :
+    WorkbookContextBase( rParent ),
     mxString( xString )
 {
-    OSL_ENSURE( mxString.get(), "OoxRichStringContext::OoxRichStringContext - missing string object" );
+    OSL_ENSURE( mxString.get(), "RichStringContext::RichStringContext - missing string object" );
 }
 
 // ============================================================================
@@ -73,4 +71,4 @@ OoxRichStringContext::OoxRichStringContext( ParentType& rParent, RichStringRef x
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/scenariobuffer.hxx b/oox/inc/oox/xls/scenariobuffer.hxx
index 03c081393712..e3fac3cd8354 100644
--- a/oox/inc/oox/xls/scenariobuffer.hxx
+++ b/oox/inc/oox/xls/scenariobuffer.hxx
@@ -30,7 +30,8 @@
 #define OOX_XLS_SCENARIOBUFFER_HXX
 
 #include <com/sun/star/table/CellAddress.hpp>
-#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/refmap.hxx"
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
 namespace oox {
@@ -74,9 +75,9 @@ public:
     void                importInputCells( const AttributeList& rAttribs );
 
     /** Imports a scenario definition from a SCENARIO record. */
-    void                importScenario( RecordInputStream& rStrm );
+    void                importScenario( SequenceInputStream& rStrm );
     /** Imports a new cell for this scenario from a INPUTCELLS record. */
-    void                importInputCells( RecordInputStream& rStrm );
+    void                importInputCells( SequenceInputStream& rStrm );
 
     /** Imports a scenario definition from a SCENARIO record. */
     void                importScenario( BiffInputStream& rStrm );
@@ -112,7 +113,7 @@ public:
     /** Imports sheet scenario settings from a scenarios element. */
     void                importScenarios( const AttributeList& rAttribs );
     /** Imports sheet scenario settings from a SCENARIOS record. */
-    void                importScenarios( RecordInputStream& rStrm );
+    void                importScenarios( SequenceInputStream& rStrm );
     /** Imports sheet scenario settings from a SCENARIOS record. */
     void                importScenarios( BiffInputStream& rStrm );
 
@@ -154,4 +155,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/scenariocontext.hxx b/oox/inc/oox/xls/scenariocontext.hxx
index 3c1e05fab7f1..90c9466e1375 100644
--- a/oox/inc/oox/xls/scenariocontext.hxx
+++ b/oox/inc/oox/xls/scenariocontext.hxx
@@ -39,17 +39,17 @@ class SheetScenarios;
 
 // ============================================================================
 
-class OoxScenarioContext : public OoxWorksheetContextBase
+class ScenarioContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxScenarioContext( OoxWorksheetContextBase& rParent, SheetScenarios& rSheetScenarios );
+    explicit            ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     Scenario&           mrScenario;
@@ -57,17 +57,17 @@ private:
 
 // ============================================================================
 
-class OoxScenariosContext : public OoxWorksheetContextBase
+class ScenariosContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxScenariosContext( OoxWorksheetFragmentBase& rFragment );
+    explicit            ScenariosContext( WorksheetFragmentBase& rFragment );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
     virtual void        onStartElement( const AttributeList& rAttribs );
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-    virtual void        onStartRecord( RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
+    virtual void        onStartRecord( SequenceInputStream& rStrm );
 
 private:
     SheetScenarios&     mrSheetScenarios;
@@ -80,4 +80,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/sharedformulabuffer.hxx b/oox/inc/oox/xls/sharedformulabuffer.hxx
index de7e4b83c075..86f29cd85de0 100644
--- a/oox/inc/oox/xls/sharedformulabuffer.hxx
+++ b/oox/inc/oox/xls/sharedformulabuffer.hxx
@@ -62,12 +62,12 @@ class SharedFormulaBuffer : public WorksheetHelper
 public:
     explicit            SharedFormulaBuffer( const WorksheetHelper& rHelper );
 
-    /** Imports a shared formula from a OOX formula string. */
+    /** Imports a shared formula from a OOXML formula string. */
     void                importSharedFmla( const ::rtl::OUString& rFormula,
                             const ::rtl::OUString& rSharedRange, sal_Int32 nId,
                             const ::com::sun::star::table::CellAddress& rBaseAddr );
     /** Imports a shared formula from a SHAREDFORMULA record in the passed stream */
-    void                importSharedFmla( RecordInputStream& rStrm,
+    void                importSharedFmla( SequenceInputStream& rStrm,
                             const ::com::sun::star::table::CellAddress& rBaseAddr );
     /** Imports a shared formula from a SHAREDFMLA record in the passed stream. */
     void                importSharedFmla( BiffInputStream& rStrm,
@@ -111,4 +111,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/sharedstringsbuffer.hxx b/oox/inc/oox/xls/sharedstringsbuffer.hxx
index 6fcad02a1a2e..3f62d75ea5e4 100644
--- a/oox/inc/oox/xls/sharedstringsbuffer.hxx
+++ b/oox/inc/oox/xls/sharedstringsbuffer.hxx
@@ -29,7 +29,6 @@
 #ifndef OOX_XLS_SHAREDSTRINGSBUFFER_HXX
 #define OOX_XLS_SHAREDSTRINGSBUFFER_HXX
 
-#include "oox/helper/containerhelper.hxx"
 #include "oox/xls/richstring.hxx"
 
 namespace oox {
@@ -69,4 +68,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/sharedstringsfragment.hxx b/oox/inc/oox/xls/sharedstringsfragment.hxx
index 1f942ddd6ba5..f4a0ef46df99 100644
--- a/oox/inc/oox/xls/sharedstringsfragment.hxx
+++ b/oox/inc/oox/xls/sharedstringsfragment.hxx
@@ -36,21 +36,16 @@ namespace xls {
 
 // ============================================================================
 
-class OoxSharedStringsFragment : public OoxWorkbookFragmentBase
+class SharedStringsFragment : public WorkbookFragmentBase
 {
 public:
-    explicit            OoxSharedStringsFragment(
+    explicit            SharedStringsFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        finalizeImport();
@@ -63,4 +58,4 @@ protected:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/sheetdatacontext.hxx b/oox/inc/oox/xls/sheetdatacontext.hxx
index 8eb1e3509060..1649ed3fd71c 100644
--- a/oox/inc/oox/xls/sheetdatacontext.hxx
+++ b/oox/inc/oox/xls/sheetdatacontext.hxx
@@ -46,18 +46,17 @@ namespace xls {
     The sheetData element contains all row settings and all cells in a single
     sheet of a spreadsheet document.
  */
-class OoxSheetDataContext : public OoxWorksheetContextBase
+class SheetDataContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxSheetDataContext( OoxWorksheetFragmentBase& rFragment );
+    explicit            SheetDataContext( WorksheetFragmentBase& rFragment );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
 private:
     /** Different types of cell records. */
@@ -71,35 +70,35 @@ private:
     void                importFormula( const AttributeList& rAttribs );
 
     /** Imports a cell address and the following XF identifier. */
-    void                importCellHeader( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellHeader( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports an empty cell from a CELL_BLANK or MULTCELL_BLANK record. */
-    void                importCellBlank( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellBlank( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a boolean cell from a CELL_BOOL, MULTCELL_BOOL, or FORMULA_BOOL record. */
-    void                importCellBool( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellBool( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a numeric cell from a CELL_DOUBLE, MULTCELL_DOUBLE, or FORMULA_DOUBLE record. */
-    void                importCellDouble( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellDouble( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports an error code cell from a CELL_ERROR, MULTCELL_ERROR, or FORMULA_ERROR record. */
-    void                importCellError( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellError( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports an encoded numeric cell from a CELL_RK or MULTCELL_RK record. */
-    void                importCellRk( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellRk( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a rich-string cell from a CELL_RSTRING or MULTCELL_RSTRING record. */
-    void                importCellRString( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellRString( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a string cell from a CELL_SI or MULTCELL_SI record. */
-    void                importCellSi( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellSi( SequenceInputStream& rStrm, CellType eCellType );
     /** Imports a string cell from a CELL_STRING, MULTCELL_STRING, or FORMULA_STRING record. */
-    void                importCellString( RecordInputStream& rStrm, CellType eCellType );
+    void                importCellString( SequenceInputStream& rStrm, CellType eCellType );
 
     /** Imports a cell formula for the current cell. */
-    void                importCellFormula( RecordInputStream& rStrm );
+    void                importCellFormula( SequenceInputStream& rStrm );
 
     /** Imports row settings from a ROW record. */
-    void                importRow( RecordInputStream& rStrm );
+    void                importRow( SequenceInputStream& rStrm );
     /** Imports an array formula from an ARRAY record. */
-    void                importArray( RecordInputStream& rStrm );
+    void                importArray( SequenceInputStream& rStrm );
     /** Imports a shared formula from a SHAREDFORMULA record. */
-    void                importSharedFmla( RecordInputStream& rStrm );
+    void                importSharedFmla( SequenceInputStream& rStrm );
     /** Imports table operation from a DATATABLE record. */
-    void                importDataTable( RecordInputStream& rStrm );
+    void                importDataTable( SequenceInputStream& rStrm );
 
 private:
     CellModel           maCurrCell;         /// Position and formatting of current imported cell.
@@ -115,49 +114,49 @@ private:
 class BiffSheetDataContext : public BiffWorksheetContextBase
 {
 public:
-    explicit            BiffSheetDataContext( const BiffWorksheetFragmentBase& rParent );
+    explicit            BiffSheetDataContext( const WorksheetHelper& rHelper );
 
     /** Tries to import a sheet data record. */
-    virtual void        importRecord();
+    virtual void        importRecord( BiffInputStream& rStrm );
 
 private:
     /** Sets current cell according to the passed address. */
     void                setCurrCell( const BinAddress& rAddr );
 
     /** Imports an XF identifier and sets the mnXfId member. */
-    void                importXfId( bool bBiff2 );
+    void                importXfId( BiffInputStream& rStrm, bool bBiff2 );
     /** Imports a BIFF cell address and the following XF identifier. */
-    void                importCellHeader( bool bBiff2 );
+    void                importCellHeader( BiffInputStream& rStrm, bool bBiff2 );
 
     /** Imports a BLANK record describing a blank but formatted cell. */
-    void                importBlank();
+    void                importBlank( BiffInputStream& rStrm );
     /** Imports a BOOLERR record describing a boolean or error code cell. */
-    void                importBoolErr();
+    void                importBoolErr( BiffInputStream& rStrm );
     /** Imports a FORMULA record describing a formula cell. */
-    void                importFormula();
+    void                importFormula( BiffInputStream& rStrm );
     /** Imports an INTEGER record describing a BIFF2 integer cell. */
-    void                importInteger();
+    void                importInteger( BiffInputStream& rStrm );
     /** Imports a LABEL record describing an unformatted string cell. */
-    void                importLabel();
+    void                importLabel( BiffInputStream& rStrm );
     /** Imports a LABELSST record describing a string cell using the shared string list. */
-    void                importLabelSst();
+    void                importLabelSst( BiffInputStream& rStrm );
     /** Imports a MULTBLANK record describing a range of blank but formatted cells. */
-    void                importMultBlank();
+    void                importMultBlank( BiffInputStream& rStrm );
     /** Imports a MULTRK record describing a range of numeric cells. */
-    void                importMultRk();
+    void                importMultRk( BiffInputStream& rStrm );
     /** Imports a NUMBER record describing a floating-point cell. */
-    void                importNumber();
+    void                importNumber( BiffInputStream& rStrm );
     /** Imports an RK record describing a numeric cell. */
-    void                importRk();
+    void                importRk( BiffInputStream& rStrm );
 
     /** Imports row settings from a ROW record. */
-    void                importRow();
+    void                importRow( BiffInputStream& rStrm );
     /** Imports an ARRAY record describing an array formula of a cell range. */
-    void                importArray();
+    void                importArray( BiffInputStream& rStrm );
     /** Imports a SHAREDFMLA record describing a shared formula in a cell range. */
-    void                importSharedFmla();
+    void                importSharedFmla( BiffInputStream& rStrm );
     /** Imports table operation from a DATATABLE or DATATABLE2 record. */
-    void                importDataTable();
+    void                importDataTable( BiffInputStream& rStrm );
 
 private:
     CellModel           maCurrCell;             /// Position and formatting of current imported cell.
@@ -173,4 +172,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx
index f1ce98762206..86a1552664f7 100644
--- a/oox/inc/oox/xls/stylesbuffer.hxx
+++ b/oox/inc/oox/xls/stylesbuffer.hxx
@@ -30,14 +30,15 @@
 #define OOX_XLS_STYLESBUFFER_HXX
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/util/CellProtection.hpp>
 #include <com/sun/star/table/CellHoriJustify.hpp>
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellVertJustify.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
-#include "oox/helper/containerhelper.hxx"
-#include "oox/helper/graphichelper.hxx"
+#include <com/sun/star/util/CellProtection.hpp>
 #include "oox/drawingml/color.hxx"
+#include "oox/helper/graphichelper.hxx"
+#include "oox/helper/refmap.hxx"
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/numberformatsbuffer.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -112,11 +113,11 @@ public:
     void                importColor( const AttributeList& rAttribs );
 
     /** Imports a 64-bit color from the passed binary stream. */
-    void                importColor( RecordInputStream& rStrm );
-    /** Imports a 32-bit palette color identifier from the passed OOBIN stream. */
-    void                importColorId( RecordInputStream& rStrm );
-    /** Imports a 32-bit RGBA color value from the passed OOBIN stream. */
-    void                importColorRgb( RecordInputStream& rStrm );
+    void                importColor( SequenceInputStream& rStrm );
+    /** Imports a 32-bit palette color identifier from the passed BIFF12 stream. */
+    void                importColorId( SequenceInputStream& rStrm );
+    /** Imports a 32-bit RGBA color value from the passed BIFF12 stream. */
+    void                importColorRgb( SequenceInputStream& rStrm );
 
     /** Imports an 8-bit or 16-bit palette color identifier from the passed BIFF stream. */
     void                importColorId( BiffInputStream& rStrm, bool b16Bit = true );
@@ -129,7 +130,7 @@ public:
 
 // ----------------------------------------------------------------------------
 
-RecordInputStream& operator>>( RecordInputStream& rStrm, Color& orColor );
+SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor );
 
 // ============================================================================
 
@@ -143,9 +144,11 @@ public:
     /** Appends a new color from the passed attributes. */
     void                importPaletteColor( const AttributeList& rAttribs );
     /** Appends a new color from the passed RGBCOLOR record. */
-    void                importPaletteColor( RecordInputStream& rStrm );
+    void                importPaletteColor( SequenceInputStream& rStrm );
     /** Imports the PALETTE record from the passed stream. */
     void                importPalette( BiffInputStream& rStrm );
+    /** Imports a color palette from a UNO sequence in the passed any. */
+    void                importPalette( const ::com::sun::star::uno::Any& rPalette );
 
     /** Rturns the RGB value of the color with the passed index. */
     sal_Int32           getColor( sal_Int32 nPaletteIdx ) const;
@@ -180,7 +183,7 @@ struct FontModel
 
     explicit            FontModel();
 
-    void                setBinScheme( sal_uInt8 nScheme );
+    void                setBiff12Scheme( sal_uInt8 nScheme );
     void                setBiffHeight( sal_uInt16 nHeight );
     void                setBiffWeight( sal_uInt16 nWeight );
     void                setBiffUnderline( sal_uInt16 nUnderline );
@@ -260,23 +263,23 @@ public:
     void                importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
 
     /** Imports the FONT record from the passed stream. */
-    void                importFont( RecordInputStream& rStrm );
+    void                importFont( SequenceInputStream& rStrm );
     /** Imports the font name from a DXF record. */
-    void                importDxfName( RecordInputStream& rStrm );
+    void                importDxfName( SequenceInputStream& rStrm );
     /** Imports the font color from a DXF record. */
-    void                importDxfColor( RecordInputStream& rStrm );
+    void                importDxfColor( SequenceInputStream& rStrm );
     /** Imports the font scheme from a DXF record. */
-    void                importDxfScheme( RecordInputStream& rStrm );
+    void                importDxfScheme( SequenceInputStream& rStrm );
     /** Imports the font height from a DXF record. */
-    void                importDxfHeight( RecordInputStream& rStrm );
+    void                importDxfHeight( SequenceInputStream& rStrm );
     /** Imports the font weight from a DXF record. */
-    void                importDxfWeight( RecordInputStream& rStrm );
+    void                importDxfWeight( SequenceInputStream& rStrm );
     /** Imports the font underline style from a DXF record. */
-    void                importDxfUnderline( RecordInputStream& rStrm );
+    void                importDxfUnderline( SequenceInputStream& rStrm );
     /** Imports the font escapement style from a DXF record. */
-    void                importDxfEscapement( RecordInputStream& rStrm );
+    void                importDxfEscapement( SequenceInputStream& rStrm );
     /** Imports a font style flag from a DXF record. */
-    void                importDxfFlag( sal_Int32 nElement, RecordInputStream& rStrm );
+    void                importDxfFlag( sal_Int32 nElement, SequenceInputStream& rStrm );
 
     /** Imports the FONT record from the passed stream. */
     void                importFont( BiffInputStream& rStrm );
@@ -347,12 +350,12 @@ struct AlignmentModel
 
     explicit            AlignmentModel();
 
-    /** Sets horizontal alignment from the passed OOBIN or BIFF data. */
-    void                setBinHorAlign( sal_uInt8 nHorAlign );
-    /** Sets vertical alignment from the passed OOBIN or BIFF data. */
-    void                setBinVerAlign( sal_uInt8 nVerAlign );
-    /** Sets rotation from the passed OOBIN or BIFF text orientation. */
-    void                setBinTextOrient( sal_uInt8 nTextOrient );
+    /** Sets horizontal alignment from the passed BIFF data. */
+    void                setBiffHorAlign( sal_uInt8 nHorAlign );
+    /** Sets vertical alignment from the passed BIFF data. */
+    void                setBiffVerAlign( sal_uInt8 nVerAlign );
+    /** Sets rotation from the passed BIFF text orientation. */
+    void                setBiffTextOrient( sal_uInt8 nTextOrient );
 };
 
 // ----------------------------------------------------------------------------
@@ -389,8 +392,8 @@ public:
     /** Sets all attributes from the alignment element. */
     void                importAlignment( const AttributeList& rAttribs );
 
-    /** Sets the alignment attributes from the passed OOBIN XF record data. */
-    void                setBinData( sal_uInt32 nFlags );
+    /** Sets the alignment attributes from the passed BIFF12 XF record data. */
+    void                setBiff12Data( sal_uInt32 nFlags );
     /** Sets the alignment attributes from the passed BIFF2 XF record data. */
     void                setBiff2Data( sal_uInt8 nFlags );
     /** Sets the alignment attributes from the passed BIFF3 XF record data. */
@@ -455,8 +458,8 @@ public:
     /** Sets all attributes from the protection element. */
     void                importProtection( const AttributeList& rAttribs );
 
-    /** Sets the protection attributes from the passed OOBIN XF record data. */
-    void                setBinData( sal_uInt32 nFlags );
+    /** Sets the protection attributes from the passed BIFF12 XF record data. */
+    void                setBiff12Data( sal_uInt32 nFlags );
     /** Sets the protection attributes from the passed BIFF2 XF record data. */
     void                setBiff2Data( sal_uInt8 nNumFmt );
     /** Sets the protection attributes from the passed BIFF3-BIFF8 XF record data. */
@@ -491,7 +494,7 @@ struct BorderLineModel
 
     explicit            BorderLineModel( bool bDxf );
 
-    /** Sets the passed OOBIN or BIFF line style. */
+    /** Sets the passed BIFF line style. */
     void                setBiffStyle( sal_Int32 nLineStyle );
     /** Sets line style and line color from the passed BIFF data. */
     void                setBiffData( sal_uInt8 nLineStyle, sal_uInt16 nLineColor );
@@ -552,9 +555,9 @@ public:
     void                importColor( sal_Int32 nElement, const AttributeList& rAttribs );
 
     /** Imports the BORDER record from the passed stream. */
-    void                importBorder( RecordInputStream& rStrm );
+    void                importBorder( SequenceInputStream& rStrm );
     /** Imports a border from a DXF record from the passed stream. */
-    void                importDxfBorder( sal_Int32 nElement, RecordInputStream& rStrm );
+    void                importDxfBorder( sal_Int32 nElement, SequenceInputStream& rStrm );
 
     /** Sets the border attributes from the passed BIFF2 XF record data. */
     void                setBiff2Data( sal_uInt8 nFlags );
@@ -611,8 +614,8 @@ struct PatternFillModel
 
     explicit            PatternFillModel( bool bDxf );
 
-    /** Sets the passed OOBIN or BIFF pattern identifier. */
-    void                setBinPattern( sal_Int32 nPattern );
+    /** Sets the passed BIFF pattern identifier. */
+    void                setBiffPattern( sal_Int32 nPattern );
     /** Sets the pattern and pattern colors from the passed BIFF data. */
     void                setBiffData( sal_uInt16 nPatternColor, sal_uInt16 nFillColor, sal_uInt8 nPattern );
 };
@@ -634,10 +637,10 @@ struct GradientFillModel
 
     explicit            GradientFillModel();
 
-    /** Reads OOBIN gradient settings from a FILL or DXF record. */
-    void                readGradient( RecordInputStream& rStrm );
-    /** Reads OOBIN gradient stop settings from a FILL or DXF record. */
-    void                readGradientStop( RecordInputStream& rStrm, bool bDxf );
+    /** Reads BIFF12 gradient settings from a FILL or DXF record. */
+    void                readGradient( SequenceInputStream& rStrm );
+    /** Reads BIFF12 gradient stop settings from a FILL or DXF record. */
+    void                readGradientStop( SequenceInputStream& rStrm, bool bDxf );
 };
 
 // ----------------------------------------------------------------------------
@@ -674,17 +677,17 @@ public:
     void                importColor( const AttributeList& rAttribs, double fPosition );
 
     /** Imports the FILL record from the passed stream. */
-    void                importFill( RecordInputStream& rStrm );
+    void                importFill( SequenceInputStream& rStrm );
     /** Imports the fill pattern from a DXF record. */
-    void                importDxfPattern( RecordInputStream& rStrm );
+    void                importDxfPattern( SequenceInputStream& rStrm );
     /** Imports the pattern color from a DXF record. */
-    void                importDxfFgColor( RecordInputStream& rStrm );
+    void                importDxfFgColor( SequenceInputStream& rStrm );
     /** Imports the background color from a DXF record. */
-    void                importDxfBgColor( RecordInputStream& rStrm );
+    void                importDxfBgColor( SequenceInputStream& rStrm );
     /** Imports gradient settings from a DXF record. */
-    void                importDxfGradient( RecordInputStream& rStrm );
+    void                importDxfGradient( SequenceInputStream& rStrm );
     /** Imports gradient stop settings from a DXF record. */
-    void                importDxfStop( RecordInputStream& rStrm );
+    void                importDxfStop( SequenceInputStream& rStrm );
 
     /** Sets the fill attributes from the passed BIFF2 XF record data. */
     void                setBiff2Data( sal_uInt8 nFlags );
@@ -768,7 +771,7 @@ public:
     void                importProtection( const AttributeList& rAttribs );
 
     /** Imports the XF record from the passed stream. */
-    void                importXf( RecordInputStream& rStrm, bool bCellXf );
+    void                importXf( SequenceInputStream& rStrm, bool bCellXf );
 
     /** Imports the XF record from the passed stream. */
     void                importXf( BiffInputStream& rStrm );
@@ -829,7 +832,7 @@ public:
     void                importProtection( const AttributeList& rAttribs );
 
     /** Imports the DXF record from the passed stream. */
-    void                importDxf( RecordInputStream& rStrm );
+    void                importDxf( SequenceInputStream& rStrm );
 
     /** Imports font, border, and fill settings from the CFRULE record. */
     void                importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags );
@@ -884,7 +887,7 @@ public:
     /** Imports passed attributes from the cellStyle element. */
     void                importCellStyle( const AttributeList& rAttribs );
     /** Imports style settings from a CELLSTYLE record. */
-    void                importCellStyle( RecordInputStream& rStrm );
+    void                importCellStyle( SequenceInputStream& rStrm );
     /** Imports style settings from a STYLE record. */
     void                importStyle( BiffInputStream& rStrm );
 
@@ -917,7 +920,7 @@ public:
     /** Appends and returns a new named cell style object. */
     CellStyleRef        importCellStyle( const AttributeList& rAttribs );
     /** Imports the CELLSTYLE record from the passed stream. */
-    CellStyleRef        importCellStyle( RecordInputStream& rStrm );
+    CellStyleRef        importCellStyle( SequenceInputStream& rStrm );
     /** Imports the STYLE record from the passed stream. */
     CellStyleRef        importStyle( BiffInputStream& rStrm );
 
@@ -949,6 +952,21 @@ private:
 
 // ============================================================================
 
+struct AutoFormatModel
+{
+    sal_Int32           mnAutoFormatId;     /// Index of predefined autoformatting.
+    bool                mbApplyNumFmt;      /// True = apply number format from autoformatting.
+    bool                mbApplyFont;        /// True = apply font from autoformatting.
+    bool                mbApplyAlignment;   /// True = apply alignment from autoformatting.
+    bool                mbApplyBorder;      /// True = apply border from autoformatting.
+    bool                mbApplyFill;        /// True = apply fill from autoformatting.
+    bool                mbApplyProtection;  /// True = apply protection from autoformatting.
+
+    explicit            AutoFormatModel();
+};
+
+// ============================================================================
+
 class StylesBuffer : public WorkbookHelper
 {
 public:
@@ -983,11 +1001,11 @@ public:
     CellStyleRef        importCellStyle( const AttributeList& rAttribs );
 
     /** Appends a new color to the color palette. */
-    void                importPaletteColor( RecordInputStream& rStrm );
+    void                importPaletteColor( SequenceInputStream& rStrm );
     /** Imports the NUMFMT record from the passed stream. */
-    void                importNumFmt( RecordInputStream& rStrm );
+    void                importNumFmt( SequenceInputStream& rStrm );
     /** Imports the CELLSTYLE record from the passed stream. */
-    void                importCellStyle( RecordInputStream& rStrm );
+    void                importCellStyle( SequenceInputStream& rStrm );
 
     /** Imports the PALETTE record from the passed stream. */
     void                importPalette( BiffInputStream& rStrm );
@@ -1002,6 +1020,9 @@ public:
     /** Imports the STYLE record from the passed stream. */
     void                importStyle( BiffInputStream& rStrm );
 
+    /** Imports a color palette from a UNO sequence in the passed any. */
+    void                importPalette( const ::com::sun::star::uno::Any& rPalette );
+
     /** Final processing after import of all style settings. */
     void                finalizeImport();
 
@@ -1083,4 +1104,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/stylesfragment.hxx b/oox/inc/oox/xls/stylesfragment.hxx
index 876cbb81cf51..84e077da6d7a 100644
--- a/oox/inc/oox/xls/stylesfragment.hxx
+++ b/oox/inc/oox/xls/stylesfragment.hxx
@@ -37,24 +37,24 @@ namespace xls {
 
 // ============================================================================
 
-class OoxIndexedColorsContext : public OoxWorkbookContextBase
+class IndexedColorsContext : public WorkbookContextBase
 {
 public:
-    explicit            OoxIndexedColorsContext( OoxWorkbookFragmentBase& rFragment );
+    explicit            IndexedColorsContext( WorkbookFragmentBase& rFragment );
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 };
 
 // ============================================================================
 
-class OoxFontContext : public OoxWorkbookContextBase
+class FontContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    inline explicit     OoxFontContext( ParentType& rParent, const FontRef& rxFont ) :
-                            OoxWorkbookContextBase( rParent ), mxFont( rxFont ) {}
+    inline explicit     FontContext( ParentType& rParent, const FontRef& rxFont ) :
+                            WorkbookContextBase( rParent ), mxFont( rxFont ) {}
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -65,12 +65,12 @@ private:
 
 // ============================================================================
 
-class OoxBorderContext : public OoxWorkbookContextBase
+class BorderContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    inline explicit     OoxBorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
-                            OoxWorkbookContextBase( rParent ), mxBorder( rxBorder ) {}
+    inline explicit     BorderContext( ParentType& rParent, const BorderRef& rxBorder ) :
+                            WorkbookContextBase( rParent ), mxBorder( rxBorder ) {}
 
 protected:
     virtual void        onStartElement( const AttributeList& rAttribs );
@@ -82,12 +82,12 @@ private:
 
 // ============================================================================
 
-class OoxFillContext : public OoxWorkbookContextBase
+class FillContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    inline explicit     OoxFillContext( ParentType& rParent, const FillRef& rxFill ) :
-                            OoxWorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {}
+    inline explicit     FillContext( ParentType& rParent, const FillRef& rxFill ) :
+                            WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {}
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -99,12 +99,12 @@ private:
 
 // ============================================================================
 
-class OoxXfContext : public OoxWorkbookContextBase
+class XfContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    inline explicit     OoxXfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
-                            OoxWorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {}
+    inline explicit     XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) :
+                            WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {}
 
 protected:
     virtual void        onStartElement( const AttributeList& rAttribs );
@@ -117,12 +117,12 @@ private:
 
 // ============================================================================
 
-class OoxDxfContext : public OoxWorkbookContextBase
+class DxfContext : public WorkbookContextBase
 {
 public:
     template< typename ParentType >
-    inline explicit     OoxDxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
-                            OoxWorkbookContextBase( rParent ), mxDxf( rxDxf ) {}
+    inline explicit     DxfContext( ParentType& rParent, const DxfRef& rxDxf ) :
+                            WorkbookContextBase( rParent ), mxDxf( rxDxf ) {}
 
 protected:
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
@@ -133,20 +133,16 @@ private:
 
 // ============================================================================
 
-class OoxStylesFragment : public OoxWorkbookFragmentBase
+class StylesFragment : public WorkbookFragmentBase
 {
 public:
-    explicit            OoxStylesFragment(
+    explicit            StylesFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        finalizeImport();
@@ -159,4 +155,4 @@ protected:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/tablebuffer.hxx b/oox/inc/oox/xls/tablebuffer.hxx
index 3dd52a3decd7..5c0d959d195b 100644
--- a/oox/inc/oox/xls/tablebuffer.hxx
+++ b/oox/inc/oox/xls/tablebuffer.hxx
@@ -30,7 +30,7 @@
 #define OOX_XLS_TABLEBUFFER_HXX
 
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/helper/containerhelper.hxx"
+#include "oox/xls/autofilterbuffer.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
 namespace oox {
@@ -62,16 +62,18 @@ public:
     /** Imports a table definition from the passed attributes. */
     void                importTable( const AttributeList& rAttribs, sal_Int16 nSheet );
     /** Imports a table definition from a TABLE record. */
-    void                importTable( RecordInputStream& rStrm, sal_Int16 nSheet );
+    void                importTable( SequenceInputStream& rStrm, sal_Int16 nSheet );
+    /** Creates a new auto filter and stores it internally. */
+    inline AutoFilter&  createAutoFilter() { return maAutoFilters.createAutoFilter(); }
 
     /** Creates a database range from this tables. */
     void                finalizeImport();
 
-    /** Returns the table identifier. */
+    /** Returns the unique table identifier. */
     inline sal_Int32    getTableId() const { return maModel.mnId; }
     /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */
     inline sal_Int32    getTokenIndex() const { return mnTokenIndex; }
-    /** Returns the display name of the table. */
+    /** Returns the original display name of the table. */
     inline const ::rtl::OUString& getDisplayName() const { return maModel.maDisplayName; }
 
     /** Returns the original (unchecked) total range of the table. */
@@ -89,6 +91,8 @@ public:
 
 private:
     TableModel          maModel;
+    AutoFilterBuffer    maAutoFilters;      /// Filter settings for this table.
+    ::rtl::OUString     maDBRangeName;      /// Name of the databae range in the Calc document.
     ::com::sun::star::table::CellRangeAddress
                         maDestRange;        /// Validated range of the table in the worksheet.
     sal_Int32           mnTokenIndex;       /// Token index used in API token array.
@@ -103,10 +107,8 @@ class TableBuffer : public WorkbookHelper
 public:
     explicit            TableBuffer( const WorkbookHelper& rHelper );
 
-    /** Imports a table definition from the passed attributes. */
-    TableRef            importTable( const AttributeList& rAttribs, sal_Int16 nSheet );
-    /** Imports a table definition from a TABLE record. */
-    TableRef            importTable( RecordInputStream& rStrm, sal_Int16 nSheet );
+    /** Creates a new empty table. */
+    Table&              createTable();
 
     /** Creates database ranges from all imported tables. */
     void                finalizeImport();
@@ -117,12 +119,15 @@ public:
     TableRef            getTable( const ::rtl::OUString& rDispName ) const;
 
 private:
-    void                insertTable( TableRef xTable );
+    /** Inserts the passed table into the maps according to its identifier and name. */
+    void                insertTableToMaps( const TableRef& rxTable );
 
 private:
+    typedef RefVector< Table >                  TableVector;
     typedef RefMap< sal_Int32, Table >          TableIdMap;
     typedef RefMap< ::rtl::OUString, Table >    TableNameMap;
 
+    TableVector         maTables;
     TableIdMap          maIdTables;
     TableNameMap        maNameTables;
 };
@@ -134,4 +139,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/tablefragment.hxx b/oox/inc/oox/xls/tablefragment.hxx
index 452b61d1b857..d5cb09b519a4 100644
--- a/oox/inc/oox/xls/tablefragment.hxx
+++ b/oox/inc/oox/xls/tablefragment.hxx
@@ -30,32 +30,29 @@
 #define OOX_XLS_TABLEFRAGMENT_HXX
 
 #include "oox/xls/excelhandlers.hxx"
-#include "oox/xls/tablebuffer.hxx"
 
 namespace oox {
 namespace xls {
 
+class Table;
+
 // ============================================================================
 
-class OoxTableFragment : public OoxWorksheetFragmentBase
+class TableFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxTableFragment(
+    explicit            TableFragment(
                             const WorksheetHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
 
 private:
-    TableRef            mxTable;        /// Current table.
+    Table&              mrTable;
 };
 
 // ============================================================================
@@ -65,4 +62,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/themebuffer.hxx b/oox/inc/oox/xls/themebuffer.hxx
index e1641e740a71..eb848fcc5f12 100644
--- a/oox/inc/oox/xls/themebuffer.hxx
+++ b/oox/inc/oox/xls/themebuffer.hxx
@@ -63,4 +63,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/unitconverter.hxx b/oox/inc/oox/xls/unitconverter.hxx
index 395d6bb1a3a1..5253998433fc 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/oox/inc/oox/xls/unitconverter.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_UNITCONVERTER_HXX
 #define OOX_XLS_UNITCONVERTER_HXX
 
-#include <vector>
 #include <map>
+#include <vector>
 #include "oox/xls/workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -123,4 +123,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/viewsettings.hxx b/oox/inc/oox/xls/viewsettings.hxx
index 3e862d7b3982..401b8bb38857 100644
--- a/oox/inc/oox/xls/viewsettings.hxx
+++ b/oox/inc/oox/xls/viewsettings.hxx
@@ -31,7 +31,6 @@
 
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/helper/containerhelper.hxx"
 #include "oox/xls/addressconverter.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 #include "oox/xls/worksheethelper.hxx"
@@ -120,13 +119,13 @@ public:
     void                importChartSheetView( const AttributeList& rAttribs );
 
     /** Imports the SHEETVIEW record containing sheet view settings. */
-    void                importSheetView( RecordInputStream& rStrm );
+    void                importSheetView( SequenceInputStream& rStrm );
     /** Imports the PANE record containing sheet pane settings. */
-    void                importPane( RecordInputStream& rStrm );
+    void                importPane( SequenceInputStream& rStrm );
     /** Imports the SELECTION record containing selection settings for a pane. */
-    void                importSelection( RecordInputStream& rStrm );
+    void                importSelection( SequenceInputStream& rStrm );
     /** Imports the CHARTSHEETVIEW record containing view settings of a chart sheet. */
-    void                importChartSheetView( RecordInputStream& rStrm );
+    void                importChartSheetView( SequenceInputStream& rStrm );
 
     /** Imports the WINDOW2 record containing sheet view settings. */
     void                importWindow2( BiffInputStream& rStrm );
@@ -140,6 +139,9 @@ public:
     /** Converts all imported sheet view settings. */
     void                finalizeImport();
 
+    /** Returns true, if the sheet layout is set to right-to-left. */
+    bool                isSheetRightToLeft() const;
+
 private:
     SheetViewModelRef   createSheetView();
 
@@ -183,9 +185,9 @@ public:
     /** Imports the oleSize element containing the visible size of the workbook. */
     void                importOleSize( const AttributeList& rAttribs );
     /** Imports the WORKBOOKVIEW record containing workbook view settings. */
-    void                importWorkbookView( RecordInputStream& rStrm );
+    void                importWorkbookView( SequenceInputStream& rStrm );
     /** Imports the OLESIZE record containing the visible size of the workbook. */
-    void                importOleSize( RecordInputStream& rStrm );
+    void                importOleSize( SequenceInputStream& rStrm );
     /** Imports the WINDOW1 record containing workbook view settings. */
     void                importWindow1( BiffInputStream& rStrm );
     /** Imports the OLESIZE record containing the visible size of the workbook. */
@@ -230,4 +232,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/webquerybuffer.hxx b/oox/inc/oox/xls/webquerybuffer.hxx
deleted file mode 100644
index 483edf993e7c..000000000000
--- a/oox/inc/oox/xls/webquerybuffer.hxx
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-#ifndef OOX_XLS_WEBQUERYBUFFER_HXX
-#define OOX_XLS_WEBQUERYBUFFER_HXX
-
-#include <vector>
-#include <boost/unordered_map.hpp>
-#include <boost/shared_ptr.hpp>
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/workbookhelper.hxx"
-
-namespace oox {
-namespace xls {
-
-// ============================================================================
-
-struct QueryTable
-{
-    sal_Int32   mnConnectionId;
-};
-
-// struct WebQuery
-// {
-//     enum WebQueryMode
-//     {
-//         xlWQUnknown,                /// Not specified.
-//         xlWQDocument,               /// Entire document.
-//         xlWQAllTables,              /// All tables.
-//         xlWQSpecTables              /// Specific tables.
-//     };
-//
-//     ::rtl::OUString maURL;                          /// Source document URL.
-//     ::rtl::OUString maTables;                       /// List of source range names.
-//     ::com::sun::star::table::CellRangeAddress maDestRange; /// Destination range.
-//     WebQueryMode meMode;                            /// Current mode of web query.
-//     sal_uInt16 mnRefresh;                           /// Refresh time in minutes.
-// };
-
-struct BaseProperties
-{
-};
-
-/** Stores web query properties from webPr element. */
-struct WebProperties : public BaseProperties
-{
-    ::rtl::OUString     maURL;
-};
-
-/** Stores text data source properties from textPr element. */
-struct TextProperties : public BaseProperties
-{
-    ::rtl::OUString     maSourceFile;
-};
-
-struct Connection
-{
-    static const sal_Int32 CONNECTION_ODBC_SOURCE;
-    static const sal_Int32 CONNECTION_DAO_SOURCE;
-    static const sal_Int32 CONNECTION_FILE_SOURCE;
-    static const sal_Int32 CONNECTION_WEBQUERY;
-    static const sal_Int32 CONNECTION_OLEDB_SOURCE;
-    static const sal_Int32 CONNECTION_TEXT_SOURCE;
-    static const sal_Int32 CONNECTION_ADO_RECORD_SET;
-    static const sal_Int32 CONNECTION_DSP;
-
-    ::rtl::OUString     maName;                     /// Connection name (must be unique).
-    sal_Int32           mnType;
-    ::boost::shared_ptr< BaseProperties > mpProperties;
-};
-
-// ============================================================================
-
-typedef ::boost::unordered_map< ::rtl::OUString, QueryTable, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > QueryTableHashMap;
-
-class WebQueryBuffer : public WorkbookHelper
-{
-public:
-    explicit            WebQueryBuffer( const WorkbookHelper& rHelper );
-
-    void                importQueryTable( const AttributeList& rAttribs );
-
-    void                importConnection( const AttributeList& rAttribs );
-
-    void                importWebPr( const AttributeList& rAttribs );
-
-    /** Dumps content for debug purposes. */
-    void                dump() const;
-
-private:
-    QueryTableHashMap           maQueryTableMap;
-    ::std::vector< Connection > maConnections;
-
-    sal_Int32                   mnCurConnId;        /// Current connection ID.
-};
-
-// ============================================================================
-
-} // namespace xls
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/xls/workbookfragment.hxx b/oox/inc/oox/xls/workbookfragment.hxx
index 4ed3cfddd19f..d6d37242b0fc 100644
--- a/oox/inc/oox/xls/workbookfragment.hxx
+++ b/oox/inc/oox/xls/workbookfragment.hxx
@@ -39,22 +39,18 @@ class ExternalLink;
 
 // ============================================================================
 
-class OoxWorkbookFragment : public OoxWorkbookFragmentBase
+class WorkbookFragment : public WorkbookFragmentBase
 {
 public:
-    explicit            OoxWorkbookFragment(
+    explicit            WorkbookFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
-
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        finalizeImport();
@@ -64,8 +60,8 @@ private:
     void                importDefinedName( const AttributeList& rAttribs );
     void                importPivotCache( const AttributeList& rAttribs );
 
-    void                importExternalRef( RecordInputStream& rStrm );
-    void                importPivotCache( RecordInputStream& rStrm );
+    void                importExternalRef( SequenceInputStream& rStrm );
+    void                importPivotCache( SequenceInputStream& rStrm );
 
     void                importExternalLinkFragment( ExternalLink& rExtLink );
     void                importPivotCacheDefFragment( const ::rtl::OUString& rRelId, sal_Int32 nCacheId );
@@ -102,4 +98,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/workbookhelper.hxx b/oox/inc/oox/xls/workbookhelper.hxx
index 80401a257656..fa32ea026fca 100644
--- a/oox/inc/oox/xls/workbookhelper.hxx
+++ b/oox/inc/oox/xls/workbookhelper.hxx
@@ -38,24 +38,21 @@ namespace com { namespace sun { namespace star {
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
     namespace lang { class XMultiServiceFactory; }
-    namespace awt { class XDevice; }
+    namespace sheet { class XDatabaseRange; }
+    namespace sheet { class XNamedRange; }
+    namespace sheet { class XSpreadsheet; }
+    namespace sheet { class XSpreadsheetDocument; }
+    namespace style { class XStyle; }
     namespace table { struct CellAddress; }
     namespace table { struct CellRangeAddress; }
     namespace table { class XCell; }
     namespace table { class XCellRange; }
-    namespace sheet { class XSpreadsheetDocument; }
-    namespace sheet { class XSpreadsheet; }
-    namespace sheet { class XNamedRanges; }
-    namespace sheet { class XNamedRange; }
-    namespace sheet { class XDatabaseRanges; }
-    namespace sheet { class XExternalDocLinks; }
-    namespace style { class XStyle; }
 } } }
 
 namespace oox {
     class AttributeList;
     class SegmentProgressBar;
-    class RecordInputStream;
+    class SequenceInputStream;
 }
 
 namespace oox { namespace core {
@@ -80,8 +77,8 @@ class ExcelBiffFilter;
 /** An enumeration for all supported spreadsheet filter types. */
 enum FilterType
 {
-    FILTER_OOX,         /// MS Excel OOXML (Office Open XML) or OOBIN.
-    FILTER_BIFF,        /// MS Excel BIFF (Binary Interchange File Format).
+    FILTER_OOXML,       /// MS Excel OOXML (Office Open XML) or BIFF12.
+    FILTER_BIFF,        /// MS Excel BIFF2-BIFF8 (Binary Interchange File Format).
     FILTER_UNKNOWN      /// Unknown filter type.
 };
 
@@ -90,31 +87,31 @@ enum FilterType
 /** Functor for case-insensitive string comparison, usable in maps etc. */
 struct IgnoreCaseCompare
 {
-    bool                operator()( const ::rtl::OUString& rName1, const ::rtl::OUString& rName2 ) const;
+    bool operator()( const ::rtl::OUString& rName1, const ::rtl::OUString& rName2 ) const;
 };
 
 // ============================================================================
 
-class WorkbookData;
-class WorkbookSettings;
-class ViewSettings;
-class WorksheetBuffer;
-class ThemeBuffer;
-class StylesBuffer;
-class SharedStringsBuffer;
-class ExternalLinkBuffer;
+class AddressConverter;
+class BiffCodecHelper;
+class ConnectionsBuffer;
 class DefinedNamesBuffer;
-class TableBuffer;
-class ScenarioBuffer;
-class WebQueryBuffer;
+class ExcelChartConverter;
+class ExternalLinkBuffer;
+class FormulaParser;
+class PageSettingsConverter;
 class PivotCacheBuffer;
 class PivotTableBuffer;
-class FormulaParser;
+class ScenarioBuffer;
+class SharedStringsBuffer;
+class StylesBuffer;
+class TableBuffer;
+class ThemeBuffer;
 class UnitConverter;
-class AddressConverter;
-class ExcelChartConverter;
-class PageSettingsConverter;
-class BiffCodecHelper;
+class ViewSettings;
+class WorkbookData;
+class WorkbookSettings;
+class WorksheetBuffer;
 
 /** Helper class to provice access to global workbook data.
 
@@ -164,21 +161,6 @@ public:
     /** Returns a reference to the service factory of the spreadsheet document model. */
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                         getDocumentFactory() const;
-    /** Returns the reference device of the document. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >
-                        getReferenceDevice() const;
-    /** Returns the container for defined names from the Calc document. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRanges >
-                        getNamedRanges() const;
-    /** Returns the container for database ranges from the Calc document. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRanges >
-                        getDatabaseRanges() const;
-    /** Returns the container for external documents from the Calc document. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLinks >
-                        getExternalDocLinks() const;
-    /** Returns the container for DDE links from the Calc document. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                        getDdeLinks() const;
 
     /** Returns a reference to the specified spreadsheet in the document model. */
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >
@@ -204,12 +186,21 @@ public:
                         getStyleObject( const ::rtl::OUString& rStyleName, bool bPageStyle ) const;
 
     /** Creates and returns a defined name on-the-fly in the Calc document.
-        The name will not be buffered in this defined names buffer.
+        The name will not be buffered in the global defined names buffer.
         @param orName  (in/out-parameter) Returns the resulting used name. */
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
                         createNamedRangeObject(
                             ::rtl::OUString& orName,
                             sal_Int32 nNameFlags = 0 ) const;
+
+    /** Creates and returns a database range on-the-fly in the Calc document.
+        The range will not be buffered in the global table buffer.
+        @param orName  (in/out-parameter) Returns the resulting used name. */
+    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange >
+                        createDatabaseRangeObject(
+                            ::rtl::OUString& orName,
+                            const ::com::sun::star::table::CellRangeAddress& rRangeAddr ) const;
+
     /** Creates and returns a com.sun.star.style.Style object for cells or pages. */
     ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >
                         createStyleObject(
@@ -238,8 +229,8 @@ public:
     TableBuffer&        getTables() const;
     /** Returns the scenarios collection. */
     ScenarioBuffer&     getScenarios() const;
-    /** Returns the web queries. */
-    WebQueryBuffer&     getWebQueries() const;
+    /** Returns the collection of external data connections. */
+    ConnectionsBuffer&  getConnections() const;
     /** Returns the collection of pivot caches. */
     PivotCacheBuffer&   getPivotCaches() const;
     /** Returns the collection of pivot tables. */
@@ -258,17 +249,17 @@ public:
     /** Returns the page and print settings converter. */
     PageSettingsConverter& getPageSettingsConverter() const;
 
-    // OOX specific (MUST NOT be called in BIFF filter) -----------------------
+    // OOXML/BIFF12 specific (MUST NOT be called in BIFF filter) --------------
 
-    /** Returns the base OOX filter object.
-        Must not be called, if current filter is not the OOX filter. */
+    /** Returns the base OOXML/BIFF12 filter object.
+        Must not be called, if current filter is not the OOXML/BIFF12 filter. */
     ::oox::core::XmlFilterBase& getOoxFilter() const;
 
     /** Imports a fragment using the passed fragment handler, which contains
         the full path to the fragment stream. */
     bool                importOoxFragment( const ::rtl::Reference< ::oox::core::FragmentHandler >& rxHandler );
 
-    // BIFF specific (MUST NOT be called in OOX filter) -----------------------
+    // BIFF2-BIFF8 specific (MUST NOT be called in OOXML/BIFF12 filter) -------
 
     /** Returns the base BIFF filter object. */
     ::oox::core::BinaryFilterBase& getBiffFilter() const;
diff --git a/oox/inc/oox/xls/workbooksettings.hxx b/oox/inc/oox/xls/workbooksettings.hxx
index 82fc889d0660..eb1ac8237c81 100644
--- a/oox/inc/oox/xls/workbooksettings.hxx
+++ b/oox/inc/oox/xls/workbooksettings.hxx
@@ -63,8 +63,8 @@ struct WorkbookSettingsModel
 
     explicit            WorkbookSettingsModel();
 
-    /** Sets OOBIN or BIFF object visibility mode. */
-    void                setBinObjectMode( sal_uInt16 nObjMode );
+    /** Sets BIFF object visibility mode. */
+    void                setBiffObjectMode( sal_uInt16 nObjMode );
 };
 
 // ============================================================================
@@ -103,11 +103,11 @@ public:
     void                importCalcPr( const AttributeList& rAttribs );
 
     /** Imports the FILESHARING record containing write protection settings. */
-    void                importFileSharing( RecordInputStream& rStrm );
+    void                importFileSharing( SequenceInputStream& rStrm );
     /** Imports the WORKBOOKPR record containing global workbook settings. */
-    void                importWorkbookPr( RecordInputStream& rStrm );
+    void                importWorkbookPr( SequenceInputStream& rStrm );
     /** Imports the CALCPR record containing workbook calculation settings. */
-    void                importCalcPr( RecordInputStream& rStrm );
+    void                importCalcPr( SequenceInputStream& rStrm );
 
     /** Sets the save external linked values flag, e.g. from the WSBOOL record. */
     void                setSaveExtLinkValues( bool bSaveExtLinks );
@@ -165,4 +165,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/worksheetbuffer.hxx b/oox/inc/oox/xls/worksheetbuffer.hxx
index 8b88a84981fb..5873ec41d9e9 100644
--- a/oox/inc/oox/xls/worksheetbuffer.hxx
+++ b/oox/inc/oox/xls/worksheetbuffer.hxx
@@ -30,7 +30,8 @@
 #define OOX_XLS_WORKSHEETBUFFER_HXX
 
 #include <utility>
-#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/refmap.hxx"
+#include "oox/helper/refvector.hxx"
 #include "oox/xls/workbookhelper.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -59,8 +60,8 @@ struct SheetInfoModel
 /** Stores information about all sheets in a spreadsheet document.
 
     Information about sheets includes the sheet name, the visibility state, and
-    for the OOX filter, the relation identifier of the sheet used to obtain the
-    related worksheet fragment.
+    for the OOXML filter, the relation identifier of the sheet used to obtain
+    the related worksheet fragment.
  */
 class WorksheetBuffer : public WorkbookHelper
 {
@@ -75,8 +76,8 @@ public:
 
     /** Imports the attributes of a sheet element. */
     void                importSheet( const AttributeList& rAttribs );
-    /** Imports the SHEET record from the passed OOBIN stream. */
-    void                importSheet( RecordInputStream& rStrm );
+    /** Imports the SHEET record from the passed BIFF12 stream. */
+    void                importSheet( SequenceInputStream& rStrm );
     /** Imports the SHEET record from the passed BIFF stream. */
     void                importSheet( BiffInputStream& rStrm );
     /** Inserts a new empty sheet into the document. Looks for an unused name.
@@ -85,7 +86,7 @@ public:
 
     /** Returns the number of original sheets contained in the workbook. */
     sal_Int32           getWorksheetCount() const;
-    /** Returns the OOX relation identifier of the specified worksheet. */
+    /** Returns the OOXML relation identifier of the specified worksheet. */
     ::rtl::OUString     getWorksheetRelId( sal_Int32 nWorksheet ) const;
     /** Returns the BIFF record handle of the associated sheet substream. */
     sal_Int64           getBiffRecordHandle( sal_Int32 nWorksheet ) const;
@@ -132,4 +133,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/worksheetfragment.hxx b/oox/inc/oox/xls/worksheetfragment.hxx
index bd78d241bc04..32970c8c8956 100644
--- a/oox/inc/oox/xls/worksheetfragment.hxx
+++ b/oox/inc/oox/xls/worksheetfragment.hxx
@@ -36,24 +36,23 @@ namespace xls {
 
 // ============================================================================
 
-class OoxDataValidationsContext : public OoxWorksheetContextBase
+class DataValidationsContext : public WorksheetContextBase
 {
 public:
-    explicit            OoxDataValidationsContext( OoxWorksheetFragmentBase& rFragment );
+    explicit            DataValidationsContext( WorksheetFragmentBase& rFragment );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
+    virtual void        onEndElement();
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
 private:
     /** Imports the dataValidation element containing data validation settings. */
     void                importDataValidation( const AttributeList& rAttribs );
     /** Imports the DATAVALIDATION record containing data validation settings. */
-    void                importDataValidation( RecordInputStream& rStrm );
+    void                importDataValidation( SequenceInputStream& rStrm );
 
 private:
     ::std::auto_ptr< ValidationModel > mxValModel;
@@ -61,25 +60,21 @@ private:
 
 // ============================================================================
 
-class OoxWorksheetFragment : public OoxWorksheetFragmentBase
+class WorksheetFragment : public WorksheetFragmentBase
 {
 public:
-    explicit            OoxWorksheetFragment(
+    explicit            WorksheetFragment(
                             const WorkbookHelper& rHelper,
                             const ::rtl::OUString& rFragmentPath,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 
 protected:
-    // oox.core.ContextHandler2Helper interface -------------------------------
-
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
-    virtual void        onEndElement( const ::rtl::OUString& rChars );
+    virtual void        onCharacters( const ::rtl::OUString& rChars );
 
-    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, RecordInputStream& rStrm );
-
-    // oox.core.FragmentHandler2 interface ------------------------------------
+    virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
 
     virtual const ::oox::core::RecordInfo* getRecordInfos() const;
     virtual void        initializeImport();
@@ -110,25 +105,25 @@ private:
     void                importControl( const AttributeList& rAttribs );
 
     /** Imports the DIMENSION record containing the used area of the sheet. */
-    void                importDimension( RecordInputStream& rStrm );
+    void                importDimension( SequenceInputStream& rStrm );
     /** Imports sheet format properties from a SHEETFORMATPR record. */
-    void                importSheetFormatPr( RecordInputStream& rStrm );
+    void                importSheetFormatPr( SequenceInputStream& rStrm );
     /** Imports column settings from a COL record. */
-    void                importCol( RecordInputStream& rStrm );
+    void                importCol( SequenceInputStream& rStrm );
     /** Imports a merged cell range from a MERGECELL record. */
-    void                importMergeCell( RecordInputStream& rStrm );
+    void                importMergeCell( SequenceInputStream& rStrm );
     /** Imports a hyperlink for a cell range from a HYPERLINK record. */
-    void                importHyperlink( RecordInputStream& rStrm );
+    void                importHyperlink( SequenceInputStream& rStrm );
     /** Imports the BRK record for an individual row or column page break. */
-    void                importBrk( RecordInputStream& rStrm, bool bRowBreak );
+    void                importBrk( SequenceInputStream& rStrm, bool bRowBreak );
     /** Imports the DRAWING record containing the relation identifier for the DrawingML part. */
-    void                importDrawing( RecordInputStream& rStrm );
+    void                importDrawing( SequenceInputStream& rStrm );
     /** Imports the LEGACYDRAWING record containing the relation identifier for the VML drawing part. */
-    void                importLegacyDrawing( RecordInputStream& rStrm );
+    void                importLegacyDrawing( SequenceInputStream& rStrm );
     /** Imports additional data for an OLE object. */
-    void                importOleObject( RecordInputStream& rStrm );
+    void                importOleObject( SequenceInputStream& rStrm );
     /** Imports additional data for an OCX form control. */
-    void                importControl( RecordInputStream& rStrm );
+    void                importControl( SequenceInputStream& rStrm );
 
     /** Imports the binary data of an embedded OLE object from the fragment with the passed ID. */
     void                importEmbeddedOleData( StreamDataSequence& orEmbeddedData, const ::rtl::OUString& rRelId );
@@ -136,14 +131,12 @@ private:
 
 // ============================================================================
 
-class BiffPivotTableContext;
-
 class BiffWorksheetFragment : public BiffWorksheetFragmentBase
 {
 public:
     explicit            BiffWorksheetFragment(
                             const BiffWorkbookFragmentBase& rParent,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
     virtual             ~BiffWorksheetFragment();
@@ -152,41 +145,45 @@ public:
     virtual bool        importFragment();
 
 private:
+    /** Imports the AUTOFILTER and following records with auto filter settings. */
+    void                importAutoFilter( BiffInputStream& rStrm );
     /** Imports the COLINFO record and sets column properties and formatting. */
-    void                importColInfo();
+    void                importColInfo( BiffInputStream& rStrm );
     /** Imports the BIFF2 COLUMNDEFAULT record and sets column default formatting. */
-    void                importColumnDefault();
+    void                importColumnDefault( BiffInputStream& rStrm );
     /** Imports the BIFF2 COLWIDTH record and sets column width. */
-    void                importColWidth();
+    void                importColWidth( BiffInputStream& rStrm );
     /** Imports the DATAVALIDATION record containing cell ranges with data validation settings. */
-    void                importDataValidation();
+    void                importDataValidation( BiffInputStream& rStrm );
     /** Imports the DATAVALIDATIONS record containing global data validation settings. */
-    void                importDataValidations();
+    void                importDataValidations( BiffInputStream& rStrm );
     /** Imports the DEFCOLWIDTH record and sets default column width. */
-    void                importDefColWidth();
+    void                importDefColWidth( BiffInputStream& rStrm );
     /** Imports the DEFROWHEIGHT record and sets default row height and properties. */
-    void                importDefRowHeight();
+    void                importDefRowHeight( BiffInputStream& rStrm );
     /** Imports the DIMENSION record containing the used area of the sheet. */
-    void                importDimension();
+    void                importDimension( BiffInputStream& rStrm );
     /** Imports the HYPERLINK record and sets a cell hyperlink. */
-    void                importHyperlink();
+    void                importHyperlink( BiffInputStream& rStrm );
     /** Imports the LABELRANGES record and sets the imported label ranges. */
-    void                importLabelRanges();
+    void                importLabelRanges( BiffInputStream& rStrm );
     /** Imports the MEREDCELLS record and merges all cells in the document. */
-    void                importMergedCells();
+    void                importMergedCells( BiffInputStream& rStrm );
     /** Imports the HORPAGEBREAKS or VERPAGEBREAKS record and inserts page breaks. */
-    void                importPageBreaks( bool bRowBreak );
+    void                importPageBreaks( BiffInputStream& rStrm, bool bRowBreak );
     /** Imports a pivot table. */
-    void                importPTDefinition();
+    void                importPTDefinition( BiffInputStream& rStrm );
+    /** Imports the QUERYTABLE and following records and inserts a web query. */
+    void                importQueryTable( BiffInputStream& rStrm );
     /** Imports the SCENARIOS record and the following scenarios. */
-    void                importScenarios();
+    void                importScenarios( BiffInputStream& rStrm );
     /** Imports the SHAREDFEATHEAD record. */
-    void                importSharedFeatHead();
+    void                importSharedFeatHead( BiffInputStream& rStrm );
     /** Imports the STANDARDWIDTH record and sets standard column width. */
-    void                importStandardWidth();
+    void                importStandardWidth( BiffInputStream& rStrm );
 
 private:
-    ::boost::shared_ptr< BiffPivotTableContext > mxPTContext;
+    ::boost::shared_ptr< BiffWorksheetContextBase > mxContext;
 };
 
 // ============================================================================
@@ -196,4 +193,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/worksheethelper.hxx b/oox/inc/oox/xls/worksheethelper.hxx
index 6e45e5b71bbe..18800091f531 100644
--- a/oox/inc/oox/xls/worksheethelper.hxx
+++ b/oox/inc/oox/xls/worksheethelper.hxx
@@ -38,29 +38,31 @@ namespace com { namespace sun { namespace star {
     namespace awt { struct Point; }
     namespace awt { struct Rectangle; }
     namespace awt { struct Size; }
-    namespace util { struct DateTime; }
     namespace drawing { class XDrawPage; }
-    namespace table { class XTableColumns; }
-    namespace table { class XTableRows; }
+    namespace sheet { class XSheetCellRanges; }
+    namespace sheet { class XSpreadsheet; }
     namespace table { class XCell; }
     namespace table { class XCellRange; }
-    namespace sheet { class XSpreadsheet; }
-    namespace sheet { class XSheetCellRanges; }
+    namespace table { class XTableColumns; }
+    namespace table { class XTableRows; }
+    namespace util { struct DateTime; }
 } } }
 
 namespace oox {
 namespace xls {
 
+class AutoFilterBuffer;
 struct BinAddress;
 struct BinRange;
 class BinRangeList;
-class WorksheetSettings;
-class SharedFormulaBuffer;
-class CondFormatBuffer;
 class CommentsBuffer;
+class CondFormatBuffer;
 class PageSettings;
+class QueryTableBuffer;
+class SharedFormulaBuffer;
 class SheetViewSettings;
 class VmlDrawing;
+class WorksheetSettings;
 
 // ============================================================================
 // ============================================================================
@@ -203,12 +205,12 @@ struct ValidationModel
 
     explicit            ValidationModel();
 
-    /** Sets the passed OOBIN or BIFF validation type. */
-    void                setBinType( sal_uInt8 nType );
-    /** Sets the passed OOBIN or BIFF operator. */
-    void                setBinOperator( sal_uInt8 nOperator );
-    /** Sets the passed OOBIN or BIFF error style. */
-    void                setBinErrorStyle( sal_uInt8 nErrorStyle );
+    /** Sets the passed BIFF validation type. */
+    void                setBiffType( sal_uInt8 nType );
+    /** Sets the passed BIFF operator. */
+    void                setBiffOperator( sal_uInt8 nOperator );
+    /** Sets the passed BIFF error style. */
+    void                setBiffErrorStyle( sal_uInt8 nErrorStyle );
 };
 
 // ============================================================================
@@ -315,6 +317,10 @@ public:
     CondFormatBuffer&   getCondFormats() const;
     /** Returns the buffer for all cell comments in this sheet. */
     CommentsBuffer&     getComments() const;
+    /** Returns the auto filters for the sheet. */
+    AutoFilterBuffer&   getAutoFilters() const;
+    /** Returns the buffer for all web query tables in this sheet. */
+    QueryTableBuffer&   getQueryTables() const;
     /** Returns the page/print settings for this sheet. */
     PageSettings&       getPageSettings() const;
     /** Returns the view settings for this sheet. */
@@ -384,9 +390,8 @@ public:
     void                extendUsedArea( const ::com::sun::star::table::CellAddress& rAddress );
     /** Extends the used area of this sheet by the passed cell range. */
     void                extendUsedArea( const ::com::sun::star::table::CellRangeAddress& rRange );
-    /** Extends the shape bounding box by the position and size of the passed rectangle. */
-    void                extendShapeBoundingBox(
-                            const ::com::sun::star::awt::Rectangle& rShapeRect );
+    /** Extends the shape bounding box by the position and size of the passed rectangle (in 1/100 mm). */
+    void                extendShapeBoundingBox( const ::com::sun::star::awt::Rectangle& rShapeRect );
 
     /** Sets base width for all columns (without padding pixels). This value
         is only used, if width has not been set with setDefaultColumnWidth(). */
@@ -446,7 +451,7 @@ protected:
     /** Constructs from the passed data, creates and owns a new data object. */
     explicit            WorksheetHelperRoot(
                             const WorkbookHelper& rHelper,
-                            ISegmentProgressBarRef xProgressBar,
+                            const ISegmentProgressBarRef& rxProgressBar,
                             WorksheetType eSheetType,
                             sal_Int16 nSheet );
 
@@ -470,4 +475,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
diff --git a/oox/inc/oox/xls/worksheetsettings.hxx b/oox/inc/oox/xls/worksheetsettings.hxx
index 3f92c4f47aea..43e73ec52e38 100644
--- a/oox/inc/oox/xls/worksheetsettings.hxx
+++ b/oox/inc/oox/xls/worksheetsettings.hxx
@@ -29,8 +29,8 @@
 #ifndef OOX_XLS_WORKSHEETSETTINGS_HXX
 #define OOX_XLS_WORKSHEETSETTINGS_HXX
 
-#include "oox/xls/worksheethelper.hxx"
 #include "oox/xls/richstring.hxx"
+#include "oox/xls/worksheethelper.hxx"
 
 namespace oox {
 namespace xls {
@@ -99,16 +99,18 @@ public:
     void                importPhoneticPr( const AttributeList& rAttribs );
 
     /** Imports sheet properties from the SHEETPR record. */
-    void                importSheetPr( RecordInputStream& rStrm );
+    void                importSheetPr( SequenceInputStream& rStrm );
     /** Imports sheet properties from the CHARTSHEETPR record. */
-    void                importChartSheetPr( RecordInputStream& rStrm );
+    void                importChartSheetPr( SequenceInputStream& rStrm );
     /** Imports sheet protection settings from the SHEETPROTECTION record. */
-    void                importSheetProtection( RecordInputStream& rStrm );
+    void                importSheetProtection( SequenceInputStream& rStrm );
     /** Imports chart sheet protection settings from the CHARTPROTECTION record. */
-    void                importChartProtection( RecordInputStream& rStrm );
+    void                importChartProtection( SequenceInputStream& rStrm );
     /** Imports phonetic settings from the PHONETICPR record. */
-    void                importPhoneticPr( RecordInputStream& rStrm );
+    void                importPhoneticPr( SequenceInputStream& rStrm );
 
+    /** Imports sheet properties from a SHEETEXT record. */
+    void                importSheetExt( BiffInputStream& rStrm );
     /** Imports sheet properties from a SHEETPR record. */
     void                importSheetPr( BiffInputStream& rStrm );
     /** Imports protection status from the PROTECT record. */
@@ -142,4 +144,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+\ No newline at end of file
author	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 22:49:23 -0600
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 22:49:23 -0600
commit	f673d89a6a4f6b2d3d519ab17a57b299cb6be1ad (patch)
tree	dc8127da17e362197b1b19df7b6957ce554fb0fd /oox/inc
parent	50bc1bc97b170c38648fab979ccb812a3c458cab (diff)
parent	818573bfbce420afedffd45d7bb080f25da32625 (diff)