Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (252 commits) masterfix DEV300: #i10000# usage of L10N build_type ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300 DEV300 masterfix: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r) hr75: #i116747#: remove obsolete copyright notices hr75: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r) #i10000# WAE: cast to right type gnumake3: remove comphelper version; fix including extract.hxx chart52: #i28670# import/export of manual chart legend size from/to XLS chart52: #i28670# import of manual chart legend size from OOXML chart52: adapt to changed API removetooltypes: adjust rebase for linux removetooltypes01: #i112600# adjust rebase for windows removetooltypes01: #i112600# Fix build problems on non-pro CWS gnumake3: -D_DLL is needed on Windows; removed superficial _DLL_ usage all over the place added some accessible names and releations in PDFImport dialog and XML Settings dialog masterfix: #i10000# header file removed XPathLogger.cxx: added include for <stdio.h> masterfix: #i10000#: WAE fix removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff removetooltypes01: #i112600# remove tooltypes from writerfilter ... Conflicts: binfilter/bf_basic/source/classes/sbunoobj.cxx binfilter/bf_basic/source/inc/buffer.hxx binfilter/bf_basic/source/inc/filefmt.hxx binfilter/bf_basic/source/runtime/basrdll.cxx binfilter/bf_basic/source/sbx/sbxdec.hxx binfilter/bf_basic/source/sbx/sbxres.hxx binfilter/bf_forms/source/component/DatabaseForm.hxx binfilter/bf_forms/source/component/forms_CheckBox.cxx binfilter/bf_forms/source/component/forms_ComboBox.cxx binfilter/bf_forms/source/component/forms_Currency.cxx binfilter/bf_forms/source/component/forms_Date.cxx binfilter/bf_forms/source/component/forms_Edit.cxx binfilter/bf_forms/source/component/forms_File.cxx binfilter/bf_forms/source/component/forms_Filter.cxx binfilter/bf_forms/source/component/forms_FormComponent.cxx binfilter/bf_forms/source/component/forms_FormattedField.cxx binfilter/bf_forms/source/component/forms_GroupManager.cxx binfilter/bf_forms/source/component/forms_Hidden.cxx binfilter/bf_forms/source/component/forms_ImageControl.cxx binfilter/bf_forms/source/component/forms_ListBox.cxx binfilter/bf_forms/source/component/forms_Numeric.cxx binfilter/bf_forms/source/component/forms_Pattern.cxx binfilter/bf_forms/source/component/forms_RadioButton.cxx binfilter/bf_forms/source/component/forms_Time.cxx binfilter/bf_forms/source/misc/forms_formsmodule.cxx binfilter/bf_forms/source/misc/forms_services.cxx binfilter/bf_forms/source/resource/forms_frm_resource.cxx binfilter/bf_sc/source/core/inc/ansitab.hxx binfilter/bf_sc/source/core/tool/sc_compiler.cxx binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx binfilter/bf_sc/source/ui/inc/dbdocfun.hxx binfilter/bf_sc/source/ui/inc/drawutil.hxx binfilter/bf_sc/source/ui/inc/dwfunctr.hxx binfilter/bf_sc/source/ui/inc/editable.hxx binfilter/bf_sc/source/ui/inc/gridmerg.hxx binfilter/bf_sc/source/ui/inc/imoptdlg.hxx binfilter/bf_sc/source/ui/inc/namecrea.hxx binfilter/bf_sc/source/ui/inc/navsett.hxx binfilter/bf_sc/source/ui/inc/refundo.hxx binfilter/bf_sc/source/ui/inc/undoolk.hxx binfilter/bf_sc/source/ui/inc/viewutil.hxx binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx binfilter/bf_sch/source/ui/app/sch_menu.src binfilter/bf_sch/source/ui/inc/globopt.hxx binfilter/bf_sch/source/ui/inc/guiutil.hxx binfilter/bf_sch/source/ui/unoidl/sch_register.cxx binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx binfilter/bf_sd/source/filter/propread.hxx binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx binfilter/bf_sd/source/ui/inc/unokywds.hxx binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx binfilter/bf_sfx2/source/inc/fltoptint.hxx binfilter/bf_sfx2/source/inc/sfxtypes.hxx binfilter/bf_so3/inc/binddata.hxx binfilter/bf_so3/source/inplace/client.cxx binfilter/bf_so3/source/ole/socont.h binfilter/bf_so3/source/persist/binddata.cxx binfilter/bf_so3/source/persist/transbnd.cxx binfilter/bf_so3/source/persist/transprt.cxx binfilter/bf_starmath/source/starmath_register.cxx binfilter/bf_svtools/source/config/svt_menuoptions.cxx binfilter/bf_svtools/source/config/svt_saveopt.cxx binfilter/bf_svtools/source/config/svt_searchopt.cxx binfilter/bf_svtools/source/filter.vcl/igif/decode.hxx binfilter/bf_svtools/source/items1/svt_cenumitm.cxx binfilter/bf_svtools/source/items1/svt_poolio.cxx binfilter/bf_svtools/source/misc/svt_ehdl.cxx binfilter/bf_svtools/source/misc1/svt_adrparse.cxx binfilter/bf_svtools/source/misc1/svt_inethist.cxx binfilter/bf_svtools/source/numbers/numfmuno.hxx binfilter/bf_svtools/source/numbers/numhead.hxx binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx binfilter/bf_svtools/source/numbers/svt_numuno.cxx binfilter/bf_svtools/source/numbers/zforscan.hxx binfilter/bf_svtools/source/svdde/ddeimp.hxx binfilter/bf_svtools/source/uno/svt_registerservices.cxx binfilter/bf_svx/source/editeng/svx_editattr.cxx binfilter/bf_svx/source/inc/dbtoolsclient.hxx binfilter/bf_svx/source/items/svx_paperinf.cxx binfilter/bf_svx/source/outliner/paralist.hxx binfilter/bf_svx/source/svdraw/svdtxhdl.hxx binfilter/bf_svx/source/svdraw/svx_svdattr.cxx binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx binfilter/bf_svx/source/unodraw/svx_unoprov.cxx binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx binfilter/bf_sw/source/core/bastyp/sw_index.cxx binfilter/bf_sw/source/core/except/sw_errhdl.cxx binfilter/bf_sw/source/core/inc/docfld.hxx binfilter/bf_sw/source/core/inc/flowfrm.hxx binfilter/bf_sw/source/core/inc/frame.hxx binfilter/bf_sw/source/core/inc/hffrm.hxx binfilter/bf_sw/source/core/inc/notxtfrm.hxx binfilter/bf_sw/source/core/inc/pamtyp.hxx binfilter/bf_sw/source/core/inc/rowfrm.hxx binfilter/bf_sw/source/core/inc/sectfrm.hxx binfilter/bf_sw/source/core/inc/splargs.hxx binfilter/bf_sw/source/core/inc/splcstk.hxx binfilter/bf_sw/source/core/inc/swblocks.hxx binfilter/bf_sw/source/core/inc/tabfrm.hxx binfilter/bf_sw/source/core/inc/toxhlp.hxx binfilter/bf_sw/source/core/inc/txmsrt.hxx binfilter/bf_sw/source/core/inc/txtfrm.hxx binfilter/bf_sw/source/core/layout/virtoutp.hxx binfilter/bf_sw/source/core/sw3io/crypter.hxx binfilter/bf_sw/source/core/sw3io/sw3imp.hxx binfilter/bf_sw/source/core/sw3io/sw3marks.hxx binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx binfilter/bf_sw/source/core/swg/rdswg.hxx binfilter/bf_sw/source/core/swg/swgids.hxx binfilter/bf_sw/source/core/text/guess.hxx binfilter/bf_sw/source/core/text/itratr.hxx binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx binfilter/bf_sw/source/filter/excel/excfntbf.hxx binfilter/bf_sw/source/filter/excel/excvfbff.hxx binfilter/bf_sw/source/filter/excel/excxfbuf.hxx binfilter/bf_sw/source/filter/inc/fltglbls.hxx binfilter/bf_sw/source/filter/inc/fltini.hxx binfilter/bf_sw/source/filter/inc/w4wflt.hxx binfilter/bf_sw/source/filter/inc/w4wpar.hxx binfilter/bf_sw/source/filter/inc/w4wstk.hxx binfilter/bf_sw/source/filter/inc/wrt_fn.hxx binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx binfilter/bf_sw/source/filter/w4w/w4wgraf.hxx binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx binfilter/bf_sw/source/filter/xml/sw_swxml.cxx binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx binfilter/bf_sw/source/filter/xml/xmlexpit.hxx binfilter/bf_sw/source/filter/xml/xmlimpit.hxx binfilter/bf_sw/source/filter/xml/xmlitem.hxx binfilter/bf_sw/source/filter/xml/xmltbli.hxx binfilter/bf_sw/source/ui/app/sw_docsh.cxx binfilter/bf_sw/source/ui/app/sw_docshini.cxx binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx binfilter/bf_sw/source/ui/inc/bmpwin.hxx binfilter/bf_sw/source/ui/inc/caption.hxx binfilter/bf_sw/source/ui/inc/docinf.hxx binfilter/bf_sw/source/ui/inc/fontcfg.hxx binfilter/bf_sw/source/ui/inc/formedt.hxx binfilter/bf_sw/source/ui/inc/hdftctrl.hxx binfilter/bf_sw/source/ui/inc/idxmrk.hxx binfilter/bf_sw/source/ui/inc/initui.hxx binfilter/bf_sw/source/ui/inc/modcfg.hxx binfilter/bf_sw/source/ui/inc/pview.hxx binfilter/bf_sw/source/ui/inc/scroll.hxx binfilter/bf_sw/source/ui/inc/swcont.hxx binfilter/bf_sw/source/ui/inc/uitool.hxx binfilter/bf_sw/source/ui/inc/unotxvw.hxx binfilter/bf_sw/source/ui/inc/usrpref.hxx binfilter/bf_sw/source/ui/inc/workctrl.hxx binfilter/bf_sw/source/ui/inc/wrtsh.hxx binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx binfilter/bf_xmloff/source/core/xmloff_facreg.cxx binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx binfilter/binfilterdetect/source/bindetect.cxx binfilter/filter/source/bf_migrate/bf_migrateexports.cxx binfilter/filter/source/bf_migrate/bf_migratefilter.cxx binfilter/filter/source/bf_migrate/bf_migratefilter.hxx binfilter/filter/source/bf_offwrp/bf_wrapper.cxx binfilter/inc/bf_basic/basmgr.hxx binfilter/inc/bf_basic/sbmeth.hxx binfilter/inc/bf_basic/sbstar.hxx binfilter/inc/bf_basic/sbx.hxx binfilter/inc/bf_basic/sbxcore.hxx binfilter/inc/bf_basic/sbxdef.hxx binfilter/inc/bf_basic/sbxfac.hxx binfilter/inc/bf_basic/sbxobj.hxx binfilter/inc/bf_basic/sbxvar.hxx binfilter/inc/bf_goodies/b3dcolor.hxx binfilter/inc/bf_goodies/b3dcompo.hxx binfilter/inc/bf_goodies/b3dentty.hxx binfilter/inc/bf_goodies/b3dgeom.hxx binfilter/inc/bf_goodies/b3dlight.hxx binfilter/inc/bf_goodies/b3dtex.hxx binfilter/inc/bf_goodies/b3dtrans.hxx binfilter/inc/bf_goodies/b3dvolum.hxx binfilter/inc/bf_goodies/base3d.hxx binfilter/inc/bf_goodies/bucket.hxx binfilter/inc/bf_goodies/hmatrix.hxx binfilter/inc/bf_goodies/matril3d.hxx binfilter/inc/bf_goodies/matrix3d.hxx binfilter/inc/bf_goodies/point3d.hxx binfilter/inc/bf_goodies/point4d.hxx binfilter/inc/bf_goodies/vector3d.hxx binfilter/inc/bf_sc/arealink.hxx binfilter/inc/bf_sc/bclist.hxx binfilter/inc/bf_sc/callform.hxx binfilter/inc/bf_sc/cellform.hxx binfilter/inc/bf_sc/chartuno.hxx binfilter/inc/bf_sc/chgviset.hxx binfilter/inc/bf_sc/collect.hxx binfilter/inc/bf_sc/column.hxx binfilter/inc/bf_sc/conditio.hxx binfilter/inc/bf_sc/consoli.hxx binfilter/inc/bf_sc/dbcolect.hxx binfilter/inc/bf_sc/dbdocutl.hxx binfilter/inc/bf_sc/dbtoken.hxx binfilter/inc/bf_sc/detdata.hxx binfilter/inc/bf_sc/detfunc.hxx binfilter/inc/bf_sc/dociter.hxx binfilter/inc/bf_sc/docpool.hxx binfilter/inc/bf_sc/docuno.hxx binfilter/inc/bf_sc/dpobject.hxx binfilter/inc/bf_sc/dpoutput.hxx binfilter/inc/bf_sc/dpsave.hxx binfilter/inc/bf_sc/dpshttab.hxx binfilter/inc/bf_sc/dptabdat.hxx binfilter/inc/bf_sc/dptabres.hxx binfilter/inc/bf_sc/drawpage.hxx binfilter/inc/bf_sc/drwlayer.hxx binfilter/inc/bf_sc/editsrc.hxx binfilter/inc/bf_sc/fielduno.hxx binfilter/inc/bf_sc/filter.hxx binfilter/inc/bf_sc/fmtuno.hxx binfilter/inc/bf_sc/funcuno.hxx binfilter/inc/bf_sc/global.hxx binfilter/inc/bf_sc/hints.hxx binfilter/inc/bf_sc/indexmap.hxx binfilter/inc/bf_sc/inputopt.hxx binfilter/inc/bf_sc/markarr.hxx binfilter/inc/bf_sc/markdata.hxx binfilter/inc/bf_sc/navicfg.hxx binfilter/inc/bf_sc/optutil.hxx binfilter/inc/bf_sc/pagepar.hxx binfilter/inc/bf_sc/printopt.hxx binfilter/inc/bf_sc/prnsave.hxx binfilter/inc/bf_sc/progress.hxx binfilter/inc/bf_sc/rangelst.hxx binfilter/inc/bf_sc/rangenam.hxx binfilter/inc/bf_sc/rangeseq.hxx binfilter/inc/bf_sc/rangeutl.hxx binfilter/inc/bf_sc/rechead.hxx binfilter/inc/bf_sc/refdata.hxx binfilter/inc/bf_sc/refreshtimer.hxx binfilter/inc/bf_sc/scmod.hxx binfilter/inc/bf_sc/shapeuno.hxx binfilter/inc/bf_sc/sortparam.hxx binfilter/inc/bf_sc/stlsheet.hxx binfilter/inc/bf_sc/subtotal.hxx binfilter/inc/bf_sc/table.hxx binfilter/inc/bf_sc/tablink.hxx binfilter/inc/bf_sc/tabopparams.hxx binfilter/inc/bf_sc/textuno.hxx binfilter/inc/bf_sc/unoguard.hxx binfilter/inc/bf_sc/unowids.hxx binfilter/inc/bf_sc/userdat.hxx binfilter/inc/bf_sc/validat.hxx binfilter/inc/bf_sc/viewopti.hxx binfilter/inc/bf_sch/calculat.hxx binfilter/inc/bf_sch/charttyp.hxx binfilter/inc/bf_sch/chaxis.hxx binfilter/inc/bf_sch/chdescr.hxx binfilter/inc/bf_sch/docshell.hxx binfilter/inc/bf_sch/glob.hxx binfilter/inc/bf_sch/globfunc.hxx binfilter/inc/bf_sch/memchrt.hxx binfilter/inc/bf_sch/objfac.hxx binfilter/inc/bf_sch/schgroup.hxx binfilter/inc/bf_sch/stlsheet.hxx binfilter/inc/bf_sd/anminfo.hxx binfilter/inc/bf_sd/docshell.hxx binfilter/inc/bf_sd/drawdoc.hxx binfilter/inc/bf_sd/grdocsh.hxx binfilter/inc/bf_sd/sdattr.hxx binfilter/inc/bf_sfx2/app.hxx binfilter/inc/bf_sfx2/bitset.hxx binfilter/inc/bf_sfx2/docfac.hxx binfilter/inc/bf_sfx2/docfile.hxx binfilter/inc/bf_sfx2/docfilt.hxx binfilter/inc/bf_sfx2/docinf.hxx binfilter/inc/bf_sfx2/doctempl.hxx binfilter/inc/bf_sfx2/event.hxx binfilter/inc/bf_sfx2/fcontnr.hxx binfilter/inc/bf_sfx2/frameobj.hxx binfilter/inc/bf_sfx2/genlink.hxx binfilter/inc/bf_sfx2/interno.hxx binfilter/inc/bf_sfx2/minarray.hxx binfilter/inc/bf_sfx2/minstack.hxx binfilter/inc/bf_sfx2/misccfg.hxx binfilter/inc/bf_sfx2/plugobj.hxx binfilter/inc/bf_sfx2/printer.hxx binfilter/inc/bf_sfx2/saveopt.hxx binfilter/inc/bf_sfx2/sfxuno.hxx binfilter/inc/bf_sfx2/timestamp.hxx binfilter/inc/bf_so3/binding.hxx binfilter/inc/bf_so3/factory.hxx binfilter/inc/bf_so3/ipenv.hxx binfilter/inc/bf_so3/ipwin.hxx binfilter/inc/bf_so3/linkmgr.hxx binfilter/inc/bf_so3/linksrc.hxx binfilter/inc/bf_so3/lnkbase.hxx binfilter/inc/bf_so3/outplace.hxx binfilter/inc/bf_so3/persist.hxx binfilter/inc/bf_so3/protocol.hxx binfilter/inc/bf_so3/pseudo.hxx binfilter/inc/bf_so3/so2dll.hxx binfilter/inc/bf_so3/svstor.hxx binfilter/inc/bf_so3/transbnd.hxx binfilter/inc/bf_so3/transprt.hxx binfilter/inc/bf_starmath/symbol.hxx binfilter/inc/bf_starmath/unomodel.hxx binfilter/inc/bf_starmath/utility.hxx binfilter/inc/bf_starmath/xchar.hxx binfilter/inc/bf_svtools/DocumentInfoPreview.hxx binfilter/inc/bf_svtools/aeitem.hxx binfilter/inc/bf_svtools/apearcfg.hxx binfilter/inc/bf_svtools/bf_prewin.h binfilter/inc/bf_svtools/bintitem.hxx binfilter/inc/bf_svtools/brdcst.hxx binfilter/inc/bf_svtools/broadcast.hxx binfilter/inc/bf_svtools/cancel.hxx binfilter/inc/bf_svtools/cenumitm.hxx binfilter/inc/bf_svtools/cintitem.hxx binfilter/inc/bf_svtools/cntnrsrt.hxx binfilter/inc/bf_svtools/cntwall.hxx binfilter/inc/bf_svtools/cstitem.hxx binfilter/inc/bf_svtools/ctypeitm.hxx binfilter/inc/bf_svtools/custritm.hxx binfilter/inc/bf_svtools/dateitem.hxx binfilter/inc/bf_svtools/defaultoptions.hxx binfilter/inc/bf_svtools/dtritem.hxx binfilter/inc/bf_svtools/eitem.hxx binfilter/inc/bf_svtools/expander.hxx binfilter/inc/bf_svtools/filerec.hxx binfilter/inc/bf_svtools/filter.hxx binfilter/inc/bf_svtools/flagitem.hxx binfilter/inc/bf_svtools/flbytes.hxx binfilter/inc/bf_svtools/fltcall.hxx binfilter/inc/bf_svtools/fltdefs.hxx binfilter/inc/bf_svtools/frqitem.hxx binfilter/inc/bf_svtools/fstathelper.hxx binfilter/inc/bf_svtools/gifread.hxx binfilter/inc/bf_svtools/globalnameitem.hxx binfilter/inc/bf_svtools/hint.hxx binfilter/inc/bf_svtools/htmlout.hxx binfilter/inc/bf_svtools/httpcook.hxx binfilter/inc/bf_svtools/imap.hxx binfilter/inc/bf_svtools/imapcirc.hxx binfilter/inc/bf_svtools/imapobj.hxx binfilter/inc/bf_svtools/imappoly.hxx binfilter/inc/bf_svtools/imaprect.hxx binfilter/inc/bf_svtools/inethist.hxx binfilter/inc/bf_svtools/inidef.hxx binfilter/inc/bf_svtools/intitem.hxx binfilter/inc/bf_svtools/itemiter.hxx binfilter/inc/bf_svtools/itempool.hxx binfilter/inc/bf_svtools/itemset.hxx binfilter/inc/bf_svtools/jpeg.hxx binfilter/inc/bf_svtools/lckbitem.hxx binfilter/inc/bf_svtools/lingucfg.hxx binfilter/inc/bf_svtools/listener.hxx binfilter/inc/bf_svtools/lngmisc.hxx binfilter/inc/bf_svtools/loginerr.hxx binfilter/inc/bf_svtools/lstner.hxx binfilter/inc/bf_svtools/misccfg.hxx binfilter/inc/bf_svtools/nfkeytab.hxx binfilter/inc/bf_svtools/nranges.hxx binfilter/inc/bf_svtools/pngread.hxx binfilter/inc/bf_svtools/poolcach.hxx binfilter/inc/bf_svtools/ptitem.hxx binfilter/inc/bf_svtools/rectitem.hxx binfilter/inc/bf_svtools/reqitem.hxx binfilter/inc/bf_svtools/searchopt.hxx binfilter/inc/bf_svtools/sectctr.hxx binfilter/inc/bf_svtools/section.hxx binfilter/inc/bf_svtools/sgfbram.hxx binfilter/inc/bf_svtools/sgffilt.hxx binfilter/inc/bf_svtools/slstitm.hxx binfilter/inc/bf_svtools/style.hxx binfilter/inc/bf_svtools/svarray.hxx binfilter/inc/bf_svtools/svdde.hxx binfilter/inc/bf_svtools/svicnvw.hxx binfilter/inc/bf_svtools/svimpbox.hxx binfilter/inc/bf_svtools/svimpicn.hxx binfilter/inc/bf_svtools/syslocaleoptions.hxx binfilter/inc/bf_svtools/szitem.hxx binfilter/inc/bf_svtools/testtool.hxx binfilter/inc/bf_svtools/tfrmitem.hxx binfilter/inc/bf_svtools/tresitem.hxx binfilter/inc/bf_svtools/ttprops.hxx binfilter/inc/bf_svtools/undo.hxx binfilter/inc/bf_svtools/whiter.hxx binfilter/inc/bf_svtools/wmf.hxx binfilter/inc/bf_svtools/xbmread.hxx binfilter/inc/bf_svtools/xmlcnimp.hxx binfilter/inc/bf_svtools/xpmread.hxx binfilter/inc/bf_svtools/zforfind.hxx binfilter/inc/bf_svtools/zforlist.hxx binfilter/inc/bf_svtools/zformat.hxx binfilter/inc/bf_svx/boxobj.hxx binfilter/inc/bf_svx/camera3d.hxx binfilter/inc/bf_svx/cube3d.hxx binfilter/inc/bf_svx/def3d.hxx binfilter/inc/bf_svx/deflt3d.hxx binfilter/inc/bf_svx/dlight3d.hxx binfilter/inc/bf_svx/editdata.hxx binfilter/inc/bf_svx/editobj.hxx binfilter/inc/bf_svx/editstat.hxx binfilter/inc/bf_svx/editview.hxx binfilter/inc/bf_svx/extrud3d.hxx binfilter/inc/bf_svx/fmmodel.hxx binfilter/inc/bf_svx/fmpage.hxx binfilter/inc/bf_svx/forbiddencharacterstable.hxx binfilter/inc/bf_svx/gallery.hxx binfilter/inc/bf_svx/grfcrop.hxx binfilter/inc/bf_svx/lathe3d.hxx binfilter/inc/bf_svx/light3d.hxx binfilter/inc/bf_svx/linkmgr.hxx binfilter/inc/bf_svx/obj3d.hxx binfilter/inc/bf_svx/outliner.hxx binfilter/inc/bf_svx/outlobj.hxx binfilter/inc/bf_svx/plight3d.hxx binfilter/inc/bf_svx/pntobj3d.hxx binfilter/inc/bf_svx/poly3d.hxx binfilter/inc/bf_svx/polygn3d.hxx binfilter/inc/bf_svx/polyob3d.hxx binfilter/inc/bf_svx/polysc3d.hxx binfilter/inc/bf_svx/scene3d.hxx binfilter/inc/bf_svx/sdginitm.hxx binfilter/inc/bf_svx/sdooitm.hxx binfilter/inc/bf_svx/sdshitm.hxx binfilter/inc/bf_svx/sdtagitm.hxx binfilter/inc/bf_svx/sdtaiitm.hxx binfilter/inc/bf_svx/sdtcfitm.hxx binfilter/inc/bf_svx/sdynitm.hxx binfilter/inc/bf_svx/sphere3d.hxx binfilter/inc/bf_svx/svdattr.hxx binfilter/inc/bf_svx/svddrag.hxx binfilter/inc/bf_svx/svdetc.hxx binfilter/inc/bf_svx/svdhdl.hxx binfilter/inc/bf_svx/svdhlpln.hxx binfilter/inc/bf_svx/svdio.hxx binfilter/inc/bf_svx/svditer.hxx binfilter/inc/bf_svx/svdlayer.hxx binfilter/inc/bf_svx/svdmark.hxx binfilter/inc/bf_svx/svdmodel.hxx binfilter/inc/bf_svx/svdmrkv.hxx binfilter/inc/bf_svx/svdoattr.hxx binfilter/inc/bf_svx/svdocapt.hxx binfilter/inc/bf_svx/svdocirc.hxx binfilter/inc/bf_svx/svdoedge.hxx binfilter/inc/bf_svx/svdograf.hxx binfilter/inc/bf_svx/svdogrp.hxx binfilter/inc/bf_svx/svdomeas.hxx binfilter/inc/bf_svx/svdoole2.hxx binfilter/inc/bf_svx/svdopage.hxx binfilter/inc/bf_svx/svdopath.hxx binfilter/inc/bf_svx/svdorect.hxx binfilter/inc/bf_svx/svdosmbr.hxx binfilter/inc/bf_svx/svdosmev.hxx binfilter/inc/bf_svx/svdosmrt.hxx binfilter/inc/bf_svx/svdotext.hxx binfilter/inc/bf_svx/svdouno.hxx binfilter/inc/bf_svx/svdovirt.hxx binfilter/inc/bf_svx/svdpage.hxx binfilter/inc/bf_svx/svdpagv.hxx binfilter/inc/bf_svx/svdpntv.hxx binfilter/inc/bf_svx/svdpool.hxx binfilter/inc/bf_svx/svdsob.hxx binfilter/inc/bf_svx/svdtouch.hxx binfilter/inc/bf_svx/svdtypes.hxx binfilter/inc/bf_svx/svdundo.hxx binfilter/inc/bf_svx/svdviter.hxx binfilter/inc/bf_svx/svdvmark.hxx binfilter/inc/bf_svx/svimbase.hxx binfilter/inc/bf_svx/svx3ditems.hxx binfilter/inc/bf_svx/svxfont.hxx binfilter/inc/bf_svx/swafopt.hxx binfilter/inc/bf_svx/sxcaitm.hxx binfilter/inc/bf_svx/sxcecitm.hxx binfilter/inc/bf_svx/sxcllitm.hxx binfilter/inc/bf_svx/sxmbritm.hxx binfilter/inc/bf_svx/sxmspitm.hxx binfilter/inc/bf_svx/sxmsuitm.hxx binfilter/inc/bf_svx/sxmtaitm.hxx binfilter/inc/bf_svx/sxmtfitm.hxx binfilter/inc/bf_svx/sxmtritm.hxx binfilter/inc/bf_svx/sxopitm.hxx binfilter/inc/bf_svx/unoedsrc.hxx binfilter/inc/bf_svx/unoforou.hxx binfilter/inc/bf_svx/unolingu.hxx binfilter/inc/bf_svx/unoshape.hxx binfilter/inc/bf_svx/unotext.hxx binfilter/inc/bf_svx/unoviwed.hxx binfilter/inc/bf_svx/unoviwou.hxx binfilter/inc/bf_svx/viewpt3d.hxx binfilter/inc/bf_svx/volume3d.hxx binfilter/inc/bf_svx/xbitmap.hxx binfilter/inc/bf_svx/xflbckit.hxx binfilter/inc/bf_svx/xflbmsli.hxx binfilter/inc/bf_svx/xflbmtit.hxx binfilter/inc/bf_svx/xflbstit.hxx binfilter/inc/bf_svx/xflftrit.hxx binfilter/inc/bf_svx/xflgrit.hxx binfilter/inc/bf_svx/xflhtit.hxx binfilter/inc/bf_svx/xftmrit.hxx binfilter/inc/bf_svx/xit.hxx binfilter/inc/bf_svx/xlndsit.hxx binfilter/inc/bf_svx/xlnedcit.hxx binfilter/inc/bf_svx/xlnstcit.hxx binfilter/inc/bf_svx/xmlcnitm.hxx binfilter/inc/bf_svx/xmlgrhlp.hxx binfilter/inc/bf_svx/xoutbmp.hxx binfilter/inc/bf_svx/xoutx.hxx binfilter/inc/bf_svx/xpoly.hxx binfilter/inc/bf_svx/xpolyimp.hxx binfilter/inc/bf_svx/xpool.hxx binfilter/inc/bf_svx/xtextit0.hxx binfilter/inc/bf_svx/zoomitem.hxx binfilter/inc/bf_sw/accessibilityoptions.hxx binfilter/inc/bf_sw/authfld.hxx binfilter/inc/bf_sw/authratr.hxx binfilter/inc/bf_sw/bparr.hxx binfilter/inc/bf_sw/breakit.hxx binfilter/inc/bf_sw/calbck.hxx binfilter/inc/bf_sw/cellatr.hxx binfilter/inc/bf_sw/cellfml.hxx binfilter/inc/bf_sw/charatr.hxx binfilter/inc/bf_sw/crsrsh.hxx binfilter/inc/bf_sw/crsskip.hxx binfilter/inc/bf_sw/cshtyp.hxx binfilter/inc/bf_sw/ddefld.hxx binfilter/inc/bf_sw/docary.hxx binfilter/inc/bf_sw/docfac.hxx binfilter/inc/bf_sw/docsh.hxx binfilter/inc/bf_sw/docstat.hxx binfilter/inc/bf_sw/docufld.hxx binfilter/inc/bf_sw/dpage.hxx binfilter/inc/bf_sw/drawdoc.hxx binfilter/inc/bf_sw/editsh.hxx binfilter/inc/bf_sw/errhdl.hxx binfilter/inc/bf_sw/expfld.hxx binfilter/inc/bf_sw/fesh.hxx binfilter/inc/bf_sw/fmtanchr.hxx binfilter/inc/bf_sw/fmtclds.hxx binfilter/inc/bf_sw/fmtcnct.hxx binfilter/inc/bf_sw/fmtcntnt.hxx binfilter/inc/bf_sw/fmtfordr.hxx binfilter/inc/bf_sw/fmtfsize.hxx binfilter/inc/bf_sw/fmtftntx.hxx binfilter/inc/bf_sw/fmthdft.hxx binfilter/inc/bf_sw/fmtline.hxx binfilter/inc/bf_sw/fmtlsplt.hxx binfilter/inc/bf_sw/fmtornt.hxx binfilter/inc/bf_sw/fmtsrnd.hxx binfilter/inc/bf_sw/format.hxx binfilter/inc/bf_sw/frmatr.hxx binfilter/inc/bf_sw/frmfmt.hxx binfilter/inc/bf_sw/ftninfo.hxx binfilter/inc/bf_sw/grfatr.hxx binfilter/inc/bf_sw/hintids.hxx binfilter/inc/bf_sw/hints.hxx binfilter/inc/bf_sw/index.hxx binfilter/inc/bf_sw/iodetect.hxx binfilter/inc/bf_sw/linetype.hxx binfilter/inc/bf_sw/mdiexp.hxx binfilter/inc/bf_sw/ndarr.hxx binfilter/inc/bf_sw/ndindex.hxx binfilter/inc/bf_sw/ndole.hxx binfilter/inc/bf_sw/ndtxt.hxx binfilter/inc/bf_sw/ndtyp.hxx binfilter/inc/bf_sw/newhdl.hxx binfilter/inc/bf_sw/pagedesc.hxx binfilter/inc/bf_sw/pageiter.hxx binfilter/inc/bf_sw/paratr.hxx binfilter/inc/bf_sw/poolfmt.awk binfilter/inc/bf_sw/poolfmt.hxx binfilter/inc/bf_sw/pvprtdat.hxx binfilter/inc/bf_sw/redline.hxx binfilter/inc/bf_sw/reffld.hxx binfilter/inc/bf_sw/shellio.hxx binfilter/inc/bf_sw/sw3io.hxx binfilter/inc/bf_sw/swatrset.hxx binfilter/inc/bf_sw/swcrsr.hxx binfilter/inc/bf_sw/swdbdata.hxx binfilter/inc/bf_sw/swdbtoolsclient.hxx binfilter/inc/bf_sw/swevent.hxx binfilter/inc/bf_sw/swgpar.hxx binfilter/inc/bf_sw/swgstr.hxx binfilter/inc/bf_sw/swmodule.hxx binfilter/inc/bf_sw/swprtopt.hxx binfilter/inc/bf_sw/swrect.hxx binfilter/inc/bf_sw/swregion.hxx binfilter/inc/bf_sw/swserv.hxx binfilter/inc/bf_sw/swtable.hxx binfilter/inc/bf_sw/swtypes.hxx binfilter/inc/bf_sw/swunohelper.hxx binfilter/inc/bf_sw/swwait.hxx binfilter/inc/bf_sw/tgrditem.hxx binfilter/inc/bf_sw/toxwrap.hxx binfilter/inc/bf_sw/txatbase.hxx binfilter/inc/bf_sw/txatritr.hxx binfilter/inc/bf_sw/txtatr.hxx binfilter/inc/bf_sw/txtftn.hxx binfilter/inc/bf_sw/txtinet.hxx binfilter/inc/bf_sw/undobj.hxx binfilter/inc/bf_sw/unoatxt.hxx binfilter/inc/bf_sw/unocoll.hxx binfilter/inc/bf_sw/unocrsr.hxx binfilter/inc/bf_sw/unodraw.hxx binfilter/inc/bf_sw/unoevtlstnr.hxx binfilter/inc/bf_sw/unofield.hxx binfilter/inc/bf_sw/unoframe.hxx binfilter/inc/bf_sw/unoidx.hxx binfilter/inc/bf_sw/unoobj.hxx binfilter/inc/bf_sw/unoport.hxx binfilter/inc/bf_sw/unoprnms.hxx binfilter/inc/bf_sw/unoredline.hxx binfilter/inc/bf_sw/unoredlines.hxx binfilter/inc/bf_sw/unosrch.hxx binfilter/inc/bf_sw/unostyle.hxx binfilter/inc/bf_sw/unotbl.hxx binfilter/inc/bf_sw/unotxdoc.hxx binfilter/inc/bf_sw/viewopt.hxx binfilter/inc/bf_sw/viewsh.hxx binfilter/inc/bf_sw/viscrs.hxx binfilter/inc/bf_xmloff/NamedBoolPropertyHdl.hxx binfilter/inc/bf_xmloff/VisAreaContext.hxx binfilter/inc/bf_xmloff/i18nmap.hxx binfilter/inc/bf_xmloff/sdxmlexp.hxx binfilter/inc/bf_xmloff/styleexp.hxx binfilter/inc/bf_xmloff/txtfldi.hxx binfilter/inc/bf_xmloff/xexptran.hxx binfilter/inc/bf_xmloff/xmlcnimp.hxx binfilter/inc/bf_xmloff/xmlcnitm.hxx binfilter/inc/bf_xmloff/xmlehelp.hxx binfilter/inc/bf_xmloff/xmlexp.hxx binfilter/inc/bf_xmloff/xmlictxt.hxx binfilter/inc/bf_xmloff/xmlimppr.hxx binfilter/inc/bf_xmloff/xmlnume.hxx binfilter/inc/bf_xmloff/xmlnumfi.hxx binfilter/inc/bf_xmloff/xmlstyle.hxx binfilter/inc/bf_xmloff/xmltoken.hxx binfilter/inc/bf_xmloff/xmluconv.hxx filter/inc/filter/msfilter/escherex.hxx filter/inc/filter/msfilter/msdffimp.hxx filter/inc/filter/msfilter/svdfppt.hxx filter/inc/filter/msfilter/svxmsbas.hxx filter/inc/registration.hxx filter/source/docbook/sofftodocbookheadings.xsl filter/source/flash/swfuno.cxx filter/source/flash/swfwriter1.cxx filter/source/graphicfilter/egif/dlgegif.cxx filter/source/graphicfilter/egif/egif.cxx filter/source/graphicfilter/egif/makefile.mk filter/source/graphicfilter/eos2met/dlgeos2.cxx filter/source/graphicfilter/eos2met/dlgeos2.hxx filter/source/graphicfilter/eos2met/eos2met.cxx filter/source/graphicfilter/eos2met/makefile.mk filter/source/graphicfilter/epbm/dlgepbm.cxx filter/source/graphicfilter/epbm/epbm.cxx filter/source/graphicfilter/epbm/makefile.mk filter/source/graphicfilter/epgm/dlgepgm.cxx filter/source/graphicfilter/epgm/dlgepgm.hxx filter/source/graphicfilter/epgm/epgm.cxx filter/source/graphicfilter/epgm/makefile.mk filter/source/graphicfilter/epict/dlgepct.cxx filter/source/graphicfilter/epict/epict.cxx filter/source/graphicfilter/epict/makefile.mk filter/source/graphicfilter/eppm/dlgeppm.cxx filter/source/graphicfilter/eppm/dlgeppm.hxx filter/source/graphicfilter/eppm/eppm.cxx filter/source/graphicfilter/eppm/makefile.mk filter/source/graphicfilter/eps/dlgeps.cxx filter/source/graphicfilter/eps/dlgeps.hxx filter/source/graphicfilter/eps/eps.cxx filter/source/graphicfilter/eps/makefile.mk filter/source/graphicfilter/eras/eras.cxx filter/source/graphicfilter/etiff/etiff.cxx filter/source/graphicfilter/expm/expm.cxx filter/source/graphicfilter/icgm/actimpr.cxx filter/source/graphicfilter/idxf/dxf2mtf.cxx filter/source/graphicfilter/idxf/dxf2mtf.hxx filter/source/graphicfilter/idxf/dxfgrprd.cxx filter/source/graphicfilter/idxf/dxfgrprd.hxx filter/source/graphicfilter/idxf/idxf.cxx filter/source/graphicfilter/ieps/ieps.cxx filter/source/graphicfilter/ios2met/ios2met.cxx filter/source/graphicfilter/ipbm/ipbm.cxx filter/source/graphicfilter/ipcd/ipcd.cxx filter/source/graphicfilter/ipcx/ipcx.cxx filter/source/graphicfilter/ipict/ipict.cxx filter/source/graphicfilter/ipict/makefile.mk filter/source/graphicfilter/ipsd/ipsd.cxx filter/source/graphicfilter/iras/iras.cxx filter/source/graphicfilter/itga/itga.cxx filter/source/graphicfilter/itiff/itiff.cxx filter/source/msfilter/escherex.cxx filter/source/msfilter/eschesdo.cxx filter/source/msfilter/eschesdo.hxx filter/source/msfilter/makefile.mk filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msocximex.cxx filter/source/msfilter/msoleexp.cxx filter/source/msfilter/msvbahelper.cxx filter/source/msfilter/powerpoint/pptimporteruno.cxx filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svxmsbas.cxx filter/source/pdf/pdfexport.cxx filter/source/pdf/pdfuno.cxx filter/source/placeware/uno.cxx filter/source/svg/makefile.mk filter/source/svg/svgexport.cxx filter/source/svg/svgfontexport.cxx filter/source/svg/svguno.cxx filter/source/svg/svgwriter.cxx filter/source/t602/filterenv.cxx filter/source/xmlfilteradaptor/genericfilter.cxx filter/source/xmlfilterdetect/fdcomp.cxx filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xsltdialog/xmlfileview.cxx filter/source/xsltdialog/xmlfilterdialogcomponent.cxx filter/source/xsltfilter/XSLTFilter.cxx hwpfilter/source/hwpreader.hxx oox/inc/oox/core/binarycodec.hxx oox/inc/oox/core/binaryfilterbase.hxx oox/inc/oox/core/contexthandler.hxx oox/inc/oox/core/contexthandler2.hxx oox/inc/oox/core/fasttokenhandler.hxx oox/inc/oox/core/filterbase.hxx oox/inc/oox/core/filterdetect.hxx oox/inc/oox/core/fragmenthandler.hxx oox/inc/oox/core/fragmenthandler2.hxx oox/inc/oox/core/recordparser.hxx oox/inc/oox/core/relations.hxx oox/inc/oox/core/relationshandler.hxx oox/inc/oox/core/xmlfilterbase.hxx oox/inc/oox/drawingml/chart/axiscontext.hxx oox/inc/oox/drawingml/chart/axisconverter.hxx oox/inc/oox/drawingml/chart/axismodel.hxx oox/inc/oox/drawingml/chart/chartcontextbase.hxx oox/inc/oox/drawingml/chart/chartconverter.hxx oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx oox/inc/oox/drawingml/chart/chartspaceconverter.hxx oox/inc/oox/drawingml/chart/chartspacefragment.hxx oox/inc/oox/drawingml/chart/chartspacemodel.hxx oox/inc/oox/drawingml/chart/converterbase.hxx oox/inc/oox/drawingml/chart/datasourcecontext.hxx oox/inc/oox/drawingml/chart/datasourceconverter.hxx oox/inc/oox/drawingml/chart/datasourcemodel.hxx oox/inc/oox/drawingml/chart/modelbase.hxx oox/inc/oox/drawingml/chart/objectformatter.hxx oox/inc/oox/drawingml/chart/plotareacontext.hxx oox/inc/oox/drawingml/chart/plotareaconverter.hxx oox/inc/oox/drawingml/chart/plotareamodel.hxx oox/inc/oox/drawingml/chart/seriescontext.hxx oox/inc/oox/drawingml/chart/seriesconverter.hxx oox/inc/oox/drawingml/chart/seriesmodel.hxx oox/inc/oox/drawingml/chart/titlecontext.hxx oox/inc/oox/drawingml/chart/titleconverter.hxx oox/inc/oox/drawingml/chart/titlemodel.hxx oox/inc/oox/drawingml/chart/typegroupcontext.hxx oox/inc/oox/drawingml/chart/typegroupconverter.hxx oox/inc/oox/drawingml/chart/typegroupmodel.hxx oox/inc/oox/drawingml/textbody.hxx oox/inc/oox/drawingml/textliststyle.hxx oox/inc/oox/drawingml/textparagraphproperties.hxx oox/inc/oox/helper/attributelist.hxx oox/inc/oox/helper/binaryinputstream.hxx oox/inc/oox/helper/binaryoutputstream.hxx oox/inc/oox/helper/binarystreambase.hxx oox/inc/oox/helper/containerhelper.hxx oox/inc/oox/helper/graphichelper.hxx oox/inc/oox/helper/helper.hxx oox/inc/oox/helper/modelobjecthelper.hxx oox/inc/oox/helper/progressbar.hxx oox/inc/oox/helper/propertymap.hxx oox/inc/oox/helper/propertyset.hxx oox/inc/oox/helper/textinputstream.hxx oox/inc/oox/ole/axbinaryreader.hxx oox/inc/oox/ole/axcontrolfragment.hxx oox/inc/oox/ole/olehelper.hxx oox/inc/oox/ole/oleobjecthelper.hxx oox/inc/oox/ole/vbacontrol.hxx oox/inc/oox/ole/vbainputstream.hxx oox/inc/oox/ole/vbamodule.hxx oox/inc/oox/ole/vbaproject.hxx oox/inc/oox/ole/vbaprojectfilter.hxx oox/inc/oox/token/propertynames.hxx oox/inc/oox/vml/vmldrawing.hxx oox/inc/oox/vml/vmldrawingfragment.hxx oox/inc/oox/vml/vmlformatting.hxx oox/inc/oox/vml/vmlinputstream.hxx oox/inc/oox/vml/vmlshape.hxx oox/inc/oox/vml/vmlshapecontainer.hxx oox/inc/oox/vml/vmlshapecontext.hxx oox/inc/oox/xls/addressconverter.hxx oox/inc/oox/xls/biffcodec.hxx oox/inc/oox/xls/biffdetector.hxx oox/inc/oox/xls/biffhelper.hxx oox/inc/oox/xls/biffinputstream.hxx oox/inc/oox/xls/biffoutputstream.hxx oox/inc/oox/xls/chartsheetfragment.hxx oox/inc/oox/xls/commentsbuffer.hxx oox/inc/oox/xls/commentsfragment.hxx oox/inc/oox/xls/condformatbuffer.hxx oox/inc/oox/xls/condformatcontext.hxx oox/inc/oox/xls/connectionsfragment.hxx oox/inc/oox/xls/defnamesbuffer.hxx oox/inc/oox/xls/drawingfragment.hxx oox/inc/oox/xls/excelchartconverter.hxx oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelhandlers.hxx oox/inc/oox/xls/excelvbaproject.hxx oox/inc/oox/xls/externallinkbuffer.hxx oox/inc/oox/xls/externallinkfragment.hxx oox/inc/oox/xls/formulabase.hxx oox/inc/oox/xls/formulaparser.hxx oox/inc/oox/xls/numberformatsbuffer.hxx oox/inc/oox/xls/ooxformulaparser.hxx oox/inc/oox/xls/pagesettings.hxx oox/inc/oox/xls/pivotcachebuffer.hxx oox/inc/oox/xls/pivotcachefragment.hxx oox/inc/oox/xls/pivottablebuffer.hxx oox/inc/oox/xls/pivottablefragment.hxx oox/inc/oox/xls/querytablefragment.hxx oox/inc/oox/xls/richstring.hxx oox/inc/oox/xls/richstringcontext.hxx oox/inc/oox/xls/scenariobuffer.hxx oox/inc/oox/xls/scenariocontext.hxx oox/inc/oox/xls/sharedformulabuffer.hxx oox/inc/oox/xls/sharedstringsbuffer.hxx oox/inc/oox/xls/sharedstringsfragment.hxx oox/inc/oox/xls/sheetdatacontext.hxx oox/inc/oox/xls/stylesbuffer.hxx oox/inc/oox/xls/stylesfragment.hxx oox/inc/oox/xls/tablebuffer.hxx oox/inc/oox/xls/tablefragment.hxx oox/inc/oox/xls/themebuffer.hxx oox/inc/oox/xls/unitconverter.hxx oox/inc/oox/xls/viewsettings.hxx oox/inc/oox/xls/webquerybuffer.hxx oox/inc/oox/xls/workbookfragment.hxx oox/inc/oox/xls/workbooksettings.hxx oox/inc/oox/xls/worksheetbuffer.hxx oox/inc/oox/xls/worksheetfragment.hxx oox/inc/oox/xls/worksheethelper.hxx oox/inc/oox/xls/worksheetsettings.hxx oox/prj/build.lst oox/prj/d.lst oox/source/core/binarycodec.cxx oox/source/core/binaryfilterbase.cxx oox/source/core/contexthandler.cxx oox/source/core/contexthandler2.cxx oox/source/core/facreg.cxx oox/source/core/fasttokenhandler.cxx oox/source/core/filterbase.cxx oox/source/core/filterdetect.cxx oox/source/core/fragmenthandler.cxx oox/source/core/fragmenthandler2.cxx oox/source/core/recordparser.cxx oox/source/core/relations.cxx oox/source/core/relationshandler.cxx oox/source/core/xmlfilterbase.cxx oox/source/docprop/ooxmldocpropimport.cxx oox/source/docprop/ooxmldocpropimport.hxx oox/source/drawingml/chart/axiscontext.cxx oox/source/drawingml/chart/axisconverter.cxx oox/source/drawingml/chart/axismodel.cxx oox/source/drawingml/chart/chartcontextbase.cxx oox/source/drawingml/chart/chartconverter.cxx oox/source/drawingml/chart/chartdrawingfragment.cxx oox/source/drawingml/chart/chartspaceconverter.cxx oox/source/drawingml/chart/chartspacefragment.cxx oox/source/drawingml/chart/chartspacemodel.cxx oox/source/drawingml/chart/converterbase.cxx oox/source/drawingml/chart/datasourcecontext.cxx oox/source/drawingml/chart/datasourceconverter.cxx oox/source/drawingml/chart/datasourcemodel.cxx oox/source/drawingml/chart/modelbase.cxx oox/source/drawingml/chart/objectformatter.cxx oox/source/drawingml/chart/plotareacontext.cxx oox/source/drawingml/chart/plotareaconverter.cxx oox/source/drawingml/chart/seriescontext.cxx oox/source/drawingml/chart/seriesconverter.cxx oox/source/drawingml/chart/seriesmodel.cxx oox/source/drawingml/chart/titlecontext.cxx oox/source/drawingml/chart/titleconverter.cxx oox/source/drawingml/chart/titlemodel.cxx oox/source/drawingml/chart/typegroupcontext.cxx oox/source/drawingml/chart/typegroupconverter.cxx oox/source/drawingml/chart/typegroupmodel.cxx oox/source/drawingml/shape.cxx oox/source/drawingml/shapecontext.cxx oox/source/drawingml/table/tableproperties.cxx oox/source/drawingml/textbodypropertiescontext.cxx oox/source/drawingml/textliststyle.cxx oox/source/drawingml/transform2dcontext.cxx oox/source/dump/biffdumper.cxx oox/source/dump/dffdumper.cxx oox/source/dump/dumperbase.cxx oox/source/dump/oledumper.cxx oox/source/dump/pptxdumper.cxx oox/source/dump/xlsbdumper.cxx oox/source/helper/attributelist.cxx oox/source/helper/binaryinputstream.cxx oox/source/helper/binarystreambase.cxx oox/source/helper/containerhelper.cxx oox/source/helper/graphichelper.cxx oox/source/helper/modelobjecthelper.cxx oox/source/helper/progressbar.cxx oox/source/helper/propertymap.cxx oox/source/helper/propertyset.cxx oox/source/helper/textinputstream.cxx oox/source/ole/axbinaryreader.cxx oox/source/ole/axcontrol.cxx oox/source/ole/olehelper.cxx oox/source/ole/oleobjecthelper.cxx oox/source/ole/vbacontrol.cxx oox/source/ole/vbamodule.cxx oox/source/ole/vbaproject.cxx oox/source/ole/vbaprojectfilter.cxx oox/source/ppt/customshowlistcontext.cxx oox/source/ppt/pptimport.cxx oox/source/ppt/pptshapegroupcontext.cxx oox/source/shape/FastTokenHandlerService.cxx oox/source/shape/FastTokenHandlerService.hxx oox/source/token/makefile.mk oox/source/token/namespacemap.cxx oox/source/token/properties.txt oox/source/token/propertynames.cxx oox/source/token/tokenmap.cxx oox/source/token/tokens.hxx.head oox/source/vml/vmldrawing.cxx oox/source/vml/vmldrawingfragment.cxx oox/source/vml/vmlformatting.cxx oox/source/vml/vmlinputstream.cxx oox/source/vml/vmlshape.cxx oox/source/vml/vmlshapecontainer.cxx oox/source/vml/vmlshapecontext.cxx oox/source/vml/vmltextbox.cxx oox/source/xls/addressconverter.cxx oox/source/xls/autofiltercontext.cxx oox/source/xls/biffcodec.cxx oox/source/xls/biffdetector.cxx oox/source/xls/biffhelper.cxx oox/source/xls/biffinputstream.cxx oox/source/xls/biffoutputstream.cxx oox/source/xls/chartsheetfragment.cxx oox/source/xls/commentsbuffer.cxx oox/source/xls/commentsfragment.cxx oox/source/xls/condformatbuffer.cxx oox/source/xls/condformatcontext.cxx oox/source/xls/connectionsfragment.cxx oox/source/xls/defnamesbuffer.cxx oox/source/xls/drawingfragment.cxx oox/source/xls/excelchartconverter.cxx oox/source/xls/excelfilter.cxx oox/source/xls/excelhandlers.cxx oox/source/xls/externallinkbuffer.cxx oox/source/xls/externallinkfragment.cxx oox/source/xls/formulabase.cxx oox/source/xls/formulaparser.cxx oox/source/xls/numberformatsbuffer.cxx oox/source/xls/ooxformulaparser.cxx oox/source/xls/pagesettings.cxx oox/source/xls/pivotcachebuffer.cxx oox/source/xls/pivotcachefragment.cxx oox/source/xls/pivottablebuffer.cxx oox/source/xls/pivottablefragment.cxx oox/source/xls/querytablefragment.cxx oox/source/xls/richstring.cxx oox/source/xls/richstringcontext.cxx oox/source/xls/scenariobuffer.cxx oox/source/xls/scenariocontext.cxx oox/source/xls/sharedformulabuffer.cxx oox/source/xls/sharedstringsbuffer.cxx oox/source/xls/sharedstringsfragment.cxx oox/source/xls/sheetdatacontext.cxx oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesfragment.cxx oox/source/xls/tablebuffer.cxx oox/source/xls/tablefragment.cxx oox/source/xls/themebuffer.cxx oox/source/xls/unitconverter.cxx oox/source/xls/webquerybuffer.cxx oox/source/xls/workbookfragment.cxx oox/source/xls/workbookhelper.cxx oox/source/xls/workbooksettings.cxx oox/source/xls/worksheetbuffer.cxx oox/source/xls/worksheetfragment.cxx oox/source/xls/worksheethelper.cxx oox/source/xls/worksheetsettings.cxx unoxml/source/rdf/librdf_repository.cxx unoxml/source/xpath/xpathapi.hxx writerfilter/inc/resourcemodel/Fraction.hxx writerfilter/inc/resourcemodel/TagLogger.hxx writerfilter/inc/resourcemodel/XPathLogger.hxx writerfilter/source/dmapper/BorderHandler.cxx writerfilter/source/dmapper/CellColorHandler.cxx writerfilter/source/dmapper/CellColorHandler.hxx writerfilter/source/dmapper/CellMarginHandler.cxx writerfilter/source/dmapper/CellMarginHandler.hxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/FFDataHandler.cxx writerfilter/source/dmapper/FontTable.cxx writerfilter/source/dmapper/FontTable.hxx writerfilter/source/dmapper/GraphicImport.cxx writerfilter/source/dmapper/GraphicImport.hxx writerfilter/source/dmapper/MeasureHandler.cxx writerfilter/source/dmapper/NumberingManager.cxx writerfilter/source/dmapper/NumberingManager.hxx writerfilter/source/dmapper/OLEHandler.cxx writerfilter/source/dmapper/OLEHandler.hxx writerfilter/source/dmapper/PropertyIds.hxx writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.hxx writerfilter/source/dmapper/PropertyMapHelper.cxx writerfilter/source/dmapper/PropertyMapHelper.hxx writerfilter/source/dmapper/SectionColumnHandler.cxx writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/StyleSheetTable.hxx writerfilter/source/dmapper/TDefTableHandler.cxx writerfilter/source/dmapper/dmapperLoggers.hxx writerfilter/source/filter/ImportFilter.cxx writerfilter/source/filter/RtfFilter.cxx writerfilter/source/filter/RtfFilter.hxx writerfilter/source/ooxml/OOXMLFactory.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.hxx writerfilter/source/ooxml/OOXMLFastHelper.hxx writerfilter/source/ooxml/OOXMLParserState.hxx writerfilter/source/ooxml/factoryimpl_ns.xsl writerfilter/source/ooxml/model.xml writerfilter/source/resourcemodel/TagLogger.cxx writerfilter/source/resourcemodel/XPathLogger.cxx writerperfect/prj/build.lst writerperfect/source/wpdimp/wpft_genericfilter.cxx
author: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 22:49:23 -0600
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 22:49:23 -0600
commit: f673d89a6a4f6b2d3d519ab17a57b299cb6be1ad (patch)
tree: dc8127da17e362197b1b19df7b6957ce554fb0fd /writerfilter/source/dmapper
parent: 50bc1bc97b170c38648fab979ccb812a3c458cab (diff)
parent: 818573bfbce420afedffd45d7bb080f25da32625 (diff)
44 files changed, 1157 insertions, 1000 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 2ecc10931ec0..5e354343acd4 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -42,12 +42,13 @@ using namespace ::com::sun::star;
 
 
 BorderHandler::BorderHandler( bool bOOXML ) :
