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

15 files changed, 233 insertions, 306 deletions

diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index a72eeb797315..bb25789826c7 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -27,17 +27,21 @@
  ************************************************************************/
 
 #include "oox/helper/attributelist.hxx"
+
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include "oox/token/tokenmap.hxx"
+
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::xml::sax;
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::util::DateTime;
-using ::com::sun::star::xml::sax::XFastAttributeList;
-
-namespace oox {
 
 // ============================================================================
 
@@ -75,6 +79,11 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd )
 
 // ----------------------------------------------------------------------------
 
+sal_Int32 AttributeConversion::decodeToken( const OUString& rValue )
+{
+    return StaticTokenMap::get().getTokenFromUnicode( rValue );
+}
+
 OUString AttributeConversion::decodeXString( const OUString& rValue )
 {
     // string shorter than one encoded character - no need to decode
@@ -316,4 +325,4 @@ DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const DateTime& rDefa
 
 } // 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/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 80f50d5521e7..051dff310037 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -27,27 +27,32 @@
  ************************************************************************/
 
 #include "oox/helper/binaryinputstream.hxx"
+
 #include <string.h>
 #include <vector>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/binaryoutputstream.hxx"
 
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OString;
 using ::rtl::OStringBuffer;
 using ::rtl::OStringToOUString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XSeekable;
 
-namespace oox {
+namespace {
 
 const sal_Int32 INPUTSTREAM_BUFFERSIZE      = 0x8000;
 
+} // namespace
+
 // ============================================================================
 
 OString BinaryInputStream::readNulCharArray()
@@ -332,4 +337,4 @@ void RelativeInputStream::skip( sal_Int32 nBytes )
 
 } // 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/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index c9bf31879907..fafabc468a2a 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -27,19 +27,23 @@
  ************************************************************************/
 
 #include "oox/helper/binaryoutputstream.hxx"
+
 #include <osl/diagnose.h>
 #include <string.h>
 
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::io::XOutputStream;
-using ::com::sun::star::io::XSeekable;
-
 namespace oox {
 
+// ============================================================================
+
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::uno;
+
+namespace {
+
 const sal_Int32 OUTPUTSTREAM_BUFFERSIZE     = 0x8000;
 
+} // namespace
+
 // ============================================================================
 
 void BinaryOutputStream::writeAtom( const void* pMem, sal_uInt8 nSize )
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 6f7c77d9de20..0abff066d7fb 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -27,16 +27,18 @@
  ************************************************************************/
 
 #include "oox/helper/binarystreambase.hxx"
-#include <osl/diagnose.h>
 
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::io::XSeekable;
+#include <osl/diagnose.h>
 
 namespace oox {
 
 // ============================================================================
 
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::uno;
+
+// ============================================================================
+
 BinaryStreamBase::~BinaryStreamBase()
 {
 }
@@ -160,4 +162,4 @@ void SequenceSeekableStream::seek( sal_Int64 nPos )
 
 } // 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/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index efc39f5e9be6..d756367ce22a 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -27,25 +27,23 @@
  ************************************************************************/
 
 #include "oox/helper/containerhelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <rtl/ustrbuf.hxx>
 #include "oox/helper/helper.hxx"
 
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::container::XIndexContainer;
-using ::com::sun::star::container::XNameAccess;
-using ::com::sun::star::container::XNameContainer;
-
-namespace oox {
 
 // ============================================================================
 
@@ -163,64 +161,6 @@ OUString ContainerHelper::insertByUnusedName(
 
 // ============================================================================
 
-ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxFactory, const OUString& rServiceName ) :
-    mxFactory( rxFactory ),
-    maServiceName( rServiceName ),
-    mnIndex( 0 )
-{
-    OSL_ENSURE( mxFactory.is(), "ObjectContainer::ObjectContainer - missing service factory" );
-}
-
-ObjectContainer::~ObjectContainer()
-{
-}
-
-bool ObjectContainer::hasObject( const OUString& rObjName ) const
-{
-    createContainer();
-    return mxContainer.is() && mxContainer->hasByName( rObjName );
-}
-
-Any ObjectContainer::getObject( const OUString& rObjName ) const
-{
-    createContainer();
-    if( mxContainer.is() ) try
-    {
-        return mxContainer->getByName( rObjName );
-    }
-    catch( Exception& )
-    {
-    }
-    return Any();
-}
-
-OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rObj, bool bInsertByUnusedName )
-{
-    createContainer();
-    if( mxContainer.is() )
-    {
-        if( bInsertByUnusedName )
-            return ContainerHelper::insertByUnusedName( mxContainer, rObjName + OUString::valueOf( ++mnIndex ), ' ', rObj );
-        if( ContainerHelper::insertByName( mxContainer, rObjName, rObj ) )
-            return rObjName;
-    }
-    return OUString();
-}
-
-void ObjectContainer::createContainer() const
-{
-    if( !mxContainer.is() && mxFactory.is() ) try
-    {
-        mxContainer.set( mxFactory->createInstance( maServiceName ), UNO_QUERY_THROW );
-    }
-    catch( Exception& )
-    {
-    }
-    OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
-}
-
-// ============================================================================
-
 } // 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/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 17cee4eabf32..a6774fdcc3e8 100644..100755
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -27,45 +27,37 @@
  ************************************************************************/
 
 #include "oox/helper/graphichelper.hxx"
