summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-03-11 11:26:05 +0100
commit8122194ff0a27b467de23498483887fc2b760508 (patch)
tree8be6de3bbd5b979f2ab18dd57186ba32febc0066
parentc835dffaf3525f6f8d0c1d3d34c3ec68600da32a (diff)
parent47d83021c1fb1fb51cb268f7549d9d0f92531e66 (diff)
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
-rw-r--r--filter/inc/filter.hrc22
-rw-r--r--filter/inc/filter/msfilter/countryid.hxx5
-rw-r--r--filter/inc/filter/msfilter/escherex.hxx187
-rw-r--r--filter/inc/filter/msfilter/mscodec.hxx5
-rw-r--r--filter/inc/filter/msfilter/msdffimp.hxx5
-rw-r--r--filter/inc/filter/msfilter/msfilterdllapi.h5
-rw-r--r--filter/inc/filter/msfilter/msfiltertracer.hxx5
-rw-r--r--filter/inc/filter/msfilter/msocximex.hxx5
-rw-r--r--filter/inc/filter/msfilter/msoleexp.hxx5
-rw-r--r--filter/inc/filter/msfilter/msvbahelper.hxx58
-rw-r--r--filter/inc/filter/msfilter/svdfppt.hxx13
-rw-r--r--filter/inc/filter/msfilter/svxmsbas.hxx5
-rw-r--r--filter/inc/makefile.mk6
-rw-r--r--filter/inc/pch/precompiled_filter.cxx5
-rw-r--r--filter/inc/pch/precompiled_filter.hxx5
-rw-r--r--filter/prj/build.lst24
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/Helper.java5
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/TypeDetection.java5
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/makefile.mk6
-rw-r--r--filter/qa/complex/filter/misc/FinalizedMandatoryTest.java5
-rwxr-xr-xfilter/qa/complex/filter/misc/makefile.mk6
-rw-r--r--filter/source/config/cache/basecontainer.cxx5
-rw-r--r--filter/source/config/cache/basecontainer.hxx5
-rw-r--r--filter/source/config/cache/cacheitem.cxx5
-rw-r--r--filter/source/config/cache/cacheitem.hxx5
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx5
-rw-r--r--filter/source/config/cache/cacheupdatelistener.hxx5
-rw-r--r--filter/source/config/cache/configflush.cxx5
-rw-r--r--filter/source/config/cache/configflush.hxx5
-rw-r--r--filter/source/config/cache/constant.hxx5
-rw-r--r--filter/source/config/cache/contenthandlerfactory.cxx5
-rw-r--r--filter/source/config/cache/contenthandlerfactory.hxx5
-rw-r--r--filter/source/config/cache/filtercache.cxx7
-rw-r--r--filter/source/config/cache/filtercache.hxx7
-rw-r--r--filter/source/config/cache/filterfactory.cxx5
-rw-r--r--filter/source/config/cache/filterfactory.hxx5
-rw-r--r--filter/source/config/cache/frameloaderfactory.cxx5
-rw-r--r--filter/source/config/cache/frameloaderfactory.hxx5
-rw-r--r--filter/source/config/cache/lateinitlistener.cxx5
-rw-r--r--filter/source/config/cache/lateinitlistener.hxx5
-rw-r--r--filter/source/config/cache/lateinitthread.cxx5
-rw-r--r--filter/source/config/cache/lateinitthread.hxx5
-rw-r--r--filter/source/config/cache/macros.hxx5
-rw-r--r--filter/source/config/cache/makefile.mk6
-rw-r--r--filter/source/config/cache/querytokenizer.cxx5
-rw-r--r--filter/source/config/cache/querytokenizer.hxx5
-rw-r--r--filter/source/config/cache/registration.cxx5
-rw-r--r--filter/source/config/cache/registration.hxx5
-rw-r--r--filter/source/config/cache/typedetection.cxx5
-rw-r--r--filter/source/config/cache/typedetection.hxx5
-rw-r--r--filter/source/config/cache/versions.hxx5
-rw-r--r--filter/source/config/fragments/filters/makefile.mk6
-rw-r--r--filter/source/config/fragments/makefile.mk6
-rw-r--r--filter/source/config/fragments/packagedef.mk6
-rw-r--r--filter/source/config/fragments/types/makefile.mk6
-rw-r--r--filter/source/config/fragments/types/pcd_Photo_CD_Base.xcu2
-rw-r--r--filter/source/config/fragments/types/pcd_Photo_CD_Base16.xcu2
-rw-r--r--filter/source/config/fragments/types/pcd_Photo_CD_Base4.xcu2
-rw-r--r--filter/source/config/fragments/types/svm_StarView_Metafile.xcu2
-rwxr-xr-xfilter/source/config/tools/merge/pyAltFCFGMerge1
-rw-r--r--filter/source/config/tools/split/FCFGSplit.java5
-rw-r--r--filter/source/config/tools/split/Splitter.java5
-rw-r--r--filter/source/config/tools/split/SplitterData.java5
-rw-r--r--filter/source/config/tools/split/makefile.mk6
-rw-r--r--filter/source/docbook/docbooktosoffheadings.xsl8
-rw-r--r--filter/source/docbook/makefile.mk6
-rw-r--r--filter/source/docbook/sofftodocbookheadings.xsl8
-rw-r--r--filter/source/filtertracer/filtertracer.cxx5
-rw-r--r--filter/source/filtertracer/filtertracer.hxx5
-rw-r--r--filter/source/filtertracer/filtertraceruno.cxx5
-rw-r--r--filter/source/filtertracer/makefile.mk6
-rw-r--r--filter/source/flash/impswfdialog.cxx5
-rw-r--r--filter/source/flash/impswfdialog.hrc5
-rw-r--r--filter/source/flash/impswfdialog.hxx5
-rw-r--r--filter/source/flash/impswfdialog.src5
-rw-r--r--filter/source/flash/makefile.mk6
-rw-r--r--filter/source/flash/swfdialog.cxx5
-rw-r--r--filter/source/flash/swfdialog.hxx5
-rw-r--r--filter/source/flash/swfexporter.cxx8
-rw-r--r--filter/source/flash/swfexporter.hxx7
-rw-r--r--filter/source/flash/swffilter.cxx5
-rw-r--r--filter/source/flash/swfuno.cxx5
-rw-r--r--filter/source/flash/swfwriter.cxx7
-rw-r--r--filter/source/flash/swfwriter.hxx7
-rw-r--r--filter/source/flash/swfwriter1.cxx5
-rw-r--r--filter/source/flash/swfwriter2.cxx5
-rw-r--r--filter/source/graphicfilter/egif/dlgegif.cxx108
-rw-r--r--filter/source/graphicfilter/egif/dlgegif.hrc36
-rw-r--r--filter/source/graphicfilter/egif/dlgegif.hxx71
-rw-r--r--filter/source/graphicfilter/egif/dlgegif.src118
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx629
-rw-r--r--filter/source/graphicfilter/egif/egifstr.src39
-rw-r--r--filter/source/graphicfilter/egif/exports.map8
-rw-r--r--filter/source/graphicfilter/egif/giflzwc.cxx256
-rw-r--r--filter/source/graphicfilter/egif/giflzwc.hxx65
-rw-r--r--filter/source/graphicfilter/egif/makefile.mk78
-rw-r--r--filter/source/graphicfilter/egif/strings.hrc28
-rw-r--r--filter/source/graphicfilter/eos2met/dlgeos2.cxx179
-rw-r--r--filter/source/graphicfilter/eos2met/dlgeos2.hrc41
-rw-r--r--filter/source/graphicfilter/eos2met/dlgeos2.hxx80
-rw-r--r--filter/source/graphicfilter/eos2met/dlgeos2.src162
-rw-r--r--filter/source/graphicfilter/eos2met/eos2met.cxx2648
-rw-r--r--filter/source/graphicfilter/eos2met/eos2mstr.src38
-rw-r--r--filter/source/graphicfilter/eos2met/exports.map8
-rw-r--r--filter/source/graphicfilter/eos2met/makefile.mk74
-rw-r--r--filter/source/graphicfilter/eos2met/strings.hrc29
-rw-r--r--filter/source/graphicfilter/epbm/dlgepbm.cxx99
-rw-r--r--filter/source/graphicfilter/epbm/dlgepbm.hrc34
-rw-r--r--filter/source/graphicfilter/epbm/dlgepbm.hxx71
-rw-r--r--filter/source/graphicfilter/epbm/dlgepbm.src106
-rw-r--r--filter/source/graphicfilter/epbm/epbm.cxx272
-rw-r--r--filter/source/graphicfilter/epbm/epbmstr.src35
-rw-r--r--filter/source/graphicfilter/epbm/exports.map8
-rw-r--r--filter/source/graphicfilter/epbm/makefile.mk75
-rw-r--r--filter/source/graphicfilter/epbm/strings.hrc27
-rw-r--r--filter/source/graphicfilter/epgm/dlgepgm.cxx97
-rw-r--r--filter/source/graphicfilter/epgm/dlgepgm.hrc34
-rw-r--r--filter/source/graphicfilter/epgm/dlgepgm.hxx71
-rw-r--r--filter/source/graphicfilter/epgm/dlgepgm.src105
-rw-r--r--filter/source/graphicfilter/epgm/epgm.cxx297
-rw-r--r--filter/source/graphicfilter/epgm/epgmstr.src35
-rw-r--r--filter/source/graphicfilter/epgm/exports.map8
-rw-r--r--filter/source/graphicfilter/epgm/makefile.mk76
-rw-r--r--filter/source/graphicfilter/epgm/strings.hrc27
-rw-r--r--filter/source/graphicfilter/epict/dlgepct.cxx183
-rw-r--r--filter/source/graphicfilter/epict/dlgepct.hrc41
-rw-r--r--filter/source/graphicfilter/epict/dlgepct.hxx80
-rw-r--r--filter/source/graphicfilter/epict/dlgepct.src163
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx2387
-rw-r--r--filter/source/graphicfilter/epict/epictstr.src38
-rw-r--r--filter/source/graphicfilter/epict/exports.map8
-rw-r--r--filter/source/graphicfilter/epict/makefile.mk76
-rw-r--r--filter/source/graphicfilter/epict/strings.hrc29
-rw-r--r--filter/source/graphicfilter/eppm/dlgeppm.cxx96
-rw-r--r--filter/source/graphicfilter/eppm/dlgeppm.hrc34
-rw-r--r--filter/source/graphicfilter/eppm/dlgeppm.hxx71
-rw-r--r--filter/source/graphicfilter/eppm/dlgeppm.src106
-rw-r--r--filter/source/graphicfilter/eppm/eppm.cxx305
-rw-r--r--filter/source/graphicfilter/eppm/eppmstr.src35
-rw-r--r--filter/source/graphicfilter/eppm/exports.map8
-rw-r--r--filter/source/graphicfilter/eppm/makefile.mk76
-rw-r--r--filter/source/graphicfilter/eppm/strings.hrc27
-rw-r--r--filter/source/graphicfilter/eps/dlgeps.cxx206
-rw-r--r--filter/source/graphicfilter/eps/dlgeps.hrc43
-rw-r--r--filter/source/graphicfilter/eps/dlgeps.hxx82
-rw-r--r--filter/source/graphicfilter/eps/dlgeps.src160
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2793
-rw-r--r--filter/source/graphicfilter/eps/epsstr.src70
-rw-r--r--filter/source/graphicfilter/eps/exports.map8
-rw-r--r--filter/source/graphicfilter/eps/makefile.mk79
-rw-r--r--filter/source/graphicfilter/eps/strings.hrc29
-rw-r--r--filter/source/graphicfilter/eras/eras.cxx317
-rw-r--r--filter/source/graphicfilter/eras/exports.map7
-rw-r--r--filter/source/graphicfilter/eras/makefile.mk67
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx648
-rw-r--r--filter/source/graphicfilter/etiff/exports.map7
-rw-r--r--filter/source/graphicfilter/etiff/makefile.mk65
-rw-r--r--filter/source/graphicfilter/expm/expm.cxx302
-rw-r--r--filter/source/graphicfilter/expm/exports.map7
-rw-r--r--filter/source/graphicfilter/expm/makefile.mk66
-rw-r--r--filter/source/graphicfilter/icgm/actimpr.cxx1134
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.cxx410
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.hxx87
-rw-r--r--filter/source/graphicfilter/icgm/bundles.cxx288
-rw-r--r--filter/source/graphicfilter/icgm/bundles.hxx173
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx927
-rw-r--r--filter/source/graphicfilter/icgm/cgm.hxx178
-rw-r--r--filter/source/graphicfilter/icgm/cgmres.hrc28
-rw-r--r--filter/source/graphicfilter/icgm/cgmtypes.hxx145
-rw-r--r--filter/source/graphicfilter/icgm/chart.cxx100
-rw-r--r--filter/source/graphicfilter/icgm/chart.hxx214
-rw-r--r--filter/source/graphicfilter/icgm/class0.cxx138
-rw-r--r--filter/source/graphicfilter/icgm/class1.cxx231
-rw-r--r--filter/source/graphicfilter/icgm/class2.cxx227
-rw-r--r--filter/source/graphicfilter/icgm/class3.cxx144
-rw-r--r--filter/source/graphicfilter/icgm/class4.cxx861
-rw-r--r--filter/source/graphicfilter/icgm/class5.cxx524
-rw-r--r--filter/source/graphicfilter/icgm/class7.cxx237
-rw-r--r--filter/source/graphicfilter/icgm/classx.cxx262
-rw-r--r--filter/source/graphicfilter/icgm/elements.cxx395
-rw-r--r--filter/source/graphicfilter/icgm/elements.hxx145
-rw-r--r--filter/source/graphicfilter/icgm/exports.map7
-rw-r--r--filter/source/graphicfilter/icgm/main.hxx63
-rw-r--r--filter/source/graphicfilter/icgm/makefile.mk80
-rw-r--r--filter/source/graphicfilter/icgm/outact.cxx200
-rw-r--r--filter/source/graphicfilter/icgm/outact.hxx148
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx980
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.hxx128
-rw-r--r--filter/source/graphicfilter/idxf/dxfblkrd.cxx139
-rw-r--r--filter/source/graphicfilter/idxf/dxfblkrd.hxx87
-rw-r--r--filter/source/graphicfilter/idxf/dxfentrd.cxx871
-rw-r--r--filter/source/graphicfilter/idxf/dxfentrd.hxx602
-rw-r--r--filter/source/graphicfilter/idxf/dxfgrprd.cxx361
-rw-r--r--filter/source/graphicfilter/idxf/dxfgrprd.hxx155
-rw-r--r--filter/source/graphicfilter/idxf/dxfreprd.cxx385
-rw-r--r--filter/source/graphicfilter/idxf/dxfreprd.hxx138
-rw-r--r--filter/source/graphicfilter/idxf/dxftblrd.cxx348
-rw-r--r--filter/source/graphicfilter/idxf/dxftblrd.hxx183
-rw-r--r--filter/source/graphicfilter/idxf/dxfvec.cxx254
-rw-r--r--filter/source/graphicfilter/idxf/dxfvec.hxx261
-rw-r--r--filter/source/graphicfilter/idxf/exports.map7
-rw-r--r--filter/source/graphicfilter/idxf/idxf.cxx82
-rw-r--r--filter/source/graphicfilter/idxf/makefile.mk79
-rw-r--r--filter/source/graphicfilter/ieps/exports.map7
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx771
-rw-r--r--filter/source/graphicfilter/ieps/makefile.mk66
-rw-r--r--filter/source/graphicfilter/ios2met/exports.map7
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx2784
-rw-r--r--filter/source/graphicfilter/ios2met/makefile.mk68
-rw-r--r--filter/source/graphicfilter/ipbm/exports.map7
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx565
-rw-r--r--filter/source/graphicfilter/ipbm/makefile.mk68
-rw-r--r--filter/source/graphicfilter/ipcd/exports.map7
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx422
-rw-r--r--filter/source/graphicfilter/ipcd/makefile.mk67
-rw-r--r--filter/source/graphicfilter/ipcx/exports.map7
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx458
-rw-r--r--filter/source/graphicfilter/ipcx/makefile.mk67
-rw-r--r--filter/source/graphicfilter/ipict/exports.map7
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx1937
-rw-r--r--filter/source/graphicfilter/ipict/makefile.mk68
-rw-r--r--filter/source/graphicfilter/ipsd/exports.map7
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx763
-rw-r--r--filter/source/graphicfilter/ipsd/makefile.mk67
-rw-r--r--filter/source/graphicfilter/iras/exports.map7
-rw-r--r--filter/source/graphicfilter/iras/iras.cxx383
-rw-r--r--filter/source/graphicfilter/iras/makefile.mk67
-rw-r--r--filter/source/graphicfilter/itga/exports.map7
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx758
-rw-r--r--filter/source/graphicfilter/itga/makefile.mk67
-rw-r--r--filter/source/graphicfilter/itiff/ccidecom.cxx1112
-rw-r--r--filter/source/graphicfilter/itiff/ccidecom.hxx125
-rw-r--r--filter/source/graphicfilter/itiff/exports.map7
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx1342
-rw-r--r--filter/source/graphicfilter/itiff/lzwdecom.cxx192
-rw-r--r--filter/source/graphicfilter/itiff/lzwdecom.hxx79
-rw-r--r--filter/source/graphicfilter/itiff/makefile.mk71
-rw-r--r--filter/source/msfilter/countryid.cxx5
-rw-r--r--filter/source/msfilter/escherex.cxx308
-rw-r--r--filter/source/msfilter/eschesdo.cxx82
-rw-r--r--filter/source/msfilter/eschesdo.hxx8
-rw-r--r--filter/source/msfilter/makefile.mk10
-rw-r--r--filter/source/msfilter/makefile.pmk6
-rw-r--r--filter/source/msfilter/mscodec.cxx5
-rw-r--r--filter/source/msfilter/msdffimp.cxx50
-rw-r--r--filter/source/msfilter/msfiltertracer.cxx5
-rw-r--r--filter/source/msfilter/msocximex.cxx5
-rw-r--r--filter/source/msfilter/msoleexp.cxx5
-rw-r--r--filter/source/msfilter/msvbahelper.cxx384
-rw-r--r--filter/source/msfilter/msvbasic.cxx5
-rw-r--r--filter/source/msfilter/msvbasic.hxx5
-rw-r--r--filter/source/msfilter/powerpoint/makefile.mk6
-rw-r--r--filter/source/msfilter/powerpoint/pptcom.hxx5
-rw-r--r--filter/source/msfilter/powerpoint/pptimporter.cxx5
-rw-r--r--filter/source/msfilter/powerpoint/pptimporter.hxx5
-rw-r--r--filter/source/msfilter/powerpoint/pptimporteruno.cxx5
-rw-r--r--filter/source/msfilter/powerpoint/ppttoxml.cxx5
-rw-r--r--filter/source/msfilter/powerpoint/ppttoxml.hxx5
-rw-r--r--filter/source/msfilter/svdfppt.cxx60
-rw-r--r--filter/source/msfilter/svxmsbas.cxx5
-rw-r--r--filter/source/msfilter/svxmsbas2.cxx5
-rw-r--r--filter/source/msfilter/viscache.hxx5
-rw-r--r--filter/source/pdf/impdialog.cxx5
-rw-r--r--filter/source/pdf/impdialog.hrc5
-rw-r--r--filter/source/pdf/impdialog.hxx5
-rw-r--r--filter/source/pdf/impdialog.src5
-rw-r--r--filter/source/pdf/makefile.mk6
-rw-r--r--filter/source/pdf/pdf.hrc5
-rw-r--r--filter/source/pdf/pdf.src5
-rw-r--r--filter/source/pdf/pdfdialog.cxx5
-rw-r--r--filter/source/pdf/pdfdialog.hxx5
-rw-r--r--filter/source/pdf/pdfexport.cxx30
-rw-r--r--filter/source/pdf/pdfexport.hxx5
-rw-r--r--filter/source/pdf/pdffilter.cxx5
-rw-r--r--filter/source/pdf/pdffilter.hxx5
-rw-r--r--filter/source/pdf/pdfuno.cxx5
-rw-r--r--filter/source/placeware/Base64Codec.cxx5
-rw-r--r--filter/source/placeware/Base64Codec.hxx5
-rw-r--r--filter/source/placeware/exporter.cxx5
-rw-r--r--filter/source/placeware/exporter.hxx5
-rw-r--r--filter/source/placeware/filter.cxx5
-rw-r--r--filter/source/placeware/makefile.mk6
-rw-r--r--filter/source/placeware/tempfile.cxx5
-rw-r--r--filter/source/placeware/tempfile.hxx5
-rw-r--r--filter/source/placeware/uno.cxx5
-rw-r--r--filter/source/placeware/zip.cxx5
-rw-r--r--filter/source/placeware/zip.hxx5
-rw-r--r--filter/source/placeware/zipfile.hxx5
-rw-r--r--filter/source/svg/SOTranscoder.java5
-rw-r--r--filter/source/svg/makefile.mk9
-rw-r--r--filter/source/svg/svgexport.cxx11
-rw-r--r--filter/source/svg/svgfilter.cxx5
-rw-r--r--filter/source/svg/svgfilter.hxx7
-rw-r--r--filter/source/svg/svgfontexport.cxx5
-rw-r--r--filter/source/svg/svgfontexport.hxx5
-rw-r--r--filter/source/svg/svgimport.cxx5
-rw-r--r--filter/source/svg/svgscript.hxx5
-rw-r--r--filter/source/svg/svguno.cxx5
-rw-r--r--filter/source/svg/svgwriter.cxx5
-rw-r--r--filter/source/svg/svgwriter.hxx5
-rw-r--r--filter/source/t602/filterenv.cxx5
-rw-r--r--filter/source/t602/makefile.mk6
-rw-r--r--filter/source/t602/t602filter.cxx5
-rw-r--r--filter/source/t602/t602filter.hrc5
-rw-r--r--filter/source/t602/t602filter.hxx5
-rw-r--r--filter/source/t602/t602filter.src5
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx6
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx5
-rw-r--r--filter/source/xmlfilteradaptor/genericfilter.cxx5
-rw-r--r--filter/source/xmlfilteradaptor/makefile.mk6
-rwxr-xr-xfilter/source/xmlfilteradaptor/streamwrap.cxx5
-rwxr-xr-xfilter/source/xmlfilteradaptor/streamwrap.hxx5
-rw-r--r--filter/source/xmlfilterdetect/fdcomp.cxx5
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.cxx6
-rw-r--r--filter/source/xmlfilterdetect/filterdetect.hxx5
-rw-r--r--filter/source/xmlfilterdetect/makefile.mk6
-rw-r--r--filter/source/xslt/common/math.xsl8
-rw-r--r--filter/source/xslt/common/measure_conversion.xsl6
-rw-r--r--filter/source/xslt/export/common/ooo2ms_docpr.xsl8
-rw-r--r--filter/source/xslt/export/spreadsheetml/formular.xsl8
-rw-r--r--filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl8
-rw-r--r--filter/source/xslt/export/spreadsheetml/style_mapping.xsl8
-rw-r--r--filter/source/xslt/export/spreadsheetml/styles.xsl8
-rw-r--r--filter/source/xslt/export/spreadsheetml/table.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_border.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_custom_draw.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_draw.xsl18
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_field.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_list.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_page.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_path.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_settings.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_table.xsl8
-rw-r--r--filter/source/xslt/export/wordml/ooo2wordml_text.xsl8
-rw-r--r--filter/source/xslt/import/common/ms2ooo_docpr.xsl8
-rw-r--r--filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_custom_draw.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_draw.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_field.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_list.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_page.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_path.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_settings.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_table.xsl8
-rw-r--r--filter/source/xslt/import/wordml/wordml2ooo_text.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/body.xsl50
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl50
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl50
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/table/table.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/table/table_columns.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/body.xsl5676
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/header.xsl972
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl8
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/table.xsl8
-rw-r--r--filter/source/xsltdialog/hidother.src5
-rw-r--r--filter/source/xsltdialog/makefile.mk6
-rw-r--r--filter/source/xsltdialog/typedetectionexport.cxx5
-rw-r--r--filter/source/xsltdialog/typedetectionexport.hxx5
-rw-r--r--filter/source/xsltdialog/typedetectionimport.cxx5
-rw-r--r--filter/source/xsltdialog/typedetectionimport.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfileview.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfileview.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfileview.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfileview.src5
-rw-r--r--filter/source/xsltdialog/xmlfiltercommon.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltercommon.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogstrings.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogstrings.src5
-rw-r--r--filter/source/xsltdialog/xmlfilterhelpids.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.src5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.src5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.src5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.src5
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hrc5
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.src5
-rw-r--r--filter/source/xsltfilter/Base64.java5
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx5
-rw-r--r--filter/source/xsltfilter/XSLTFilterOLEExtracter.java10
-rw-r--r--filter/source/xsltfilter/XSLTransformer.java10
-rw-r--r--filter/source/xsltfilter/fla.cxx5
-rw-r--r--filter/source/xsltfilter/fla.hxx5
-rw-r--r--filter/source/xsltfilter/makefile.mk6
-rw-r--r--filter/source/xsltvalidate/XSLTValidate.java5
-rw-r--r--filter/source/xsltvalidate/makefile.mk6
-rw-r--r--hwpfilter/inc/makefile.mk6
-rw-r--r--hwpfilter/inc/pch/precompiled_hwpfilter.cxx5
-rw-r--r--hwpfilter/inc/pch/precompiled_hwpfilter.hxx5
-rw-r--r--hwpfilter/source/attributes.cxx5
-rw-r--r--hwpfilter/source/attributes.hxx5
-rw-r--r--hwpfilter/source/cspline.cpp5
-rw-r--r--hwpfilter/source/cspline.h5
-rw-r--r--hwpfilter/source/datecode.h5
-rw-r--r--hwpfilter/source/drawdef.h5
-rw-r--r--hwpfilter/source/drawing.h5
-rw-r--r--hwpfilter/source/fontmap.cpp5
-rw-r--r--hwpfilter/source/formula.cpp5
-rw-r--r--hwpfilter/source/formula.h5
-rw-r--r--hwpfilter/source/grammar.cpp5
-rw-r--r--hwpfilter/source/grammar.h5
-rw-r--r--hwpfilter/source/hbox.cpp5
-rw-r--r--hwpfilter/source/hbox.h5
-rw-r--r--hwpfilter/source/hcode.cpp5
-rw-r--r--hwpfilter/source/hcode.h5
-rw-r--r--hwpfilter/source/hfont.cpp5
-rw-r--r--hwpfilter/source/hfont.h5
-rw-r--r--hwpfilter/source/hgzip.cpp5
-rw-r--r--hwpfilter/source/hgzip.h5
-rw-r--r--hwpfilter/source/himgutil.cpp5
-rw-r--r--hwpfilter/source/himgutil.h5
-rw-r--r--hwpfilter/source/hinfo.cpp5
-rw-r--r--hwpfilter/source/hinfo.h5
-rw-r--r--hwpfilter/source/hiodev.cpp5
-rw-r--r--hwpfilter/source/hiodev.h5
-rw-r--r--hwpfilter/source/hpara.cpp5
-rw-r--r--hwpfilter/source/hpara.h5
-rw-r--r--hwpfilter/source/hstream.cpp5
-rw-r--r--hwpfilter/source/hstream.h5
-rw-r--r--hwpfilter/source/hstyle.cpp5
-rw-r--r--hwpfilter/source/hstyle.h5
-rw-r--r--hwpfilter/source/htags.cpp5
-rw-r--r--hwpfilter/source/htags.h5
-rw-r--r--hwpfilter/source/hutil.cpp5
-rw-r--r--hwpfilter/source/hutil.h5
-rw-r--r--hwpfilter/source/hwpeq.cpp6
-rw-r--r--hwpfilter/source/hwpeq.h5
-rw-r--r--hwpfilter/source/hwpfile.cpp5
-rw-r--r--hwpfilter/source/hwpfile.h5
-rw-r--r--hwpfilter/source/hwplib.h5
-rw-r--r--hwpfilter/source/hwpread.cpp5
-rw-r--r--hwpfilter/source/hwpreader.cxx5
-rw-r--r--hwpfilter/source/hwpreader.hxx5
-rw-r--r--hwpfilter/source/list.hxx5
-rw-r--r--hwpfilter/source/makefile.mk6
-rw-r--r--hwpfilter/source/mapping.h5
-rw-r--r--hwpfilter/source/mzstring.cpp5
-rw-r--r--hwpfilter/source/mzstring.h5
-rw-r--r--hwpfilter/source/nodes.h5
-rw-r--r--hwpfilter/source/precompile.h5
-rw-r--r--hwpfilter/source/solver.cpp5
-rw-r--r--hwpfilter/source/solver.h5
-rw-r--r--oox/inc/oox/core/binarycodec.hxx5
-rw-r--r--oox/inc/oox/core/binaryfilterbase.hxx5
-rw-r--r--oox/inc/oox/core/contexthandler.hxx5
-rw-r--r--oox/inc/oox/core/contexthandler2.hxx5
-rw-r--r--oox/inc/oox/core/fasttokenhandler.hxx5
-rw-r--r--oox/inc/oox/core/filterbase.hxx5
-rw-r--r--oox/inc/oox/core/filterdetect.hxx5
-rw-r--r--oox/inc/oox/core/fragmenthandler.hxx5
-rw-r--r--oox/inc/oox/core/fragmenthandler2.hxx5
-rw-r--r--oox/inc/oox/core/recordparser.hxx5
-rw-r--r--oox/inc/oox/core/relations.hxx5
-rw-r--r--oox/inc/oox/core/relationshandler.hxx5
-rw-r--r--oox/inc/oox/core/xmlfilterbase.hxx5
-rw-r--r--oox/inc/oox/dllapi.h5
-rw-r--r--oox/inc/oox/drawingml/chart/axiscontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/axisconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/axismodel.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/chartcontextbase.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/chartconverter.hxx40
-rw-r--r--oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx126
-rw-r--r--oox/inc/oox/drawingml/chart/chartspaceconverter.hxx14
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacefragment.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacemodel.hxx7
-rw-r--r--oox/inc/oox/drawingml/chart/converterbase.hxx12
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/datasourceconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcemodel.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/modelbase.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/objectformatter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/plotareacontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/plotareaconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/plotareamodel.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/seriescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/seriesconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/seriesmodel.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/titlecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/titleconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/titlemodel.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupconverter.hxx6
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupmodel.hxx5
-rw-r--r--oox/inc/oox/drawingml/clrscheme.hxx5
-rw-r--r--oox/inc/oox/drawingml/clrschemecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/color.hxx5
-rw-r--r--oox/inc/oox/drawingml/colorchoicecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/connectorshapecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/customshapegeometry.hxx5
-rw-r--r--oox/inc/oox/drawingml/customshapeproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/diagram/datamodelcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/diagram/diagram.hxx5
-rw-r--r--oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx5
-rw-r--r--oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx5
-rw-r--r--oox/inc/oox/drawingml/drawingmltypes.hxx36
-rw-r--r--oox/inc/oox/drawingml/embeddedwavaudiofile.hxx5
-rw-r--r--oox/inc/oox/drawingml/fillproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/fillpropertiesgroupcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/graphicshapecontext.hxx14
-rw-r--r--oox/inc/oox/drawingml/guidcontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/lineproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/linepropertiescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/objectdefaultcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/shape.hxx14
-rw-r--r--oox/inc/oox/drawingml/shapecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/shapegroupcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/shapepropertiescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/shapestylecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/spdefcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/table/tablebackgroundstylecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablecell.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablecellcontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablepartstylecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tableproperties.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablerow.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablerowcontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestyle.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestylecellstylecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestylecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestylelist.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestylepart.hxx6
-rw-r--r--oox/inc/oox/drawingml/table/tablestyletextstylecontext.hxx6
-rw-r--r--oox/inc/oox/drawingml/textbody.hxx5
-rw-r--r--oox/inc/oox/drawingml/textbodycontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textbodyproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/textbodypropertiescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textcharacterproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/textcharacterpropertiescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textfield.hxx5
-rw-r--r--oox/inc/oox/drawingml/textfieldcontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textfont.hxx5
-rw-r--r--oox/inc/oox/drawingml/textliststyle.hxx5
-rw-r--r--oox/inc/oox/drawingml/textliststylecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textparagraph.hxx5
-rw-r--r--oox/inc/oox/drawingml/textparagraphproperties.hxx5
-rw-r--r--oox/inc/oox/drawingml/textparagraphpropertiescontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/textrun.hxx5
-rw-r--r--oox/inc/oox/drawingml/textspacing.hxx5
-rw-r--r--oox/inc/oox/drawingml/theme.hxx5
-rw-r--r--oox/inc/oox/drawingml/themeelementscontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/themefragmenthandler.hxx5
-rw-r--r--oox/inc/oox/drawingml/transform2dcontext.hxx5
-rw-r--r--oox/inc/oox/dump/biffdumper.hxx5
-rw-r--r--oox/inc/oox/dump/dffdumper.hxx12
-rw-r--r--oox/inc/oox/dump/dumperbase.hxx42
-rw-r--r--oox/inc/oox/dump/oledumper.hxx5
-rw-r--r--oox/inc/oox/dump/pptxdumper.hxx5
-rw-r--r--oox/inc/oox/dump/xlsbdumper.hxx5
-rw-r--r--oox/inc/oox/export/shapes.hxx5
-rw-r--r--oox/inc/oox/export/utils.hxx5
-rw-r--r--oox/inc/oox/export/vmlexport.hxx5
-rw-r--r--oox/inc/oox/helper/attributelist.hxx5
-rw-r--r--oox/inc/oox/helper/binaryinputstream.hxx5
-rw-r--r--oox/inc/oox/helper/binaryoutputstream.hxx5
-rw-r--r--oox/inc/oox/helper/binarystreambase.hxx5
-rw-r--r--oox/inc/oox/helper/containerhelper.hxx5
-rw-r--r--oox/inc/oox/helper/graphichelper.hxx5
-rw-r--r--oox/inc/oox/helper/helper.hxx5
-rw-r--r--oox/inc/oox/helper/modelobjecthelper.hxx5
-rw-r--r--oox/inc/oox/helper/olestorage.hxx5
-rw-r--r--oox/inc/oox/helper/progressbar.hxx5
-rw-r--r--oox/inc/oox/helper/propertymap.hxx5
-rw-r--r--oox/inc/oox/helper/propertyset.hxx5
-rw-r--r--oox/inc/oox/helper/recordinputstream.hxx5
-rw-r--r--oox/inc/oox/helper/storagebase.hxx5
-rw-r--r--oox/inc/oox/helper/zipstorage.hxx5
-rw-r--r--[-rwxr-xr-x]oox/inc/oox/ole/axbinaryreader.hxx5
-rw-r--r--oox/inc/oox/ole/axcontrol.hxx5
-rw-r--r--oox/inc/oox/ole/axcontrolfragment.hxx5
-rw-r--r--oox/inc/oox/ole/axcontrolhelper.hxx5
-rw-r--r--oox/inc/oox/ole/olehelper.hxx5
-rw-r--r--oox/inc/oox/ole/oleobjecthelper.hxx5
-rw-r--r--oox/inc/oox/ole/vbainputstream.hxx5
-rw-r--r--oox/inc/oox/ppt/animationspersist.hxx5
-rw-r--r--oox/inc/oox/ppt/backgroundproperties.hxx5
-rw-r--r--oox/inc/oox/ppt/headerfooter.hxx5
-rw-r--r--oox/inc/oox/ppt/layoutfragmenthandler.hxx5
-rw-r--r--oox/inc/oox/ppt/pptimport.hxx5
-rw-r--r--oox/inc/oox/ppt/pptshape.hxx7
-rw-r--r--oox/inc/oox/ppt/pptshapecontext.hxx5
-rw-r--r--oox/inc/oox/ppt/pptshapegroupcontext.hxx5
-rw-r--r--oox/inc/oox/ppt/pptshapepropertiescontext.hxx5
-rw-r--r--oox/inc/oox/ppt/presentationfragmenthandler.hxx5
-rw-r--r--oox/inc/oox/ppt/slidefragmenthandler.hxx5
-rw-r--r--oox/inc/oox/ppt/slidemastertextstylescontext.hxx5
-rw-r--r--oox/inc/oox/ppt/slidepersist.hxx5
-rw-r--r--oox/inc/oox/ppt/slidetimingcontext.hxx5
-rw-r--r--oox/inc/oox/ppt/slidetransition.hxx5
-rw-r--r--oox/inc/oox/ppt/slidetransitioncontext.hxx5
-rw-r--r--oox/inc/oox/ppt/soundactioncontext.hxx5
-rw-r--r--oox/inc/oox/ppt/timenode.hxx5
-rw-r--r--oox/inc/oox/ppt/timenodelistcontext.hxx5
-rw-r--r--oox/inc/oox/token/propertylist.hxx5
-rw-r--r--oox/inc/oox/token/tokenmap.hxx5
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx7
-rw-r--r--oox/inc/oox/vml/vmldrawingfragment.hxx5
-rw-r--r--oox/inc/oox/vml/vmlformatting.hxx5
-rw-r--r--oox/inc/oox/vml/vmlinputstream.hxx5
-rw-r--r--oox/inc/oox/vml/vmlshape.hxx7
-rw-r--r--oox/inc/oox/vml/vmlshapecontainer.hxx5
-rw-r--r--oox/inc/oox/vml/vmlshapecontext.hxx5
-rw-r--r--oox/inc/oox/xls/addressconverter.hxx5
-rw-r--r--oox/inc/oox/xls/autofiltercontext.hxx5
-rw-r--r--oox/inc/oox/xls/biffcodec.hxx5
-rw-r--r--oox/inc/oox/xls/biffdetector.hxx5
-rw-r--r--oox/inc/oox/xls/biffhelper.hxx5
-rw-r--r--oox/inc/oox/xls/biffinputstream.hxx5
-rw-r--r--oox/inc/oox/xls/biffoutputstream.hxx5
-rw-r--r--oox/inc/oox/xls/chartsheetfragment.hxx5
-rw-r--r--oox/inc/oox/xls/commentsbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/commentsfragment.hxx5
-rw-r--r--oox/inc/oox/xls/condformatbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/condformatcontext.hxx5
-rw-r--r--oox/inc/oox/xls/connectionsfragment.hxx5
-rw-r--r--oox/inc/oox/xls/defnamesbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/drawingfragment.hxx25
-rw-r--r--oox/inc/oox/xls/excelchartconverter.hxx6
-rw-r--r--oox/inc/oox/xls/excelfilter.hxx5
-rw-r--r--oox/inc/oox/xls/excelhandlers.hxx5
-rw-r--r--oox/inc/oox/xls/externallinkbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/externallinkfragment.hxx5
-rw-r--r--oox/inc/oox/xls/formulabase.hxx5
-rw-r--r--oox/inc/oox/xls/formulaparser.hxx5
-rw-r--r--oox/inc/oox/xls/numberformatsbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/ooxformulaparser.hxx5
-rw-r--r--oox/inc/oox/xls/pagesettings.hxx5
-rw-r--r--oox/inc/oox/xls/pivotcachebuffer.hxx5
-rw-r--r--oox/inc/oox/xls/pivotcachefragment.hxx5
-rw-r--r--oox/inc/oox/xls/pivottablebuffer.hxx5
-rw-r--r--oox/inc/oox/xls/pivottablefragment.hxx5
-rw-r--r--oox/inc/oox/xls/querytablefragment.hxx5
-rw-r--r--oox/inc/oox/xls/richstring.hxx5
-rw-r--r--oox/inc/oox/xls/richstringcontext.hxx5
-rw-r--r--oox/inc/oox/xls/scenariobuffer.hxx5
-rw-r--r--oox/inc/oox/xls/scenariocontext.hxx5
-rw-r--r--oox/inc/oox/xls/sharedformulabuffer.hxx5
-rw-r--r--oox/inc/oox/xls/sharedstringsbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/sharedstringsfragment.hxx5
-rw-r--r--oox/inc/oox/xls/sheetdatacontext.hxx5
-rw-r--r--oox/inc/oox/xls/stylesbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/stylesfragment.hxx5
-rw-r--r--oox/inc/oox/xls/tablebuffer.hxx5
-rw-r--r--oox/inc/oox/xls/tablefragment.hxx5
-rw-r--r--oox/inc/oox/xls/themebuffer.hxx5
-rw-r--r--oox/inc/oox/xls/unitconverter.hxx5
-rw-r--r--oox/inc/oox/xls/viewsettings.hxx5
-rw-r--r--oox/inc/oox/xls/webquerybuffer.hxx5
-rw-r--r--oox/inc/oox/xls/workbookfragment.hxx5
-rw-r--r--oox/inc/oox/xls/workbookhelper.hxx7
-rw-r--r--oox/inc/oox/xls/workbooksettings.hxx5
-rw-r--r--oox/inc/oox/xls/worksheetbuffer.hxx5
-rw-r--r--oox/inc/oox/xls/worksheetfragment.hxx5
-rw-r--r--oox/inc/oox/xls/worksheethelper.hxx5
-rw-r--r--oox/inc/oox/xls/worksheetsettings.hxx5
-rw-r--r--oox/source/core/binarycodec.cxx5
-rw-r--r--oox/source/core/binaryfilterbase.cxx5
-rw-r--r--oox/source/core/contexthandler.cxx5
-rw-r--r--oox/source/core/contexthandler2.cxx5
-rw-r--r--oox/source/core/facreg.cxx5
-rw-r--r--oox/source/core/fasttokenhandler.cxx5
-rw-r--r--oox/source/core/filterbase.cxx5
-rw-r--r--oox/source/core/filterdetect.cxx5
-rw-r--r--oox/source/core/fragmenthandler.cxx5
-rw-r--r--oox/source/core/fragmenthandler2.cxx5
-rw-r--r--oox/source/core/makefile.mk8
-rw-r--r--oox/source/core/recordparser.cxx5
-rw-r--r--oox/source/core/relations.cxx5
-rw-r--r--oox/source/core/relationshandler.cxx5
-rw-r--r--oox/source/core/xmlfilterbase.cxx6
-rw-r--r--oox/source/docprop/docprophandler.cxx5
-rw-r--r--oox/source/docprop/docprophandler.hxx5
-rw-r--r--oox/source/docprop/makefile.mk6
-rw-r--r--oox/source/docprop/ooxmldocpropimport.cxx5
-rw-r--r--oox/source/docprop/ooxmldocpropimport.hxx5
-rw-r--r--oox/source/drawingml/chart/axiscontext.cxx5
-rw-r--r--oox/source/drawingml/chart/axisconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/axismodel.cxx5
-rw-r--r--oox/source/drawingml/chart/chartcontextbase.cxx6
-rw-r--r--oox/source/drawingml/chart/chartconverter.cxx18
-rw-r--r--oox/source/drawingml/chart/chartdrawingfragment.cxx239
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx69
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx9
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx6
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx29
-rw-r--r--oox/source/drawingml/chart/datasourcecontext.cxx6
-rw-r--r--oox/source/drawingml/chart/datasourceconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/datasourcemodel.cxx6
-rw-r--r--oox/source/drawingml/chart/makefile.mk9
-rw-r--r--oox/source/drawingml/chart/modelbase.cxx6
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx6
-rw-r--r--oox/source/drawingml/chart/plotareacontext.cxx5
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/plotareamodel.cxx5
-rw-r--r--oox/source/drawingml/chart/seriescontext.cxx5
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/seriesmodel.cxx5
-rw-r--r--oox/source/drawingml/chart/titlecontext.cxx6
-rw-r--r--oox/source/drawingml/chart/titleconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/titlemodel.cxx6
-rw-r--r--oox/source/drawingml/chart/typegroupcontext.cxx5
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/typegroupmodel.cxx5
-rw-r--r--oox/source/drawingml/clrscheme.cxx5
-rw-r--r--oox/source/drawingml/clrschemecontext.cxx5
-rw-r--r--oox/source/drawingml/color.cxx5
-rw-r--r--oox/source/drawingml/colorchoicecontext.cxx5
-rw-r--r--oox/source/drawingml/connectorshapecontext.cxx5
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx5
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx5
-rw-r--r--oox/source/drawingml/diagram/datamodelcontext.cxx5
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx5
-rw-r--r--oox/source/drawingml/diagram/diagramdefinitioncontext.cxx5
-rw-r--r--oox/source/drawingml/diagram/diagramdefinitioncontext.hxx5
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.cxx5
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx5
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx5
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.hxx5
-rw-r--r--oox/source/drawingml/diagram/makefile.mk6
-rw-r--r--oox/source/drawingml/drawingmltypes.cxx5
-rw-r--r--oox/source/drawingml/embeddedwavaudiofile.cxx5
-rw-r--r--oox/source/drawingml/fillproperties.cxx5
-rw-r--r--oox/source/drawingml/fillpropertiesgroupcontext.cxx5
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx38
-rw-r--r--oox/source/drawingml/guidcontext.cxx6
-rw-r--r--oox/source/drawingml/hyperlinkcontext.cxx5
-rw-r--r--oox/source/drawingml/hyperlinkcontext.hxx5
-rw-r--r--oox/source/drawingml/lineproperties.cxx5
-rw-r--r--oox/source/drawingml/linepropertiescontext.cxx5
-rw-r--r--oox/source/drawingml/makefile.mk8
-rw-r--r--oox/source/drawingml/objectdefaultcontext.cxx5
-rw-r--r--oox/source/drawingml/shape.cxx33
-rw-r--r--oox/source/drawingml/shapecontext.cxx5
-rw-r--r--oox/source/drawingml/shapegroupcontext.cxx7
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx5
-rw-r--r--oox/source/drawingml/shapestylecontext.cxx5
-rw-r--r--oox/source/drawingml/spdefcontext.cxx5
-rw-r--r--oox/source/drawingml/table/makefile.mk6
-rw-r--r--oox/source/drawingml/table/tablebackgroundstylecontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablecell.cxx5
-rw-r--r--oox/source/drawingml/table/tablecellcontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablecontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablepartstylecontext.cxx5
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx5
-rw-r--r--oox/source/drawingml/table/tablerow.cxx5
-rw-r--r--oox/source/drawingml/table/tablerowcontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablestyle.cxx5
-rw-r--r--oox/source/drawingml/table/tablestylecellstylecontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablestylecontext.cxx5
-rw-r--r--oox/source/drawingml/table/tablestylelist.cxx5
-rw-r--r--oox/source/drawingml/table/tablestylelistfragmenthandler.cxx5
-rw-r--r--oox/source/drawingml/table/tablestylepart.cxx5
-rw-r--r--oox/source/drawingml/table/tablestyletextstylecontext.cxx5
-rw-r--r--oox/source/drawingml/textbody.cxx5
-rw-r--r--oox/source/drawingml/textbodycontext.cxx5
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx5
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx5
-rw-r--r--oox/source/drawingml/textcharacterpropertiescontext.cxx5
-rw-r--r--oox/source/drawingml/textfield.cxx5
-rw-r--r--oox/source/drawingml/textfieldcontext.cxx5
-rw-r--r--oox/source/drawingml/textfont.cxx5
-rw-r--r--oox/source/drawingml/textliststyle.cxx5
-rw-r--r--oox/source/drawingml/textliststylecontext.cxx5
-rw-r--r--oox/source/drawingml/textparagraph.cxx5
-rw-r--r--oox/source/drawingml/textparagraphproperties.cxx5
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx5
-rw-r--r--oox/source/drawingml/textrun.cxx5
-rw-r--r--oox/source/drawingml/textspacingcontext.cxx5
-rw-r--r--oox/source/drawingml/textspacingcontext.hxx5
-rw-r--r--oox/source/drawingml/texttabstoplistcontext.cxx5
-rw-r--r--oox/source/drawingml/texttabstoplistcontext.hxx5
-rw-r--r--oox/source/drawingml/theme.cxx5
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx5
-rw-r--r--oox/source/drawingml/themefragmenthandler.cxx5
-rw-r--r--oox/source/drawingml/transform2dcontext.cxx5
-rw-r--r--oox/source/dump/biffdumper.cxx5
-rw-r--r--oox/source/dump/biffdumper.ini7
-rw-r--r--oox/source/dump/dffdumper.cxx244
-rw-r--r--oox/source/dump/dffdumper.ini712
-rw-r--r--oox/source/dump/dumperbase.cxx185
-rw-r--r--oox/source/dump/dumperbase.ini40
-rw-r--r--oox/source/dump/makefile.mk8
-rw-r--r--oox/source/dump/oledumper.cxx15
-rw-r--r--oox/source/dump/oledumper.ini34
-rw-r--r--oox/source/dump/pptxdumper.cxx5
-rw-r--r--oox/source/dump/xlsbdumper.cxx5
-rw-r--r--oox/source/export/drawingml.cxx7
-rw-r--r--oox/source/export/preset-definitions-to-shape-types.pl2
-rw-r--r--oox/source/export/presetShapeDefinitions.xml39830
-rw-r--r--oox/source/export/shapes.cxx7
-rw-r--r--oox/source/export/vmlexport.cxx5
-rw-r--r--oox/source/helper/attributelist.cxx5
-rw-r--r--oox/source/helper/binaryinputstream.cxx5
-rw-r--r--oox/source/helper/binaryoutputstream.cxx5
-rw-r--r--oox/source/helper/binarystreambase.cxx5
-rw-r--r--oox/source/helper/containerhelper.cxx5
-rw-r--r--oox/source/helper/graphichelper.cxx5
-rw-r--r--oox/source/helper/makefile.mk8
-rw-r--r--oox/source/helper/modelobjecthelper.cxx5
-rw-r--r--oox/source/helper/olestorage.cxx5
-rw-r--r--oox/source/helper/progressbar.cxx5
-rw-r--r--oox/source/helper/propertymap.cxx5
-rw-r--r--oox/source/helper/propertyset.cxx5
-rw-r--r--oox/source/helper/recordinputstream.cxx5
-rw-r--r--oox/source/helper/storagebase.cxx5
-rw-r--r--oox/source/helper/zipstorage.cxx5
-rw-r--r--[-rwxr-xr-x]oox/source/ole/axbinaryreader.cxx5
-rw-r--r--oox/source/ole/axcontrol.cxx5
-rw-r--r--oox/source/ole/axcontrolfragment.cxx5
-rw-r--r--oox/source/ole/axcontrolhelper.cxx5
-rw-r--r--oox/source/ole/makefile.mk8
-rw-r--r--oox/source/ole/olehelper.cxx5
-rw-r--r--oox/source/ole/oleobjecthelper.cxx5
-rw-r--r--oox/source/ole/vbainputstream.cxx5
-rw-r--r--oox/source/ppt/animationspersist.cxx5
-rw-r--r--oox/source/ppt/animationtypes.cxx5
-rw-r--r--oox/source/ppt/animationtypes.hxx5
-rw-r--r--oox/source/ppt/animvariantcontext.cxx5
-rw-r--r--oox/source/ppt/animvariantcontext.hxx5
-rw-r--r--oox/source/ppt/backgroundproperties.cxx5
-rw-r--r--oox/source/ppt/buildlistcontext.cxx5
-rw-r--r--oox/source/ppt/buildlistcontext.hxx5
-rw-r--r--oox/source/ppt/commonbehaviorcontext.cxx5
-rw-r--r--oox/source/ppt/commonbehaviorcontext.hxx5
-rw-r--r--oox/source/ppt/commontimenodecontext.cxx5
-rw-r--r--oox/source/ppt/commontimenodecontext.hxx5
-rw-r--r--oox/source/ppt/conditioncontext.cxx5
-rw-r--r--oox/source/ppt/conditioncontext.hxx5
-rw-r--r--oox/source/ppt/customshowlistcontext.cxx5
-rw-r--r--oox/source/ppt/customshowlistcontext.hxx5
-rw-r--r--oox/source/ppt/headerfootercontext.cxx5
-rw-r--r--oox/source/ppt/headerfootercontext.hxx5
-rw-r--r--oox/source/ppt/layoutfragmenthandler.cxx5
-rw-r--r--oox/source/ppt/makefile.mk6
-rw-r--r--oox/source/ppt/pptfilterhelpers.cxx5
-rw-r--r--oox/source/ppt/pptfilterhelpers.hxx5
-rw-r--r--oox/source/ppt/pptimport.cxx5
-rw-r--r--oox/source/ppt/pptshape.cxx11
-rw-r--r--oox/source/ppt/pptshapecontext.cxx5
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx7
-rw-r--r--oox/source/ppt/pptshapepropertiescontext.cxx5
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx5
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx5
-rw-r--r--oox/source/ppt/slidemastertextstylescontext.cxx5
-rw-r--r--oox/source/ppt/slidepersist.cxx9
-rw-r--r--oox/source/ppt/slidetimingcontext.cxx5
-rw-r--r--oox/source/ppt/slidetransition.cxx5
-rw-r--r--oox/source/ppt/slidetransitioncontext.cxx5
-rw-r--r--oox/source/ppt/soundactioncontext.cxx5
-rw-r--r--oox/source/ppt/timeanimvaluecontext.cxx5
-rw-r--r--oox/source/ppt/timeanimvaluecontext.hxx5
-rw-r--r--oox/source/ppt/timenode.cxx5
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx5
-rw-r--r--oox/source/ppt/timetargetelementcontext.cxx5
-rw-r--r--oox/source/ppt/timetargetelementcontext.hxx5
-rw-r--r--oox/source/shape/FastTokenHandlerService.cxx5
-rw-r--r--oox/source/shape/FastTokenHandlerService.hxx5
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx9
-rw-r--r--oox/source/shape/ShapeContextHandler.hxx5
-rw-r--r--oox/source/shape/ShapeFilterBase.cxx5
-rw-r--r--oox/source/shape/ShapeFilterBase.hxx5
-rw-r--r--oox/source/shape/makefile.mk6
-rw-r--r--oox/source/token/gennamespaces.pl1
-rw-r--r--oox/source/token/makefile.mk8
-rw-r--r--oox/source/token/namespaces.txt1
-rw-r--r--oox/source/token/propertylist.cxx5
-rw-r--r--oox/source/token/tokenmap.cxx5
-rw-r--r--oox/source/vml/makefile.mk8
-rw-r--r--oox/source/vml/vmldrawing.cxx5
-rw-r--r--oox/source/vml/vmldrawingfragment.cxx5
-rw-r--r--oox/source/vml/vmlformatting.cxx5
-rw-r--r--oox/source/vml/vmlinputstream.cxx5
-rw-r--r--oox/source/vml/vmlshape.cxx5
-rw-r--r--oox/source/vml/vmlshapecontainer.cxx5
-rw-r--r--oox/source/vml/vmlshapecontext.cxx5
-rw-r--r--oox/source/xls/addressconverter.cxx5
-rw-r--r--oox/source/xls/autofiltercontext.cxx5
-rw-r--r--oox/source/xls/biffcodec.cxx5
-rw-r--r--oox/source/xls/biffdetector.cxx5
-rw-r--r--oox/source/xls/biffhelper.cxx5
-rw-r--r--oox/source/xls/biffinputstream.cxx5
-rw-r--r--oox/source/xls/biffoutputstream.cxx5
-rw-r--r--oox/source/xls/chartsheetfragment.cxx5
-rw-r--r--oox/source/xls/commentsbuffer.cxx5
-rw-r--r--oox/source/xls/commentsfragment.cxx5
-rw-r--r--oox/source/xls/condformatbuffer.cxx5
-rw-r--r--oox/source/xls/condformatcontext.cxx5
-rw-r--r--oox/source/xls/connectionsfragment.cxx5
-rw-r--r--oox/source/xls/defnamesbuffer.cxx5
-rw-r--r--oox/source/xls/drawingfragment.cxx65
-rw-r--r--oox/source/xls/excelchartconverter.cxx6
-rw-r--r--oox/source/xls/excelfilter.cxx5
-rw-r--r--oox/source/xls/excelhandlers.cxx5
-rw-r--r--oox/source/xls/externallinkbuffer.cxx5
-rw-r--r--oox/source/xls/externallinkfragment.cxx5
-rw-r--r--oox/source/xls/formulabase.cxx5
-rw-r--r--oox/source/xls/formulaparser.cxx5
-rw-r--r--oox/source/xls/makefile.mk8
-rw-r--r--oox/source/xls/numberformatsbuffer.cxx5
-rw-r--r--oox/source/xls/ooxformulaparser.cxx5
-rw-r--r--oox/source/xls/pagesettings.cxx5
-rw-r--r--oox/source/xls/pivotcachebuffer.cxx5
-rw-r--r--oox/source/xls/pivotcachefragment.cxx5
-rw-r--r--oox/source/xls/pivottablebuffer.cxx5
-rw-r--r--oox/source/xls/pivottablefragment.cxx5
-rw-r--r--oox/source/xls/querytablefragment.cxx5
-rw-r--r--oox/source/xls/richstring.cxx5
-rw-r--r--oox/source/xls/richstringcontext.cxx5
-rw-r--r--oox/source/xls/scenariobuffer.cxx5
-rw-r--r--oox/source/xls/scenariocontext.cxx5
-rw-r--r--oox/source/xls/sharedformulabuffer.cxx5
-rw-r--r--oox/source/xls/sharedstringsbuffer.cxx5
-rw-r--r--oox/source/xls/sharedstringsfragment.cxx5
-rw-r--r--oox/source/xls/sheetdatacontext.cxx5
-rw-r--r--oox/source/xls/stylesbuffer.cxx6
-rw-r--r--oox/source/xls/stylesfragment.cxx5
-rw-r--r--oox/source/xls/tablebuffer.cxx5
-rw-r--r--oox/source/xls/tablefragment.cxx5
-rw-r--r--oox/source/xls/themebuffer.cxx5
-rw-r--r--oox/source/xls/unitconverter.cxx5
-rw-r--r--oox/source/xls/viewsettings.cxx7
-rw-r--r--oox/source/xls/webquerybuffer.cxx5
-rw-r--r--oox/source/xls/workbookfragment.cxx5
-rw-r--r--oox/source/xls/workbookhelper.cxx12
-rw-r--r--oox/source/xls/workbooksettings.cxx5
-rw-r--r--oox/source/xls/worksheetbuffer.cxx5
-rw-r--r--oox/source/xls/worksheetfragment.cxx5
-rw-r--r--oox/source/xls/worksheethelper.cxx5
-rw-r--r--oox/source/xls/worksheetsettings.cxx5
-rw-r--r--oox/util/makefile.mk8
-rw-r--r--oox/util/makefile.pmk6
-rw-r--r--unoxml/qa/complex/RDFRepositoryTest.java8
-rw-r--r--unoxml/qa/complex/makefile.mk8
-rw-r--r--unoxml/source/dom/attr.cxx5
-rw-r--r--unoxml/source/dom/attr.hxx5
-rw-r--r--unoxml/source/dom/attributesmap.cxx5
-rw-r--r--unoxml/source/dom/attributesmap.hxx5
-rw-r--r--unoxml/source/dom/cdatasection.cxx5
-rw-r--r--unoxml/source/dom/cdatasection.hxx5
-rw-r--r--unoxml/source/dom/characterdata.cxx5
-rw-r--r--unoxml/source/dom/characterdata.hxx5
-rw-r--r--unoxml/source/dom/childlist.cxx5
-rw-r--r--unoxml/source/dom/childlist.hxx5
-rw-r--r--unoxml/source/dom/comment.cxx5
-rw-r--r--unoxml/source/dom/comment.hxx5
-rw-r--r--unoxml/source/dom/document.cxx5
-rw-r--r--unoxml/source/dom/document.hxx5
-rw-r--r--unoxml/source/dom/documentbuilder.cxx5
-rw-r--r--unoxml/source/dom/documentbuilder.hxx5
-rw-r--r--unoxml/source/dom/documentfragment.cxx5
-rw-r--r--unoxml/source/dom/documentfragment.hxx5
-rw-r--r--unoxml/source/dom/documenttype.cxx5
-rw-r--r--unoxml/source/dom/documenttype.hxx5
-rw-r--r--unoxml/source/dom/domimplementation.cxx5
-rw-r--r--unoxml/source/dom/domimplementation.hxx5
-rw-r--r--unoxml/source/dom/element.cxx5
-rw-r--r--unoxml/source/dom/element.hxx5
-rw-r--r--unoxml/source/dom/elementlist.cxx5
-rw-r--r--unoxml/source/dom/elementlist.hxx5
-rw-r--r--unoxml/source/dom/entitiesmap.cxx5
-rw-r--r--unoxml/source/dom/entitiesmap.hxx5
-rw-r--r--unoxml/source/dom/entity.cxx5
-rw-r--r--unoxml/source/dom/entity.hxx5
-rw-r--r--unoxml/source/dom/entityreference.cxx5
-rw-r--r--unoxml/source/dom/entityreference.hxx5
-rw-r--r--unoxml/source/dom/makefile.mk6
-rw-r--r--unoxml/source/dom/node.cxx5
-rw-r--r--unoxml/source/dom/node.hxx5
-rw-r--r--unoxml/source/dom/notation.cxx5
-rw-r--r--unoxml/source/dom/notation.hxx5
-rw-r--r--unoxml/source/dom/notationsmap.cxx5
-rw-r--r--unoxml/source/dom/notationsmap.hxx5
-rw-r--r--unoxml/source/dom/processinginstruction.cxx5
-rw-r--r--unoxml/source/dom/processinginstruction.hxx5
-rw-r--r--unoxml/source/dom/saxbuilder.cxx5
-rw-r--r--unoxml/source/dom/saxbuilder.hxx5
-rw-r--r--unoxml/source/dom/text.cxx5
-rw-r--r--unoxml/source/dom/text.hxx5
-rw-r--r--unoxml/source/events/makefile.mk6
-rw-r--r--unoxml/source/events/testlistener.cxx5
-rw-r--r--unoxml/source/events/testlistener.hxx5
-rw-r--r--unoxml/source/rdf/CBlankNode.cxx5
-rw-r--r--unoxml/source/rdf/CLiteral.cxx5
-rw-r--r--unoxml/source/rdf/CNodes.hxx5
-rw-r--r--unoxml/source/rdf/CURI.cxx5
-rw-r--r--unoxml/source/rdf/librdf_repository.cxx5
-rw-r--r--unoxml/source/rdf/librdf_repository.hxx5
-rw-r--r--unoxml/source/rdf/librdf_services.cxx5
-rw-r--r--unoxml/source/rdf/makefile.mk8
-rw-r--r--unoxml/source/service/makefile.mk6
-rw-r--r--unoxml/source/service/services.cxx5
-rw-r--r--unoxml/source/xpath/makefile.mk6
-rw-r--r--unoxml/source/xpath/nodelist.cxx5
-rw-r--r--unoxml/source/xpath/nodelist.hxx5
-rw-r--r--unoxml/source/xpath/xpathapi.cxx5
-rw-r--r--unoxml/source/xpath/xpathapi.hxx5
-rw-r--r--unoxml/source/xpath/xpathobject.cxx5
-rw-r--r--unoxml/source/xpath/xpathobject.hxx5
-rw-r--r--unoxml/test/domtest.cxx5
-rw-r--r--unoxml/test/export.map6
-rw-r--r--unoxml/test/makefile.mk8
-rw-r--r--writerfilter/inc/WriterFilterDllApi.hxx5
-rw-r--r--writerfilter/inc/dmapper/DomainMapper.hxx5
-rw-r--r--writerfilter/inc/doctok/WW8Document.hxx5
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/OutputWithDepth.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/QNameToString.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/SubSequence.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/TableData.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/TableManager.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/TagLogger.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/WW8ResourceModel.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/exceptions.hxx5
-rw-r--r--writerfilter/inc/resourcemodel/util.hxx5
-rw-r--r--writerfilter/inc/rtftok/RTFInputSource.hxx29
-rw-r--r--writerfilter/inc/rtftok/RTFParseException.hxx29
-rw-r--r--writerfilter/inc/rtftok/RTFScanner.hxx29
-rw-r--r--writerfilter/inc/rtftok/RTFScannerHandler.hxx29
-rw-r--r--writerfilter/inc/writerfilter.mk6
-rw-r--r--writerfilter/qa/cppunittests/doctok/makefile.mk8
-rw-r--r--writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx27
-rw-r--r--writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx27
-rw-r--r--writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx27
-rw-r--r--writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx27
-rw-r--r--writerfilter/qa/cppunittests/odiapi/export.map6
-rw-r--r--writerfilter/qa/cppunittests/odiapi/makefile.mk8
-rw-r--r--writerfilter/qa/cppunittests/odiapi/testCore.cxx28
-rw-r--r--writerfilter/qa/cppunittests/odiapi/testProperty.cxx27
-rw-r--r--writerfilter/qa/cppunittests/qname/export.map6
-rw-r--r--writerfilter/qa/cppunittests/qname/makefile.mk8
-rw-r--r--writerfilter/qa/cppunittests/qname/testQName.cxx27
-rw-r--r--writerfilter/qa/cppunittests/sl/export.map6
-rw-r--r--writerfilter/qa/cppunittests/sl/makefile.mk8
-rw-r--r--writerfilter/qa/cppunittests/sl/testOD_SL.cxx27
-rw-r--r--writerfilter/qa/cppunittests/xxml/export.map6
-rw-r--r--writerfilter/qa/cppunittests/xxml/makefile.mk8
-rw-r--r--writerfilter/qa/cppunittests/xxml/testXXML.cxx26
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/BorderHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/CellMarginHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/CellMarginHandler.hxx6
-rw-r--r--writerfilter/source/dmapper/ConversionHelper.cxx6
-rw-r--r--writerfilter/source/dmapper/ConversionHelper.hxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.hxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.hxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx5
-rw-r--r--writerfilter/source/dmapper/FontTable.cxx5
-rw-r--r--writerfilter/source/dmapper/FontTable.hxx5
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx6
-rw-r--r--writerfilter/source/dmapper/GraphicImport.hxx5
-rw-r--r--writerfilter/source/dmapper/LFOTable.cxx5
-rw-r--r--writerfilter/source/dmapper/LFOTable.hxx5
-rw-r--r--writerfilter/source/dmapper/ListTable.cxx5
-rw-r--r--writerfilter/source/dmapper/ListTable.hxx5
-rw-r--r--writerfilter/source/dmapper/MeasureHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/MeasureHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx5
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.hxx5
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/OLEHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/PropertyIds.cxx5
-rw-r--r--writerfilter/source/dmapper/PropertyIds.hxx5
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx6
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx5
-rw-r--r--writerfilter/source/dmapper/SectionColumnHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/SectionColumnHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx5
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.hxx5
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/ThemeTable.cxx5
-rw-r--r--writerfilter/source/dmapper/ThemeTable.hxx5
-rw-r--r--writerfilter/source/dmapper/makefile.mk6
-rw-r--r--writerfilter/source/doctok/Dff.cxx5
-rw-r--r--writerfilter/source/doctok/Dff.hxx6
-rw-r--r--writerfilter/source/doctok/DffImpl.cxx5
-rw-r--r--writerfilter/source/doctok/PLCF.hxx5
-rw-r--r--writerfilter/source/doctok/WW8Annotation.cxx5
-rw-r--r--writerfilter/source/doctok/WW8BinTable.hxx5
-rw-r--r--writerfilter/source/doctok/WW8BinTableImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8BinTableImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8Clx.cxx5
-rw-r--r--writerfilter/source/doctok/WW8Clx.hxx5
-rw-r--r--writerfilter/source/doctok/WW8CpAndFc.cxx5
-rw-r--r--writerfilter/source/doctok/WW8CpAndFc.hxx5
-rw-r--r--writerfilter/source/doctok/WW8DocumentImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8DocumentImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8FKP.hxx5
-rw-r--r--writerfilter/source/doctok/WW8FKPImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8FKPImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8FontTable.cxx5
-rw-r--r--writerfilter/source/doctok/WW8LFOLevel.cxx6
-rw-r--r--writerfilter/source/doctok/WW8LFOTable.cxx6
-rw-r--r--writerfilter/source/doctok/WW8ListTable.cxx5
-rw-r--r--writerfilter/source/doctok/WW8OutputWithDepth.cxx5
-rw-r--r--writerfilter/source/doctok/WW8OutputWithDepth.hxx5
-rw-r--r--writerfilter/source/doctok/WW8Picture.cxx5
-rw-r--r--writerfilter/source/doctok/WW8PieceTable.hxx5
-rw-r--r--writerfilter/source/doctok/WW8PieceTableImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8PieceTableImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8PropertySetImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8PropertySetImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8ResourceModelImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8StreamImpl.cxx5
-rw-r--r--writerfilter/source/doctok/WW8StreamImpl.hxx5
-rw-r--r--writerfilter/source/doctok/WW8StructBase.cxx5
-rw-r--r--writerfilter/source/doctok/WW8StructBase.hxx5
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.cxx5
-rw-r--r--writerfilter/source/doctok/WW8Sttbf.hxx5
-rw-r--r--writerfilter/source/doctok/WW8StyleSheet.cxx5
-rw-r--r--writerfilter/source/doctok/WW8Table.cxx5
-rw-r--r--writerfilter/source/doctok/WW8Text.cxx5
-rw-r--r--writerfilter/source/doctok/WW8inc.xsl8
-rw-r--r--writerfilter/source/doctok/WW8sprms.xsl8
-rw-r--r--writerfilter/source/doctok/WW8xmi.xsl8
-rw-r--r--writerfilter/source/doctok/XNoteHelper.hxx5
-rw-r--r--writerfilter/source/doctok/XNoteHelperImpl.hxx5
-rw-r--r--writerfilter/source/doctok/analyzer.xsl8
-rw-r--r--writerfilter/source/doctok/doctokLoggers.hxx5
-rw-r--r--writerfilter/source/doctok/doctokutil.cxx5
-rw-r--r--writerfilter/source/doctok/escherdoc.xsl8
-rw-r--r--writerfilter/source/doctok/genqnametostr6
-rw-r--r--writerfilter/source/doctok/makefile.mk6
-rw-r--r--writerfilter/source/doctok/qnametostr.xsl8
-rw-r--r--writerfilter/source/doctok/qnametostrheader6
-rw-r--r--writerfilter/source/doctok/resourceidmapper.xsl9
-rw-r--r--writerfilter/source/doctok/resourceidmapperback.xsl9
-rw-r--r--writerfilter/source/doctok/resourceids.xsl12
-rw-r--r--writerfilter/source/doctok/resources.xsl12
-rw-r--r--writerfilter/source/doctok/resourcesimpl.xsl8
-rw-r--r--writerfilter/source/doctok/resourcetools.xsl12
-rw-r--r--writerfilter/source/doctok/sprmcodetostr.xsl8
-rw-r--r--writerfilter/source/doctok/sprmids.xsl12
-rw-r--r--writerfilter/source/doctok/tidyxmi.xsl8
-rw-r--r--writerfilter/source/doctok/util.hxx5
-rw-r--r--writerfilter/source/doctok/xmistat.xsl8
-rwxr-xr-xwriterfilter/source/doctok/xmitocpp6
-rw-r--r--writerfilter/source/filter/ImportFilter.cxx5
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx5
-rw-r--r--writerfilter/source/filter/WriterFilter.hxx5
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.cxx5
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.hxx5
-rw-r--r--writerfilter/source/filter/makefile.mk6
-rw-r--r--writerfilter/source/ooxml/Handler.cxx5
-rw-r--r--writerfilter/source/ooxml/Handler.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastHelper.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLParserState.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLParserState.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLStreamImpl.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLStreamImpl.hxx5
-rw-r--r--writerfilter/source/ooxml/RefAndPointer.hxx5
-rw-r--r--writerfilter/source/ooxml/analyzer.xsl8
-rw-r--r--writerfilter/source/ooxml/checkmodel.xsl8
-rw-r--r--writerfilter/source/ooxml/dummyannotate.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_shared-math.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_vml-main.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_vml-officeDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_vml-wordprocessingDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresources_wml.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_vml-main.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_vml-officeDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_vml-wordprocessingDrawing.xsl8
-rw-r--r--writerfilter/source/ooxml/fastresourcesimpl_wml.xsl8
-rw-r--r--writerfilter/source/ooxml/fasttokens.xsl8
-rw-r--r--writerfilter/source/ooxml/fasttokensimpl.xsl8
-rw-r--r--writerfilter/source/ooxml/gperffasttokenhandler.xsl8
-rw-r--r--writerfilter/source/ooxml/makefile.mk6
-rw-r--r--writerfilter/source/ooxml/modelcleanup.xsl8
-rw-r--r--writerfilter/source/ooxml/modelpreprocess.xsl8
-rw-r--r--writerfilter/source/ooxml/namespaceids.xsl8
-rw-r--r--writerfilter/source/ooxml/ooxmlLoggers.hxx5
-rw-r--r--writerfilter/source/ooxml/qnametostr.xsl8
-rw-r--r--writerfilter/source/ooxml/resourceids.xsl8
-rw-r--r--writerfilter/source/ooxml/resourcestools.xsl50
-rw-r--r--writerfilter/source/ooxml/values.xsl8
-rw-r--r--writerfilter/source/ooxml/valuesimpl.xsl8
-rw-r--r--writerfilter/source/resourcemodel/TagLogger.cxx5
-rw-r--r--writerfilter/source/resourcemodel/WW8Analyzer.cxx5
-rw-r--r--writerfilter/source/resourcemodel/WW8Analyzer.hxx5
-rw-r--r--writerfilter/source/resourcemodel/analyzerheader6
-rwxr-xr-xwriterfilter/source/resourcemodel/genqnametostr6
-rw-r--r--writerfilter/source/resourcemodel/makefile.mk6
-rw-r--r--writerfilter/source/resourcemodel/qnametostrheader6
-rw-r--r--writerfilter/source/resourcemodel/resourcemodel.cxx5
-rw-r--r--writerfilter/source/resourcemodel/resourcemodel.hxx5
-rw-r--r--writerfilter/source/resourcemodel/sprmcodetostrheader6
-rw-r--r--writerfilter/source/resourcemodel/util.cxx5
-rw-r--r--writerfilter/source/rtftok/FlexLexer.h5
-rw-r--r--writerfilter/source/rtftok/RTFParseException.cxx9
-rw-r--r--writerfilter/source/rtftok/RTFScanner.lex6
-rw-r--r--writerfilter/source/rtftok/makefile.mk9
-rw-r--r--writerfilter/unocomponent/component.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/makefile.mk6
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/makefile.mk6
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx9
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx9
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/makefile.mk6
-rw-r--r--writerfilter/unocomponent/makefile.mk6
-rw-r--r--writerfilter/util/makefile.mk8
-rw-r--r--xmerge/build.xml6
-rw-r--r--xmerge/inc/makefile.mk6
-rw-r--r--xmerge/inc/pch/precompiled_xmerge.cxx5
-rw-r--r--xmerge/inc/pch/precompiled_xmerge.hxx5
-rw-r--r--xmerge/java/build.xml6
-rw-r--r--xmerge/java/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/Convert.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/ConvertData.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/ConvertException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/ConverterFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/Document.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentMerger.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentSerializer.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/MergeException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/PluginFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/Version.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/dom/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/dom/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/dom/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/Record.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/package.html8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/bin/verify_sane.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/bin/qa_comparator.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/bin/qa_test_driver.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/bin/run-convtest6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/form.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/office.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/script.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/style.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/table.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa-wrapper/results/baseline/xml-base/text.mod8
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/bin/mysplit.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/bin/tappen.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/bin/template.pl6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/bin/test_driver.pl6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/OfficeZip.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/PDBDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/PDBHeader.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/PDBUtil.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/PalmDB.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/Record.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/SimplePdbCompare.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/XmlDiff.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/XmlWrapper.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/XmlZipExtract.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/comparator.pl6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/Blocklist.dtd8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/chart.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/datastyl.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/drawing.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/dtypes.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/form.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/meta.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/nmspace.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/office.dtd8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/office.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/script.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/settings.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/style.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/table.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/dtd/text.mod8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/comparator/pdbcomparison.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/converter/palm/palmtests/qa/lib/converterlib.pm6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/Style.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/converter.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/converter.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ParseToken.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/UnsupportedFunctionException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/converter.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/converter.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/converter.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/DBFilter.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbooktosoffheadings.xsl8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/literallayout.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/sofftodocbookheadings_article.xsl8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/sofftodocbookheadings_chapter.xsl8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/htmltosoff.xsl8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/sofftohtml.xsl8
-rw-r--r--xmerge/java/org/openoffice/xmerge/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/Difference.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/Iterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/diff/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/merge/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.properties6
-rw-r--r--xmerge/java/org/openoffice/xmerge/test/Driver.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/test/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/test/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/ColourConverter.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/Debug.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/Debug.properties6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/EndianConverter.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/IntArrayList.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/Resources.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/XmlUtil.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/build.xml6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/converter.dtd8
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/makefile.mk6
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/registry/package.html8
-rw-r--r--xmerge/java/org/openoffice/xmerge/util/resources.properties6
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/cpp/FlatXml.cxx5
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/cpp/makefile.mk6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/XFilterAdapter.idl5
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/XInputStreamToInputStreamAdapter.java5
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/XOutputStreamToOutputStreamAdapter.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk6
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/streamwrap.cxx5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/streamwrap.hxx5
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/TestStream.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/XMergeBridge.java5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/streamwrap.cxx5
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/streamwrap.hxx5
-rw-r--r--xmerge/source/activesync/makefile.mk6
-rw-r--r--xmerge/source/aportisdoc/build.xml6
-rw-r--r--xmerge/source/aportisdoc/converter.xml6
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocConstants.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html8
-rw-r--r--xmerge/source/aportisdoc/makefile.mk6
-rw-r--r--xmerge/source/bridge/build.xml6
-rw-r--r--xmerge/source/bridge/java/XMergeBridge.java5
-rw-r--r--xmerge/source/bridge/makefile.mk6
-rw-r--r--xmerge/source/htmlsoff/build.xml6
-rw-r--r--xmerge/source/htmlsoff/converter.xml6
-rw-r--r--xmerge/source/htmlsoff/htmltosoff.xsl8
-rw-r--r--xmerge/source/htmlsoff/makefile.mk6
-rw-r--r--xmerge/source/htmlsoff/package.html8
-rw-r--r--xmerge/source/htmlsoff/sofftohtml.xsl8
-rw-r--r--xmerge/source/minicalc/build.xml6
-rw-r--r--xmerge/source/minicalc/converter.xml6
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcConstants.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDataString.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcEncoder.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/SxcDocumentSerializerImpl.java5
-rw-r--r--xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/package.html8
-rw-r--r--xmerge/source/minicalc/makefile.mk6
-rwxr-xr-xxmerge/source/palmtests/bin/verify_sane.pl6
-rwxr-xr-xxmerge/source/palmtests/qa-wrapper/bin/qa_comparator.pl6
-rwxr-xr-xxmerge/source/palmtests/qa-wrapper/bin/qa_test_driver.pl6
-rwxr-xr-xxmerge/source/palmtests/qa-wrapper/bin/run-convtest6
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod8
-rw-r--r--xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod8
-rwxr-xr-xxmerge/source/palmtests/qa/bin/mysplit.pl6
-rwxr-xr-xxmerge/source/palmtests/qa/bin/tappen.pl6
-rwxr-xr-xxmerge/source/palmtests/qa/bin/template.pl6
-rwxr-xr-xxmerge/source/palmtests/qa/bin/test_driver.pl6
-rw-r--r--xmerge/source/palmtests/qa/comparator/OfficeZip.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/PDBDecoder.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/PDBHeader.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/PDBUtil.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/PalmDB.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/Record.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/XmlDiff.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/XmlWrapper.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/XmlZipExtract.java5
-rw-r--r--xmerge/source/palmtests/qa/comparator/comparator.pl6
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/chart.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/drawing.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/form.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/meta.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/office.dtd8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/office.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/script.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/settings.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/style.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/table.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/dtd/text.mod8
-rw-r--r--xmerge/source/palmtests/qa/comparator/pdbcomparison.java5
-rw-r--r--xmerge/source/palmtests/qa/lib/converterlib.pm6
-rw-r--r--xmerge/source/pexcel/build.xml6
-rw-r--r--xmerge/source/pexcel/converter.xml6
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelConstants.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/SxcDocumentSerializerImpl.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/package.html8
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BIFFRecord.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Eof.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/NumberFormat.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/UnsupportedFormulaException.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParsingException.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FunctionLookup.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperandLookup.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/OperatorLookup.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/ParseToken.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/Token.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenConstants.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenDecoder.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenFactory.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/UnsupportedFunctionException.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/package.html8
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/package.html8
-rw-r--r--xmerge/source/pexcel/makefile.mk6
-rw-r--r--xmerge/source/pocketword/build.xml6
-rw-r--r--xmerge/source/pocketword/converter.xml6
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/Paragraph.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordConstants.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java5
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/package.html8
-rw-r--r--xmerge/source/pocketword/makefile.mk6
-rw-r--r--xmerge/source/regutil/makefile.mk6
-rw-r--r--xmerge/source/wordsmith/build.xml6
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DOCConstants.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentMergerImpl.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSEncoder.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/Wse.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseColorTable.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseFontTable.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseHeader.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WseTextRun.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/textRecord.java5
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/util.java5
-rw-r--r--xmerge/source/wordsmith/makefile.mk6
-rw-r--r--xmerge/source/xmerge/build.xml6
-rw-r--r--xmerge/source/xmerge/converter.dtd8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertException.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterCapabilities.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConverterFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Version.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbUtil.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetDecoder.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcPluginFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/SxwPluginFactory.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxw/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/ConverterCapabilitiesImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/GenericOfficeDocument.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/XsltPlugin.properties6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.properties6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.properties6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/TwipsConverter.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/package.html8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties6
-rw-r--r--xmerge/source/xmerge/makefile.mk6
-rw-r--r--xmerge/util/build.xml6
-rw-r--r--xmerge/util/makefile.mk6
-rw-r--r--xmerge/workben/XmlDiff.java5
-rw-r--r--xmerge/workben/XmlDiff.properties6
-rw-r--r--xmerge/workben/build.xml6
-rw-r--r--xmerge/workben/jstyle.pl6
-rw-r--r--xmerge/workben/makefile.mk6
1920 files changed, 67427 insertions, 32306 deletions
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 60d626379b1b..4bea3330f617 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: filter.hrc,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
// include ---------------------------------------------------------------
-
-#ifndef _SOLAR_HRC
#include <svl/solar.hrc>
-#endif
// Help-Ids --------------------------------------------------------------
@@ -46,8 +40,20 @@
#define RID_XSLT_DIALOG_END (RID_FILTER_START + 69)
#define RID_PDF_OLD_EXPORT_DLG (RID_FILTER_START + 70)
-// warning, next range is RID_FILTER_START + 100 !
+#define DLG_EXPORT_EPCT (RID_GOODIES_START+ 0)
+#define DLG_EXPORT_GIF (RID_GOODIES_START+ 1)
+#define DLG_EXPORT_EMET (RID_GOODIES_START+ 2)
+#define DLG_EXPORT_JPG (RID_GOODIES_START+ 3)
+#define DLG_IMPORT_PCD (RID_GOODIES_START+ 4)
+#define DLG_EXPORT_EPNG (RID_GOODIES_START+ 5)
+#define DLG_EXPORT_EPS (RID_GOODIES_START+ 8)
+#define DLG_EXPORT_EPBM (RID_GOODIES_START+ 9)
+#define DLG_EXPORT_EPGM (RID_GOODIES_START+ 10)
+#define DLG_EXPORT_EPPM (RID_GOODIES_START+ 11)
+#define DLG_SSL_NEWCERT (RID_GOODIES_START+ 12)
+#define DLG_SSL_INFCERT (RID_GOODIES_START+ 13)
+// warning, next range is RID_FILTER_START + 100 !
#define HID_FILTER_XSLT_START (HID_FILTER_START + 0) // see source/xsltdialog/xmlfilterhelpids.hrc for range
#define HID_FILTER_XSLT_END (HID_FILTER_START + 99)
diff --git a/filter/inc/filter/msfilter/countryid.hxx b/filter/inc/filter/msfilter/countryid.hxx
index 0c66f1bf546c..f33b2fe6b5ac 100644
--- a/filter/inc/filter/msfilter/countryid.hxx
+++ b/filter/inc/filter/msfilter/countryid.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: countryid.hxx,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index fc36208d1207..b98f5dc85147 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: escherex.hxx,v $
- * $Revision: 1.6.146.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,13 +28,15 @@
#ifndef _SVX_ESCHEREX_HXX
#define _SVX_ESCHEREX_HXX
+#include <memory>
#include <vector>
+#include <boost/shared_ptr.hpp>
#include <tools/solar.h>
#include <tools/gen.hxx>
#include <tools/list.hxx>
#include <tools/stream.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
@@ -948,13 +947,13 @@ enum ESCHER_LineCap
#define ESCHER_Persist_PrivateEntry 0x80000000
#define ESCHER_Persist_Dgg 0x00010000
-#define ESCHER_Persist_Dgg_FIDCL 0x00010001
#define ESCHER_Persist_Dg 0x00020000
-#define ESCHER_Persist_BlibStoreContainer 0x00030000
#define ESCHER_Persist_CurrentPosition 0x00040000
#define ESCHER_Persist_Grouping_Snap 0x00050000
#define ESCHER_Persist_Grouping_Logic 0x00060000
+const sal_uInt32 DFF_DGG_CLUSTER_SIZE = 0x00000400; /// Shape IDs per cluster in DGG atom.
+
// ---------------------------------------------------------------------------------------------
namespace com { namespace sun { namespace star {
@@ -964,6 +963,7 @@ namespace com { namespace sun { namespace star {
namespace drawing {
struct EnhancedCustomShapeAdjustmentValue;
class XShape;
+ class XShapes;
}
}}}
@@ -1033,13 +1033,11 @@ struct EscherPersistEntry
// ---------------------------------------------------------------------------------------------
-class SvMemoryStream;
class EscherBlibEntry
{
friend class EscherGraphicProvider;
friend class EscherEx;
- friend class _EscherEx;
protected:
@@ -1347,52 +1345,137 @@ public:
};
+// ============================================================================
+
+/** Instance for global DFF data, shared through various instances of EscherEx. */
+class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider
+{
+public:
+ explicit EscherExGlobal( sal_uInt32 nGraphicProvFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+ virtual ~EscherExGlobal();
+
+ /** Returns a new drawing ID for a new drawing container (DGCONTAINER). */
+ sal_uInt32 GenerateDrawingId();
+ /** Creates and returns a new shape identifier, updates the internal shape
+ counters and registers the identifier in the DGG cluster table.
+ @param nDrawingId Drawing identifier has to be passed to be able to
+ generate shape identifiers for multiple drawings simultaniously. */
+ sal_uInt32 GenerateShapeId( sal_uInt32 nDrawingId, bool bIsInSpgr );
+ /** Returns the number of shapes in the current drawing, based on number of
+ calls to the GenerateShapeId() function. */
+ sal_uInt32 GetDrawingShapeCount( sal_uInt32 nDrawingId ) const;
+ /** Returns the last shape identifier generated by the GenerateShapeId()
+ function. */
+ sal_uInt32 GetLastShapeId( sal_uInt32 nDrawingId ) const;
+
+ /** Sets the flag indicating that the DGGCONTAINER exists. */
+ inline void SetDggContainer() { mbHasDggCont = true; }
+ /** Sets the flag indicating that the DGGCONTAINER exists. */
+ inline bool HasDggContainer() const { return mbHasDggCont; }
+ /** Returns the total size of the DGG atom (including header). */
+ sal_uInt32 GetDggAtomSize() const;
+ /** Writes the complete DGG atom to the passed stream (overwrites existing data!). */
+ void WriteDggAtom( SvStream& rStrm ) const;
+
+ /** Called if a picture shall be written and no picture stream is set at
+ class ImplEscherExSdr.
+
+ On first invokation, this function calls the virtual member function
+ ImplQueryPictureStream(). The return value will be cached internally
+ for subsequent calls and for the GetPictureStream() function.
+ */
+ SvStream* QueryPictureStream();
+
+ /** Returns the picture stream if existing (queried), otherwise null. */
+ inline SvStream* GetPictureStream() { return mpPicStrm; }
+
+private:
+ /** Derived classes may implement to create a new stream used to store the
+ picture data.
+
+ The implementation has to take care about lifetime of the returned
+ stream (it will not be destructed automatically). This function is
+ called exactly once. The return value will be cached internally for
+ repeated calls of the public QueryPictureStream() function.
+ */
+ virtual SvStream* ImplQueryPictureStream();
+
+private:
+ struct ClusterEntry
+ {
+ sal_uInt32 mnDrawingId; /// Identifier of drawing this cluster belongs to (one-based index into maDrawingInfos).
+ sal_uInt32 mnNextShapeId; /// Next free shape identifier in this cluster.
+ inline explicit ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {}
+ };
+ typedef ::std::vector< ClusterEntry > ClusterTable;
+
+ struct DrawingInfo
+ {
+ sal_uInt32 mnClusterId; /// Currently used cluster (one-based index into maClusterTable).
+ sal_uInt32 mnShapeCount; /// Current number of shapes in this drawing.
+ sal_uInt32 mnLastShapeId; /// Last shape identifier generated for this drawing.
+ inline explicit DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {}
+ };
+ typedef ::std::vector< DrawingInfo > DrawingInfoVector;
+
+ ClusterTable maClusterTable; /// List with cluster IDs (used object IDs in drawings).
+ DrawingInfoVector maDrawingInfos; /// Data about all used drawings.
+ SvStream* mpPicStrm; /// Cached result of ImplQueryPictureStream().
+ bool mbHasDggCont; /// True = the DGGCONTAINER has been initialized.
+ bool mbPicStrmQueried; /// True = ImplQueryPictureStream() has been called.
+};
+
+typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef;
+
// ---------------------------------------------------------------------------------------------
class SdrObject;
class SdrPage;
class ImplEscherExSdr;
-class Color;
-
-class Graphic;
-class SvMemoryStream;
-class SvStream;
-class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider
+class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
{
- protected :
+ protected:
+ typedef ::std::auto_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
+ EscherExGlobalRef mxGlobal;
+ ImplEscherExSdrPtr mpImplEscherExSdr;
SvStream* mpOutStrm;
- ImplEscherExSdr* mpImplEscherExSdr;
UINT32 mnStrmStartOfs;
std::vector< sal_uInt32 > mOffsets;
std::vector< sal_uInt16 > mRecTypes;
- UINT32 mnDrawings;
- UINT32 mnFIDCLs; // anzahl der cluster ID's
-
UINT32 mnCurrentDg;
- UINT32 mnCurrentShapeID; // die naechste freie ID
- UINT32 mnCurrentShapeMaximumID; // die hoechste und auch benutzte ID
- UINT32 mnTotalShapesDg; // anzahl der shapes im Dg
- UINT32 mnTotalShapeIdUsedDg; // anzahl der benutzten shape Id's im Dg
- UINT32 mnTotalShapesDgg; // anzahl der shapes im Dgg
UINT32 mnCountOfs;
UINT32 mnGroupLevel;
UINT16 mnHellLayerId;
BOOL mbEscherSpgr;
- BOOL mbEscherDgg;
BOOL mbEscherDg;
BOOL mbOleEmf; // OLE is EMF instead of WMF
virtual BOOL DoSeek( UINT32 nKey );
- public:
+public:
+ explicit EscherEx( const EscherExGlobalRef& rxGlobal, SvStream& rOutStrm );
+ virtual ~EscherEx();
+
+ /** Creates and returns a new shape identifier, updates the internal shape
+ counters and registers the identifier in the DGG cluster table. */
+ inline sal_uInt32 GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); }
+
+ /** Returns the graphic provider from the global object that has been
+ passed to the constructor.
+ */
+ inline EscherGraphicProvider&
+ GetGraphicProvider() { return *mxGlobal; }
- EscherEx( SvStream& rOut, UINT32 nDrawings );
+ /** Called if a picture shall be written and no picture stream is set at
+ class ImplEscherExSdr.
+ */
+ inline SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); }
/// Fuegt in den EscherStream interne Daten ein, dieser Vorgang
/// darf und muss nur einmal ausgefuehrt werden.
@@ -1401,14 +1484,29 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
/// gemerged, wie es fuer Excel (und Word?) benoetigt wird.
virtual void Flush( SvStream* pPicStreamMergeBSE = NULL );
- virtual ~EscherEx();
+ /** Inserts the passed number of bytes at the current position of the
+ output stream.
- // Application may overload this function to maintain an offset
- // table for specific regions but MUST call this function too.
- virtual void InsertAtCurrentPos( UINT32 nBytes, BOOL bCont = FALSE );// es werden nBytes an der aktuellen Stream Position eingefuegt,
- // die PersistantTable und interne Zeiger angepasst
+ Inserts dummy bytes and moves all following stream data, and updates
+ all internal stream offsets stored in the PersistTable and the affected
+ container sizes, which makes this operation very expensive. (!)
+
+ @param nBytes The number of bytes to be inserted into the stream.
+
+ @param bExpandEndOfAtom If set to true, an atom that currently ends
+ exactly at the current stream position will be expanded to include
+ the inserted data. If set to false, an atom that currently ends
+ exactly at the current stream position will not be expanded to
+ include the inserted data (used to insert e.g. a new atom after an
+ existing atom). Note that containers that end exactly at the
+ current stream position are always expanded to include the inserted
+ data.
+ */
+ void InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom );
void InsertPersistOffset( UINT32 nKey, UINT32 nOffset ); // Es wird nicht geprueft, ob sich jener schluessel schon in der PersistantTable befindet
+ void ReplacePersistOffset( UINT32 nKey, UINT32 nOffset );
+ UINT32 GetPersistOffset( UINT32 nKey );
BOOL SeekToPersistOffset( UINT32 nKey );
virtual BOOL InsertAtPersistOffset( UINT32 nKey, UINT32 nValue );// nValue wird im Stream an entrsprechender Stelle eingefuegt(overwrite modus), ohne dass sich die
// aktuelle StreamPosition aendert
@@ -1443,21 +1541,16 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
// ein ESCHER_Sp wird geschrieben ( Ein ESCHER_DgContainer muss dazu geoeffnet sein !!)
virtual void AddShape( UINT32 nShpInstance, UINT32 nFlagIds, UINT32 nShapeID = 0 );
- // reserviert eine ShapeId
- UINT32 GetShapeID();
virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect );
UINT32 GetColor( const UINT32 nColor, BOOL bSwap = TRUE );
UINT32 GetColor( const Color& rColor, BOOL bSwap = TRUE );
- // OLE is written as EMF instead of WMF (default WMF)
- void SetOleEmf( BOOL bVal ) { mbOleEmf = bVal; }
- BOOL IsOleEmf() const { return mbOleEmf; }
-
// ...Sdr... implemented in eschesdo.cxx
void AddSdrPage( const SdrPage& rPage );
+ void AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
/// returns the ShapeID
UINT32 AddSdrObject( const SdrObject& rObj );
@@ -1470,7 +1563,9 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
/// Called before a shape is written, application supplies
/// ClientRecords. May set AppData::bDontWriteShape so the
/// shape is ignored.
- virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape );
+ virtual EscherExHostAppData* StartShape(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape,
+ const Rectangle* pChildAnchor );
/// Called after a shape is written to inform the application
/// of the resulted shape type and ID.
@@ -1494,10 +1589,6 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
/// the same functionality as an ordinary recursive group.
virtual EscherExHostAppData* EnterAdditionalTextGroup();
- /// Called if a picture shall be written and no PicStream is
- /// set at ImplEscherExSdr
- virtual SvStream* QueryPicStream();
-
/// Called if an ESCHER_Prop_lTxid shall be written
virtual UINT32 QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, UINT32 nShapeId );
// add an dummy rectangle shape into the escher stream
@@ -1507,6 +1598,14 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
void SetHellLayerId( UINT16 nId ) { mnHellLayerId = nId; }
UINT16 GetHellLayerId() const { return mnHellLayerId; }
+
+private:
+ EscherEx( const EscherEx& );
+ EscherEx& operator=( const EscherEx& );
+
+ // prevent C-style cast to former base class EscherGraphicProvider
+ operator EscherGraphicProvider&();
+ operator EscherGraphicProvider const&();
};
diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx
index a42e360d0f96..7bad8af6b788 100644
--- a/filter/inc/filter/msfilter/mscodec.hxx
+++ b/filter/inc/filter/msfilter/mscodec.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mscodec.hxx,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index eadb6328b1de..4f11a4c2fab9 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: msdffimp.hxx,v $
- * $Revision: 1.4.214.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msfilterdllapi.h b/filter/inc/filter/msfilter/msfilterdllapi.h
index ada4c8e853a9..28985f0c500f 100644
--- a/filter/inc/filter/msfilter/msfilterdllapi.h
+++ b/filter/inc/filter/msfilter/msfilterdllapi.h
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dllapi.h,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx
index 13417175dc52..3b103e5be422 100644
--- a/filter/inc/filter/msfilter/msfiltertracer.hxx
+++ b/filter/inc/filter/msfilter/msfiltertracer.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: msfiltertracer.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index cf06e8378541..173835495b12 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: msocximex.hxx,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msoleexp.hxx b/filter/inc/filter/msfilter/msoleexp.hxx
index 8053928780f4..3cdbab6a9235 100644
--- a/filter/inc/filter/msfilter/msoleexp.hxx
+++ b/filter/inc/filter/msfilter/msoleexp.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: msoleexp.hxx,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx
deleted file mode 100644
index 93f2de413291..000000000000
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile:
- * $Revision:
- *
- * 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 _MSVBAHELPER_HXX
-#define _MSVBAHELPER_HXX
-
-#include <sfx2/objsh.hxx>
-#include "filter/msfilter/msfilterdllapi.h"
-
-namespace ooo { namespace vba
-{
- class MSFILTER_DLLPUBLIC VBAMacroResolvedInfo
- {
- SfxObjectShell* mpDocContext;
- bool mbFound;
- String msResolvedMacro;
- public:
- VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
- void SetResolved( bool bRes ) { mbFound = bRes; }
- bool IsResolved() { return mbFound; }
- void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; }
- SfxObjectShell* MacroDocContext() { return mpDocContext; }
- String ResolvedMacro() { return msResolvedMacro; }
- void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
- };
-
- MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
- MSFILTER_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
- MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
-} }
-
-#endif
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 8d9b85c7301f..796ecc18cd3a 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: svdfppt.hxx,v $
- * $Revision: 1.7.6.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,14 +36,14 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <svx/svdobj.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editdata.hxx>
#include <filter/msfilter/msdffimp.hxx> // Escher-Grafikimport
#include <filter/msfilter/msocximex.hxx>
#include <filter/msfilter/msfiltertracer.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
#define ITEMID_FIELD EE_FEATURE_FIELD
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
#undef ITEMID_FIELD
#include "filter/msfilter/msfilterdllapi.h"
#include <vcl/font.hxx>
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 641d71e3ac2d..f488017e4804 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: svxmsbas.hxx,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/makefile.mk b/filter/inc/makefile.mk
index ccb616d8e94c..ae44f91ba667 100644
--- a/filter/inc/makefile.mk
+++ b/filter/inc/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/pch/precompiled_filter.cxx b/filter/inc/pch/precompiled_filter.cxx
index a118d543d0bb..c2c7f32127b9 100644
--- a/filter/inc/pch/precompiled_filter.cxx
+++ b/filter/inc/pch/precompiled_filter.cxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: precompiled_filter.cxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/pch/precompiled_filter.hxx b/filter/inc/pch/precompiled_filter.hxx
index c68e8c3a32e5..3220aa3f6e4c 100644
--- a/filter/inc/pch/precompiled_filter.hxx
+++ b/filter/inc/pch/precompiled_filter.hxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: precompiled_filter.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/prj/build.lst b/filter/prj/bui