-    m_nCurrentBorderPosition( BORDER_TOP ),
-    m_nLineWidth(0),
-    m_nLineType(0),
-    m_nLineColor(0),
-    m_nLineDistance(0),
-    m_bOOXML( bOOXML )
+LoggedProperties(dmapper_logger, "BorderHandler"),
+m_nCurrentBorderPosition( BORDER_TOP ),
+m_nLineWidth(0),
+m_nLineType(0),
+m_nLineColor(0),
+m_nLineDistance(0),
+m_bOOXML( bOOXML )
 {
     const int nBorderCount(BORDER_COUNT);
     std::fill_n(m_aFilledLines, nBorderCount, false);
@@ -58,14 +59,8 @@ BorderHandler::~BorderHandler()
 {
 }
 
-void BorderHandler::attribute(Id rName, Value & rVal)
+void BorderHandler::lcl_attribute(Id rName, Value & rVal)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("BorderHandler.attribute");
-    dmapper_logger->attribute("id", (*QNameToString::Instance())(rName));
-    dmapper_logger->endElement();
-#endif
-
     sal_Int32 nIntValue = rVal.getInt();
     switch( rName )
     {
@@ -109,13 +104,8 @@ void BorderHandler::attribute(Id rName, Value & rVal)
     }
 }
 