+
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/awt/XUnitConversion.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/graphic/GraphicObject.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
-#include <comphelper/componentcontext.hxx>
 #include <comphelper/seqstream.hxx>
-#include "tokens.hxx"
 #include "oox/helper/containerhelper.hxx"
-
-using ::rtl::OUString;
-using ::com::sun::star::awt::DeviceInfo;
-using ::com::sun::star::awt::Point;
-using ::com::sun::star::awt::Size;
-using ::com::sun::star::awt::XDevice;
-using ::com::sun::star::awt::XUnitConversion;
-using ::com::sun::star::beans::PropertyValue;
-using ::com::sun::star::frame::XFrame;
-using ::com::sun::star::frame::XFramesSupplier;
-using ::com::sun::star::graphic::GraphicObject;
-using ::com::sun::star::graphic::XGraphic;
-using ::com::sun::star::graphic::XGraphicObject;
-using ::com::sun::star::graphic::XGraphicProvider;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_SET_THROW;
+#include "oox/helper/propertyset.hxx"
+#include "oox/token/tokens.hxx"
 
 namespace oox {
 
 // ============================================================================
 
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::graphic;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
 namespace {
 
 inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm )
@@ -77,13 +69,17 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm
 
 // ============================================================================
 
-GraphicHelper::GraphicHelper( const Reference< XMultiServiceFactory >& rxGlobalFactory, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
-    mxGraphicProvider( rxGlobalFactory->createInstance( CREATE_OUSTRING( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY ),
+GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
+    mxCompContext( rxContext ),
     mxStorage( rxStorage ),
     maGraphicObjScheme( CREATE_OUSTRING( "vnd.sun.star.GraphicObject:" ) )
 {
-    ::comphelper::ComponentContext aContext( rxGlobalFactory );
-    mxCompContext = aContext.getUNOContext();
+    OSL_ENSURE( mxCompContext.is(), "GraphicHelper::GraphicHelper - missing component context" );
+    Reference< XMultiServiceFactory > xFactory( mxCompContext->getServiceManager(), UNO_QUERY_THROW );
+    OSL_ENSURE( xFactory.is(), "GraphicHelper::GraphicHelper - missing service factory" );
+
+    if( xFactory.is() )
+        mxGraphicProvider.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.graphic.GraphicProvider" ) ), UNO_QUERY );
 
     //! TODO: get colors from system
     maSystemPalette[ XML_3dDkShadow ]               = 0x716F64;
@@ -120,9 +116,9 @@ GraphicHelper::GraphicHelper( const Reference< XMultiServiceFactory >& rxGlobalF
     // if no target frame has been passed (e.g. OLE objects), try to fallback to the active frame
     // TODO: we need some mechanism to keep and pass the parent frame
     Reference< XFrame > xFrame = rxTargetFrame;
-    if( !xFrame.is() && rxGlobalFactory.is() ) try
+    if( !xFrame.is() && xFactory.is() ) try
     {
-        Reference< XFramesSupplier > xFramesSupp( rxGlobalFactory->createInstance( CREATE_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY_THROW );
+        Reference< XFramesSupplier > xFramesSupp( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY_THROW );
         xFrame = xFramesSupp->getActiveFrame();
     }
     catch( Exception& )
@@ -353,8 +349,21 @@ OUString GraphicHelper::importEmbeddedGraphicObject( const OUString& rStreamName
     return xGraphic.is() ? createGraphicObject( xGraphic ) : OUString();
 }
 
+Size GraphicHelper::getOriginalSize( const Reference< XGraphic >& xGraphic ) const
+{
+    Size aSizeHmm;
+    PropertySet aPropSet( xGraphic );
+    if( aPropSet.getProperty( aSizeHmm, PROP_Size100thMM ) && (aSizeHmm.Width == 0) && (aSizeHmm.Height == 0) )     // MAPMODE_PIXEL used?
+    {
+        Size aSizePixel( 0, 0 );
+        if( aPropSet.getProperty( aSizePixel, PROP_SizePixel ) )
+            aSizeHmm = convertScreenPixelToHmm( aSizePixel );
+    }
+    return aSizeHmm;
+}
+
 // ============================================================================
 
 } // 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/helper/makefile.mk b/oox/source/helper/makefile.mk
index 3518db0c6d7c..f31736faac8d 100644
--- a/oox/source/helper/makefile.mk
+++ b/oox/source/helper/makefile.mk
@@ -51,7 +51,6 @@ SLOFILES =	\
         $(SLO)$/progressbar.obj				\
         $(SLO)$/propertymap.obj				\
         $(SLO)$/propertyset.obj				\
-        $(SLO)$/recordinputstream.obj		\
         $(SLO)$/storagebase.obj				\
         $(SLO)$/textinputstream.obj		    \
         $(SLO)$/zipstorage.obj
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 8c397d4aa56c..f1c8ef8d9291 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -27,21 +27,83 @@
  ************************************************************************/
 
 #include "oox/helper/modelobjecthelper.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
 #include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/helper.hxx"
 
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::awt::Gradient;
-using ::com::sun::star::drawing::LineDash;
-using ::com::sun::star::drawing::PolyPolygonBezierCoords;
 
-namespace oox {
+// ============================================================================
+
+ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxFactory, const OUString& rServiceName ) :
+    mxFactory( rxFactory ),
+    maServiceName( rServiceName ),
+    mnIndex( 0 )
+{
+    OSL_ENSURE( mxFactory.is(), "ObjectContainer::ObjectContainer - missing service factory" );
+}
+
+ObjectContainer::~ObjectContainer()
+{
+}
+
+bool ObjectContainer::hasObject( const OUString& rObjName ) const
+{
+    createContainer();
+    return mxContainer.is() && mxContainer->hasByName( rObjName );
+}
+
+Any ObjectContainer::getObject( const OUString& rObjName ) const
+{
+    createContainer();
+    if( mxContainer.is() ) try
+    {
+        return mxContainer->getByName( rObjName );
+    }
+    catch( Exception& )
+    {
+    }
+    return Any();
+}
+
+OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rObj, bool bInsertByUnusedName )
+{
+    createContainer();
+    if( mxContainer.is() )
+    {
+        if( bInsertByUnusedName )
+            return ContainerHelper::insertByUnusedName( mxContainer, rObjName + OUString::valueOf( ++mnIndex ), ' ', rObj );
+        if( ContainerHelper::insertByName( mxContainer, rObjName, rObj ) )
+            return rObjName;
+    }
+    return OUString();
+}
+
+void ObjectContainer::createContainer() const
+{
+    if( !mxContainer.is() && mxFactory.is() ) try
+    {
+        mxContainer.set( mxFactory->createInstance( maServiceName ), UNO_QUERY_THROW );
+    }
+    catch( Exception& )
+    {
+    }
+    OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
+}
 
 // ============================================================================
 
@@ -90,4 +152,4 @@ OUString ModelObjectHelper::insertFillBitmap( const OUString& rGraphicUrl )
 
 } // 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/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index 8950cff57c44..2700760b1dbf 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -27,17 +27,19 @@
  ************************************************************************/
 
 #include "oox/helper/progressbar.hxx"
+
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include "oox/helper/helper.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::task::XStatusIndicator;
-
 namespace oox {
 
 // ============================================================================
 
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
 namespace {
 
 const sal_Int32 PROGRESS_RANGE      = 1000000;
@@ -184,4 +186,4 @@ ISegmentProgressBarRef SegmentProgressBar::createSegment( double fLength )
 
 } // 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/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 22ad90d7fdf1..221799a41c53 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -27,69 +27,44 @@
  ************************************************************************/
 
 #include "oox/helper/propertymap.hxx"
-#include <osl/mutex.hxx>
-#include <cppuhelper/implbase2.hxx>
+
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
-#include "properties.hxx"
-#include "oox/token/propertylist.hxx"
+#include <cppuhelper/implbase2.hxx>
+#include <osl/mutex.hxx>
+#include "oox/token/propertynames.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::lang::IllegalArgumentException;
-using ::com::sun::star::lang::WrappedTargetException;
-using ::com::sun::star::beans::Property;
-using ::com::sun::star::beans::PropertyValue;
-using ::com::sun::star::beans::PropertyVetoException;
-using ::com::sun::star::beans::UnknownPropertyException;
-using ::com::sun::star::beans::XPropertyChangeListener;
-using ::com::sun::star::beans::XPropertySet;
-using ::com::sun::star::beans::XPropertySetInfo;
-using ::com::sun::star::beans::XVetoableChangeListener;
+namespace oox {
 using ::com::sun::star::container::XIndexReplace;
 
-#if OSL_DEBUG_LEVEL > 0
-#include <cstdio>
-#include <com/sun/star/style/LineSpacing.hpp>
-#include <com/sun/star/style/LineSpacingMode.hpp>
-#include <com/sun/star/text/WritingMode.hpp>
+// ============================================================================
+
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
-using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
-using ::rtl::OString;
-using ::com::sun::star::style::LineSpacing;
-using ::com::sun::star::text::WritingMode;
 using ::com::sun::star::drawing::TextHorizontalAdjust;
 using ::com::sun::star::drawing::TextVerticalAdjust;
-#endif
 
-namespace oox {
+using ::rtl::OString;
+using ::rtl::OUString;
 
 // ============================================================================
 
 namespace {
 
-/** Thread-save singleton of a vector of all supported property names. */
-struct StaticPropertyList : public ::rtl::Static< PropertyList, StaticPropertyList > {};
-
-// ----------------------------------------------------------------------------
-
-typedef ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo > GenericPropertySetImplBase;
+typedef ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo > GenericPropertySetBase;
 
 /** This class implements a generic XPropertySet.
 
     Properties of all names and types can be set and later retrieved.
     TODO: move this to comphelper or better find an existing implementation
  */
-class GenericPropertySet : public GenericPropertySetImplBase, private ::osl::Mutex
+class GenericPropertySet : public GenericPropertySetBase, private ::osl::Mutex
 {
 public:
     explicit            GenericPropertySet();
@@ -122,7 +97,7 @@ GenericPropertySet::GenericPropertySet()
 
 GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap )
 {
-    const PropertyList& rPropNames = StaticPropertyList::get();
+    const PropertyNameVector& rPropNames = StaticPropertyNameVector::get();
     for( PropertyMap::const_iterator aIt = rPropMap.begin(), aEnd = rPropMap.end(); aIt != aEnd; ++aIt )
         maPropMap[ rPropNames[ aIt->first ] ] = aIt->second;
 }
@@ -190,7 +165,7 @@ sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rProper
 // ============================================================================
 
 PropertyMap::PropertyMap() :
-    mpPropNames( &StaticPropertyList::get() )
+    mpPropNames( &StaticPropertyNameVector::get() ) // pointer instead reference to get compiler generated copy c'tor and operator=
 {
 }
 
@@ -201,7 +176,7 @@ PropertyMap::~PropertyMap()
 /*static*/ const OUString& PropertyMap::getPropertyName( sal_Int32 nPropId )
 {
     OSL_ENSURE( (0 <= nPropId) && (nPropId < PROP_COUNT), "PropertyMap::getPropertyName - invalid property identifier" );
-    return StaticPropertyList::get()[ nPropId ];
+    return StaticPropertyNameVector::get()[ nPropId ];
 }
 
 const Any* PropertyMap::getProperty( sal_Int32 nPropId ) const
@@ -374,4 +349,4 @@ void PropertyMap::dump()
 
 } // 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/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 25249ffc44ad..5f0ef0acb122 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -27,21 +27,21 @@
  ************************************************************************/
 
 #include "oox/helper/propertyset.hxx"
-#include <rtl/strbuf.hxx>
+
 #include <osl/diagnose.h>
+#include <rtl/strbuf.hxx>
 #include "oox/helper/propertymap.hxx"
 
-using ::rtl::OUString;
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OStringBuffer;
+using ::rtl::OUString;
 using ::rtl::OUStringToOString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::beans::XPropertySet;
-
-namespace oox {
 
 // ============================================================================
 
@@ -173,15 +173,8 @@ void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue )
     }
 }
 
-#if OSL_DEBUG_LEVEL > 0
-void PropertySet::dump()
-{
-    PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) );
-}
-#endif
-
 // ============================================================================
 
 } // 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/helper/recordinputstream.cxx b/oox/source/helper/recordinputstream.cxx
deleted file mode 100644
index 1109d19d1d1f..000000000000
--- a/oox/source/helper/recordinputstream.cxx
+++ /dev/null
@@ -1,73 +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.
- *
- ************************************************************************/
-
-#include "oox/helper/recordinputstream.hxx"
-#include <vector>
-#include <string.h>
-
-using ::rtl::OUString;
-
-namespace oox {
-
-// ============================================================================
-
-RecordInputStream::RecordInputStream( const StreamDataSequence& rData ) :
-    SequenceInputStream( rData )
-{
-}
-
-OUString RecordInputStream::readString( bool b32BitLen )
-{
-    OUString aString;
-    if( !isEof() )
-    {
-        sal_Int32 nCharCount = b32BitLen ? readValue< sal_Int32 >() : readValue< sal_Int16 >();
-        // string length -1 is often used to indicate a missing string
-        OSL_ENSURE( !isEof() && (nCharCount >= -1), "RecordInputStream::readString - invalid string length" );
-        if( !isEof() && (nCharCount > 0) )
-        {
-            ::std::vector< sal_Unicode > aBuffer;
-            aBuffer.reserve( getLimitedValue< size_t, sal_Int32 >( nCharCount + 1, 0, 0xFFFF ) );
-            for( sal_Int32 nCharIdx = 0; !isEof() && (nCharIdx < nCharCount); ++nCharIdx )
-            {
-                sal_uInt16 nChar;
-                readValue( nChar );
-                aBuffer.push_back( static_cast< sal_Unicode >( nChar ) );
-            }
-            aBuffer.push_back( 0 );
-            aString = OUString( &aBuffer.front() );
-        }
-    }
-    return aString;
-}
-
-// ============================================================================
-
-} // namespace oox
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index 3abd50f81628..2201320fad1a 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -27,24 +27,23 @@
  ************************************************************************/
 
 #include "oox/helper/storagebase.hxx"
-#include <com/sun/star/io/XStream.hpp>
+
 #include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/io/XStream.hpp>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/binaryoutputstream.hxx"
 
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::uno;
+
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_SET_THROW;
-using ::com::sun::star::embed::XStorage;
-using ::com::sun::star::embed::XTransactedObject;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XOutputStream;
-using ::com::sun::star::io::XStream;
-
-namespace oox {
 
 // ============================================================================
 
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index df1565ad8682..8296144d73ec 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -27,17 +27,20 @@
  ************************************************************************/
 
 #include "oox/helper/textinputstream.hxx"
+
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 
+namespace oox {
+
+// ============================================================================
+
 using ::rtl::OStringBuffer;
 using ::rtl::OStringToOUString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
-namespace oox {
-
 // ============================================================================
 
 namespace {
@@ -127,4 +130,4 @@ OUString TextInputStream::readLine()
 
 } // 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/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 333c3f21c4da..7891c70fb214 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include "oox/helper/zipstorage.hxx"
+
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
@@ -36,25 +37,20 @@
 #include <comphelper/storagehelper.hxx>
 #include "oox/helper/helper.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::container::NoSuchElementException;
-using ::com::sun::star::embed::XStorage;
-using ::com::sun::star::embed::XTransactedObject;
-using ::com::sun::star::io::XInputStream;
-using ::com::sun::star::io::XOutputStream;
-using ::com::sun::star::io::XStream;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-
 namespace oox {
 
 // ============================================================================
 
+using namespace ::com::sun::star::container;
+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 ::rtl::OUString;
+
+// ============================================================================
+
 ZipStorage::ZipStorage(
         const Reference< XMultiServiceFactory >& rxFactory,
         const Reference< XInputStream >& rxInStream ) :
@@ -74,8 +70,10 @@ ZipStorage::ZipStorage(
 
             TODO: #i105410# switch to 'OFOPXMLFormat' and use its
             implementation of relations handling. */
+
         mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream(
-            ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, sal_True );
+            ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory,
+            sal_False /* DEV300_m80: Was sal_True, but DOCX and others did not load */ );
     }
     catch( Exception& )
     {