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

4 files changed, 211 insertions, 239 deletions

diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 3d2be51ef625..242d83b8e0fb 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -34,9 +34,7 @@
 
 #include <osl/time.h>
 
-#include "tokens.hxx"
 #include "oox/helper/attributelist.hxx"
-#include "oox/core/namespaces.hxx"
 
 using namespace ::com::sun::star;
 
@@ -227,19 +225,19 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const ::rtl::OUString& aChars )
 
     switch( m_nBlock )
     {
-        case XML_Characters|NMSP_EXTPR:
+        case EXTPR_TOKEN( Characters ):
             aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharacterCount" ) );
             break;
 
-        case XML_Pages|NMSP_EXTPR:
+        case EXTPR_TOKEN( Pages ):
             aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageCount" ) );
             break;
 
-        case XML_Words|NMSP_EXTPR:
+        case EXTPR_TOKEN( Words ):
             aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WordCount" ) );
             break;
 
-        case XML_Paragraphs|NMSP_EXTPR:
+        case EXTPR_TOKEN( Paragraphs ):
             aName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphCount" ) );
             break;
 
@@ -300,9 +298,9 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const
 {
     if ( !m_nInBlock && !m_nState )
     {
-        if ( nElement == ( XML_coreProperties|NMSP_COREPR )
-          || nElement == ( XML_Properties|NMSP_EXTPR )
-          || nElement == ( XML_Properties|NMSP_CUSTPR ) )
+        if ( nElement == COREPR_TOKEN( coreProperties )
+          || nElement == EXTPR_TOKEN( Properties )
+          || nElement == CUSTPR_TOKEN( Properties ) )
         {
             m_nState = nElement;
         }
@@ -321,7 +319,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const
         if ( xAttribs.is() && xAttribs->hasAttribute( XML_name ) )
             m_aCustomPropertyName = xAttribs->getValue( XML_name );
     }
-    else if ( m_nState && m_nInBlock && m_nInBlock == 2 && ( nElement >> 16 ) == ( NMSP_VT >> 16 ) )
+    else if ( m_nState && m_nInBlock && m_nInBlock == 2 && getNamespace( nElement ) == NMSP_officeDocPropsVT )
     {
         m_nType = nElement;
     }
@@ -403,72 +401,72 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString& aChars )
     {
         if ( (m_nInBlock == 2) || ((m_nInBlock == 3) && m_nType) )
         {
-            if ( m_nState == ( XML_coreProperties|NMSP_COREPR ) )
+            if ( m_nState == COREPR_TOKEN( coreProperties ) )
             {
                 switch( m_nBlock )
                 {
-                    case XML_category|NMSP_COREPR:
+                    case COREPR_TOKEN( category ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "category" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_contentStatus|NMSP_COREPR:
+                    case COREPR_TOKEN( contentStatus ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "contentStatus" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_contentType|NMSP_COREPR:
+                    case COREPR_TOKEN( contentType ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "contentType" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_identifier|NMSP_COREPR:
+                    case COREPR_TOKEN( identifier ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "identifier" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_version|NMSP_COREPR:
+                    case COREPR_TOKEN( version ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "version" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_created|NMSP_DCTERMS:
+                    case DCT_TOKEN( created ):
                         if ( aChars.getLength() >= 4 )
                             m_xDocProp->setCreationDate( GetDateTimeFromW3CDTF( aChars ) );
                         break;
 
-                    case XML_creator|NMSP_DC:
+                    case DC_TOKEN( creator ):
                         m_xDocProp->setAuthor( aChars );
                         break;
 
-                    case XML_description|NMSP_DC:
+                    case DC_TOKEN( description ):
                         m_xDocProp->setDescription( aChars );
                         break;
 
-                    case XML_keywords|NMSP_COREPR:
+                    case COREPR_TOKEN( keywords ):
                         m_xDocProp->setKeywords( GetKeywordsSet( aChars ) );
                         break;
 
-                    case XML_language|NMSP_DC:
+                    case DC_TOKEN( language ):
                         if ( aChars.getLength() >= 2 )
                             m_xDocProp->setLanguage( GetLanguage( aChars ) );
                         break;
 
-                    case XML_lastModifiedBy|NMSP_COREPR:
+                    case COREPR_TOKEN( lastModifiedBy ):
                         m_xDocProp->setModifiedBy( aChars );
                         break;
 
-                    case XML_lastPrinted|NMSP_COREPR:
+                    case COREPR_TOKEN( lastPrinted ):
                         if ( aChars.getLength() >= 4 )
                             m_xDocProp->setPrintDate( GetDateTimeFromW3CDTF( aChars ) );
                         break;
 
-                    case XML_modified|NMSP_DCTERMS:
+                    case DCT_TOKEN( modified ):
                         if ( aChars.getLength() >= 4 )
                             m_xDocProp->setModificationDate( GetDateTimeFromW3CDTF( aChars ) );
                         break;
 
-                    case XML_revision|NMSP_COREPR:
+                    case COREPR_TOKEN( revision ):
                         try
                         {
                             m_xDocProp->setEditingCycles(
@@ -480,11 +478,11 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString& aChars )
                         }
                         break;
 
-                    case XML_subject|NMSP_DC:
+                    case DC_TOKEN( subject ):
                         m_xDocProp->setSubject( aChars );
                         break;
 
-                    case XML_title|NMSP_DC:
+                    case DC_TOKEN( title ):
                         m_xDocProp->setTitle( aChars );
                         break;
 
@@ -492,19 +490,19 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString& aChars )
                         OSL_FAIL( "Unexpected core property!" );
                 }
             }
-            else if ( m_nState == ( XML_Properties|NMSP_EXTPR ) )
+            else if ( m_nState == EXTPR_TOKEN( Properties ) )
             {
                 switch( m_nBlock )
                 {
-                    case XML_Application|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Application ):
                         m_xDocProp->setGenerator( aChars );
                         break;
 
-                    case XML_Template|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Template ):
                         m_xDocProp->setTemplateName( aChars );
                         break;
 
-                    case XML_TotalTime|NMSP_EXTPR:
+                    case EXTPR_TOKEN( TotalTime ):
                         try
                         {
                             m_xDocProp->setEditingDuration( aChars.toInt32() );
@@ -515,89 +513,89 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString& aChars )
                         }
                         break;
 
-                    case XML_Characters|NMSP_EXTPR:
-                    case XML_Pages|NMSP_EXTPR:
-                    case XML_Words|NMSP_EXTPR:
-                    case XML_Paragraphs|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Characters ):
+                    case EXTPR_TOKEN( Pages ):
+                    case EXTPR_TOKEN( Words ):
+                    case EXTPR_TOKEN( Paragraphs ):
                         UpdateDocStatistic( aChars );
                         break;
 
-                    case XML_HyperlinksChanged|NMSP_EXTPR:
+                    case EXTPR_TOKEN( HyperlinksChanged ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HyperlinksChanged" ) );
                         AddCustomProperty( uno::makeAny( aChars.toBoolean() ) ); // the property has boolean type
                         break;
 
-                    case XML_LinksUpToDate|NMSP_EXTPR:
+                    case EXTPR_TOKEN( LinksUpToDate ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LinksUpToDate" ) );
                         AddCustomProperty( uno::makeAny( aChars.toBoolean() ) ); // the property has boolean type
                         break;
 
-                    case XML_ScaleCrop|NMSP_EXTPR:
+                    case EXTPR_TOKEN( ScaleCrop ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScaleCrop" ) );
                         AddCustomProperty( uno::makeAny( aChars.toBoolean() ) ); // the property has boolean type
                         break;
 
-                    case XML_SharedDoc|NMSP_EXTPR:
+                    case EXTPR_TOKEN( SharedDoc ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShareDoc" ) );
                         AddCustomProperty( uno::makeAny( aChars.toBoolean() ) ); // the property has boolean type
                         break;
 
-                    case XML_DocSecurity|NMSP_EXTPR:
+                    case EXTPR_TOKEN( DocSecurity ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocSecurity" ) );
                         AddCustomProperty( uno::makeAny( aChars.toInt32() ) ); // the property has sal_Int32 type
                         break;
 
-                    case XML_HiddenSlides|NMSP_EXTPR:
+                    case EXTPR_TOKEN( HiddenSlides ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HiddenSlides" ) );
                         AddCustomProperty( uno::makeAny( aChars.toInt32() ) ); // the property has sal_Int32 type
                         break;
 
-                    case XML_MMClips|NMSP_EXTPR:
+                    case EXTPR_TOKEN( MMClips ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MMClips" ) );
                         AddCustomProperty( uno::makeAny( aChars.toInt32() ) ); // the property has sal_Int32 type
                         break;
 
-                    case XML_Notes|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Notes ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Notes" ) );
                         AddCustomProperty( uno::makeAny( aChars.toInt32() ) ); // the property has sal_Int32 type
                         break;
 
-                    case XML_Slides|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Slides ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Slides" ) );
                         AddCustomProperty( uno::makeAny( aChars.toInt32() ) ); // the property has sal_Int32 type
                         break;
 
-                    case XML_AppVersion|NMSP_EXTPR:
+                    case EXTPR_TOKEN( AppVersion ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AppVersion" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_Company|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Company ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Company" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_HyperlinkBase|NMSP_EXTPR:
+                    case EXTPR_TOKEN( HyperlinkBase ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HyperlinkBase" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_Manager|NMSP_EXTPR:
+                    case EXTPR_TOKEN( Manager ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Manager" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_PresentationFormat|NMSP_EXTPR:
+                    case EXTPR_TOKEN( PresentationFormat ):
                         m_aCustomPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PresentationFormat" ) );
                         AddCustomProperty( uno::makeAny( aChars ) ); // the property has string type
                         break;
 
-                    case XML_CharactersWithSpaces|NMSP_EXTPR:
-                    case XML_Lines|NMSP_EXTPR:
-                    case XML_DigSig|NMSP_EXTPR:
-                    case XML_HeadingPairs|NMSP_EXTPR:
-                    case XML_HLinks|NMSP_EXTPR:
-                    case XML_TitlesOfParts|NMSP_EXTPR:
+                    case EXTPR_TOKEN( CharactersWithSpaces ):
+                    case EXTPR_TOKEN( Lines ):
+                    case EXTPR_TOKEN( DigSig ):
+                    case EXTPR_TOKEN( HeadingPairs ):
+                    case EXTPR_TOKEN( HLinks ):
+                    case EXTPR_TOKEN( TitlesOfParts ):
                         // ignored during the import currently
                         break;
 
@@ -605,46 +603,46 @@ void SAL_CALL OOXMLDocPropHandler::characters( const ::rtl::OUString& aChars )
                         OSL_FAIL( "Unexpected extended property!" );
                 }
             }
-            else if ( m_nState == ( XML_Properties|NMSP_CUSTPR ) )
+            else if ( m_nState == CUSTPR_TOKEN( Properties ) )
             {
-                if ( m_nBlock == ( XML_property|NMSP_CUSTPR ) )
+                if ( m_nBlock == CUSTPR_TOKEN( property ) )
                 {
                     // this is a custom property
                     switch( m_nType )
                     {
-                        case XML_bool|NMSP_VT:
+                        case VT_TOKEN( bool ):
                             AddCustomProperty( uno::makeAny( aChars.toBoolean() ) );
                             break;
 
-                        case XML_bstr|NMSP_VT:
-                        case XML_lpstr|NMSP_VT:
-                        case XML_lpwstr|NMSP_VT:
+                        case VT_TOKEN( bstr ):
+                        case VT_TOKEN( lpstr ):
+                        case VT_TOKEN( lpwstr ):
                             AddCustomProperty( uno::makeAny( AttributeConversion::decodeXString( aChars ) ) ); // the property has string type
                             break;
 
-                        case XML_date|NMSP_VT:
-                        case XML_filetime|NMSP_VT:
+                        case VT_TOKEN( date ):
+                        case VT_TOKEN( filetime ):
                             AddCustomProperty( uno::makeAny( GetDateTimeFromW3CDTF( aChars ) ) );
 
-                        case XML_i1|NMSP_VT:
-                        case XML_i2|NMSP_VT:
+                        case VT_TOKEN( i1 ):
+                        case VT_TOKEN( i2 ):
                             AddCustomProperty( uno::makeAny( (sal_Int16)aChars.toInt32() ) );
                             break;
 
-                        case XML_i4|NMSP_VT:
-                        case XML_int|NMSP_VT:
+                        case VT_TOKEN( i4 ):
+                        case VT_TOKEN( int ):
                             AddCustomProperty( uno::makeAny( aChars.toInt32() ) );
                             break;
 
-                        case XML_i8|NMSP_VT:
+                        case VT_TOKEN( i8 ):
                             AddCustomProperty( uno::makeAny( aChars.toInt64() ) );
                             break;
 
-                        case XML_r4|NMSP_VT:
+                        case VT_TOKEN( r4 ):
                             AddCustomProperty( uno::makeAny( aChars.toFloat() ) );
                             break;
 
-                        case XML_r8|NMSP_VT:
+                        case VT_TOKEN( r8 ):
                             AddCustomProperty( uno::makeAny( aChars.toDouble() ) );
                             break;
 
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 5f4baf8be17a..47f34f77e740 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -35,9 +35,19 @@
 
 #include <cppuhelper/implbase1.hxx>
 
+#include "oox/token/namespaces.hxx"
+#include "oox/token/tokens.hxx"
+
 namespace oox {
 namespace docprop {
 
+#define COREPR_TOKEN( token )   (::oox::NMSP_packageMetaCorePr | XML_##token)
+#define CUSTPR_TOKEN( token )   (::oox::NMSP_officeCustomPr | XML_##token)
+#define EXTPR_TOKEN( token )    (::oox::NMSP_officeExtPr | XML_##token)
+#define VT_TOKEN( token )       (::oox::NMSP_officeDocPropsVT | XML_##token)
+#define DC_TOKEN( token )       (::oox::NMSP_dc | XML_##token)
+#define DCT_TOKEN( token )      (::oox::NMSP_dcTerms | XML_##token)
+
 class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index a8b4559327d7..7e826d51a83b 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -26,204 +26,167 @@
  *
  ************************************************************************/
 
-#include <com/sun/star/embed/XStorage.hpp>
+#include "ooxmldocpropimport.hxx"
+
+#include <vector>
+#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <com/sun/star/embed/XRelationshipAccess.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/xml/sax/XFastParser.hpp>
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
-
-#include <oox/core/namespaces.hxx>
+#include <com/sun/star/embed/XStorage.hpp>
+#include "oox/core/fastparser.hxx"
+#include "oox/core/relations.hxx"
+#include "oox/helper/containerhelper.hxx"
+#include "oox/helper/helper.hxx"
 #include "docprophandler.hxx"
-#include "ooxmldocpropimport.hxx"
-
-using namespace ::com::sun::star;
 
 namespace oox {
 namespace docprop {
 
-// -----------------------------------------------------------
-::rtl::OUString SAL_CALL OOXMLDocPropImportImpl_getImplementationName()
+// ============================================================================
+
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::xml::sax;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+OUString SAL_CALL DocumentPropertiesImport_getImplementationName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.oox.docprop.OOXMLDocumentPropertiesImporter"));
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" );
 }
 
-// -----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OOXMLDocPropImportImpl_getSupportedServiceNames()
+Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames()
 {
-    uno::Sequence< ::rtl::OUString > s(1);
-    s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.document.OOXMLDocumentPropertiesImporter"));
-    return s;
+    Sequence< OUString > aServices( 1 );
+    aServices[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.OOXMLDocumentPropertiesImporter" );
+    return aServices;
 }
 
-// -----------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL OOXMLDocPropImportImpl_createInstance(
-    const uno::Reference< uno::XComponentContext > & context)
-        SAL_THROW((uno::Exception))
+Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext ) SAL_THROW((Exception))
 {
-    return static_cast< ::cppu::OWeakObject * >(new OOXMLDocPropImportImpl(context));
+    return static_cast< ::cppu::OWeakObject* >( new DocumentPropertiesImport( rxContext ) );
 }
 
+// ============================================================================
 
-// -----------------------------------------------------------
-OOXMLDocPropImportImpl::OOXMLDocPropImportImpl(uno::Reference< uno::XComponentContext > const & xContext) :
-    m_xContext( xContext )
-{}
+namespace {
 
-// -----------------------------------------------------------
-uno::Sequence< xml::sax::InputSource > OOXMLDocPropImportImpl::GetRelatedStreams( const uno::Reference< embed::XStorage > xStorage, const ::rtl::OUString& aStreamType )
+Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException)
 {
-    if ( !xStorage.is() )
-        throw uno::RuntimeException();
+    Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW );
+    Reference< XHierarchicalStorageAccess > xHierarchy( rxStorage, UNO_QUERY_THROW );
 
-    uno::Reference< embed::XRelationshipAccess > xRelation( xStorage, uno::UNO_QUERY_THROW );
-    uno::Reference< embed::XHierarchicalStorageAccess > xHierarchy( xStorage, uno::UNO_QUERY_THROW );
+    Sequence< Sequence< StringPair > > aPropsInfo = xRelation->getRelationshipsByType( rStreamType );
 
-    uno::Sequence< uno::Sequence< beans::StringPair > > aPropsInfo = xRelation->getRelationshipsByType( aStreamType );
+    ::std::vector< InputSource > aResult;
 
-    uno::Sequence< xml::sax::InputSource > aResult( aPropsInfo.getLength() );
-    if ( aPropsInfo.getLength() )
+    for( sal_Int32 nIndex = 0, nLength = aPropsInfo.getLength(); nIndex < nLength; ++nIndex )
     {
-        sal_Int32 nLength = 0;
-        for ( sal_Int32 nInd = 0; nInd < aPropsInfo.getLength(); nInd++ )
-            for ( sal_Int32 nEntryInd = 0; nEntryInd < aPropsInfo[nInd].getLength(); nEntryInd++ )
-                if ( aPropsInfo[nInd][nEntryInd].First.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Target" ) ) ) )
+        const Sequence< StringPair >& rEntries = aPropsInfo[ nIndex ];
+        for( sal_Int32 nEntryIndex = 0, nEntryLength = rEntries.getLength(); nEntryIndex < nEntryLength; ++nEntryIndex )
+        {
+            const StringPair& rEntry = rEntries[ nEntryIndex ];
+            if( rEntry.First.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Target" ) ) )
+            {
+                Reference< XExtendedStorageStream > xExtStream(
+                    xHierarchy->openStreamElementByHierarchicalName( rEntry.Second, ElementModes::READ ), UNO_QUERY_THROW );
+                Reference< XInputStream > xInStream = xExtStream->getInputStream();
+                if( xInStream.is() )
                 {
-                    uno::Reference< embed::XExtendedStorageStream > xExtStream = xHierarchy->openStreamElementByHierarchicalName( aPropsInfo[nInd][nEntryInd].Second, embed::ElementModes::READ );
-                    if ( !xExtStream.is() )
-                        throw uno::RuntimeException();
-
-                    aResult[nLength].sSystemId = aPropsInfo[nInd][nEntryInd].Second;
-                    aResult[nLength++].aInputStream = xExtStream->getInputStream();
-                    break;
+                    aResult.resize( aResult.size() + 1 );
+                    aResult.back().sSystemId = rEntry.Second;
+                    aResult.back().aInputStream = xExtStream->getInputStream();
                 }
-
-        aResult.realloc( nLength );
+                break;
+            }
+        }
     }
 
-    return aResult;
+    return ContainerHelper::vectorToSequence( aResult );
 }
 
-// com.sun.star.uno.XServiceInfo:
-// -----------------------------------------------------------
-::rtl::OUString SAL_CALL OOXMLDocPropImportImpl::getImplementationName() throw (uno::RuntimeException)
+} // namespace
+
+// ============================================================================
+
+DocumentPropertiesImport::DocumentPropertiesImport( const Reference< XComponentContext >& rxContext ) :
+    mxContext( rxContext )
 {
-    return OOXMLDocPropImportImpl_getImplementationName();
 }
 
-// -----------------------------------------------------------
-::sal_Bool SAL_CALL OOXMLDocPropImportImpl::supportsService(::rtl::OUString const & serviceName) throw (uno::RuntimeException)
-{
-    uno::Sequence< ::rtl::OUString > serviceNames = OOXMLDocPropImportImpl_getSupportedServiceNames();
-    for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i)
-    {
-        if (serviceNames[i] == serviceName)
-            return sal_True;
-    }
+// XServiceInfo
 
-    return sal_False;
+OUString SAL_CALL DocumentPropertiesImport::getImplementationName() throw (RuntimeException)
+{
+    return DocumentPropertiesImport_getImplementationName();
 }
 
-// -----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OOXMLDocPropImportImpl::getSupportedServiceNames() throw (uno::RuntimeException)
+sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName ) throw (RuntimeException)
 {
-    return OOXMLDocPropImportImpl_getSupportedServiceNames();
+    Sequence< OUString > aServiceNames = DocumentPropertiesImport_getSupportedServiceNames();
+    for( sal_Int32 nIndex = 0, nLength = aServiceNames.getLength(); nIndex < nLength; ++nIndex )
+        if( aServiceNames[ nIndex ] == rServiceName )
+            return sal_True;
+    return sal_False;
 }
 
-// -----------------------------------------------------------
-// ::com::sun::star::document::XOOXMLDocumentPropertiesImporter:
-void SAL_CALL OOXMLDocPropImportImpl::importProperties(const uno::Reference< embed::XStorage > & xSource, const uno::Reference< document::XDocumentProperties > & xDocumentProperties) throw (uno::RuntimeException, lang::IllegalArgumentException, xml::sax::SAXException, uno::Exception)
+Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames() throw (RuntimeException)
 {
-    // TODO: Insert your implementation for "importProperties" here.
-    if ( !m_xContext.is() )
-        throw uno::RuntimeException();
+    return DocumentPropertiesImport_getSupportedServiceNames();
+}
 
-    if ( !xSource.is() || !xDocumentProperties.is() )
-        throw lang::IllegalArgumentException();
+// XOOXMLDocumentPropertiesImporter
 
-    // the MS Office seems to have a bug, so we have to do similar handling
-    ::rtl::OUString aCoreType( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties" ) );
-    ::rtl::OUString aCoreWorkaroundType( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" ) );
+void SAL_CALL DocumentPropertiesImport::importProperties(
+        const Reference< XStorage >& rxSource, const Reference< XDocumentProperties >& rxDocumentProperties )
+        throw (RuntimeException, IllegalArgumentException, SAXException, Exception)
+{
+    if( !mxContext.is() )
+        throw RuntimeException();
 
-    ::rtl::OUString aExtType( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officedocument/2006/relationships/extended-properties" ) );
-    ::rtl::OUString aCustomType( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officedocument/2006/relationships/custom-properties" ) );
+    if( !rxSource.is() || !rxDocumentProperties.is() )
+        throw IllegalArgumentException();
 
-    uno::Sequence< xml::sax::InputSource > aCoreStreams = GetRelatedStreams( xSource, aCoreType );
-    if ( !aCoreStreams.getLength() )
-        aCoreStreams = GetRelatedStreams( xSource, aCoreWorkaroundType );
+    Sequence< InputSource > aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "metadata/core-properties" ) );
+    // MS Office seems to have a bug, so we have to do similar handling
+    if( !aCoreStreams.hasElements() )
+        aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_PACKAGE_RELATION_TYPE( "metadata/core-properties" ) );
 
-    uno::Sequence< xml::sax::InputSource > aExtStreams = GetRelatedStreams( xSource, aExtType );
-    uno::Sequence< xml::sax::InputSource > aCustomStreams = GetRelatedStreams( xSource, aCustomType );
+    Sequence< InputSource > aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "extended-properties" ) );
+    Sequence< InputSource > aCustomStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "custom-properties" ) );
 
-    if ( aCoreStreams.getLength() || aExtStreams.getLength() || aCustomStreams.getLength() )
+    if( aCoreStreams.hasElements() || aExtStreams.hasElements() || aCustomStreams.hasElements() )
     {
-        if ( aCoreStreams.getLength() > 1 )
-            throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unexpected core properties stream!" ) ), uno::Reference< uno::XInterface >() );
-
-        uno::Reference< lang::XMultiComponentFactory > xFactory( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-
-        uno::Reference< xml::sax::XFastParser > xParser(
-            xFactory->createInstanceWithContext(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.FastParser" ) ),
-                m_xContext ),
-            uno::UNO_QUERY_THROW );
-
-        uno::Reference< xml::sax::XFastTokenHandler > xTokenHandler(
-            xFactory->createInstanceWithContext(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.oox.FastTokenHandlerService" ) ),
-                m_xContext ),
-            uno::UNO_QUERY_THROW );
-
-        uno::Reference< xml::sax::XFastDocumentHandler > xDocHandler( static_cast< xml::sax::XFastDocumentHandler* >( new OOXMLDocPropHandler( m_xContext, xDocumentProperties ) ) );
-
-        xParser->setFastDocumentHandler( xDocHandler );
-        xParser->setTokenHandler( xTokenHandler );
-
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/package/2006/metadata/core-properties" ) ), NMSP_COREPR );
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://purl.org/dc/elements/1.1/" ) ), NMSP_DC );
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://purl.org/dc/terms/" ) ), NMSP_DCTERMS );
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" ) ), NMSP_EXTPR );
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" ) ), NMSP_CUSTPR );
-        xParser->registerNamespace( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes" ) ), NMSP_VT );
-
-        // #158414# XFastParser::parseStream() throws on invalid XML
-        if ( aCoreStreams.getLength() ) try
-        {
-            if ( aCoreStreams[0].aInputStream.is() )
-            {
-                xParser->parseStream( aCoreStreams[0] );
-                aCoreStreams[0].aInputStream->closeInput();
-            }
-        }
-        catch( uno::Exception& )
-        {
-        }
-
-        sal_Int32 nInd = 0;
-        for ( nInd = 0; nInd < aExtStreams.getLength(); nInd++ )
-        {
-            xParser->parseStream( aExtStreams[nInd] );
-            if ( aExtStreams[nInd].aInputStream.is() )
-                aExtStreams[nInd].aInputStream->closeInput();
-        }
-
-        for ( nInd = 0; nInd < aCustomStreams.getLength(); nInd++ )
-        {
-            xParser->parseStream( aCustomStreams[nInd] );
-            if ( aCustomStreams[nInd].aInputStream.is() )
-                aCustomStreams[nInd].aInputStream->closeInput();
-        }
+        if( aCoreStreams.getLength() > 1 )
+            throw IOException( CREATE_OUSTRING( "Unexpected core properties stream!" ), Reference< XInterface >() );
+
+        ::oox::core::FastParser aParser( mxContext );
+        aParser.registerNamespace( NMSP_packageMetaCorePr );
+        aParser.registerNamespace( NMSP_dc );
+        aParser.registerNamespace( NMSP_dcTerms );
+        aParser.registerNamespace( NMSP_officeExtPr );
+        aParser.registerNamespace( NMSP_officeCustomPr );
+        aParser.registerNamespace( NMSP_officeDocPropsVT );
+        aParser.setDocumentHandler( new OOXMLDocPropHandler( mxContext, rxDocumentProperties ) );
+
+        if( aCoreStreams.hasElements() )
+            aParser.parseStream( aCoreStreams[ 0 ], true );
+        for( sal_Int32 nIndex = 0; nIndex < aExtStreams.getLength(); ++nIndex )
+            aParser.parseStream( aExtStreams[ nIndex ], true );
+        for( sal_Int32 nIndex = 0; nIndex < aCustomStreams.getLength(); ++nIndex )
+            aParser.parseStream( aCustomStreams[ nIndex ], true );
     }
 }
 
+// ============================================================================
+
 } // namespace docprop
 } // namespace oox
 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index 438442c3e1a7..7c52d2e8c242 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -29,45 +29,46 @@
 #ifndef OOX_DOCPROP_OOXMLDOCPROPIMPORT_HXX
 #define OOX_DOCPROP_OOXMLDOCPROPIMPORT_HXX
 
-#include <sal/config.h>
-#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
+#include <cppuhelper/implbase2.hxx>
 
 namespace oox {
 namespace docprop {
 
-class OOXMLDocPropImportImpl:
+// ============================================================================
+
+class DocumentPropertiesImport :
     public ::cppu::WeakImplHelper2<
         ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::document::XOOXMLDocumentPropertiesImporter>
+        ::com::sun::star::document::XOOXMLDocumentPropertiesImporter >
 {
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-
-    OOXMLDocPropImportImpl(const OOXMLDocPropImportImpl &); // not defined
-    OOXMLDocPropImportImpl& operator=(const OOXMLDocPropImportImpl &); // not defined
-
 public:
-    explicit OOXMLDocPropImportImpl(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
-    virtual ~OOXMLDocPropImportImpl() {}
-
-    ::com::sun::star::uno::Sequence< ::com::sun::star::xml::sax::InputSource > GetRelatedStreams( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage, const ::rtl::OUString& aStreamType );
+    explicit            DocumentPropertiesImport(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
-    // ::com::sun::star::lang::XServiceInfo:
+    // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) 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);
 
-    // ::com::sun::star::document::XOOXMLDocumentPropertiesImporter:
-    virtual void SAL_CALL importProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > & xDocumentProperties) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception);
+    // XOOXMLDocumentPropertiesImporter
+    virtual void SAL_CALL importProperties(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxSource,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rxDocumentProperties )
+                        throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception);
 
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 };
 
+// ============================================================================
+
 } // namespace docprop
 } // namespace oox
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file