-void BorderHandler::sprm(Sprm & rSprm)
+void BorderHandler::lcl_sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("BorderHandler.sprm");
-    dmapper_logger->attribute("sprm", rSprm.toString());
-#endif
-
     switch( rSprm.getId())
     {
         case NS_ooxml::LN_CT_TblBorders_top:
@@ -136,11 +126,6 @@ void BorderHandler::sprm(Sprm & rSprm)
         break;
         default:;
     }
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
-
 }
 
 PropertyMapPtr  BorderHandler::getProperties()
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 71c4b5e67510..6d23f123c2aa 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -29,7 +29,7 @@
 #define INCLUDED_BORDERHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 
@@ -37,7 +37,7 @@ namespace writerfilter {
 namespace dmapper
 {
 class PropertyMap;
-class WRITERFILTER_DLLPRIVATE BorderHandler : public Properties
+class WRITERFILTER_DLLPRIVATE BorderHandler : public LoggedProperties
 {
 public:
     //todo: order is a guess
@@ -64,14 +64,14 @@ private:
     bool                                        m_aFilledLines[BORDER_COUNT];
     ::com::sun::star::table::BorderLine2        m_aBorderLines[BORDER_COUNT];
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     BorderHandler( bool bOOXML );
     virtual ~BorderHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     ::boost::shared_ptr<PropertyMap>            getProperties();
     ::com::sun::star::table::BorderLine2        getBorderLine();
     sal_Int32                                   getLineDistance() const { return m_nLineDistance;}
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 6472d1049962..bfb210ddc7a2 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -31,6 +31,7 @@
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <sal/macros.h>
+#include "dmapperLoggers.hxx"
 
 #define OOXML_COLOR_AUTO 0x0a //todo: AutoColor needs symbol
 
@@ -42,9 +43,10 @@ using namespace ::writerfilter;
 
 
 CellColorHandler::CellColorHandler() :
-    m_nShadowType( 0 ),
-    m_nColor( 0xffffffff ),
-    m_nFillColor( 0xffffffff ),
+LoggedProperties(dmapper_logger, "CellColorHandler"),
+m_nShadowType( 0 ),
+m_nColor( 0xffffffff ),
+m_nFillColor( 0xffffffff ),
     m_OutputFormat( Form )
 {
 }
@@ -53,7 +55,7 @@ CellColorHandler::~CellColorHandler()
 {
 }
 
-void CellColorHandler::attribute(Id rName, Value & rVal)
+void CellColorHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     switch( rName )
@@ -92,7 +94,7 @@ void CellColorHandler::attribute(Id rName, Value & rVal)
     }
 }
 
-void CellColorHandler::sprm(Sprm & rSprm)
+void CellColorHandler::lcl_sprm(Sprm & rSprm)
 {
     (void)rSprm;
 }
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 3cdf730211b1..a745b8fcf73e 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -29,14 +29,14 @@
 #define INCLUDED_CELLCOLORHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 namespace writerfilter {
 namespace dmapper
 {
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellColorHandler : public Properties
+class WRITERFILTER_DLLPRIVATE CellColorHandler : public LoggedProperties
 {
 public:
     enum OutputFormat { Form, Paragraph, Character }; // for what part of the document
@@ -46,14 +46,14 @@ private:
     sal_Int32 m_nFillColor;
     OutputFormat m_OutputFormat;
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     CellColorHandler( );
     virtual ~CellColorHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     ::boost::shared_ptr<TablePropertyMap>            getProperties();
 
     void setOutputFormat( OutputFormat format ) { m_OutputFormat = format; }
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 035c73fc033d..a18e0e8a810b 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -30,6 +30,7 @@
 #include <doctok/resourceids.hxx>
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
+#include "dmapperLoggers.hxx"
 
 namespace writerfilter {
 namespace dmapper {
@@ -39,15 +40,16 @@ using namespace ::writerfilter;
 
 
 CellMarginHandler::CellMarginHandler() :
-    m_nValue( 0 ),
-    m_nLeftMargin( 0 ),
-    m_bLeftMarginValid( false ),
-    m_nRightMargin( 0 ),
-    m_bRightMarginValid( false ),
-    m_nTopMargin( 0 ),
-    m_bTopMarginValid( false ),
-    m_nBottomMargin( 0 ),
-    m_bBottomMarginValid( false )
+LoggedProperties(dmapper_logger, "CellMarginHandler"),
+m_nValue( 0 ),
+m_nLeftMargin( 0 ),
+m_bLeftMarginValid( false ),
+m_nRightMargin( 0 ),
+m_bRightMarginValid( false ),
+m_nTopMargin( 0 ),
+m_bTopMarginValid( false ),
+m_nBottomMargin( 0 ),
+m_bBottomMarginValid( false )
 {
 }
 
@@ -55,7 +57,7 @@ CellMarginHandler::~CellMarginHandler()
 {
 }
 
-void CellMarginHandler::attribute(Id rName, Value & rVal)
+void CellMarginHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     (void)nIntValue;
@@ -73,7 +75,7 @@ void CellMarginHandler::attribute(Id rName, Value & rVal)
     }
 }
 
-void CellMarginHandler::sprm(Sprm & rSprm)
+void CellMarginHandler::lcl_sprm(Sprm & rSprm)
 {
     writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
     if( pProperties.get())
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 4642f3a61b1b..7a36458a72c2 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -29,18 +29,22 @@
 #define INCLUDED_CELLMARGINHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 namespace writerfilter {
 namespace dmapper
 {
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE CellMarginHandler : public Properties
+class WRITERFILTER_DLLPRIVATE CellMarginHandler : public LoggedProperties
 {
 private:
     sal_Int32   m_nValue;
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     sal_Int32   m_nLeftMargin;
     bool        m_bLeftMarginValid;
@@ -55,10 +59,6 @@ public:
     CellMarginHandler( );
     virtual ~CellMarginHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     ::boost::shared_ptr<TablePropertyMap>            getProperties();
 
 };
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 7997f145bf6d..4e750bb96c4b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -87,15 +87,11 @@
 #include <vector>
 #include <iostream>
 
-#ifdef DEBUG_DOMAINMAPPER
-#include <resourcemodel/QNameToString.hxx>
-#include <resourcemodel/util.hxx>
-#include <resourcemodel/TagLogger.hxx>
-#endif
 #if OSL_DEBUG_LEVEL > 0
 #include <resourcemodel/QNameToString.hxx>
 #endif
 
+#include <resourcemodel/TagLogger.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
@@ -107,9 +103,7 @@ using resourcemodel::resolveAttributeProperties;
 
 namespace dmapper{
 
-#ifdef DEBUG_DOMAINMAPPER
 TagLogger::Pointer_t dmapper_logger(TagLogger::getInstance("DOMAINMAPPER"));
-#endif
 
 struct _PageSz
 {
@@ -124,6 +118,9 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
                             uno::Reference< io::XInputStream > xInputStream,
                             uno::Reference< lang::XComponent > xModel,
                             SourceDocumentType eDocumentType) :
+LoggedProperties(dmapper_logger, "DomainMapper"),
+LoggedTable(dmapper_logger, "DomainMapper"),
+LoggedStream(dmapper_logger, "DomainMapper"),
     m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType )),
     mnBackgroundColor(0), mbIsHighlightSet(false)
 {
@@ -184,14 +181,8 @@ DomainMapper::~DomainMapper()
     delete m_pImpl;
 }
 
-void DomainMapper::attribute(Id nName, Value & val)
+void DomainMapper::lcl_attribute(Id nName, Value & val)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("attribute");
-    dmapper_logger->attribute("name", (*QNameToString::Instance())(nName));
-    dmapper_logger->attribute("value", val.toString());
-    dmapper_logger->endElement();
-#endif
     static ::rtl::OUString sLocalBookmarkName;
     sal_Int32 nIntValue = val.getInt();
     rtl::OUString sStringValue = val.getString();
@@ -1419,18 +1410,14 @@ void DomainMapper::attribute(Id nName, Value & val)
     }
 }
 
-void DomainMapper::sprm(Sprm & rSprm)
+void DomainMapper::lcl_sprm(Sprm & rSprm)
 {
     if( !m_pImpl->getTableManager().sprm(rSprm))
-        DomainMapper::sprm( rSprm, m_pImpl->GetTopContext() );
+        sprmWithProps( rSprm, m_pImpl->GetTopContext() );
 }
 
-void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmType )
+void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmType )
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("DomainMapper.sprm");
-    dmapper_logger->chars(rSprm.toString());
-#endif
     OSL_ENSURE(rContext.get(), "PropertyMap has to be valid!");
     if(!rContext.get())
         return ;
@@ -1960,12 +1947,6 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
                     {
                         uno::Any aBold( uno::makeAny( nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) );
 
-#ifdef DEBUG_DOMAINMAPPER
-                        dmapper_logger->startElement("charWeight");
-                        dmapper_logger->attribute("weight", nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL);
-                        dmapper_logger->endElement();
-#endif
-
                         rContext->Insert(ePropertyId, true, aBold );
                         if( nSprmId != NS_sprm::LN_CFBoldBi ) // sprmCFBoldBi
                             rContext->Insert(PROP_CHAR_WEIGHT_ASIAN, true, aBold );
@@ -3136,26 +3117,13 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
 #endif
         }
     }
-
-#ifdef DEBUG_DOMAINMAPPER
-    rContext->dumpXml(dmapper_logger);
-    dmapper_logger->endElement();
-#endif
 }
 
 
-void DomainMapper::entry(int /*pos*/,
+void DomainMapper::lcl_entry(int /*pos*/,
                          writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("DomainMapper.entry");
-#endif
-
     ref->resolve(*this);
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/,
@@ -3163,15 +3131,12 @@ void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/,
 {
 }
 
-void DomainMapper::startSectionGroup()
+void DomainMapper::lcl_startSectionGroup()
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("section");
-#endif
     m_pImpl->PushProperties(CONTEXT_SECTION);
 }
 
-void DomainMapper::endSectionGroup()
+void DomainMapper::lcl_endSectionGroup()
 {
     PropertyMapPtr pContext = m_pImpl->GetTopContextOfType(CONTEXT_SECTION);
     SectionPropertyMap* pSectionContext = dynamic_cast< SectionPropertyMap* >( pContext.get() );
@@ -3179,18 +3144,10 @@ void DomainMapper::endSectionGroup()
     if(pSectionContext)
         pSectionContext->CloseSectionGroup( *m_pImpl );
     m_pImpl->PopProperties(CONTEXT_SECTION);
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void DomainMapper::startParagraphGroup()
+void DomainMapper::lcl_startParagraphGroup()
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("paragraph");
-#endif
-
     m_pImpl->getTableManager().startParagraphGroup();
     m_pImpl->PushProperties(CONTEXT_PARAGRAPH);
     static ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("Standard") );
@@ -3205,40 +3162,27 @@ void DomainMapper::startParagraphGroup()
     m_pImpl->clearDeferredBreaks();
 }
 
-void DomainMapper::endParagraphGroup()
+void DomainMapper::lcl_endParagraphGroup()
 {
     m_pImpl->PopProperties(CONTEXT_PARAGRAPH);
     m_pImpl->getTableManager().endParagraphGroup();
     //frame conversion has to be executed after table conversion
     m_pImpl->ExecuteFrameConversion();
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 void DomainMapper::markLastParagraphInSection( )
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->element( "markLastParagraphInSection" );
-#endif
     m_pImpl->SetIsLastParagraphInSection( true );
 }
 
-void DomainMapper::startShape( uno::Reference< drawing::XShape > xShape )
+void DomainMapper::lcl_startShape( uno::Reference< drawing::XShape > xShape )
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("shape");
-#endif
     m_pImpl->PushShapeContext( xShape );
 }
 
-void DomainMapper::endShape( )
+void DomainMapper::lcl_endShape( )
 {
     m_pImpl->PopShapeContext( );
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 void DomainMapper::PushStyleSheetProperties( PropertyMapPtr pStyleProperties, bool bAffectTableMngr )
@@ -3268,12 +3212,8 @@ void DomainMapper::PopListProperties()
     m_pImpl->PopProperties( CONTEXT_LIST );
 }
 
-void DomainMapper::startCharacterGroup()
+void DomainMapper::lcl_startCharacterGroup()
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("charactergroup");
-#endif
-
     m_pImpl->PushProperties(CONTEXT_CHARACTER);
     DomainMapperTableManager& rTableManager = m_pImpl->getTableManager();
     if( rTableManager.getTableStyleName().getLength() )
@@ -3283,16 +3223,12 @@ void DomainMapper::startCharacterGroup()
     }
 }
 
-void DomainMapper::endCharacterGroup()
+void DomainMapper::lcl_endCharacterGroup()
 {
     m_pImpl->PopProperties(CONTEXT_CHARACTER);
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void DomainMapper::text(const sal_uInt8 * data_, size_t len)
+void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
 {
     //TODO: Determine the right text encoding (FIB?)
     ::rtl::OUString sText( (const sal_Char*) data_, len, RTL_TEXTENCODING_MS_1252 );
@@ -3372,19 +3308,13 @@ void DomainMapper::text(const sal_uInt8 * data_, size_t len)
     }
 }
 
-void DomainMapper::utext(const sal_uInt8 * data_, size_t len)
+void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
 {
     OUString sText;
     OUStringBuffer aBuffer = OUStringBuffer(len);
     aBuffer.append( (const sal_Unicode *) data_, len);
     sText = aBuffer.makeStringAndClear();
 
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("utext");
-    dmapper_logger->chars(sText);
-    dmapper_logger->endElement();
-#endif
-
     try
     {
         m_pImpl->getTableManager().utext(data_, len);
@@ -3431,12 +3361,8 @@ void DomainMapper::utext(const sal_uInt8 * data_, size_t len)
     }
 }
 
-void DomainMapper::props(writerfilter::Reference<Properties>::Pointer_t ref)
+void DomainMapper::lcl_props(writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("props");
-#endif
-
     string sType = ref->getType();
     if( sType == "PICF" )
     {
@@ -3448,18 +3374,10 @@ void DomainMapper::props(writerfilter::Reference<Properties>::Pointer_t ref)
     }
     else
         ref->resolve(*this);
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
+void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("table");
-    dmapper_logger->attribute("id", (*QNameToString::Instance())(name));
-#endif
     m_pImpl->SetAnyTableImport(true);
     switch(name)
     {
@@ -3504,18 +3422,10 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
         OSL_ENSURE( false, "which table is to be filled here?");
     }
     m_pImpl->SetAnyTableImport(false);
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void DomainMapper::substream(Id rName, ::writerfilter::Reference<Stream>::Pointer_t ref)
+void DomainMapper::lcl_substream(Id rName, ::writerfilter::Reference<Stream>::Pointer_t ref)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("substream");
-#endif
-
     m_pImpl->appendTableManager( );
     m_pImpl->getTableManager().startLevel();
 
@@ -3577,13 +3487,9 @@ void DomainMapper::substream(Id rName, ::writerfilter::Reference<Stream>::Pointe
 
     m_pImpl->getTableManager().endLevel();
     m_pImpl->popTableManager( );
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void DomainMapper::info(const string & /*info_*/)
+void DomainMapper::lcl_info(const string & /*info_*/)
 {
 }
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3093ff135cee..ebe7d41665f5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <dmapperLoggers.hxx>
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
 #include <PropertyMapHelper.hxx>
 #endif
 
@@ -51,7 +51,7 @@ using namespace ::std;
 #define DEF_BORDER_DIST 190  //0,19cm
 #define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
 static void  lcl_printProperties( PropertyMapPtr pProps )
 {
     if( pProps.get() )
@@ -110,7 +110,7 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
     m_pTableSeq = TableSequencePointer_t(new TableSequence_t(nRows));
     m_nRowIndex = 0;
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("tablehandler.table");
     dmapper_logger->attribute("rows", nRows);
 
@@ -123,11 +123,6 @@ void DomainMapperTableHandler::startTable(unsigned int nRows,
 
 PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntryPtr pStyleSheet, StyleSheetTablePtr pStyleSheetTable)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("lcl_SearchParentStyleSheetAndMergeProperties");
-    pStyleSheet->dumpXml( dmapper_logger );
-#endif
-
     PropertyMapPtr pRet;
     if( pStyleSheet->sBaseStyleIdentifier.getLength())
     {
@@ -141,10 +136,6 @@ PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
 
     pRet->insert(  pStyleSheet->pProperties, true );
 
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
-
     return pRet;
 }
 
@@ -246,7 +237,7 @@ void lcl_computeCellBorders( PropertyMapPtr pTableBorders, PropertyMapPtr pCellP
     }
 }
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
 
 void lcl_debug_BorderLine(table::BorderLine & rLine)
 {
@@ -362,7 +353,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
                 PropertyMapPtr pMergedProperties = lcl_SearchParentStyleSheetAndMergeProperties(pStyleSheet, pStyleSheetTable);
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->startElement("mergedProps");
                 pMergedProperties->dumpXml( dmapper_logger );
                 dmapper_logger->endElement();
@@ -371,7 +362,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
                 m_aTableProperties->insert( pMergedProperties );
                 m_aTableProperties->insert( pTableProps );
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->startElement("TableProperties");
                 m_aTableProperties->dumpXml( dmapper_logger );
                 dmapper_logger->endElement();
@@ -382,7 +373,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
         // Set the table default attributes for the cells
         rInfo.pTableDefaults->insert( m_aTableProperties );
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("TableDefaults");
         rInfo.pTableDefaults->dumpXml( dmapper_logger );
         dmapper_logger->endElement();
@@ -452,7 +443,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         m_aTableProperties->Insert( PROP_TABLE_BORDER, false, uno::makeAny( aTableBorder ) );
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         lcl_debug_TableBorder(aTableBorder);
 #endif
 
@@ -474,7 +465,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
         rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("debug.tableprops");
         m_aTableProperties->dumpXml( dmapper_logger );
         dmapper_logger->endElement();
@@ -487,7 +478,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(TableInfo & rInfo)
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("getCellProperties");
 #endif
 
@@ -580,7 +571,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 pAllCellProps->insert( *aCellIterator );
                 aCellIterator->get( )->swap( *pAllCellProps.get( ) );
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->startElement("cell");
                 dmapper_logger->attribute("cell", nCell);
                 dmapper_logger->attribute("row", nRow);
@@ -613,14 +604,14 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                                                  uno::makeAny((sal_Int32) rInfo.nBottomBorderDistance ) );
 
                 pSingleCellProperties[nCell] = aCellIterator->get()->GetPropertyValues();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
                 dmapper_logger->endElement();
 #endif
             }
             ++nCell;
             ++aCellIterator;
         }
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         //-->debug cell properties
         {
             ::rtl::OUString sNames;
@@ -647,7 +638,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
         ++aRowOfCellsIterator;
     }
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement();
 #endif
 
@@ -656,7 +647,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
 
 RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("getRowProperties");
 #endif
 
@@ -666,7 +657,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
     sal_Int32 nRow = 0;
     while( aRowIter != aRowIterEnd )
     {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->startElement("rowProps.row");
 #endif
         if( aRowIter->get() )
@@ -676,19 +667,19 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
                 aRowIter->get()->Insert( PROP_IS_SPLIT_ALLOWED, false, uno::makeAny(sal_True ) );
 
             aRowProperties[nRow] = (*aRowIter)->GetPropertyValues();
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
             ((*aRowIter)->dumpXml( dmapper_logger ));
             lcl_DumpPropertyValues(dmapper_logger, aRowProperties[nRow]);
 #endif
         }
         ++nRow;
         ++aRowIter;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
         dmapper_logger->endElement();
 #endif
     }
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement();
 #endif
 
@@ -697,7 +688,7 @@ RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties()
 
 void DomainMapperTableHandler::endTable()
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("tablehandler.endTable");
 #endif
 
@@ -709,7 +700,7 @@ void DomainMapperTableHandler::endTable()
 
     RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     lcl_DumpPropertyValueSeq(dmapper_logger, aRowProperties);
 #endif
 
@@ -726,25 +717,25 @@ void DomainMapperTableHandler::endTable()
         }
         catch (lang::IllegalArgumentException e)
         {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->chars("failed to import table!");
 #endif
         }
-#ifdef DEBUG_DOMAINMAPPER
         catch ( uno::Exception e )
         {
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
             dmapper_logger->startElement("exception");
             dmapper_logger->chars(rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr( ));
             dmapper_logger->endElement();
-        }
 #endif
+        }
     }
 
     m_aTableProperties.reset();
     m_aCellProperties.clear();
     m_aRowProperties.clear();
 
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement();
     dmapper_logger->endElement();
 #endif
@@ -756,7 +747,7 @@ void DomainMapperTableHandler::startRow(unsigned int nCells,
     m_aRowProperties.push_back( pProps );
     m_aCellProperties.push_back( PropertyMapVector1() );
 
-#if DEBUG_DOMAINMAPPER
+#if DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("table.row");
     dmapper_logger->attribute("cells", nCells);
     if (pProps != NULL)
@@ -772,7 +763,7 @@ void DomainMapperTableHandler::endRow()
     (*m_pTableSeq)[m_nRowIndex] = *m_pRowSeq;
     ++m_nRowIndex;
     m_nCellIndex = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->endElement();
 #endif
 }
@@ -791,7 +782,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
         m_aCellProperties[nRow - 1].push_back( pEmptyProps );
     }
 
-#if DEBUG_DOMAINMAPPER
+#if DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("table.cell");
     dmapper_logger->startElement("table.cell.start");
     dmapper_logger->chars(toString(start));
@@ -808,7 +799,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
 
 void DomainMapperTableHandler::endCell(const Handle_t & end)
 {
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_DMAPPER_TABLE_HANDLER
     dmapper_logger->startElement("table.cell.end");
     dmapper_logger->chars(toString(end));
     dmapper_logger->endElement();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7061fe5a83af..ae6cb04fcb63 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -701,10 +701,9 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
 
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->attribute("isTextAppend", xTextAppend.is());
-    dmapper_logger->attribute("isIgnor", getTableManager().isIgnore());
 #endif
 
-    if(xTextAppend.is() && ! getTableManager( ).isIgnore())
+    if(xTextAppend.is() && ! getTableManager( ).isIgnore() && pParaContext != NULL)
     {
         try
         {
@@ -723,7 +722,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
               old _and_ new DropCap must not occur
              */
 
-            bool bIsDropCap = pParaContext->IsFrameMode() && sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none;
+            bool bIsDropCap =
+                pParaContext->IsFrameMode() &&
+                sal::static_int_cast<Id>(pParaContext->GetDropCap()) != NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none;
+
             style::DropCapFormat aDrop;
             ParagraphPropertiesPtr pToBeSavedProperties;
             bool bKeepLastParagraphProperties = false;
@@ -2169,7 +2171,7 @@ void DomainMapper_Impl::handleToc
 //                    {
                             //todo: entries can only be included completely
 //                    }
-//                  \n Builds a table of contents or a range of entries, sucah as �1-9�, in a table of contents without page numbers
+//                  \n Builds a table of contents or a range of entries, sucah as �1-9�, in a table of contents without page numbers
 //                    if( lcl_FindInCommand( pContext->GetCommand(), 'n', sValue ))
 //                    {
                         //todo: what does the description mean?
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index db2bf648250c..0b42591b9a5c 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -28,10 +28,8 @@
 #include "FFDataHandler.hxx"
 
 #include <ooxml/resourceids.hxx>
-#ifdef DEBUG_DOMAINMAPPER
-#include <resourcemodel/QNameToString.hxx>
 #include "dmapperLoggers.hxx"
-#endif
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -39,17 +37,18 @@ namespace dmapper {
  * class: FFDataHandler *
  ************************/
 
-FFDataHandler::FFDataHandler()
-: m_bEnabled(false),
-  m_bCalcOnExit(false),
-  m_nHelpTextType(0),
-  m_nStatusTextType(0),
-  m_nCheckboxHeight(0),
-  m_bCheckboxAutoHeight(false),
-  m_bCheckboxDefault(false),
-  m_bCheckboxChecked(false),
-  m_nTextType(0),
-  m_nTextMaxLength(0)
+FFDataHandler::FFDataHandler() :
+LoggedProperties(dmapper_logger, "FFDataHandler"),
+m_bEnabled(false),
+m_bCalcOnExit(false),
+m_nHelpTextType(0),
+m_nStatusTextType(0),
+m_nCheckboxHeight(0),
+m_bCheckboxAutoHeight(false),
+m_bCheckboxDefault(false),
+m_bCheckboxChecked(false),
+m_nTextType(0),
+m_nTextMaxLength(0)
 {
 }
 
@@ -239,12 +238,8 @@ void FFDataHandler::setTextFormat(const rtl::OUString & r_sTextFormat)
 }
 
 
-void FFDataHandler::sprm(Sprm & r_Sprm)
+void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("FFDataHandler.sprm");
-    dmapper_logger->chars(r_Sprm.toString());
-#endif
     switch(r_Sprm.getId())
     {
     case NS_ooxml::LN_CT_FFData_name:
@@ -358,9 +353,6 @@ void FFDataHandler::sprm(Sprm & r_Sprm)
 #endif
         break;
     }
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 void FFDataHandler::resolveSprm(Sprm & r_Sprm)
@@ -370,14 +362,8 @@ void FFDataHandler::resolveSprm(Sprm & r_Sprm)
         pProperties->resolve(*this);
 }
 
-void FFDataHandler::attribute(Id name, Value & val)
+void FFDataHandler::lcl_attribute(Id name, Value & val)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("FFDataHandler.attribute");
-    dmapper_logger->attribute("name", (*QNameToString::Instance())(name));
-    dmapper_logger->attribute("value", val.toString());
-    dmapper_logger->endElement();
-#endif
     switch (name)
     {
     case NS_ooxml::LN_CT_FFHelpText_type:
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index 602bce7c4522..c340cd5ce886 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -27,11 +27,11 @@
  ************************************************************************/
 #ifndef INCLUDED_FFDataHandler_HXX
 #define INCLUDED_FFDataHandler_HXX
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <rtl/ustring.hxx>
 namespace writerfilter {
 namespace dmapper {
-class FFDataHandler : public Properties
+class FFDataHandler : public LoggedProperties
 {
 public:
     // typedefs
@@ -116,12 +116,8 @@ public:
     void setTextFormat(const rtl::OUString & r_sTextFormat);
 
     // sprm
-    void sprm(Sprm & r_sprm);
     void resolveSprm(Sprm & r_sprm);
 
-    // attribute
-    void attribute(Id name, Value & val);
-
 private:
     rtl::OUString m_sName;
     bool m_bEnabled;
@@ -143,6 +139,12 @@ private:
     sal_uInt32 m_nTextMaxLength;
     rtl::OUString m_sTextDefault;
     rtl::OUString m_sTextFormat;
+
+    // sprm
+    void lcl_sprm(Sprm & r_sprm);
+
+    // attribute
+    void lcl_attribute(Id name, Value & val);
 };
 
 
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 3459fedba359..310c99afa1c6 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -35,19 +35,24 @@
 #include <stdio.h>
 #include <rtl/tencinfo.h>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper
 {
 
 struct FontTable_Impl
 {
-    std::vector< FontEntry > aFontEntries;
+    std::vector< FontEntry::Pointer_t > aFontEntries;
     FontEntry::Pointer_t pCurrentEntry;
     FontTable_Impl() {}
 };
 
-FontTable::FontTable() :
-    m_pImpl( new FontTable_Impl )
+FontTable::FontTable()
+: LoggedProperties(dmapper_logger, "FontTable")
+, LoggedTable(dmapper_logger, "FontTable")
+, LoggedStream(dmapper_logger, "FontTable")
+, m_pImpl( new FontTable_Impl )
 {
 }
 
@@ -56,7 +61,7 @@ FontTable::~FontTable()
     delete m_pImpl;
 }
 
-void FontTable::attribute(Id Name, Value & val)
+void FontTable::lcl_attribute(Id Name, Value & val)
 {
     OSL_ENSURE( m_pImpl->pCurrentEntry, "current entry has to be set here");
     if(!m_pImpl->pCurrentEntry)
@@ -123,7 +128,7 @@ void FontTable::attribute(Id Name, Value & val)
     }
 }
 
-void FontTable::sprm(Sprm& rSprm)
+void FontTable::lcl_sprm(Sprm& rSprm)
 {
     OSL_ENSURE( m_pImpl->pCurrentEntry, "current entry has to be set here");
     if(!m_pImpl->pCurrentEntry)
@@ -149,81 +154,78 @@ void FontTable::resolveSprm(Sprm & r_Sprm)
         pProperties->resolve(*this);
 }
 
-void FontTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
+void FontTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
 {
     //create a new font entry
     OSL_ENSURE( !m_pImpl->pCurrentEntry, "current entry has to be NULL here");
     m_pImpl->pCurrentEntry.reset(new FontEntry);
     ref->resolve(*this);
     //append it to the table
-    m_pImpl->aFontEntries.push_back( *m_pImpl->pCurrentEntry );
+    m_pImpl->aFontEntries.push_back( m_pImpl->pCurrentEntry );
     m_pImpl->pCurrentEntry.reset();
 }
 
-void FontTable::startSectionGroup()
+void FontTable::lcl_startSectionGroup()
 {
 }
 
-void FontTable::endSectionGroup()
+void FontTable::lcl_endSectionGroup()
 {
 }
 
-void FontTable::startParagraphGroup()
+void FontTable::lcl_startParagraphGroup()
 {
 }
 
-void FontTable::endParagraphGroup()
+void FontTable::lcl_endParagraphGroup()
 {
 }
 
-void FontTable::startCharacterGroup()
+void FontTable::lcl_startCharacterGroup()
 {
 }
 
-void FontTable::endCharacterGroup()
+void FontTable::lcl_endCharacterGroup()
 {
 }
 
-void FontTable::text(const sal_uInt8*, size_t )
+void FontTable::lcl_text(const sal_uInt8*, size_t )
 {
 }
 
-void FontTable::utext(const sal_uInt8* , size_t)
+void FontTable::lcl_utext(const sal_uInt8* , size_t)
 {
 }
 
-void FontTable::props(writerfilter::Reference<Properties>::Pointer_t)
+void FontTable::lcl_props(writerfilter::Reference<Properties>::Pointer_t)
 {
 }
 
-void FontTable::table(Id, writerfilter::Reference<Table>::Pointer_t)
+void FontTable::lcl_table(Id, writerfilter::Reference<Table>::Pointer_t)
 {
 }
 
-void FontTable::substream(Id, ::writerfilter::Reference<Stream>::Pointer_t)
+void FontTable::lcl_substream(Id, ::writerfilter::Reference<Stream>::Pointer_t)
 {
 }
 
-void FontTable::info(const string& )
+void FontTable::lcl_info(const string& )
 {
 }
 
-void FontTable::startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > )
+void FontTable::lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > )
 {
 }
 
-void FontTable::endShape( )
+void FontTable::lcl_endShape( )
 {
 }
 
 const FontEntry::Pointer_t FontTable::getFontEntry(sal_uInt32 nIndex)
 {
-    FontEntry::Pointer_t pRet;
-    if(m_pImpl->aFontEntries.size() > nIndex)
-    {
-        pRet.reset(&m_pImpl->aFontEntries[nIndex]);
-    }
-    return pRet;
+    return (m_pImpl->aFontEntries.size() > nIndex)
+        ?   m_pImpl->aFontEntries[nIndex]
+        :   FontEntry::Pointer_t();
 }
 
 sal_uInt32 FontTable::size()
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 226ad371ca64..d2849107558c 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -31,7 +31,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 
 namespace writerfilter {
@@ -63,43 +63,46 @@ struct FontEntry
         nAltFontIndex( 0 )
         {}
 };
-class WRITERFILTER_DLLPRIVATE FontTable : public Properties, public Table
-                    /*,public BinaryObj*/, public Stream
+
+class WRITERFILTER_DLLPRIVATE FontTable : public LoggedProperties, public LoggedTable
+    /*,public BinaryObj*/, public LoggedStream
 {
     FontTable_Impl   *m_pImpl;
 
-public:
+ public:
     FontTable();
     virtual ~FontTable();
 
+    sal_uInt32          size();
+    const FontEntry::Pointer_t  getFontEntry(sal_uInt32 nIndex);
+
+ private:
     // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
     void resolveSprm(Sprm & r_sprm);
 
     // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
 
     // Stream
-    virtual void startSectionGroup();
-    virtual void endSectionGroup();
-    virtual void startParagraphGroup();
-    virtual void endParagraphGroup();
-    virtual void startCharacterGroup();
-    virtual void endCharacterGroup();
-    virtual void text(const sal_uInt8 * data, size_t len);
-    virtual void utext(const sal_uInt8 * data, size_t len);
-    virtual void props(writerfilter::Reference<Properties>::Pointer_t ref);
-    virtual void table(Id name,
-                       writerfilter::Reference<Table>::Pointer_t ref);
-    virtual void substream(Id name,
-                           ::writerfilter::Reference<Stream>::Pointer_t ref);
-    virtual void info(const string & info);
-    virtual void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-    virtual void endShape( );
+    virtual void lcl_startSectionGroup();
+    virtual void lcl_endSectionGroup();
+    virtual void lcl_startParagraphGroup();
+    virtual void lcl_endParagraphGroup();
+    virtual void lcl_startCharacterGroup();
+    virtual void lcl_endCharacterGroup();
+    virtual void lcl_text(const sal_uInt8 * data, size_t len);
+    virtual void lcl_utext(const sal_uInt8 * data, size_t len);
+    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref);
+    virtual void lcl_table(Id name,
+                           writerfilter::Reference<Table>::Pointer_t ref);
+    virtual void lcl_substream(Id name,
+                               ::writerfilter::Reference<Stream>::Pointer_t ref);
+    virtual void lcl_info(const string & info);
+    virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+    virtual void lcl_endShape( );
 
-    const FontEntry::Pointer_t  getFontEntry(sal_uInt32 nIndex);
-    sal_uInt32          size();
 };
 typedef boost::shared_ptr< FontTable >          FontTablePtr;
 }}
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 571812951fb8..d3af9dac4c35 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -9,6 +9,8 @@
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
+#include "dmapperLoggers.hxx"
+
 #include <iostream>
 using namespace std;
 
@@ -18,7 +20,7 @@ namespace dmapper {
 using namespace com::sun::star;
 
 PositionHandler::PositionHandler( ) :
-    Properties( )
+LoggedProperties(dmapper_logger, "PositionHandler")
 {
     m_nOrient = text::VertOrientation::NONE;
     m_nRelation = text::RelOrientation::FRAME;
@@ -29,7 +31,7 @@ PositionHandler::~PositionHandler( )
 {
 }
 
-void PositionHandler::attribute( Id aName, Value& rVal )
+void PositionHandler::lcl_attribute( Id aName, Value& rVal )
 {
     sal_Int32 nIntValue = rVal.getInt( );
     switch ( aName )
@@ -86,11 +88,15 @@ void PositionHandler::attribute( Id aName, Value& rVal )
                 }
             }
             break;
-        default:;
+        default:
+#ifdef DEBUG_DOMAINMAPPER
+            dmapper_logger->element("unhandled");
+#endif
+            break;
     }
 }
 
-void PositionHandler::sprm( Sprm& rSprm )
+void PositionHandler::lcl_sprm( Sprm& rSprm )
 {
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue->getInt();
@@ -154,12 +160,16 @@ void PositionHandler::sprm( Sprm& rSprm )
         case NS_ooxml::LN_CT_PosH_posOffset:
         case NS_ooxml::LN_CT_PosV_posOffset:
             m_nPosition = ConversionHelper::convertEMUToMM100( nIntValue );
-        default:;
+        default:
+#ifdef DEBUG_DOMAINMAPPER
+            dmapper_logger->element("unhandled");
+#endif
+            break;
     }
 }
 
 WrapHandler::WrapHandler( ) :
-    Properties( ),
+LoggedProperties(dmapper_logger, "WrapHandler"),
     m_nType( 0 ),
     m_nSide( 0 )
 {
@@ -169,7 +179,7 @@ WrapHandler::~WrapHandler( )
 {
 }
 
-void WrapHandler::attribute( Id aName, Value& rVal )
+void WrapHandler::lcl_attribute( Id aName, Value& rVal )
 {
     switch ( aName )
     {
@@ -183,7 +193,7 @@ void WrapHandler::attribute( Id aName, Value& rVal )
     }
 }
 
-void WrapHandler::sprm( Sprm& )
+void WrapHandler::lcl_sprm( Sprm& )
 {
 }
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 911f2c9de155..c7761132359c 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -5,7 +5,7 @@
 #include "PropertyMap.hxx"
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 
 #include <boost/shared_ptr.hpp>
 
@@ -13,7 +13,7 @@ namespace writerfilter {
 namespace dmapper
 {
 
-class WRITERFILTER_DLLPRIVATE PositionHandler: public Properties
+class WRITERFILTER_DLLPRIVATE PositionHandler: public LoggedProperties
 {
 public:
     PositionHandler( );
@@ -23,12 +23,13 @@ public:
     sal_Int16 m_nRelation;
     sal_Int32 m_nPosition;
 
-    virtual void attribute( Id aName, Value& rVal );
-    virtual void sprm( Sprm& rSprm );
+ private:
+    virtual void lcl_attribute( Id aName, Value& rVal );
+    virtual void lcl_sprm( Sprm& rSprm );
 };
 typedef boost::shared_ptr<PositionHandler> PositionHandlerPtr;
 
-class WRITERFILTER_DLLPRIVATE WrapHandler: public Properties
+class WRITERFILTER_DLLPRIVATE WrapHandler: public LoggedProperties
 {
 public:
     WrapHandler( );
@@ -39,8 +40,9 @@ public:
 
     sal_Int32 getWrapMode( );
 
-    virtual void attribute( Id aName, Value& rVal );
-    virtual void sprm( Sprm& rSprm );
+ private:
+    virtual void lcl_attribute( Id aName, Value& rVal );
+    virtual void lcl_sprm( Sprm& rSprm );
 };
 typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 696a5eed6b50..90c3dc8dd9db 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -26,54 +26,51 @@
  *
  ************************************************************************/
 
-#include "GraphicImport.hxx"
-#include "GraphicHelpers.hxx"
+#include <string.h>
 
-#include <dmapper/DomainMapper.hxx>
-#include <PropertyMap.hxx>
-#include <doctok/resourceids.hxx>
-#include <ooxml/resourceids.hxx>
-#include <ConversionHelper.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
-
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/ustrbuf.hxx>
 
-#include <iostream>
-#include <resourcemodel/QNameToString.hxx>
-#include <string.h>
+#include <dmapper/DomainMapper.hxx>
+#include <doctok/resourceids.hxx>
+#include <ooxml/resourceids.hxx>
+#include <resourcemodel/ResourceModelHelper.hxx>
 
-#ifdef DEBUG_DOMAINMAPPER
-#include <resourcemodel/TagLogger.hxx>
-#endif
+#include "ConversionHelper.hxx"
+#include "GraphicHelpers.hxx"
+#include "GraphicImport.hxx"
+#include "PropertyMap.hxx"
+#include "WrapPolygonHandler.hxx"
+#include "dmapperLoggers.hxx"
 
 namespace writerfilter {
+
+using resourcemodel::resolveSprmProps;
+
 namespace dmapper
 {
 using namespace ::std;
 using namespace ::com::sun::star;
 
-#ifdef DEBUG_DOMAINMAPPER
-extern TagLogger::Pointer_t dmapper_logger;
-#endif
-
 class XInputStreamHelper : public cppu::WeakImplHelper1
 <    io::XInputStream   >
 {
@@ -221,6 +218,8 @@ public:
     sal_Int32 nWrap;
     bool      bOpaque;
     bool      bContour;
+    bool      bContourOutside;
+    WrapPolygon::Pointer_t mpWrapPolygon;
     bool      bIgnoreWRK;
 
     sal_Int32 nLeftMargin;
@@ -283,6 +282,7 @@ public:
         ,nWrap(0)
         ,bOpaque( true )
         ,bContour(false)
+        ,bContourOutside(true)
         ,bIgnoreWRK(true)
         ,nLeftMargin(319)
         ,nRightMargin(319)
@@ -344,9 +344,12 @@ GraphicImport::GraphicImport(uno::Reference < uno::XComponentContext >    xCompo
                              uno::Reference< lang::XMultiServiceFactory > xTextFactory,
                              DomainMapper& rDMapper,
                              GraphicImportType eImportType )
-: m_pImpl( new GraphicImport_Impl( eImportType, rDMapper ))
-  ,m_xComponentContext( xComponentContext )
-  ,m_xTextFactory( xTextFactory)
+: LoggedProperties(dmapper_logger, "GraphicImport")
+, LoggedTable(dmapper_logger, "GraphicImport")
+, LoggedStream(dmapper_logger, "GraphicImport")
+, m_pImpl( new GraphicImport_Impl( eImportType, rDMapper ))
+, m_xComponentContext( xComponentContext )
+, m_xTextFactory( xTextFactory)
 {
 }
 
@@ -356,13 +359,30 @@ GraphicImport::~GraphicImport()
     delete m_pImpl;
 }
 
+void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
+{
+    switch (nVal)
+    {
+    case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_bothSides: // 90920;
+        m_pImpl->nWrap = text::WrapTextMode_PARALLEL;
+        break;
+    case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_left: // 90921;
+        m_pImpl->nWrap = text::WrapTextMode_LEFT;
+        break;
+    case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_right: // 90922;
+        m_pImpl->nWrap = text::WrapTextMode_RIGHT;
+        break;
+    case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_largest: // 90923;
+        m_pImpl->nWrap = text::WrapTextMode_DYNAMIC;
+        break;
+    default:;
+    }
+}
+
+
 
-void GraphicImport::attribute(Id nName, Value & val)
+void GraphicImport::lcl_attribute(Id nName, Value & val)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("attribute");
-    dmapper_logger->attribute("name", (*QNameToString::Instance())(nName));
-#endif
     sal_Int32 nIntValue = val.getInt();
     switch( nName )
     {
@@ -834,25 +854,24 @@ void GraphicImport::attribute(Id nName, Value & val)
         break;
         case NS_ooxml::LN_CT_WrapTight_wrapText: // 90934;
             m_pImpl->bContour = true;
-            //no break;
+            m_pImpl->bContourOutside = true;
+
+            handleWrapTextValue(val.getInt());
+
+            break;
+        case NS_ooxml::LN_CT_WrapThrough_wrapText:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+            m_pImpl->bContour = true;
+            m_pImpl->bContourOutside = false;
+
+            handleWrapTextValue(val.getInt());
+
+            break;
         case NS_ooxml::LN_CT_WrapSquare_wrapText: //90928;
-            switch ( val.getInt() )
-            {
-                case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_bothSides: // 90920;
-                    m_pImpl->nWrap = text::WrapTextMode_PARALLEL;
-                break;
-                case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_left: // 90921;
-                    m_pImpl->nWrap = text::WrapTextMode_LEFT;
-                break;
-                case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_right: // 90922;
-                    m_pImpl->nWrap = text::WrapTextMode_RIGHT;
-                break;
-                case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_largest: // 90923;
-                    m_pImpl->nWrap = text::WrapTextMode_DYNAMIC;
-                break;
-                default:;
-            }
-        break;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+
+            handleWrapTextValue(val.getInt());
+            break;
         case NS_ooxml::LN_shape:
             {
                 uno::Reference< drawing::XShape> xShape;
@@ -942,18 +961,11 @@ void GraphicImport::attribute(Id nName, Value & val)
             //TODO: does it need to be handled?
         break;
         default:
-#if OSL_DEBUG_LEVEL > 0
-            ::rtl::OString sMessage( "GraphicImport::attribute() - Id: ");
-            sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 10 );
-            sMessage += ::rtl::OString(" / 0x");
-            sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 16 );
-            OSL_ENSURE( false, sMessage.getStr())
+#ifdef DEBUG_DMAPPER_GRAPHIC_IMPORT
+            dmapper_logger->element("unhandled");
 #endif
             ;
     }
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 uno::Reference<text::XTextContent> GraphicImport::GetGraphicObject()
@@ -1115,13 +1127,8 @@ void GraphicImport::ProcessShapeOptions(Value& val)
 }
 
 
-void GraphicImport::sprm(Sprm & rSprm)
+void GraphicImport::lcl_sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("sprm");
-    dmapper_logger->chars(rSprm.toString());
-#endif
-
     sal_uInt32 nSprmId = rSprm.getId();
     Value::Pointer_t pValue = rSprm.getValue();
 
@@ -1143,12 +1150,12 @@ void GraphicImport::sprm(Sprm & rSprm)
         case NS_ooxml::LN_CT_Anchor_effectExtent: // 90979;
         case NS_ooxml::LN_EG_WrapType_wrapSquare: // 90945;
         case NS_ooxml::LN_EG_WrapType_wrapTight: // 90946;
+        case NS_ooxml::LN_EG_WrapType_wrapThrough:
         case NS_ooxml::LN_CT_Anchor_docPr: // 90980;
         case NS_ooxml::LN_CT_Anchor_cNvGraphicFramePr: // 90981;
         case NS_ooxml::LN_CT_Anchor_a_graphic: // 90982;
         case NS_ooxml::LN_CT_WrapPath_start: // 90924;
         case NS_ooxml::LN_CT_WrapPath_lineTo: // 90925;
-        case NS_ooxml::LN_CT_WrapTight_wrapPolygon: // 90933;
         case NS_ooxml::LN_graphic_graphic:
         case NS_ooxml::LN_pic_pic:
         {
@@ -1159,6 +1166,17 @@ void GraphicImport::sprm(Sprm & rSprm)
             }
         }
         break;
+        case NS_ooxml::LN_CT_WrapTight_wrapPolygon:
+        case NS_ooxml::LN_CT_WrapThrough_wrapPolygon:
+            /* WRITERFILTERSTATUS: done: 100, planned: 4, spent: 2 */
+            {
+                WrapPolygonHandler aHandler;
+
+                resolveSprmProps(aHandler, rSprm);
+
+                m_pImpl->mpWrapPolygon = aHandler.getPolygon();
+            }
+            break;
         case NS_ooxml::LN_CT_Anchor_positionH: // 90976;
         {
             // Use a special handler for the positionning
@@ -1211,9 +1229,6 @@ void GraphicImport::sprm(Sprm & rSprm)
         case NS_ooxml::LN_EG_WrapType_wrapTopAndBottom: // 90948;
             m_pImpl->nWrap = text::WrapTextMode_NONE;
         break;
-        case NS_ooxml::LN_EG_WrapType_wrapThrough: // 90947;
-            m_pImpl->nWrap = text::WrapTextMode_THROUGHT;
-        break;
         case 0xf010:
         case 0xf011:
             //ignore - doesn't contain useful members
@@ -1237,16 +1252,10 @@ void GraphicImport::sprm(Sprm & rSprm)
 #endif
             ;
     }
-
-
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 
-void GraphicImport::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t /*ref*/)
+void GraphicImport::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t /*ref*/)
 {
 }
 /*-- 16.11.2006 16:14:32---------------------------------------------------
@@ -1395,7 +1404,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_SURROUND_CONTOUR ),
                     uno::makeAny(m_pImpl->bContour));
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_CONTOUR_OUTSIDE ),
-                    uno::makeAny(true));
+                    uno::makeAny(m_pImpl->bContourOutside));
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_LEFT_MARGIN ),
                     uno::makeAny(m_pImpl->nLeftMargin));
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_RIGHT_MARGIN ),
@@ -1405,8 +1414,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_BOTTOM_MARGIN ),
                     uno::makeAny(m_pImpl->nBottomMargin));
 
-                xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_CONTOUR_POLY_POLYGON),
-                    uno::Any());
                 if( m_pImpl->eColorMode == drawing::ColorMode_STANDARD &&
                     m_pImpl->nContrast == -70 &&
                     m_pImpl->nBrightness == 70 )
@@ -1434,16 +1441,31 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
                     xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_HORI_MIRRORED_ON_ODD_PAGES ),
                         uno::makeAny( m_pImpl->bHoriFlip ));
                 }
+
                 if( m_pImpl->bVertFlip )
                     xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_VERT_MIRRORED ),
                         uno::makeAny( m_pImpl->bVertFlip ));
                 xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_BACK_COLOR ),
                     uno::makeAny( m_pImpl->nFillColor ));
+
                 //there seems to be no way to detect the original size via _real_ API
                 uno::Reference< beans::XPropertySet > xGraphicProperties( xGraphic, uno::UNO_QUERY_THROW );
                 awt::Size aGraphicSize, aGraphicSizePixel;
                 xGraphicProperties->getPropertyValue(rPropNameSupplier.GetName( PROP_SIZE100th_M_M )) >>= aGraphicSize;
                 xGraphicProperties->getPropertyValue(rPropNameSupplier.GetName( PROP_SIZE_PIXEL )) >>= aGraphicSizePixel;
+
+                uno::Any aContourPolyPolygon;
+                if( aGraphicSize.Width && aGraphicSize.Height &&
+                    m_pImpl->mpWrapPolygon.get() != NULL)
+                {
+                    awt::Size aDstSize(m_pImpl->getXSize(), m_pImpl->getYSize());
+                    WrapPolygon::Pointer_t pCorrected = m_pImpl->mpWrapPolygon->correctWordWrapPolygon(aGraphicSize, aDstSize);
+                    aContourPolyPolygon <<= pCorrected->getPointSequenceSequence();
+                }
+
+                xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_CONTOUR_POLY_POLYGON),
+                                                           aContourPolyPolygon);
+
                 if( aGraphicSize.Width && aGraphicSize.Height )
                 {
                     //todo: i71651 graphic size is not provided by the GraphicDescriptor
@@ -1452,9 +1474,11 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
                     lcl_CalcCrop( m_pImpl->nLeftCrop, aGraphicSize.Width );
                     lcl_CalcCrop( m_pImpl->nRightCrop, aGraphicSize.Width );
 
+
                     xGraphicProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_GRAPHIC_CROP ),
                         uno::makeAny(text::GraphicCrop(m_pImpl->nTopCrop, m_pImpl->nBottomCrop, m_pImpl->nLeftCrop, m_pImpl->nRightCrop)));
                 }
+
             }
 
             if(m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_INLINE || m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
@@ -1500,70 +1524,70 @@ void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Referen
 }
 
 
-void GraphicImport::startSectionGroup()
+void GraphicImport::lcl_startSectionGroup()
 {
 }
 
 
-void GraphicImport::endSectionGroup()
+void GraphicImport::lcl_endSectionGroup()
 {
 }
 
 
-void GraphicImport::startParagraphGroup()
+void GraphicImport::lcl_startParagraphGroup()
 {
 }
 
 
-void GraphicImport::endParagraphGroup()
+void GraphicImport::lcl_endParagraphGroup()
 {
 }
 
 
-void GraphicImport::startCharacterGroup()
+void GraphicImport::lcl_startCharacterGroup()
 {
 }
 
 
-void GraphicImport::endCharacterGroup()
+void GraphicImport::lcl_endCharacterGroup()
 {
 }
 
 
-void GraphicImport::text(const sal_uInt8 * /*_data*/, size_t /*len*/)
+void GraphicImport::lcl_text(const sal_uInt8 * /*_data*/, size_t /*len*/)
 {
 }
 
 
-void GraphicImport::utext(const sal_uInt8 * /*_data*/, size_t /*len*/)
+void GraphicImport::lcl_utext(const sal_uInt8 * /*_data*/, size_t /*len*/)
 {
 }
 
 
-void GraphicImport::props(writerfilter::Reference<Properties>::Pointer_t /*ref*/)
+void GraphicImport::lcl_props(writerfilter::Reference<Properties>::Pointer_t /*ref*/)
 {
 }
 
 
-void GraphicImport::table(Id /*name*/, writerfilter::Reference<Table>::Pointer_t /*ref*/)
+void GraphicImport::lcl_table(Id /*name*/, writerfilter::Reference<Table>::Pointer_t /*ref*/)
 {
 }
 
 
-void GraphicImport::substream(Id /*name*/, ::writerfilter::Reference<Stream>::Pointer_t /*ref*/)
+void GraphicImport::lcl_substream(Id /*name*/, ::writerfilter::Reference<Stream>::Pointer_t /*ref*/)
 {
 }
 
 
-void GraphicImport::info(const string & /*info*/)
+void GraphicImport::lcl_info(const string & /*info*/)
 {
 }
 
-void GraphicImport::startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > /*xShape*/ )
+void GraphicImport::lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > /*xShape*/ )
 {
 }
 
-void GraphicImport::endShape( )
+void GraphicImport::lcl_endShape( )
 {
 }
 
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 210343e214a8..cc609a705e40 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -28,7 +28,7 @@
 #ifndef INCLUDED_GRAPHICIMPORT_HXX
 #define INCLUDED_GRAPHICIMPORT_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 
 namespace com{ namespace sun { namespace star {
     namespace uno{
@@ -67,8 +67,8 @@ enum GraphicImportType
     IMPORT_AS_DETECTED_ANCHOR
 };
 
-class WRITERFILTER_DLLPRIVATE GraphicImport : public Properties, public Table
-                    ,public BinaryObj, public Stream
+class WRITERFILTER_DLLPRIVATE GraphicImport : public LoggedProperties, public LoggedTable
+                    ,public BinaryObj, public LoggedStream
 {
     GraphicImport_Impl* m_pImpl;
     ::com::sun::star::uno::Reference < ::com::sun::star::uno::XComponentContext >    m_xComponentContext;
@@ -89,37 +89,41 @@ public:
                   GraphicImportType eGraphicImportType);
     virtual ~GraphicImport();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
-    // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
     // BinaryObj
     virtual void data(const sal_uInt8* buf, size_t len, writerfilter::Reference<Properties>::Pointer_t ref);
 
-    // Stream
-    virtual void startSectionGroup();
-    virtual void endSectionGroup();
-    virtual void startParagraphGroup();
-    virtual void endParagraphGroup();
-    virtual void startCharacterGroup();
-    virtual void endCharacterGroup();
-    virtual void text(const sal_uInt8 * data, size_t len);
-    virtual void utext(const sal_uInt8 * data, size_t len);
-    virtual void props(writerfilter::Reference<Properties>::Pointer_t ref);
-    virtual void table(Id name,
-                       writerfilter::Reference<Table>::Pointer_t ref);
-    virtual void substream(Id name,
-                           ::writerfilter::Reference<Stream>::Pointer_t ref);
-    virtual void info(const string & info);
-    virtual void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
-    virtual void endShape( );
-
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > GetGraphicObject();
     bool    IsGraphic() const;
+
+ private:
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
+    // Table
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
+
+    // Stream
+    virtual void lcl_startSectionGroup();
+    virtual void lcl_endSectionGroup();
+    virtual void lcl_startParagraphGroup();
+    virtual void lcl_endParagraphGroup();
+    virtual void lcl_startCharacterGroup();
+    virtual void lcl_endCharacterGroup();
+    virtual void lcl_text(const sal_uInt8 * data, size_t len);
+    virtual void lcl_utext(const sal_uInt8 * data, size_t len);
+    virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref);
+    virtual void lcl_table(Id name,
+                           writerfilter::Reference<Table>::Pointer_t ref);
+    virtual void lcl_substream(Id name,
+                               ::writerfilter::Reference<Stream>::Pointer_t ref);
+    virtual void lcl_info(const string & info);
+    virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
+    virtual void lcl_endShape( );
+
+    void handleWrapTextValue(sal_uInt32 nVal);
 };
+
 typedef boost::shared_ptr< GraphicImport >          GraphicImportPtr;
 }}
 
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index d605fd32b8cf..e4b3bb60d5d8 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -31,6 +31,7 @@
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <com/sun/star/text/SizeType.hpp>
+#include "dmapperLoggers.hxx"
 
 namespace writerfilter {
 namespace dmapper {
@@ -40,9 +41,10 @@ using namespace ::com::sun::star;
 
 
 MeasureHandler::MeasureHandler() :
-    m_nMeasureValue( 0 ),
-    m_nUnit( -1 ),
-    m_nRowHeightSizeType( text::SizeType::MIN )
+LoggedProperties(dmapper_logger, "MeasureHandler"),
+m_nMeasureValue( 0 ),
+m_nUnit( -1 ),
+m_nRowHeightSizeType( text::SizeType::MIN )
 {
 }
 
@@ -52,7 +54,7 @@ MeasureHandler::~MeasureHandler()
 }
 
 
-void MeasureHandler::attribute(Id rName, Value & rVal)
+void MeasureHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     (void)rName;
@@ -89,7 +91,7 @@ void MeasureHandler::attribute(Id rName, Value & rVal)
 }
 
 
-void MeasureHandler::sprm(Sprm & rSprm)
+void MeasureHandler::lcl_sprm(Sprm & rSprm)
 {
     (void)rSprm;
 }
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 2c95293f9421..1fc9ae96985c 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -29,7 +29,7 @@
 #define INCLUDED_MEASUREHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 namespace writerfilter {
@@ -40,20 +40,20 @@ class PropertyMap;
     - Left indent of tables
     - Preferred width of tables
  */
-class WRITERFILTER_DLLPRIVATE MeasureHandler : public Properties
+class WRITERFILTER_DLLPRIVATE MeasureHandler : public LoggedProperties
 {
     sal_Int32 m_nMeasureValue;
     sal_Int32 m_nUnit;
     sal_Int16 m_nRowHeightSizeType; //table row height type
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     MeasureHandler();
     virtual ~MeasureHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     sal_Int32 getMeasureValue() const;
     //at least tables can have automatic width
     bool isAutoWidth() const;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 4ad5872d62fc..2a696910ace5 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -20,6 +20,8 @@
 #include <stdio.h>
 #endif
 
+#include "dmapperLoggers.hxx"
+
 using namespace com::sun::star;
 
 using ::rtl::OUString;
@@ -618,10 +620,12 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
 //-------------------------------------  NumberingManager implementation
 
 
-ListsManager::ListsManager( DomainMapper& rDMapper,
-        const uno::Reference< lang::XMultiServiceFactory > xFactory ) :
-    m_rDMapper( rDMapper ),
-    m_xFactory( xFactory )
+ListsManager::ListsManager(DomainMapper& rDMapper,
+                           const uno::Reference< lang::XMultiServiceFactory > xFactory) :
+LoggedProperties(dmapper_logger, "ListsManager"),
+LoggedTable(dmapper_logger, "ListsManager"),
+m_rDMapper( rDMapper ),
+m_xFactory( xFactory )
 {
 }
 
@@ -629,7 +633,7 @@ ListsManager::~ListsManager( )
 {
 }
 
-void ListsManager::attribute( Id nName, Value& rVal )
+void ListsManager::lcl_attribute( Id nName, Value& rVal )
 {
     OSL_ENSURE( m_pCurrentDefinition.get(), "current entry has to be set here");
     if(!m_pCurrentDefinition.get())
@@ -750,7 +754,7 @@ void ListsManager::attribute( Id nName, Value& rVal )
     }
 }
 
-void ListsManager::sprm( Sprm& rSprm )
+void ListsManager::lcl_sprm( Sprm& rSprm )
 {
     //fill the attributes of the style sheet
     sal_uInt32 nSprmId = rSprm.getId();
@@ -909,8 +913,8 @@ void ListsManager::sprm( Sprm& rSprm )
     }
 }
 
-void ListsManager::entry( int /* pos */,
-        writerfilter::Reference<Properties>::Pointer_t ref )
+void ListsManager::lcl_entry( int /* pos */,
+                          writerfilter::Reference<Properties>::Pointer_t ref )
 {
     if( m_rDMapper.IsOOXMLImport() )
     {
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 82787622324d..d001805f4333 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -6,7 +6,7 @@
 
 #include <WriterFilterDllApi.hxx>
 #include <dmapper/DomainMapper.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 
@@ -171,8 +171,8 @@ public:
 /** This class provides access to the defined numbering styles.
   */
 class ListsManager :
-    public Properties,
-    public Table
+    public LoggedProperties,
+    public LoggedTable
 {
 private:
 
@@ -191,6 +191,13 @@ private:
 
     AbstractListDef::Pointer    GetAbstractList( sal_Int32 nId );
 
+    // Properties
+    virtual void lcl_attribute( Id nName, Value & rVal );
+    virtual void lcl_sprm(Sprm & sprm);
+
+    // Table
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
+
 public:
 
     ListsManager(
@@ -200,13 +207,6 @@ public:
 
     typedef boost::shared_ptr< ListsManager >  Pointer;
 
-    // Properties
-    virtual void attribute( Id nName, Value & rVal );
-    virtual void sprm(Sprm & sprm);
-
-    // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
     // Config methods
     void SetLFOImport( bool bLFOImport ) { m_bIsLFOImport = bLFOImport; };
 
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 25f6df4fd820..a42e0af43a1b 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -45,6 +45,8 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -52,8 +54,9 @@ using namespace ::com::sun::star;
 
 
 OLEHandler::OLEHandler() :
-    m_nDxaOrig(0),
-    m_nDyaOrig(0),
+LoggedProperties(dmapper_logger, "OLEHandler"),
+m_nDxaOrig(0),
+m_nDyaOrig(0),
     m_nWrapMode(1)
 {
 }
@@ -64,7 +67,7 @@ OLEHandler::~OLEHandler()
 }
 
 
-void OLEHandler::attribute(Id rName, Value & rVal)
+void OLEHandler::lcl_attribute(Id rName, Value & rVal)
 {
     rtl::OUString sStringValue = rVal.getString();
     (void)rName;
@@ -135,7 +138,7 @@ void OLEHandler::attribute(Id rName, Value & rVal)
 }
 
 
-void OLEHandler::sprm(Sprm & rSprm)
+void OLEHandler::lcl_sprm(Sprm & rSprm)
 {
     sal_uInt32 nSprmId = rSprm.getId();
     switch( nSprmId )
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 61b408fbbdd4..7a40f53986db 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -29,7 +29,7 @@
 #define INCLUDED_OLEHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
@@ -59,7 +59,7 @@ namespace dmapper
 //class PropertyMap;
 /** Handler for OLE objects
  */
-class WRITERFILTER_DLLPRIVATE OLEHandler : public Properties
+class WRITERFILTER_DLLPRIVATE OLEHandler : public LoggedProperties
 {
     ::rtl::OUString     m_sObjectType;
     ::rtl::OUString     m_sProgId;
@@ -80,14 +80,15 @@ class WRITERFILTER_DLLPRIVATE OLEHandler : public Properties
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xReplacement;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream;
+
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     OLEHandler();
     virtual ~OLEHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     inline ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getShape( ) { return m_xShape; };
 
     inline bool isOLEObject( ) { return m_xInputStream.is( ); };
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index ae607199f588..41469d6cf507 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -3,6 +3,8 @@
 
 #include <ooxml/resourceids.hxx>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -17,8 +19,9 @@ _PgBorder::~_PgBorder( )
 }
 
 PageBordersHandler::PageBordersHandler( ) :
-    m_nDisplay( 0 ),
-    m_nOffset( 0 )
+LoggedProperties(dmapper_logger, "PageBordersHandler"),
+m_nDisplay( 0 ),
+m_nOffset( 0 )
 {
 }
 
@@ -26,7 +29,7 @@ PageBordersHandler::~PageBordersHandler( )
 {
 }
 
-void PageBordersHandler::attribute( Id eName, Value& rVal )
+void PageBordersHandler::lcl_attribute( Id eName, Value& rVal )
 {
     int nIntValue = rVal.getInt( );
     switch ( eName )
@@ -66,7 +69,7 @@ void PageBordersHandler::attribute( Id eName, Value& rVal )
     }
 }
 
-void PageBordersHandler::sprm( Sprm& rSprm )
+void PageBordersHandler::lcl_sprm( Sprm& rSprm )
 {
     switch ( rSprm.getId( ) )
     {
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 92a905c4f471..d238a71981d7 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -6,7 +6,7 @@
 #include "PropertyMap.hxx"
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 #include <com/sun/star/table/BorderLine2.hpp>
@@ -28,7 +28,7 @@ public:
     ~_PgBorder( );
 };
 
-class WRITERFILTER_DLLPRIVATE PageBordersHandler : public Properties
+class WRITERFILTER_DLLPRIVATE PageBordersHandler : public LoggedProperties
 {
 private:
 
@@ -37,14 +37,14 @@ private:
     sal_Int32 m_nOffset;
     vector<_PgBorder> m_aBorders;
 
+    // Properties
+    virtual void lcl_attribute( Id eName, Value& rVal );
+    virtual void lcl_sprm( Sprm& rSprm );
+
 public:
     PageBordersHandler( );
     ~PageBordersHandler( );
 
-    // Properties
-    virtual void attribute( Id eName, Value& rVal );
-    virtual void sprm( Sprm& rSprm );
-
     inline sal_Int32 GetDisplayOffset( )
     {
         return ( m_nOffset << 5 ) + m_nDisplay;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index eea6d3c1ea22..6ddd1d86a16b 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -33,262 +33,262 @@ namespace rtl{ class OUString;}
 namespace writerfilter {
 namespace dmapper{
 enum PropertyIds
-{
+    {
         PROP_ID_START = 1
- /* 1*/ ,PROP_CHAR_WEIGHT = PROP_ID_START
- /* 2*/ ,PROP_CHAR_POSTURE
- /* 3*/ ,PROP_CHAR_STRIKEOUT
- /* 4*/ ,PROP_CHAR_CONTOURED
- /* 5*/ ,PROP_CHAR_SHADOWED
- /* 6*/ ,PROP_CHAR_CASE_MAP
- /* 7*/ ,PROP_CHAR_COLOR
- /* 8*/ ,PROP_CHAR_RELIEF
- /* 9*/ ,PROP_CHAR_UNDERLINE
- /*10*/ ,PROP_CHAR_WORD_MODE
- /*11*/ ,PROP_CHAR_ESCAPEMENT
- /*12*/ ,PROP_CHAR_ESCAPEMENT_HEIGHT
- /*13*/ ,PROP_CHAR_HEIGHT
- /*14*/ ,PROP_CHAR_HEIGHT_COMPLEX
- /*15*/ ,PROP_CHAR_LOCALE
- /*16*/ ,PROP_CHAR_LOCALE_ASIAN
- /*17*/ ,PROP_CHAR_WEIGHT_COMPLEX
- /*18*/ ,PROP_CHAR_POSTURE_COMPLEX
- /*19*/ ,PROP_CHAR_AUTO_KERNING
- /*20*/ ,PROP_CHAR_CHAR_KERNING
- /*21*/ ,PROP_CHAR_SCALE_WIDTH
- /*22*/ ,PROP_CHAR_LOCALE_COMPLEX
- /*23*/ ,PROP_CHAR_UNDERLINE_COLOR
-/*24*/ , PROP_CHAR_UNDERLINE_HAS_COLOR
-/*25*/ , PROP_CHAR_FONT_NAME
-/*26*/ , PROP_CHAR_FONT_STYLE
-/*27*/ , PROP_CHAR_FONT_FAMILY
-/*28*/ , PROP_CHAR_FONT_CHAR_SET
-/*29*/ , PROP_CHAR_FONT_PITCH
-/*30*/ , PROP_CHAR_FONT_NAME_ASIAN
-/*31*/ , PROP_CHAR_HEIGHT_ASIAN
-/*32*/ , PROP_CHAR_FONT_STYLE_ASIAN
-/*33*/ , PROP_CHAR_FONT_FAMILY_ASIAN
-/*34*/ , PROP_CHAR_FONT_CHAR_SET_ASIAN
-/*35*/ , PROP_CHAR_FONT_PITCH_ASIAN
-/*36*/ , PROP_CHAR_FONT_NAME_COMPLEX
-/*37*/ , PROP_CHAR_FONT_STYLE_COMPLEX
-/*38*/ , PROP_CHAR_FONT_FAMILY_COMPLEX
-/*39*/ , PROP_CHAR_FONT_CHAR_SET_COMPLEX
-/*40*/ , PROP_CHAR_FONT_PITCH_COMPLEX
-/*41*/ , PROP_CHAR_HIDDEN
-/*42*/ , PROP_CHAR_WEIGHT_ASIAN
-/*43*/ , PROP_CHAR_POSTURE_ASIAN
-/*44*/ , PROP_PARA_STYLE_NAME
-/*45*/ , PROP_CHAR_STYLE_NAME
-/*46*/ , PROP_PARA_ADJUST
-/*47*/ , PROP_PARA_LAST_LINE_ADJUST
-/*48*/ , PROP_PARA_RIGHT_MARGIN
-/*49*/ , PROP_PARA_LEFT_MARGIN
-/*50*/ , PROP_PARA_FIRST_LINE_INDENT
-/*51*/ , PROP_PARA_KEEP_TOGETHER
-/*52*/ , PROP_PARA_TOP_MARGIN
-/*53*/ , PROP_PARA_BOTTOM_MARGIN
-/*54*/ , PROP_PARA_IS_HYPHENATION
-/*55*/ , PROP_PARA_LINE_NUMBER_COUNT
-/*56*/ , PROP_PARA_IS_HANGING_PUNCTUATION
-/*57*/ , PROP_PARA_LINE_SPACING
-/*58*/ , PROP_PARA_TAB_STOPS
-/*59*/ , PROP_PARA_WIDOWS
-/*60*/ , PROP_PARA_ORPHANS
-/*61*/ , PROP_PARA_LINE_NUMBER_START_VALUE
-/*62*/ , PROP_NUMBERING_LEVEL
-/*63*/ , PROP_NUMBERING_RULES
-/*64*/ , PROP_NUMBERING_TYPE
-/*65*/ , PROP_START_WITH
-/*66*/ , PROP_ADJUST
-/*67*/ , PROP_PARENT_NUMBERING
-/*68*/ , PROP_LEFT_MARGIN
-/*69*/ , PROP_RIGHT_MARGIN
-/*70*/ , PROP_TOP_MARGIN
-/*71*/ , PROP_BOTTOM_MARGIN
-/*72*/ , PROP_FIRST_LINE_OFFSET
-/*73*/ , PROP_LEFT_BORDER
-/*74*/ , PROP_RIGHT_BORDER
-/*75*/ , PROP_TOP_BORDER
-/*76*/ , PROP_BOTTOM_BORDER
-/*77*/ , PROP_TABLE_BORDER
-/*78*/ , PROP_LEFT_BORDER_DISTANCE
-/*79*/ , PROP_RIGHT_BORDER_DISTANCE
-/*80*/ , PROP_TOP_BORDER_DISTANCE
-/*81*/ , PROP_BOTTOM_BORDER_DISTANCE
-/*82*/ , PROP_CURRENT_PRESENTATION
-/*83*/ , PROP_IS_FIXED
-/*84*/ , PROP_SUB_TYPE
-/*85*/ , PROP_FILE_FORMAT
-/*86*/ , PROP_HYPER_LINK_U_R_L
-/*87*/ , PROP_NUMBER_FORMAT
-/*88*/ , PROP_NAME
-/*89*/ , PROP_IS_INPUT
-/*90*/ , PROP_HINT
-/*91*/ , PROP_FULL_NAME
-/*92*/ , PROP_KEYWORDS
-/*93*/ , PROP_DESCRIPTION
-/*94*/ , PROP_MACRO_NAME
-/*95*/ , PROP_SUBJECT
-/*96*/ , PROP_USER_DATA_TYPE
-/*97*/ , PROP_TITLE
-/*98*/ , PROP_CONTENT
-/*99*/ , PROP_DATA_COLUMN_NAME
-/*100*/, PROP_INPUT_STREAM
-/*101*/, PROP_GRAPHIC
-/*102*/, PROP_ANCHOR_TYPE
-/*103*/ ,PROP_SIZE
-/*104*/ ,PROP_HORI_ORIENT
-/*105*/ ,PROP_HORI_ORIENT_POSITION
-/*106*/ ,PROP_HORI_ORIENT_RELATION
-/*107*/ ,PROP_VERT_ORIENT
-/*108*/ ,PROP_VERT_ORIENT_POSITION
-/*109*/ ,PROP_VERT_ORIENT_RELATION
-/*110*/ ,PROP_GRAPHIC_CROP
-/*111*/ ,PROP_SIZE100th_M_M
-/*112*/ ,PROP_SIZE_PIXEL
-/*113*/ ,PROP_SURROUND
-/*114*/ ,PROP_SURROUND_CONTOUR
-/*115*/ ,PROP_ADJUST_CONTRAST
-/*116*/ ,PROP_ADJUST_LUMINANCE
-/*117*/ ,PROP_GRAPHIC_COLOR_MODE
-/*118*/ ,PROP_GAMMA
-/*119*/ ,PROP_HORI_MIRRORED_ON_EVEN_PAGES
-/*120*/ ,PROP_HORI_MIRRORED_ON_ODD_PAGES
-/*121*/ ,PROP_VERT_MIRRORED
-/*122*/ ,PROP_CONTOUR_OUTSIDE
-/*123*/ ,PROP_CONTOUR_POLY_POLYGON
-/*124*/ ,PROP_PAGE_TOGGLE
-/*125*/ ,PROP_BACK_COLOR
-/*126*/ ,PROP_ALTERNATIVE_TEXT
-/*127*/ ,PROP_HEADER_TEXT_LEFT
-/*128*/ ,PROP_HEADER_TEXT
-/*129*/ ,PROP_HEADER_IS_SHARED
-/*130*/ ,PROP_HEADER_IS_ON
-/*131*/ ,PROP_FOOTER_TEXT_LEFT
-/*132*/ ,PROP_FOOTER_TEXT
-/*133*/ ,PROP_FOOTER_IS_SHARED
-/*134*/ ,PROP_FOOTER_IS_ON
-/*135*/ ,PROP_WIDTH
-/*136*/ ,PROP_HEIGHT
-/*137*/ ,PROP_SEPARATOR_LINE_IS_ON
-/*138*/ ,PROP_TEXT_COLUMNS
-/*139*/ ,PROP_AUTOMATIC_DISTANCE
-/*140*/ ,PROP_IS_LANDSCAPE
-/*141*/ ,PROP_PRINTER_PAPER_TRAY_INDEX
-/*142*/ ,PROP_FIRST_PAGE
-/*143*/ ,PROP_DEFAULT
-/*144*/ ,PROP_PAGE_DESC_NAME
-/*145*/ ,PROP_PAGE_NUMBER_OFFSET
-/*146*/ ,PROP_BREAK_TYPE
-/*147*/ ,PROP_FOOTER_IS_DYNAMIC_HEIGHT
-/*148*/ ,PROP_FOOTER_DYNAMIC_SPACING
-/*149*/ ,PROP_FOOTER_HEIGHT
-/*150*/ ,PROP_FOOTER_BODY_DISTANCE
-/*151*/ ,PROP_HEADER_IS_DYNAMIC_HEIGHT
-/*152*/ ,PROP_HEADER_DYNAMIC_SPACING
-/*153*/ ,PROP_HEADER_HEIGHT
-/*154*/ ,PROP_HEADER_BODY_DISTANCE
-/*155*/ ,PROP_WRITING_MODE
-/*156*/ ,PROP_GRID_MODE
-/*157*/ ,PROP_GRID_DISPLAY
-/*158*/ ,PROP_GRID_PRINT
-/*159*/ ,PROP_ADD_EXTERNAL_LEADING
-/*160*/ ,PROP_GRID_LINES
-/*161*/ ,PROP_GRID_BASE_HEIGHT
-/*162*/ ,PROP_GRID_RUBY_HEIGHT
-/*163*/ ,PROP_IS_ON
-/*164*/ ,PROP_RESTART_AT_EACH_PAGE
-/*165*/ ,PROP_COUNT_EMPTY_LINES
-/*166*/ ,PROP_COUNT_LINES_IN_FRAMES
-/*167*/ ,PROP_INTERVAL
-/*168*/ ,PROP_DISTANCE
-/*169*/ ,PROP_NUMBER_POSITION
-/*170*/ ,PROP_LEVEL
-/*171*/ ,PROP_LEVEL_PARAGRAPH_STYLES
-/*172*/ ,PROP_LEVEL_FORMAT
-/*173*/ ,PROP_TOKEN_TYPE
-/*174*/ ,PROP_TOKEN_HYPERLINK_START
-/*175*/ ,PROP_TOKEN_HYPERLINK_END
-/*176*/ ,PROP_TOKEN_CHAPTER_INFO
-/*177*/ ,PROP_CHAPTER_FORMAT
-/*178*/ ,PROP_TOKEN_TEXT
-/*179*/ ,PROP_TEXT
-/*180*/ ,PROP_CREATE_FROM_OUTLINE
-/*181*/ ,PROP_CREATE_FROM_MARKS
-/*182*/ ,PROP_STANDARD
-/*183*/ ,PROP_CHAR_BACK_COLOR
-/*184*/ ,PROP_CHAR_EMPHASIS
-/*185*/ ,PROP_CHAR_COMBINE_IS_ON
-/*186*/ ,PROP_CHAR_COMBINE_PREFIX
-/*187*/ ,PROP_CHAR_COMBINE_SUFFIX
-/*188*/ ,PROP_CHAR_ROTATION
-/*189*/ ,PROP_CHAR_ROTATION_IS_FIT_TO_LINE
-/*190*/ ,PROP_CHAR_FLASH
-/*191*/ ,PROP_IS_SPLIT_ALLOWED
-/*192*/ ,META_PROP_VERTICAL_BORDER
-/*193*/ ,META_PROP_HORIZONTAL_BORDER
-/*194*/ ,PROP_HEADER_ROW_COUNT
-/*195*/ ,PROP_IS_AUTO_HEIGHT
-/*196*/ ,PROP_SIZE_TYPE
-/*197*/ ,PROP_TABLE_COLUMN_SEPARATORS
-/*198*/ ,META_PROP_TABLE_STYLE_NAME
-/*199*/ ,PROP_REDLINE_AUTHOR
-/*200*/ ,PROP_REDLINE_DATE_TIME
-/*201*/ ,PROP_REDLINE_COMMENT
-/*202*/ ,PROP_REDLINE_TYPE
-/*203*/ ,PROP_REDLINE_SUCCESSOR_DATA
-/*204*/ ,PROP_REDLINE_IDENTIFIER
-/*205*/ ,PROP_SIZE_PROTECTED
-/*206*/ ,PROP_POSITION_PROTECTED
-/*207*/ ,PROP_OPAQUE
-/*208*/ ,PROP_VERTICAL_MERGE
-/*209*/ ,PROP_BULLET_CHAR
-/*210*/ ,PROP_BULLET_FONT_NAME
-/*211*/ ,PROP_PARA_BACK_COLOR
-/*212*/ ,PROP_TABS_RELATIVE_TO_INDENT
-/*213*/ ,PROP_PREFIX
-/*214*/ ,PROP_SUFFIX
-/*215*/ ,PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES
-/*216*/ ,PROP_DROP_CAP_FORMAT
-/*217*/ , PROP_REFERENCE_FIELD_PART
-/*218*/ ,PROP_SOURCE_NAME
-/*219*/ ,PROP_REFERENCE_FIELD_SOURCE
-/*220*/ ,PROP_WIDTH_TYPE
-/*221*/ ,PROP_TEXT_RANGE
-/*222*/ ,PROP_SERVICE_CHAR_STYLE
-/*223*/ ,PROP_SERVICE_PARA_STYLE
-/*224*/ ,PROP_CHARACTER_STYLES
-/*225*/ ,PROP_PARAGRAPH_STYLES
-/*226*/ ,PROP_TABLE_BORDER_DISTANCES
-/*227*/ ,META_PROP_CELL_MAR_TOP
-/*228*/ ,META_PROP_CELL_MAR_BOTTOM
-/*229*/ ,META_PROP_CELL_MAR_LEFT
-/*230*/ ,META_PROP_CELL_MAR_RIGHT
-/*231*/ ,PROP_START_AT
-/*232*/ ,PROP_ADD_PARA_TABLE_SPACING
-/*233*/ ,PROP_CHAR_PROP_HEIGHT
-/*234*/ ,PROP_CHAR_PROP_HEIGHT_ASIAN
-/*235*/ ,PROP_CHAR_PROP_HEIGHT_COMPLEX
-/*236*/ ,PROP_FORMAT
-/*237*/ ,PROP_INSERT
-/*238*/ ,PROP_DELETE
-/*239*/ ,PROP_STREAM_NAME
-/*240*/ ,PROP_BITMAP
-/*241*/ ,PROP_IS_DATE
-/*242*/ ,PROP_TAB_STOP_DISTANCE
-/*243*/ ,PROP_CNF_STYLE
-/*244*/ ,PROP_INDENT_AT
-/*245*/ ,PROP_FIRST_LINE_INDENT
-/*246*/ ,PROP_NUMBERING_STYLE_NAME
-/*247*/ ,PROP_OUTLINE_LEVEL
-/*248*/ ,PROP_LISTTAB_STOP_POSITION
-/*249*/ ,PROP_POSITION_AND_SPACE_MODE
-/*250*/ ,PROP_HEADING_STYLE_NAME
-/*251*/ ,PROP_PARA_SPLIT
-/*252*/ ,PROP_HELP
+        ,META_PROP_CELL_MAR_BOTTOM = PROP_ID_START
+        ,META_PROP_CELL_MAR_LEFT
+        ,META_PROP_CELL_MAR_RIGHT
+        ,META_PROP_CELL_MAR_TOP
+        ,META_PROP_HORIZONTAL_BORDER
+        ,META_PROP_TABLE_STYLE_NAME
+        ,META_PROP_VERTICAL_BORDER
+        ,PROP_ADD_EXTERNAL_LEADING
+        ,PROP_ADD_PARA_TABLE_SPACING
+        ,PROP_ADJUST
+        ,PROP_ADJUST_CONTRAST
+        ,PROP_ADJUST_LUMINANCE
+        ,PROP_ALTERNATIVE_TEXT
+        ,PROP_ANCHOR_TYPE
+        ,PROP_AUTOMATIC_DISTANCE
+        ,PROP_BACK_COLOR
+        ,PROP_BITMAP
+        ,PROP_BOTTOM_BORDER
+        ,PROP_BOTTOM_BORDER_DISTANCE
+        ,PROP_BOTTOM_MARGIN
+        ,PROP_BREAK_TYPE
+        ,PROP_BULLET_CHAR
+        ,PROP_BULLET_FONT_NAME
+        ,PROP_CHAPTER_FORMAT
+        ,PROP_CHARACTER_STYLES
+        ,PROP_CHAR_AUTO_KERNING
+        ,PROP_CHAR_BACK_COLOR
+        ,PROP_CHAR_CASE_MAP
+        ,PROP_CHAR_CHAR_KERNING
+        ,PROP_CHAR_COLOR
+        ,PROP_CHAR_COMBINE_IS_ON
+        ,PROP_CHAR_COMBINE_PREFIX
+        ,PROP_CHAR_COMBINE_SUFFIX
+        ,PROP_CHAR_CONTOURED
+        ,PROP_CHAR_EMPHASIS
+        ,PROP_CHAR_ESCAPEMENT
+        ,PROP_CHAR_ESCAPEMENT_HEIGHT
+        ,PROP_CHAR_FLASH
+        ,PROP_CHAR_FONT_CHAR_SET
+        ,PROP_CHAR_FONT_CHAR_SET_ASIAN
+        ,PROP_CHAR_FONT_CHAR_SET_COMPLEX
+        ,PROP_CHAR_FONT_FAMILY
+        ,PROP_CHAR_FONT_FAMILY_ASIAN
+        ,PROP_CHAR_FONT_FAMILY_COMPLEX
+        ,PROP_CHAR_FONT_NAME
+        ,PROP_CHAR_FONT_NAME_ASIAN
+        ,PROP_CHAR_FONT_NAME_COMPLEX
+        ,PROP_CHAR_FONT_PITCH
+        ,PROP_CHAR_FONT_PITCH_ASIAN
+        ,PROP_CHAR_FONT_PITCH_COMPLEX
+        ,PROP_CHAR_FONT_STYLE
+        ,PROP_CHAR_FONT_STYLE_ASIAN
+        ,PROP_CHAR_FONT_STYLE_COMPLEX
+        ,PROP_CHAR_HEIGHT
+        ,PROP_CHAR_HEIGHT_ASIAN
+        ,PROP_CHAR_HEIGHT_COMPLEX
+        ,PROP_CHAR_HIDDEN
+        ,PROP_CHAR_LOCALE
+        ,PROP_CHAR_LOCALE_ASIAN
+        ,PROP_CHAR_LOCALE_COMPLEX
+        ,PROP_CHAR_POSTURE
+        ,PROP_CHAR_POSTURE_ASIAN
+        ,PROP_CHAR_POSTURE_COMPLEX
+        ,PROP_CHAR_PROP_HEIGHT
+        ,PROP_CHAR_PROP_HEIGHT_ASIAN
+        ,PROP_CHAR_PROP_HEIGHT_COMPLEX
+        ,PROP_CHAR_RELIEF
+        ,PROP_CHAR_ROTATION
+        ,PROP_CHAR_ROTATION_IS_FIT_TO_LINE
+        ,PROP_CHAR_SCALE_WIDTH
+        ,PROP_CHAR_SHADOWED
+        ,PROP_CHAR_STRIKEOUT
+        ,PROP_CHAR_STYLE_NAME
+        ,PROP_CHAR_UNDERLINE
+        ,PROP_CHAR_UNDERLINE_COLOR
+        ,PROP_CHAR_UNDERLINE_HAS_COLOR
+        ,PROP_CHAR_WEIGHT
+        ,PROP_CHAR_WEIGHT_ASIAN
+        ,PROP_CHAR_WEIGHT_COMPLEX
+        ,PROP_CHAR_WORD_MODE
+        ,PROP_CNF_STYLE
+        ,PROP_CONTENT
+        ,PROP_CONTOUR_OUTSIDE
+        ,PROP_CONTOUR_POLY_POLYGON
+        ,PROP_COUNT_EMPTY_LINES
+        ,PROP_COUNT_LINES_IN_FRAMES
+        ,PROP_CREATE_FROM_LEVEL_PARAGRAPH_STYLES
+        ,PROP_CREATE_FROM_MARKS
+        ,PROP_CREATE_FROM_OUTLINE
+        ,PROP_CURRENT_PRESENTATION
+        ,PROP_DATA_COLUMN_NAME
+        ,PROP_DEFAULT
+        ,PROP_DELETE
+        ,PROP_DESCRIPTION
+        ,PROP_DISTANCE
+        ,PROP_DROP_CAP_FORMAT
+        ,PROP_FILE_FORMAT
+        ,PROP_FIRST_LINE_INDENT
+        ,PROP_FIRST_LINE_OFFSET
+        ,PROP_FIRST_PAGE
+        ,PROP_FOOTER_BODY_DISTANCE
+        ,PROP_FOOTER_DYNAMIC_SPACING
+        ,PROP_FOOTER_HEIGHT
+        ,PROP_FOOTER_IS_DYNAMIC_HEIGHT
+        ,PROP_FOOTER_IS_ON
+        ,PROP_FOOTER_IS_SHARED
+        ,PROP_FOOTER_TEXT
+        ,PROP_FOOTER_TEXT_LEFT
+        ,PROP_FORMAT
+        ,PROP_FULL_NAME
+        ,PROP_GAMMA
+        ,PROP_GRAPHIC
+        ,PROP_GRAPHIC_COLOR_MODE
+        ,PROP_GRAPHIC_CROP
+        ,PROP_GRID_BASE_HEIGHT
+        ,PROP_GRID_DISPLAY
+        ,PROP_GRID_LINES
+        ,PROP_GRID_MODE
+        ,PROP_GRID_PRINT
+        ,PROP_GRID_RUBY_HEIGHT
+        ,PROP_HEADER_BODY_DISTANCE
+        ,PROP_HEADER_DYNAMIC_SPACING
+        ,PROP_HEADER_HEIGHT
+        ,PROP_HEADER_IS_DYNAMIC_HEIGHT
+        ,PROP_HEADER_IS_ON
+        ,PROP_HEADER_IS_SHARED
+        ,PROP_HEADER_ROW_COUNT
+        ,PROP_HEADER_TEXT
+        ,PROP_HEADER_TEXT_LEFT
+        ,PROP_HEADING_STYLE_NAME
+        ,PROP_HEIGHT
+        ,PROP_HELP
+        ,PROP_HINT
+        ,PROP_HORI_MIRRORED_ON_EVEN_PAGES
+        ,PROP_HORI_MIRRORED_ON_ODD_PAGES
+        ,PROP_HORI_ORIENT
+        ,PROP_HORI_ORIENT_POSITION
+        ,PROP_HORI_ORIENT_RELATION
+        ,PROP_HYPER_LINK_U_R_L
+        ,PROP_INDENT_AT
+        ,PROP_INPUT_STREAM
+        ,PROP_INSERT
+        ,PROP_INTERVAL
+        ,PROP_IS_AUTO_HEIGHT
+        ,PROP_IS_DATE
+        ,PROP_IS_FIXED
+        ,PROP_IS_INPUT
+        ,PROP_IS_LANDSCAPE
+        ,PROP_IS_ON
+        ,PROP_IS_SPLIT_ALLOWED
+        ,PROP_KEYWORDS
+        ,PROP_LEFT_BORDER
+        ,PROP_LEFT_BORDER_DISTANCE
+        ,PROP_LEFT_MARGIN
+        ,PROP_LEVEL
+        ,PROP_LEVEL_FORMAT
+        ,PROP_LEVEL_PARAGRAPH_STYLES
+        ,PROP_LISTTAB_STOP_POSITION
+        ,PROP_MACRO_NAME
+        ,PROP_NAME
+        ,PROP_NUMBERING_LEVEL
+        ,PROP_NUMBERING_RULES
+        ,PROP_NUMBERING_STYLE_NAME
+        ,PROP_NUMBERING_TYPE
+        ,PROP_NUMBER_FORMAT
+        ,PROP_NUMBER_POSITION
+        ,PROP_OPAQUE
+        ,PROP_OUTLINE_LEVEL
+        ,PROP_PAGE_DESC_NAME
+        ,PROP_PAGE_NUMBER_OFFSET
+        ,PROP_PAGE_TOGGLE
+        ,PROP_PARAGRAPH_STYLES
+        ,PROP_PARA_ADJUST
+        ,PROP_PARA_BACK_COLOR
+        ,PROP_PARA_BOTTOM_MARGIN
+        ,PROP_PARA_FIRST_LINE_INDENT
+        ,PROP_PARA_IS_HANGING_PUNCTUATION
+        ,PROP_PARA_IS_HYPHENATION
+        ,PROP_PARA_KEEP_TOGETHER
+        ,PROP_PARA_LAST_LINE_ADJUST
+        ,PROP_PARA_LEFT_MARGIN
+        ,PROP_PARA_LINE_NUMBER_COUNT
+        ,PROP_PARA_LINE_NUMBER_START_VALUE
+        ,PROP_PARA_LINE_SPACING
+        ,PROP_PARA_ORPHANS
+        ,PROP_PARA_RIGHT_MARGIN
+        ,PROP_PARA_SPLIT
+        ,PROP_PARA_STYLE_NAME
+        ,PROP_PARA_TAB_STOPS
+        ,PROP_PARA_TOP_MARGIN
+        ,PROP_PARA_WIDOWS
+        ,PROP_PARENT_NUMBERING
+        ,PROP_POSITION_AND_SPACE_MODE
+        ,PROP_POSITION_PROTECTED
+        ,PROP_PREFIX
+        ,PROP_PRINTER_PAPER_TRAY_INDEX
+        ,PROP_REDLINE_AUTHOR
+        ,PROP_REDLINE_COMMENT
+        ,PROP_REDLINE_DATE_TIME
+        ,PROP_REDLINE_IDENTIFIER
+        ,PROP_REDLINE_SUCCESSOR_DATA
+        ,PROP_REDLINE_TYPE
+        ,PROP_REFERENCE_FIELD_PART
+        ,PROP_REFERENCE_FIELD_SOURCE
+        ,PROP_RESTART_AT_EACH_PAGE
+        ,PROP_RIGHT_BORDER
+        ,PROP_RIGHT_BORDER_DISTANCE
+        ,PROP_RIGHT_MARGIN
+        ,PROP_SEPARATOR_LINE_IS_ON
+        ,PROP_SERVICE_CHAR_STYLE
+        ,PROP_SERVICE_PARA_STYLE
+        ,PROP_SIZE
+        ,PROP_SIZE100th_M_M
+        ,PROP_SIZE_PIXEL
+        ,PROP_SIZE_PROTECTED
+        ,PROP_SIZE_TYPE
+        ,PROP_SOURCE_NAME
+        ,PROP_STANDARD
+        ,PROP_START_AT
+        ,PROP_START_WITH
+        ,PROP_STREAM_NAME
+        ,PROP_SUBJECT
+        ,PROP_SUB_TYPE
+        ,PROP_SUFFIX
+        ,PROP_SURROUND
+        ,PROP_SURROUND_CONTOUR
+        ,PROP_TABLE_BORDER
+        ,PROP_TABLE_BORDER_DISTANCES
+        ,PROP_TABLE_COLUMN_SEPARATORS
+        ,PROP_TABS_RELATIVE_TO_INDENT
+        ,PROP_TAB_STOP_DISTANCE
+        ,PROP_TEXT
+        ,PROP_TEXT_COLUMNS
+        ,PROP_TEXT_RANGE
+        ,PROP_TITLE
+        ,PROP_TOKEN_CHAPTER_INFO
+        ,PROP_TOKEN_HYPERLINK_END
+        ,PROP_TOKEN_HYPERLINK_START
+        ,PROP_TOKEN_TEXT
+        ,PROP_TOKEN_TYPE
+        ,PROP_TOP_BORDER
+        ,PROP_TOP_BORDER_DISTANCE
+        ,PROP_TOP_MARGIN
+        ,PROP_USER_DATA_TYPE
+        ,PROP_VERTICAL_MERGE
+        ,PROP_VERT_MIRRORED
+        ,PROP_VERT_ORIENT
+        ,PROP_VERT_ORIENT_POSITION
+        ,PROP_VERT_ORIENT_RELATION
+        ,PROP_WIDTH
+        ,PROP_WIDTH_TYPE
+        ,PROP_WRITING_MODE
 /*253*/ ,PROP_FRM_DIRECTION
-};
+    };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
 {
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index ea3de1404bb7..c12daa676ca5 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -111,9 +111,42 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues()
     return m_aValues;
 }
 
+void lcl_AnyToTag(XMLTag::Pointer_t pTag, const uno::Any & rAny)
+{
+    try {
+        sal_Int32 aInt = 0;
+        rAny >>= aInt;
+        pTag->addAttr("value", aInt);
+
+        sal_uInt32 auInt = 0;
+        rAny >>= auInt;
+        pTag->addAttr("unsignedValue", auInt);
+
+        float aFloat = 0.0f;
+        rAny >>= aFloat;
+        pTag->addAttr("floatValue", aFloat);
+
+        ::rtl::OUString aStr;
+        rAny >>= aStr;
+        pTag->addAttr("stringValue", aStr);
+    }
+    catch (...) {
+    }
+}
 
 void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any& rAny, bool bOverwrite )
 {
+#ifdef DEBUG_DMAPPER_PROPERTY_MAP
+    const ::rtl::OUString& rInsert = PropertyNameSupplier::
+        GetPropertyNameSupplier().GetName(eId);
+
+    XMLTag::Pointer_t pTag(new XMLTag("propertyMap.insert"));
+    pTag->addAttr("name", rInsert);
+    lcl_AnyToTag(pTag, rAny);
+
+    dmapper_logger->addTag(pTag);
+#endif
+
     PropertyMap::iterator aElement = find(PropertyDefinition( eId, bIsTextProperty ) );
     if( aElement != end())
     {
@@ -148,15 +181,15 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
             default:
             {
                 try {
-                    sal_Int32 aInt;
+                    sal_Int32 aInt = 0;
                     aMapIter->second >>= aInt;
                     pLogger->attribute("value", aInt);
 
-                    sal_uInt32 auInt;
+                    sal_uInt32 auInt = 0;
                     aMapIter->second >>= auInt;
                     pLogger->attribute("unsignedValue", auInt);
 
-                    float aFloat;
+                    float aFloat = 0.0;
                     aMapIter->second >>= aFloat;
                     pLogger->attribute("floatValue", aFloat);
 
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 6b50230c0a15..b0224d2c6edd 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -38,9 +38,7 @@
 #include <map>
 #include <vector>
 
-#ifdef DEBUG_DOMAINMAPPER
 #include <resourcemodel/TagLogger.hxx>
-#endif
 
 namespace com{namespace sun{namespace star{
     namespace beans{
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index fd2f5ea676b8..e507c859aea9 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -31,6 +31,8 @@
 #include <ConversionHelper.hxx>
 #include <ooxml/resourceids.hxx>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -38,10 +40,11 @@ using namespace ::com::sun::star;
 
 
 SectionColumnHandler::SectionColumnHandler() :
-    bEqualWidth( false ),
-    nSpace( 0 ),
-    nNum( 0 ),
-    bSep( false )
+LoggedProperties(dmapper_logger, "SectionColumnHandler"),
+bEqualWidth( false ),
+nSpace( 0 ),
+nNum( 0 ),
+bSep( false )
 {
 }
 
@@ -49,7 +52,7 @@ SectionColumnHandler::~SectionColumnHandler()
 {
 }
 
-void SectionColumnHandler::attribute(Id rName, Value & rVal)
+void SectionColumnHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     switch( rName )
@@ -78,7 +81,7 @@ void SectionColumnHandler::attribute(Id rName, Value & rVal)
     }
 }
 
-void SectionColumnHandler::sprm(Sprm & rSprm)
+void SectionColumnHandler::lcl_sprm(Sprm & rSprm)
 {
     switch( rSprm.getId())
     {
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index bdeebd61d96c..3a420c74526f 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -29,7 +29,7 @@
 #define INCLUDED_SECTIONCOLUMNHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 
@@ -45,7 +45,7 @@ struct _Column
 };
 
 
-class WRITERFILTER_DLLPRIVATE SectionColumnHandler : public Properties
+class WRITERFILTER_DLLPRIVATE SectionColumnHandler : public LoggedProperties
 {
     bool        bEqualWidth;
     sal_Int32   nSpace;
@@ -55,14 +55,14 @@ class WRITERFILTER_DLLPRIVATE SectionColumnHandler : public Properties
 
     _Column   aTempColumn;
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     SectionColumnHandler();
     virtual ~SectionColumnHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     bool        IsEqualWidth() const { return bEqualWidth; }
     sal_Int32   GetSpace() const { return nSpace; }
     sal_Int32   GetNum() const { return nNum; }
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 057e47e812b6..10a4e2568229 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -26,20 +26,17 @@
  *
  ************************************************************************/
 
+#include <stdio.h>
+#include <rtl/ustring.hxx>
 #include <resourcemodel/ResourceModelHelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-
 #include <SettingsTable.hxx>
+#include <resourcemodel/ResourceModelHelper.hxx>
 #include <doctok/resourceids.hxx>
 #include <ooxml/resourceids.hxx>
-#include <stdio.h>
 #include <ConversionHelper.hxx>
-#include <rtl/ustring.hxx>
 
-#ifdef DEBUG_DOMAINMAPPER
-#include <resourcemodel/QNameToString.hxx>
 #include "dmapperLoggers.hxx"
-#endif
 
 namespace writerfilter {
 
@@ -95,10 +92,13 @@ struct SettingsTable_Impl
     , m_nCryptAlgorithmType(NS_ooxml::LN_Value_wordprocessingml_ST_AlgType_typeAny)
     , m_nCryptSpinCount(0)
     {}
+
 };
 
-SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > xTextFactory) :
-m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
+SettingsTable::SettingsTable(DomainMapper& rDMapper, const uno::Reference< lang::XMultiServiceFactory > xTextFactory)
+: LoggedProperties(dmapper_logger, "SettingsTable")
+, LoggedTable(dmapper_logger, "SettingsTable")
+, m_pImpl( new SettingsTable_Impl(rDMapper, xTextFactory) )
 {
 
 }
@@ -108,14 +108,8 @@ SettingsTable::~SettingsTable()
     delete m_pImpl;
 }
 
-void SettingsTable::attribute(Id nName, Value & val)
+void SettingsTable::lcl_attribute(Id nName, Value & val)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("SettingsTable.attribute");
-    dmapper_logger->attribute("name", (*QNameToString::Instance())(nName));
-    dmapper_logger->attribute("value", val.toString());
-#endif
-
     (void) nName;
     int nIntValue = val.getInt();
     (void)nIntValue;
@@ -133,18 +127,10 @@ void SettingsTable::attribute(Id nName, Value & val)
     }
     }
 #endif
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void SettingsTable::sprm(Sprm& rSprm)
+void SettingsTable::lcl_sprm(Sprm& rSprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("SettingsTable.sprm");
-    dmapper_logger->chars(rSprm.toString());
-#endif
-
     sal_uInt32 nSprmId = rSprm.getId();
 
     Value::Pointer_t pValue = rSprm.getValue();
@@ -211,16 +197,14 @@ void SettingsTable::sprm(Sprm& rSprm)
         break;
     default:
     {
-        OSL_ENSURE( false, "unknown sprmid in SettingsTable::sprm()");
+#ifdef DEBUG_DMAPPER_SETTINGS_TABLE
+        dmapper_logger->element("unhandled");
+#endif
     }
     }
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
-void SettingsTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
+void SettingsTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
 {
     ref->resolve(*this);
 }
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index a0037eda0f4c..2b50d5112ee1 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -30,7 +30,7 @@
 #define INCLUDED_SETTINGSTABLE_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <map>
@@ -51,7 +51,7 @@ using namespace std;
 
 struct SettingsTable_Impl;
 
-class WRITERFILTER_DLLPRIVATE SettingsTable : public Properties, public Table
+class WRITERFILTER_DLLPRIVATE SettingsTable : public LoggedProperties, public LoggedTable
 {
     SettingsTable_Impl *m_pImpl;
 
@@ -61,18 +61,19 @@ class WRITERFILTER_DLLPRIVATE SettingsTable : public Properties, public Table
             );
     virtual ~SettingsTable();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
-    // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
     //returns default TabStop in 1/100th mm
     int GetDefaultTabStop() const;
 
     void ApplyProperties( uno::Reference< text::XTextDocument > xDoc );
 
+ private:
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
+    // Table
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
+
 };
 typedef boost::shared_ptr< SettingsTable >          SettingsTablePtr;
 }}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a2ed63cac524..e803388ac1d6 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -49,10 +49,7 @@
 #include <stdio.h>
 #include <rtl/ustrbuf.hxx>
 
-#ifdef DEBUG_DOMAINMAPPER
 #include <dmapperLoggers.hxx>
-#include <resourcemodel/QNameToString.hxx>
-#endif
 
 using namespace ::com::sun::star;
 namespace writerfilter {
@@ -83,32 +80,11 @@ StyleSheetEntry::~StyleSheetEntry()
 {
 }
 
-#ifdef DEBUG_DOMAINMAPPER
-void StyleSheetEntry::dumpXml( const TagLogger::Pointer_t pLogger )
-{
-    pLogger->startElement("StyleSheetEntry");
-
-    pLogger->attribute("identifierI", sStyleIdentifierI);
-    pLogger->attribute("identifierD", sStyleIdentifierD);
-    pLogger->attribute("default", bIsDefaultStyle ? "true" : "false");
-    pLogger->attribute("invalidHeight", bInvalidHeight ? "true" : "false");
-    pLogger->attribute("hasUPE", bHasUPE ? "true" : "false");
-    pLogger->attribute("styleType", nStyleTypeCode);
-    pLogger->attribute("baseStyle", sBaseStyleIdentifier);
-    pLogger->attribute("nextStyle", sNextStyleIdentifier);
-    pLogger->attribute("styleName", sStyleName);
-    pLogger->attribute("styleName1", sStyleName1);
-    pLogger->attribute("convertedName", sConvertedStyleName);
-    pProperties->dumpXml( pLogger );
-
-    pLogger->endElement();
-}
-#endif
-
 TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry& rEntry, StyleSheetTable* pStyles ):
     StyleSheetEntry( ),
     m_pStyleSheet( pStyles )
 {
+
     bIsDefaultStyle = rEntry.bIsDefaultStyle;
     bInvalidHeight = rEntry.bInvalidHeight;
     bHasUPE = rEntry.bHasUPE;
@@ -129,13 +105,6 @@ TableStyleSheetEntry::~TableStyleSheetEntry( )
 
 void TableStyleSheetEntry::AddTblStylePr( TblStyleType nType, PropertyMapPtr pProps )
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("AddTblStylePr");
-    dmapper_logger->attribute("type", nType);
-    pProps->dumpXml(dmapper_logger);
-    dmapper_logger->endElement();
-#endif
-
     static const TblStyleType pTypesToFix[] =
     {
         TBL_STYLE_FIRSTROW,
@@ -181,7 +150,7 @@ void TableStyleSheetEntry::AddTblStylePr( TblStyleType nType, PropertyMapPtr pPr
     m_aStyles[nType] = pProps;
 }
 
-PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask )
+PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask, StyleSheetEntryDequePtr pStack )
 {
     PropertyMapPtr pProps( new PropertyMap );
 
@@ -190,8 +159,20 @@ PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask )
 
     if ( pEntry.get( ) )
     {
+        if (pStack.get() == NULL)
+            pStack.reset(new StyleSheetEntryDeque());
+
+        StyleSheetEntryDeque::const_iterator aIt = find(pStack->begin(), pStack->end(), pEntry);
+
+        if (aIt != pStack->end())
+        {
+            pStack->push_back(pEntry);
+
         TableStyleSheetEntry* pParent = static_cast<TableStyleSheetEntry *>( pEntry.get( ) );
-        pProps->insert( pParent->GetProperties( nMask ) );
+            pProps->insert( pParent->GetProperties( nMask ), pStack );
+
+            pStack->pop_back();
+    }
     }
 
     // And finally get the mask ones
@@ -200,41 +181,6 @@ PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask )
     return pProps;
 }
 
-#ifdef DEBUG_DOMAINMAPPER
-void TableStyleSheetEntry::dumpXml( const TagLogger::Pointer_t pLogger )
-{
-
-    pLogger->startElement("StyleSheetEntry");
-
-    pLogger->attribute("identifierI", sStyleIdentifierI);
-    pLogger->attribute("identifierD", sStyleIdentifierD);
-    pLogger->attribute("default", bIsDefaultStyle ? "true" : "false");
-    pLogger->attribute("invalidHeight", bInvalidHeight ? "true" : "false");
-    pLogger->attribute("hasUPE", bHasUPE ? "true" : "false");
-    pLogger->attribute("styleType", nStyleTypeCode);
-    pLogger->attribute("baseStyle", sBaseStyleIdentifier);
-    pLogger->attribute("nextStyle", sNextStyleIdentifier);
-    pLogger->attribute("styleName", sStyleName);
-    pLogger->attribute("styleName1", sStyleName1);
-    pLogger->attribute("convertedName", sConvertedStyleName);
-    pProperties->dumpXml( pLogger );
-
-    for (sal_Int32 nBit = 0; nBit < 13; ++nBit)
-    {
-        pLogger->startElement("properties");
-
-        PropertyMapPtr pMap = GetProperties(1 << nBit);
-
-        pMap->dumpXml( pLogger );
-        pLogger->attribute("kind", nBit);
-
-        pLogger->endElement();
-    }
-
-    pLogger->endElement();
-}
-#endif
-
 void lcl_mergeProps( PropertyMapPtr pToFill,  PropertyMapPtr pToAdd, TblStyleType nStyleId )
 {
     static const PropertyIds pPropsToCheck[] =
@@ -410,8 +356,10 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Referenc
 }
 
 
-StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> xTextDocument) :
-    m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument) )
+StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> xTextDocument)
+: LoggedProperties(dmapper_logger, "StyleSheetTable")
+, LoggedTable(dmapper_logger, "StyleSheetTable")
+, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument) )
 {
 }
 
@@ -422,14 +370,8 @@ StyleSheetTable::~StyleSheetTable()
 }
 
 
-void StyleSheetTable::attribute(Id Name, Value & val)
+void StyleSheetTable::lcl_attribute(Id Name, Value & val)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("StyleSheetTable.attribute");
-    dmapper_logger->attribute("name", (*QNameToString::Instance())(Name));
-    dmapper_logger->attribute("value", val.toString());
-#endif
-
     OSL_ENSURE( m_pImpl->m_pCurrentEntry, "current entry has to be set here");
     if(!m_pImpl->m_pCurrentEntry)
         return ;
@@ -522,20 +464,11 @@ void StyleSheetTable::attribute(Id Name, Value & val)
         }
         break;
     }
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 
-void StyleSheetTable::sprm(Sprm & rSprm)
+void StyleSheetTable::lcl_sprm(Sprm & rSprm)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("StyleSheetTable.sprm");
-    dmapper_logger->attribute("sprm", rSprm.toString());
-#endif
-
     sal_uInt32 nSprmId = rSprm.getId();
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue.get() ? pValue->getInt() : 0;
@@ -602,6 +535,7 @@ void StyleSheetTable::sprm(Sprm & rSprm)
         }
         case NS_ooxml::LN_CT_DocDefaults_pPrDefault:
         case NS_ooxml::LN_CT_PPrDefault_pPr:
+        case NS_ooxml::LN_CT_DocDefaults_pPrDefault:
             m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultParaProps );
             resourcemodel::resolveSprmProps( m_pImpl->m_rDMapper, rSprm );
             m_pImpl->m_rDMapper.PopStyleSheetProperties();
@@ -609,6 +543,7 @@ void StyleSheetTable::sprm(Sprm & rSprm)
         break;
         case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
         case NS_ooxml::LN_CT_RPrDefault_rPr:
+        case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
             m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultCharProps );
             resourcemodel::resolveSprmProps( m_pImpl->m_rDMapper, rSprm );
             m_pImpl->m_rDMapper.PopStyleSheetProperties();
@@ -645,6 +580,7 @@ void StyleSheetTable::sprm(Sprm & rSprm)
                     pTEntry->m_nColBandSize = nIntValue;
             }
         }
+        break;
         case NS_ooxml::LN_CT_TblPrBase_tblCellMar:
             //no cell margins in styles
         break;
@@ -664,7 +600,7 @@ void StyleSheetTable::sprm(Sprm & rSprm)
                     m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pCurrentEntry->pProperties );
 
                     PropertyMapPtr pProps(new PropertyMap());
-                    m_pImpl->m_rDMapper.sprm( rSprm, pProps );
+                    m_pImpl->m_rDMapper.sprmWithProps( rSprm, pProps );
 
                     m_pImpl->m_pCurrentEntry->pProperties->insert(pProps);
 
@@ -672,20 +608,12 @@ void StyleSheetTable::sprm(Sprm & rSprm)
                 }
             }
             break;
-    }
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
+}
 }
 
 
-void StyleSheetTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
+void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("StyleSheetTable.entry");
-#endif
-
     //create a new style entry
     OSL_ENSURE( !m_pImpl->m_pCurrentEntry, "current entry has to be NULL here");
     StyleSheetEntryPtr pNewEntry( new StyleSheetEntry );
@@ -704,16 +632,8 @@ void StyleSheetTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Po
         //TODO: this entry contains the default settings - they have to be added to the settings
     }
 
-#ifdef DEBUG_DOMAINMAPPER
-    m_pImpl->m_pCurrentEntry->dumpXml( dmapper_logger );
-#endif
-
     StyleSheetEntryPtr pEmptyEntry;
     m_pImpl->m_pCurrentEntry = pEmptyEntry;
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 /*-- 21.06.2006 15:34:49---------------------------------------------------
     sorting helper
@@ -772,10 +692,6 @@ uno::Sequence< ::rtl::OUString > PropValVector::getNames()
 
 void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
 {
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->startElement("applyStyleSheets");
-#endif
-
     try
     {
         uno::Reference< style::XStyleFamiliesSupplier > xStylesSupplier( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW );
@@ -934,24 +850,13 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         PropValVector aSortedPropVals;
                         for( sal_Int32 nProp = 0; nProp < aPropValues.getLength(); ++nProp)
                         {
-#ifdef DEBUG_DOMAINMAPPER
-                            dmapper_logger->startElement("propvalue");
-                            dmapper_logger->attribute("name", aPropValues[nProp].Name);
-                            dmapper_logger->attribute("value", aPropValues[nProp].Value);
-#endif
                                 // Don't add the style name properties
                             bool bIsParaStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ParaStyleName" ) );
                             bool bIsCharStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharStyleName" ) );
                             if ( !bIsParaStyleName && !bIsCharStyleName )
                             {
-#ifdef DEBUG_DOMAINMAPPER
-                                dmapper_logger->element("insert");
-#endif
                                 aSortedPropVals.Insert( aPropValues[nProp] );
                             }
-#ifdef DEBUG_DOMAINMAPPER
-                            dmapper_logger->endElement();
-#endif
                         }
                         if(bAddFollowStyle)
                         {
@@ -1002,12 +907,6 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                     if(bInsert)
                     {
                         xStyles->insertByName( sConvertedStyleName, uno::makeAny( xStyle) );
-#ifdef DEBUG_DOMAINMAPPER
-                        uno::Reference<beans::XPropertySet> xProps(xStyle, uno::UNO_QUERY);
-                        dmapper_logger->startElement("insertStyle");
-                        dmapper_logger->unoPropertySet(xProps);
-                        dmapper_logger->endElement();
-#endif
                     }
                 }
                 ++aIt;
@@ -1019,10 +918,6 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
         (void)rEx;
         OSL_ENSURE( false, "Styles could not be imported completely");
     }
-
-#ifdef DEBUG_DOMAINMAPPER
-    dmapper_logger->endElement();
-#endif
 }
 
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 47b211c1356c..8f3811b5066a 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -35,11 +35,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <PropertyMap.hxx>
 #include <FontTable.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#ifdef DEBUG_DOMAINMAPPER
-#include <resourcemodel/TagLogger.hxx>
-#endif
+#include <resourcemodel/LoggedResources.hxx>
 
 namespace com{ namespace sun { namespace star { namespace text{
     class XTextDocument;
@@ -77,20 +73,18 @@ public:
     PropertyMapPtr  pProperties;
     ::rtl::OUString sConvertedStyleName;
 
-#ifdef DEBUG_DOMAINMAPPER
-    virtual void dumpXml( const TagLogger::Pointer_t pLogger );
-#endif
-
     StyleSheetEntry();
     virtual ~StyleSheetEntry();
 };
 
 typedef boost::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr;
+typedef ::std::deque<StyleSheetEntryPtr> StyleSheetEntryDeque;
+typedef boost::shared_ptr<StyleSheetEntryDeque> StyleSheetEntryDequePtr;
 
 class DomainMapper;
 class StyleSheetTable :
-        public Properties,
-        public Table
+        public LoggedProperties,
+        public LoggedTable
 {
     StyleSheetTable_Impl   *m_pImpl;
 
@@ -99,13 +93,6 @@ public:
                         ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument> xTextDocument );
     virtual ~StyleSheetTable();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
-    // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
     void ApplyStyleSheets( FontTablePtr rFontTable );
     const StyleSheetEntryPtr FindStyleSheetByISTD(const ::rtl::OUString& sIndex);
     const StyleSheetEntryPtr FindStyleSheetByStyleName(const ::rtl::OUString& rIndex);
@@ -119,6 +106,13 @@ public:
     ::rtl::OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties );
 
 private:
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
+    // Table
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
+
     void resolveAttributeProperties(Value & val);
     void resolveSprmProps(Sprm & sprm_);
     void applyDefaults(bool bParaProperties);
@@ -147,11 +141,10 @@ public:
     // Gets all the properties
     //     + corresponding to the mask,
     //     + from the parent styles
-    PropertyMapPtr GetProperties( sal_Int32 nMask );
-
-#ifdef DEBUG_DOMAINMAPPER
-    virtual void dumpXml( const TagLogger::Pointer_t pLogger );
-#endif
+    //
+    // @param mask      mask describing which properties to return
+    // @param pStack    already processed StyleSheetEntries
+    PropertyMapPtr GetProperties( sal_Int32 nMask, StyleSheetEntryDequePtr pStack = StyleSheetEntryDequePtr());
 
     TableStyleSheetEntry( StyleSheetEntry& aEntry, StyleSheetTable* pStyles );
     virtual ~TableStyleSheetEntry( );
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index ba00a9ef9212..45e2b17a8817 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -34,6 +34,8 @@
 #include <com/sun/star/text/TableColumnSeparator.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -42,11 +44,12 @@ using namespace ::com::sun::star;
 
 
 TDefTableHandler::TDefTableHandler(bool bOOXML) :
-    m_nLineWidth(0),
-    m_nLineType(0),
-    m_nLineColor(0),
-    m_nLineDistance(0),
-    m_bOOXML( bOOXML )
+LoggedProperties(dmapper_logger, "TDefTableHandler"),
+m_nLineWidth(0),
+m_nLineType(0),
+m_nLineColor(0),
+m_nLineDistance(0),
+m_bOOXML( bOOXML )
 {
 }
 
@@ -56,7 +59,7 @@ TDefTableHandler::~TDefTableHandler()
 }
 
 
-void TDefTableHandler::attribute(Id rName, Value & rVal)
+void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
 {
     sal_Int32 nIntValue = rVal.getInt();
     (void)nIntValue;
@@ -176,7 +179,7 @@ void TDefTableHandler::localResolve(Id rName, writerfilter::Reference<Properties
 }
 
 
-void TDefTableHandler::sprm(Sprm & rSprm)
+void TDefTableHandler::lcl_sprm(Sprm & rSprm)
 {
     switch( rSprm.getId() )
     {
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 3776af84150e..8bbf07993fc3 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -29,7 +29,7 @@
 #define INCLUDED_TDEFTABLEHANDLER_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 namespace com{ namespace sun{ namespace star{namespace table {
@@ -41,7 +41,7 @@ namespace dmapper
 {
 class PropertyMap;
 class TablePropertyMap;
-class WRITERFILTER_DLLPRIVATE TDefTableHandler : public Properties
+class WRITERFILTER_DLLPRIVATE TDefTableHandler : public LoggedProperties
 {
 public:
 
@@ -67,14 +67,15 @@ private:
     bool                                                m_bOOXML;
 
     void localResolve(Id Name, writerfilter::Reference<Properties>::Pointer_t pProperties);
+
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     TDefTableHandler( bool bOOXML );
     virtual ~TDefTableHandler();
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     size_t                                      getCellCount() const;
     void                                        fillCellProperties( size_t nCell, ::boost::shared_ptr< TablePropertyMap > pCellProperties) const;
     ::boost::shared_ptr<PropertyMap>            getRowProperties() const;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index a3ac89b6a258..cf8bda4a85cc 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -5,14 +5,17 @@
 #include <dmapperLoggers.hxx>
 #include <resourcemodel/QNameToString.hxx>
 
+#include "dmapperLoggers.hxx"
+
 namespace writerfilter {
 namespace dmapper {
 
 TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
-   m_rDMapper( rDMapper ),
-   m_pTablePropsHandler( new TablePropertiesHandler( true ) ),
-   m_nType( TBL_STYLE_UNKNOWN ),
-   m_pProperties( new PropertyMap )
+LoggedProperties(dmapper_logger, "TblStylePrHandler"),
+m_rDMapper( rDMapper ),
+m_pTablePropsHandler( new TablePropertiesHandler( true ) ),
+m_nType( TBL_STYLE_UNKNOWN ),
+m_pProperties( new PropertyMap )
 {
 }
 
@@ -21,7 +24,7 @@ TblStylePrHandler::~TblStylePrHandler( )
     delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
 }
 
-void TblStylePrHandler::attribute(Id rName, Value & rVal)
+void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("TblStylePrHandler.attribute");
@@ -42,7 +45,7 @@ void TblStylePrHandler::attribute(Id rName, Value & rVal)
     }
 }
 
-void TblStylePrHandler::sprm(Sprm & rSprm)
+void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("TblStylePrHandler.sprm");
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index b9442f62862b..b665aeb4be29 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -6,7 +6,7 @@
 
 #include <dmapper/DomainMapper.hxx>
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 
 namespace writerfilter {
@@ -33,7 +33,7 @@ enum TblStyleType
     TBL_STYLE_SWCELL
 };
 
-class WRITERFILTER_DLLPRIVATE TblStylePrHandler : public Properties
+class WRITERFILTER_DLLPRIVATE TblStylePrHandler : public LoggedProperties
 {
 private:
     DomainMapper &              m_rDMapper;
@@ -42,14 +42,14 @@ private:
     TblStyleType                m_nType;
     PropertyMapPtr              m_pProperties;
 
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
 public:
     TblStylePrHandler( DomainMapper & rDMapper );
     virtual ~TblStylePrHandler( );
 
-    // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
-
     inline PropertyMapPtr       getProperties() { return m_pProperties; };
     inline TblStyleType         getType() { return m_nType; };
 
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 9138b8a12830..aca4672a1d5e 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -31,11 +31,7 @@
 #include <doctok/resourceids.hxx>
 #include <ooxml/resourceids.hxx>
 #endif
-#include <stdio.h>
-#ifdef DEBUG_DOMAINMAPPER
 #include "dmapperLoggers.hxx"
-#include <resourcemodel/QNameToString.hxx>
-#endif
 
 namespace writerfilter {
 namespace dmapper
@@ -51,8 +47,10 @@ struct ThemeTable_Impl
     std::map<sal_uInt32, ::rtl::OUString> m_currentFontThemeEntry;
 };
 
-ThemeTable::ThemeTable() :
-    m_pImpl( new ThemeTable_Impl )
+ThemeTable::ThemeTable()
+: LoggedProperties(dmapper_logger, "ThemeTable")
+, LoggedTable(dmapper_logger, "ThemeTable")
+, m_pImpl( new ThemeTable_Impl )
 {
 
 }
@@ -62,7 +60,7 @@ ThemeTable::~ThemeTable()
     delete m_pImpl;
 }
 
-void ThemeTable::attribute(Id Name, Value & val)
+void ThemeTable::lcl_attribute(Id Name, Value & val)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("ThemeTable.attribute");
@@ -88,7 +86,7 @@ void ThemeTable::attribute(Id Name, Value & val)
 #endif
 }
 
-void ThemeTable::sprm(Sprm& rSprm)
+void ThemeTable::lcl_sprm(Sprm& rSprm)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("ThemeTable.sprm");
@@ -144,7 +142,7 @@ void ThemeTable::sprm(Sprm& rSprm)
 #endif
 }
 
-void ThemeTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
+void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
 {
 #ifdef DEBUG_DOMAINMAPPER
     dmapper_logger->startElement("ThemeTable.entry");
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index f604c61e8289..0bd7bd9d584e 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -30,7 +30,7 @@
 #define INCLUDED_THEMETABLE_HXX
 
 #include <WriterFilterDllApi.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/LoggedResources.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <map>
 
@@ -40,7 +40,7 @@ namespace dmapper
 
 struct ThemeTable_Impl;
 
-class WRITERFILTER_DLLPRIVATE ThemeTable : public Properties, public Table
+class WRITERFILTER_DLLPRIVATE ThemeTable : public LoggedProperties, public LoggedTable
 {
     ThemeTable_Impl *m_pImpl;
 
@@ -48,14 +48,15 @@ public:
     ThemeTable();
     virtual ~ThemeTable();
 
+    const ::rtl::OUString getFontNameForTheme(const Id id) const;
+
+ private:
     // Properties
-    virtual void attribute(Id Name, Value & val);
-    virtual void sprm(Sprm & sprm);
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
 
     // Table
-    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-
-    const ::rtl::OUString getFontNameForTheme(const Id id) const;
+    virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
 };
 typedef boost::shared_ptr< ThemeTable >          ThemeTablePtr;
 }}
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
new file mode 100644
index 000000000000..2aabc1a375a9
--- /dev/null
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -0,0 +1,216 @@
+/*************************************************************************
+ *
+ * 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 <com/sun/star/drawing/PointSequence.hpp>
+
+#include <ooxml/resourceids.hxx>
+#include <resourcemodel/ResourceModelHelper.hxx>
+
+#include "ConversionHelper.hxx"
+#include "WrapPolygonHandler.hxx"
+#include "dmapperLoggers.hxx"
+
+namespace writerfilter {
+
+using resourcemodel::resolveSprmProps;
+
+namespace dmapper {
+
+WrapPolygon::WrapPolygon()
+{
+}
+
+WrapPolygon::~WrapPolygon()
+{
+}
+
+void WrapPolygon::addPoint(const awt::Point & rPoint)
+{
+    mPoints.push_back(rPoint);
+}
+
+WrapPolygon::Points_t::const_iterator WrapPolygon::begin() const
+{
+    return mPoints.begin();
+}
+
+WrapPolygon::Points_t::const_iterator WrapPolygon::end() const
+{
+    return mPoints.end();
+}
+
+WrapPolygon::Points_t::iterator WrapPolygon::begin()
+{
+    return mPoints.begin();
+}
+
+WrapPolygon::Points_t::iterator WrapPolygon::end()
+{
+    return mPoints.end();
+}
+
+size_t WrapPolygon::size() const
+{
+    return mPoints.size();
+}
+
+WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint)
+{
+    WrapPolygon::Pointer_t pResult(new WrapPolygon);
+
+    Points_t::iterator aIt = begin();
+    Points_t::iterator aItEnd = end();
+
+    while (aIt != aItEnd)
+    {
+        awt::Point aPoint(aIt->X + rPoint.X, aIt->Y + rPoint.Y);
+        pResult->addPoint(aPoint);
+        aIt++;
+    }
+
+    return pResult;
+}
+
+WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fraction & rFractionY)
+{
+    WrapPolygon::Pointer_t pResult(new WrapPolygon);
+
+    Points_t::iterator aIt = begin();
+    Points_t::iterator aItEnd = end();
+
+    while (aIt != aItEnd)
+    {
+        awt::Point aPoint(Fraction(aIt->X) * rFractionX, Fraction(aIt->Y) * rFractionY);
+        pResult->addPoint(aPoint);
+        aIt++;
+    }
+
+    return pResult;
+}
+
+WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSrcSize, const awt::Size & rDstSize)
+{
+    WrapPolygon::Pointer_t pResult;
+
+    const sal_uInt32 nWrap100Percent = 21600;
+
+    Fraction aMove(nWrap100Percent, rSrcSize.Width);
+    aMove = aMove * Fraction(15, 1);
+    awt::Point aMovePoint(aMove, 0);
+    pResult = move(aMovePoint);
+
+    Fraction aScaleX(nWrap100Percent, Fraction(nWrap100Percent) + aMove);
+    Fraction aScaleY(nWrap100Percent, Fraction(nWrap100Percent) - aMove);
+    pResult = pResult->scale(aScaleX, aScaleY);
+
+    Fraction aScaleDestX(rDstSize.Width, nWrap100Percent);
+    Fraction aScaleDestY(rDstSize.Height, nWrap100Percent);
+    pResult = pResult->scale(aScaleDestX, aScaleDestY);
+
+    return pResult;
+}
+
+drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
+{
+    drawing::PointSequenceSequence aPolyPolygon(1L);
+    drawing::PointSequence * pPolygon = aPolyPolygon.getArray();
+    pPolygon->realloc(size());
+
+    sal_uInt32 n = 0;
+    Points_t::const_iterator aIt = begin();
+    Points_t::const_iterator aItEnd = end();
+
+    while (aIt != aItEnd)
+    {
+        (*pPolygon)[n] = *aIt;
+        ++n;
+        aIt++;
+    }
+
+    return aPolyPolygon;
+}
+
+WrapPolygonHandler::WrapPolygonHandler()
+: LoggedProperties(dmapper_logger, "WrapPolygonHandler")
+, mpPolygon(new WrapPolygon)
+{
+}
+
+WrapPolygonHandler::~WrapPolygonHandler()
+{
+}
+
+void WrapPolygonHandler::lcl_attribute(Id Name, Value & val)
+{
+    sal_Int32 nIntValue = val.getInt();
+
+    switch(Name)
+    {
+    case NS_ooxml::LN_CT_Point2D_x:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+        mnX = nIntValue;
+        break;
+    case NS_ooxml::LN_CT_Point2D_y:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+        mnY = nIntValue;
+        break;
+    default:
+#ifdef DEBUG_WRAP_POLYGON_HANDLER
+        dmapper_logger->element("unhandled");
+#endif
+        break;
+    }
+}
+
+void WrapPolygonHandler::lcl_sprm(Sprm & _sprm)
+{
+    switch (_sprm.getId())
+    {
+    case NS_ooxml::LN_CT_WrapPath_lineTo:
+    case NS_ooxml::LN_CT_WrapPath_start:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+        {
+            resolveSprmProps(*this, _sprm);
+
+            awt::Point aPoint(mnX, mnY);
+            mpPolygon->addPoint(aPoint);
+        }
+        break;
+    default:
+#ifdef DEBUG_WRAP_POLYGON_HANDLER
+        dmapper_logger->element("unhandled");
+#endif
+        break;
+    }
+}
+
+WrapPolygon::Pointer_t WrapPolygonHandler::getPolygon()
+{
+    return mpPolygon;
+}
+
+}}
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
new file mode 100644
index 000000000000..05161096f81a
--- /dev/null
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef WRAP_POLYGON_HANDLER_HXX
+#define WRAP_POLYGON_HANDLER_HXX
+
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <resourcemodel/LoggedResources.hxx>
+#include <resourcemodel/Fraction.hxx>
+
+namespace writerfilter {
+namespace dmapper {
+
+using namespace ::com::sun::star;
+using resourcemodel::Fraction;
+
+class WrapPolygon
+{
+public:
+    typedef ::std::deque<awt::Point> Points_t;
+    typedef ::boost::shared_ptr<WrapPolygon> Pointer_t;
+
+private:
+    Points_t mPoints;
+
+public:
+    WrapPolygon();
+    virtual ~WrapPolygon();
+
+    void addPoint(const awt::Point & rPoint);
+
+    Points_t::const_iterator begin() const;
+    Points_t::const_iterator end() const;
+    Points_t::iterator begin();
+    Points_t::iterator end();
+
+    size_t size() const;
+
+    WrapPolygon::Pointer_t move(const awt::Point & rMove);
+    WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
+    WrapPolygon::Pointer_t correctWordWrapPolygon(const awt::Size & rSrcSize, const awt::Size & rDstSize);
+    drawing::PointSequenceSequence getPointSequenceSequence() const;
+};
+
+class WrapPolygonHandler : public LoggedProperties
+{
+public:
+    WrapPolygonHandler();
+    virtual ~WrapPolygonHandler();
+
+    WrapPolygon::Pointer_t getPolygon();
+
+private:
+    WrapPolygon::Pointer_t mpPolygon;
+
+    sal_uInt32 mnX;
+    sal_uInt32 mnY;
+
+    // Properties
+    virtual void lcl_attribute(Id Name, Value & val);
+    virtual void lcl_sprm(Sprm & sprm);
+
+};
+
+}}
+
+#endif // WRAP_POLYGON_HANDLER_HXX
diff --git a/writerfilter/source/dmapper/dmapperLoggers.hxx b/writerfilter/source/dmapper/dmapperLoggers.hxx
index ea34e6a7cd7f..752705d50d17 100644
--- a/writerfilter/source/dmapper/dmapperLoggers.hxx
+++ b/writerfilter/source/dmapper/dmapperLoggers.hxx
@@ -37,6 +37,7 @@ namespace writerfilter {
         extern TagLogger::Pointer_t dmapper_logger;
     }
 }
+
 #endif // DEBUG
 #endif // INCLUDED_DMAPPER_LOGGERS_HXX
 
diff --git a/writerfilter/source/dmapper/makefile.mk b/writerfilter/source/dmapper/makefile.mk
index 300dfb31d959..a4b000411b4e 100644
--- a/writerfilter/source/dmapper/makefile.mk
+++ b/writerfilter/source/dmapper/makefile.mk
@@ -48,13 +48,13 @@ SLOFILES= \
     $(SLO)$/DomainMapperTableManager.obj \
     $(SLO)$/DomainMapper_Impl.obj \
     $(SLO)$/FFDataHandler.obj \
-    $(SLO)$/FormControlHelper.obj \
     $(SLO)$/FontTable.obj \
+    $(SLO)$/FormControlHelper.obj \
     $(SLO)$/GraphicHelpers.obj \
     $(SLO)$/GraphicImport.obj \
-    $(SLO)$/NumberingManager.obj  \
     $(SLO)$/MeasureHandler.obj \
     $(SLO)$/ModelEventListener.obj \
+    $(SLO)$/NumberingManager.obj  \
     $(SLO)$/OLEHandler.obj \
     $(SLO)$/PageBordersHandler.obj \
     $(SLO)$/PropertyIds.obj \
@@ -66,7 +66,9 @@ SLOFILES= \
     $(SLO)$/TDefTableHandler.obj \
     $(SLO)$/TablePropertiesHandler.obj \
     $(SLO)$/TblStylePrHandler.obj \
-    $(SLO)$/ThemeTable.obj 
+    $(SLO)$/ThemeTable.obj \
+    $(SLO)$/WrapPolygonHandler.obj \
+
 
 # --- Targets ----------------------------------
author	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 22:49:23 -0600
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 22:49:23 -0600
commit	f673d89a6a4f6b2d3d519ab17a57b299cb6be1ad (patch)
tree	dc8127da17e362197b1b19df7b6957ce554fb0fd /writerfilter/source/dmapper
parent	50bc1bc97b170c38648fab979ccb812a3c458cab (diff)
parent	818573bfbce420afedffd45d7bb080f25da32625 (diff)