diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 22:49:23 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 22:49:23 -0600 |
commit | f673d89a6a4f6b2d3d519ab17a57b299cb6be1ad (patch) | |
tree | dc8127da17e362197b1b19df7b6957ce554fb0fd /filter/inc | |
parent | 50bc1bc97b170c38648fab979ccb812a3c458cab (diff) | |
parent | 818573bfbce420afedffd45d7bb080f25da32625 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (252 commits)
masterfix DEV300: #i10000# usage of L10N build_type
ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
DEV300 masterfix: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r)
hr75: #i116747#: remove obsolete copyright notices
hr75: #i116747#: remove pre-OSX Mac resoure fork definition files (*.r)
#i10000# WAE: cast to right type
gnumake3: remove comphelper version; fix including extract.hxx
chart52: #i28670# import/export of manual chart legend size from/to XLS
chart52: #i28670# import of manual chart legend size from OOXML
chart52: adapt to changed API
removetooltypes: adjust rebase for linux
removetooltypes01: #i112600# adjust rebase for windows
removetooltypes01: #i112600# Fix build problems on non-pro
CWS gnumake3: -D_DLL is needed on Windows; removed superficial _DLL_ usage all over the place
added some accessible names and releations in PDFImport dialog and XML Settings dialog
masterfix: #i10000# header file removed
XPathLogger.cxx: added include for <stdio.h>
masterfix: #i10000#: WAE fix
removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff
removetooltypes01: #i112600# remove tooltypes from writerfilter
...
Conflicts:
binfilter/bf_basic/source/classes/sbunoobj.cxx
binfilter/bf_basic/source/inc/buffer.hxx
binfilter/bf_basic/source/inc/filefmt.hxx
binfilter/bf_basic/source/runtime/basrdll.cxx
binfilter/bf_basic/source/sbx/sbxdec.hxx
binfilter/bf_basic/source/sbx/sbxres.hxx
binfilter/bf_forms/source/component/DatabaseForm.hxx
binfilter/bf_forms/source/component/forms_CheckBox.cxx
binfilter/bf_forms/source/component/forms_ComboBox.cxx
binfilter/bf_forms/source/component/forms_Currency.cxx
binfilter/bf_forms/source/component/forms_Date.cxx
binfilter/bf_forms/source/component/forms_Edit.cxx
binfilter/bf_forms/source/component/forms_File.cxx
binfilter/bf_forms/source/component/forms_Filter.cxx
binfilter/bf_forms/source/component/forms_FormComponent.cxx
binfilter/bf_forms/source/component/forms_FormattedField.cxx
binfilter/bf_forms/source/component/forms_GroupManager.cxx
binfilter/bf_forms/source/component/forms_Hidden.cxx
binfilter/bf_forms/source/component/forms_ImageControl.cxx
binfilter/bf_forms/source/component/forms_ListBox.cxx
binfilter/bf_forms/source/component/forms_Numeric.cxx
binfilter/bf_forms/source/component/forms_Pattern.cxx
binfilter/bf_forms/source/component/forms_RadioButton.cxx
binfilter/bf_forms/source/component/forms_Time.cxx
binfilter/bf_forms/source/misc/forms_formsmodule.cxx
binfilter/bf_forms/source/misc/forms_services.cxx
binfilter/bf_forms/source/resource/forms_frm_resource.cxx
binfilter/bf_sc/source/core/inc/ansitab.hxx
binfilter/bf_sc/source/core/tool/sc_compiler.cxx
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
binfilter/bf_sc/source/ui/inc/dbdocfun.hxx
binfilter/bf_sc/source/ui/inc/drawutil.hxx
binfilter/bf_sc/source/ui/inc/dwfunctr.hxx
binfilter/bf_sc/source/ui/inc/editable.hxx
binfilter/bf_sc/source/ui/inc/gridmerg.hxx
binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
binfilter/bf_sc/source/ui/inc/namecrea.hxx
binfilter/bf_sc/source/ui/inc/navsett.hxx
binfilter/bf_sc/source/ui/inc/refundo.hxx
binfilter/bf_sc/source/ui/inc/undoolk.hxx
binfilter/bf_sc/source/ui/inc/viewutil.hxx
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
binfilter/bf_sch/source/ui/app/sch_menu.src
binfilter/bf_sch/source/ui/inc/globopt.hxx
binfilter/bf_sch/source/ui/inc/guiutil.hxx
binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx
binfilter/bf_sd/source/filter/propread.hxx
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
binfilter/bf_sd/source/ui/inc/unokywds.hxx
binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx
binfilter/bf_sfx2/source/inc/fltoptint.hxx
binfilter/bf_sfx2/source/inc/sfxtypes.hxx
binfilter/bf_so3/inc/binddata.hxx
binfilter/bf_so3/source/inplace/client.cxx
binfilter/bf_so3/source/ole/socont.h
binfilter/bf_so3/source/persist/binddata.cxx
binfilter/bf_so3/source/persist/transbnd.cxx
binfilter/bf_so3/source/persist/transprt.cxx
binfilter/bf_starmath/source/starmath_register.cxx
binfilter/bf_svtools/source/config/svt_menuoptions.cxx
binfilter/bf_svtools/source/config/svt_saveopt.cxx
binfilter/bf_svtools/source/config/svt_searchopt.cxx
binfilter/bf_svtools/source/filter.vcl/igif/decode.hxx
binfilter/bf_svtools/source/items1/svt_cenumitm.cxx
binfilter/bf_svtools/source/items1/svt_poolio.cxx
binfilter/bf_svtools/source/misc/svt_ehdl.cxx
binfilter/bf_svtools/source/misc1/svt_adrparse.cxx
binfilter/bf_svtools/source/misc1/svt_inethist.cxx
binfilter/bf_svtools/source/numbers/numfmuno.hxx
binfilter/bf_svtools/source/numbers/numhead.hxx
binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
binfilter/bf_svtools/source/numbers/svt_numuno.cxx
binfilter/bf_svtools/source/numbers/zforscan.hxx
binfilter/bf_svtools/source/svdde/ddeimp.hxx
binfilter/bf_svtools/source/uno/svt_registerservices.cxx
binfilter/bf_svx/source/editeng/svx_editattr.cxx
binfilter/bf_svx/source/inc/dbtoolsclient.hxx
binfilter/bf_svx/source/items/svx_paperinf.cxx
binfilter/bf_svx/source/outliner/paralist.hxx
binfilter/bf_svx/source/svdraw/svdtxhdl.hxx
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
binfilter/bf_sw/source/core/bastyp/sw_index.cxx
binfilter/bf_sw/source/core/except/sw_errhdl.cxx
binfilter/bf_sw/source/core/inc/docfld.hxx
binfilter/bf_sw/source/core/inc/flowfrm.hxx
binfilter/bf_sw/source/core/inc/frame.hxx
binfilter/bf_sw/source/core/inc/hffrm.hxx
binfilter/bf_sw/source/core/inc/notxtfrm.hxx
binfilter/bf_sw/source/core/inc/pamtyp.hxx
binfilter/bf_sw/source/core/inc/rowfrm.hxx
binfilter/bf_sw/source/core/inc/sectfrm.hxx
binfilter/bf_sw/source/core/inc/splargs.hxx
binfilter/bf_sw/source/core/inc/splcstk.hxx
binfilter/bf_sw/source/core/inc/swblocks.hxx
binfilter/bf_sw/source/core/inc/tabfrm.hxx
binfilter/bf_sw/source/core/inc/toxhlp.hxx
binfilter/bf_sw/source/core/inc/txmsrt.hxx
binfilter/bf_sw/source/core/inc/txtfrm.hxx
binfilter/bf_sw/source/core/layout/virtoutp.hxx
binfilter/bf_sw/source/core/sw3io/crypter.hxx
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
binfilter/bf_sw/source/core/sw3io/sw3marks.hxx
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx
binfilter/bf_sw/source/core/swg/rdswg.hxx
binfilter/bf_sw/source/core/swg/swgids.hxx
binfilter/bf_sw/source/core/text/guess.hxx
binfilter/bf_sw/source/core/text/itratr.hxx
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
binfilter/bf_sw/source/filter/excel/excfntbf.hxx
binfilter/bf_sw/source/filter/excel/excvfbff.hxx
binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
binfilter/bf_sw/source/filter/inc/fltglbls.hxx
binfilter/bf_sw/source/filter/inc/fltini.hxx
binfilter/bf_sw/source/filter/inc/w4wflt.hxx
binfilter/bf_sw/source/filter/inc/w4wpar.hxx
binfilter/bf_sw/source/filter/inc/w4wstk.hxx
binfilter/bf_sw/source/filter/inc/wrt_fn.hxx
binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx
binfilter/bf_sw/source/filter/w4w/w4wgraf.hxx
binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
binfilter/bf_sw/source/filter/xml/sw_xmliteme.cxx
binfilter/bf_sw/source/filter/xml/xmlexpit.hxx
binfilter/bf_sw/source/filter/xml/xmlimpit.hxx
binfilter/bf_sw/source/filter/xml/xmlitem.hxx
binfilter/bf_sw/source/filter/xml/xmltbli.hxx
binfilter/bf_sw/source/ui/app/sw_docsh.cxx
binfilter/bf_sw/source/ui/app/sw_docshini.cxx
binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
binfilter/bf_sw/source/ui/inc/bmpwin.hxx
binfilter/bf_sw/source/ui/inc/caption.hxx
binfilter/bf_sw/source/ui/inc/docinf.hxx
binfilter/bf_sw/source/ui/inc/fontcfg.hxx
binfilter/bf_sw/source/ui/inc/formedt.hxx
binfilter/bf_sw/source/ui/inc/hdftctrl.hxx
binfilter/bf_sw/source/ui/inc/idxmrk.hxx
binfilter/bf_sw/source/ui/inc/initui.hxx
binfilter/bf_sw/source/ui/inc/modcfg.hxx
binfilter/bf_sw/source/ui/inc/pview.hxx
binfilter/bf_sw/source/ui/inc/scroll.hxx
binfilter/bf_sw/source/ui/inc/swcont.hxx
binfilter/bf_sw/source/ui/inc/uitool.hxx
binfilter/bf_sw/source/ui/inc/unotxvw.hxx
binfilter/bf_sw/source/ui/inc/usrpref.hxx
binfilter/bf_sw/source/ui/inc/workctrl.hxx
binfilter/bf_sw/source/ui/inc/wrtsh.hxx
binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
binfilter/bf_xmloff/source/forms/xmloff_formenums.cxx
binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx
binfilter/bf_xmloff/source/style/xmloff_EnumPropertyHdl.cxx
binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
binfilter/bf_xmloff/source/style/xmloff_weighhdl.cxx
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
binfilter/binfilterdetect/source/bindetect.cxx
binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
binfilter/filter/source/bf_migrate/bf_migratefilter.hxx
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
binfilter/inc/bf_basic/basmgr.hxx
binfilter/inc/bf_basic/sbmeth.hxx
binfilter/inc/bf_basic/sbstar.hxx
binfilter/inc/bf_basic/sbx.hxx
binfilter/inc/bf_basic/sbxcore.hxx
binfilter/inc/bf_basic/sbxdef.hxx
binfilter/inc/bf_basic/sbxfac.hxx
binfilter/inc/bf_basic/sbxobj.hxx
binfilter/inc/bf_basic/sbxvar.hxx
binfilter/inc/bf_goodies/b3dcolor.hxx
binfilter/inc/bf_goodies/b3dcompo.hxx
binfilter/inc/bf_goodies/b3dentty.hxx
binfilter/inc/bf_goodies/b3dgeom.hxx
binfilter/inc/bf_goodies/b3dlight.hxx
binfilter/inc/bf_goodies/b3dtex.hxx
binfilter/inc/bf_goodies/b3dtrans.hxx
binfilter/inc/bf_goodies/b3dvolum.hxx
binfilter/inc/bf_goodies/base3d.hxx
binfilter/inc/bf_goodies/bucket.hxx
binfilter/inc/bf_goodies/hmatrix.hxx
binfilter/inc/bf_goodies/matril3d.hxx
binfilter/inc/bf_goodies/matrix3d.hxx
binfilter/inc/bf_goodies/point3d.hxx
binfilter/inc/bf_goodies/point4d.hxx
binfilter/inc/bf_goodies/vector3d.hxx
binfilter/inc/bf_sc/arealink.hxx
binfilter/inc/bf_sc/bclist.hxx
binfilter/inc/bf_sc/callform.hxx
binfilter/inc/bf_sc/cellform.hxx
binfilter/inc/bf_sc/chartuno.hxx
binfilter/inc/bf_sc/chgviset.hxx
binfilter/inc/bf_sc/collect.hxx
binfilter/inc/bf_sc/column.hxx
binfilter/inc/bf_sc/conditio.hxx
binfilter/inc/bf_sc/consoli.hxx
binfilter/inc/bf_sc/dbcolect.hxx
binfilter/inc/bf_sc/dbdocutl.hxx
binfilter/inc/bf_sc/dbtoken.hxx
binfilter/inc/bf_sc/detdata.hxx
binfilter/inc/bf_sc/detfunc.hxx
binfilter/inc/bf_sc/dociter.hxx
binfilter/inc/bf_sc/docpool.hxx
binfilter/inc/bf_sc/docuno.hxx
binfilter/inc/bf_sc/dpobject.hxx
binfilter/inc/bf_sc/dpoutput.hxx
binfilter/inc/bf_sc/dpsave.hxx
binfilter/inc/bf_sc/dpshttab.hxx
binfilter/inc/bf_sc/dptabdat.hxx
binfilter/inc/bf_sc/dptabres.hxx
binfilter/inc/bf_sc/drawpage.hxx
binfilter/inc/bf_sc/drwlayer.hxx
binfilter/inc/bf_sc/editsrc.hxx
binfilter/inc/bf_sc/fielduno.hxx
binfilter/inc/bf_sc/filter.hxx
binfilter/inc/bf_sc/fmtuno.hxx
binfilter/inc/bf_sc/funcuno.hxx
binfilter/inc/bf_sc/global.hxx
binfilter/inc/bf_sc/hints.hxx
binfilter/inc/bf_sc/indexmap.hxx
binfilter/inc/bf_sc/inputopt.hxx
binfilter/inc/bf_sc/markarr.hxx
binfilter/inc/bf_sc/markdata.hxx
binfilter/inc/bf_sc/navicfg.hxx
binfilter/inc/bf_sc/optutil.hxx
binfilter/inc/bf_sc/pagepar.hxx
binfilter/inc/bf_sc/printopt.hxx
binfilter/inc/bf_sc/prnsave.hxx
binfilter/inc/bf_sc/progress.hxx
binfilter/inc/bf_sc/rangelst.hxx
binfilter/inc/bf_sc/rangenam.hxx
binfilter/inc/bf_sc/rangeseq.hxx
binfilter/inc/bf_sc/rangeutl.hxx
binfilter/inc/bf_sc/rechead.hxx
binfilter/inc/bf_sc/refdata.hxx
binfilter/inc/bf_sc/refreshtimer.hxx
binfilter/inc/bf_sc/scmod.hxx
binfilter/inc/bf_sc/shapeuno.hxx
binfilter/inc/bf_sc/sortparam.hxx
binfilter/inc/bf_sc/stlsheet.hxx
binfilter/inc/bf_sc/subtotal.hxx
binfilter/inc/bf_sc/table.hxx
binfilter/inc/bf_sc/tablink.hxx
binfilter/inc/bf_sc/tabopparams.hxx
binfilter/inc/bf_sc/textuno.hxx
binfilter/inc/bf_sc/unoguard.hxx
binfilter/inc/bf_sc/unowids.hxx
binfilter/inc/bf_sc/userdat.hxx
binfilter/inc/bf_sc/validat.hxx
binfilter/inc/bf_sc/viewopti.hxx
binfilter/inc/bf_sch/calculat.hxx
binfilter/inc/bf_sch/charttyp.hxx
binfilter/inc/bf_sch/chaxis.hxx
binfilter/inc/bf_sch/chdescr.hxx
binfilter/inc/bf_sch/docshell.hxx
binfilter/inc/bf_sch/glob.hxx
binfilter/inc/bf_sch/globfunc.hxx
binfilter/inc/bf_sch/memchrt.hxx
binfilter/inc/bf_sch/objfac.hxx
binfilter/inc/bf_sch/schgroup.hxx
binfilter/inc/bf_sch/stlsheet.hxx
binfilter/inc/bf_sd/anminfo.hxx
binfilter/inc/bf_sd/docshell.hxx
binfilter/inc/bf_sd/drawdoc.hxx
binfilter/inc/bf_sd/grdocsh.hxx
binfilter/inc/bf_sd/sdattr.hxx
binfilter/inc/bf_sfx2/app.hxx
binfilter/inc/bf_sfx2/bitset.hxx
binfilter/inc/bf_sfx2/docfac.hxx
binfilter/inc/bf_sfx2/docfile.hxx
binfilter/inc/bf_sfx2/docfilt.hxx
binfilter/inc/bf_sfx2/docinf.hxx
binfilter/inc/bf_sfx2/doctempl.hxx
binfilter/inc/bf_sfx2/event.hxx
binfilter/inc/bf_sfx2/fcontnr.hxx
binfilter/inc/bf_sfx2/frameobj.hxx
binfilter/inc/bf_sfx2/genlink.hxx
binfilter/inc/bf_sfx2/interno.hxx
binfilter/inc/bf_sfx2/minarray.hxx
binfilter/inc/bf_sfx2/minstack.hxx
binfilter/inc/bf_sfx2/misccfg.hxx
binfilter/inc/bf_sfx2/plugobj.hxx
binfilter/inc/bf_sfx2/printer.hxx
binfilter/inc/bf_sfx2/saveopt.hxx
binfilter/inc/bf_sfx2/sfxuno.hxx
binfilter/inc/bf_sfx2/timestamp.hxx
binfilter/inc/bf_so3/binding.hxx
binfilter/inc/bf_so3/factory.hxx
binfilter/inc/bf_so3/ipenv.hxx
binfilter/inc/bf_so3/ipwin.hxx
binfilter/inc/bf_so3/linkmgr.hxx
binfilter/inc/bf_so3/linksrc.hxx
binfilter/inc/bf_so3/lnkbase.hxx
binfilter/inc/bf_so3/outplace.hxx
binfilter/inc/bf_so3/persist.hxx
binfilter/inc/bf_so3/protocol.hxx
binfilter/inc/bf_so3/pseudo.hxx
binfilter/inc/bf_so3/so2dll.hxx
binfilter/inc/bf_so3/svstor.hxx
binfilter/inc/bf_so3/transbnd.hxx
binfilter/inc/bf_so3/transprt.hxx
binfilter/inc/bf_starmath/symbol.hxx
binfilter/inc/bf_starmath/unomodel.hxx
binfilter/inc/bf_starmath/utility.hxx
binfilter/inc/bf_starmath/xchar.hxx
binfilter/inc/bf_svtools/DocumentInfoPreview.hxx
binfilter/inc/bf_svtools/aeitem.hxx
binfilter/inc/bf_svtools/apearcfg.hxx
binfilter/inc/bf_svtools/bf_prewin.h
binfilter/inc/bf_svtools/bintitem.hxx
binfilter/inc/bf_svtools/brdcst.hxx
binfilter/inc/bf_svtools/broadcast.hxx
binfilter/inc/bf_svtools/cancel.hxx
binfilter/inc/bf_svtools/cenumitm.hxx
binfilter/inc/bf_svtools/cintitem.hxx
binfilter/inc/bf_svtools/cntnrsrt.hxx
binfilter/inc/bf_svtools/cntwall.hxx
binfilter/inc/bf_svtools/cstitem.hxx
binfilter/inc/bf_svtools/ctypeitm.hxx
binfilter/inc/bf_svtools/custritm.hxx
binfilter/inc/bf_svtools/dateitem.hxx
binfilter/inc/bf_svtools/defaultoptions.hxx
binfilter/inc/bf_svtools/dtritem.hxx
binfilter/inc/bf_svtools/eitem.hxx
binfilter/inc/bf_svtools/expander.hxx
binfilter/inc/bf_svtools/filerec.hxx
binfilter/inc/bf_svtools/filter.hxx
binfilter/inc/bf_svtools/flagitem.hxx
binfilter/inc/bf_svtools/flbytes.hxx
binfilter/inc/bf_svtools/fltcall.hxx
binfilter/inc/bf_svtools/fltdefs.hxx
binfilter/inc/bf_svtools/frqitem.hxx
binfilter/inc/bf_svtools/fstathelper.hxx
binfilter/inc/bf_svtools/gifread.hxx
binfilter/inc/bf_svtools/globalnameitem.hxx
binfilter/inc/bf_svtools/hint.hxx
binfilter/inc/bf_svtools/htmlout.hxx
binfilter/inc/bf_svtools/httpcook.hxx
binfilter/inc/bf_svtools/imap.hxx
binfilter/inc/bf_svtools/imapcirc.hxx
binfilter/inc/bf_svtools/imapobj.hxx
binfilter/inc/bf_svtools/imappoly.hxx
binfilter/inc/bf_svtools/imaprect.hxx
binfilter/inc/bf_svtools/inethist.hxx
binfilter/inc/bf_svtools/inidef.hxx
binfilter/inc/bf_svtools/intitem.hxx
binfilter/inc/bf_svtools/itemiter.hxx
binfilter/inc/bf_svtools/itempool.hxx
binfilter/inc/bf_svtools/itemset.hxx
binfilter/inc/bf_svtools/jpeg.hxx
binfilter/inc/bf_svtools/lckbitem.hxx
binfilter/inc/bf_svtools/lingucfg.hxx
binfilter/inc/bf_svtools/listener.hxx
binfilter/inc/bf_svtools/lngmisc.hxx
binfilter/inc/bf_svtools/loginerr.hxx
binfilter/inc/bf_svtools/lstner.hxx
binfilter/inc/bf_svtools/misccfg.hxx
binfilter/inc/bf_svtools/nfkeytab.hxx
binfilter/inc/bf_svtools/nranges.hxx
binfilter/inc/bf_svtools/pngread.hxx
binfilter/inc/bf_svtools/poolcach.hxx
binfilter/inc/bf_svtools/ptitem.hxx
binfilter/inc/bf_svtools/rectitem.hxx
binfilter/inc/bf_svtools/reqitem.hxx
binfilter/inc/bf_svtools/searchopt.hxx
binfilter/inc/bf_svtools/sectctr.hxx
binfilter/inc/bf_svtools/section.hxx
binfilter/inc/bf_svtools/sgfbram.hxx
binfilter/inc/bf_svtools/sgffilt.hxx
binfilter/inc/bf_svtools/slstitm.hxx
binfilter/inc/bf_svtools/style.hxx
binfilter/inc/bf_svtools/svarray.hxx
binfilter/inc/bf_svtools/svdde.hxx
binfilter/inc/bf_svtools/svicnvw.hxx
binfilter/inc/bf_svtools/svimpbox.hxx
binfilter/inc/bf_svtools/svimpicn.hxx
binfilter/inc/bf_svtools/syslocaleoptions.hxx
binfilter/inc/bf_svtools/szitem.hxx
binfilter/inc/bf_svtools/testtool.hxx
binfilter/inc/bf_svtools/tfrmitem.hxx
binfilter/inc/bf_svtools/tresitem.hxx
binfilter/inc/bf_svtools/ttprops.hxx
binfilter/inc/bf_svtools/undo.hxx
binfilter/inc/bf_svtools/whiter.hxx
binfilter/inc/bf_svtools/wmf.hxx
binfilter/inc/bf_svtools/xbmread.hxx
binfilter/inc/bf_svtools/xmlcnimp.hxx
binfilter/inc/bf_svtools/xpmread.hxx
binfilter/inc/bf_svtools/zforfind.hxx
binfilter/inc/bf_svtools/zforlist.hxx
binfilter/inc/bf_svtools/zformat.hxx
binfilter/inc/bf_svx/boxobj.hxx
binfilter/inc/bf_svx/camera3d.hxx
binfilter/inc/bf_svx/cube3d.hxx
binfilter/inc/bf_svx/def3d.hxx
binfilter/inc/bf_svx/deflt3d.hxx
binfilter/inc/bf_svx/dlight3d.hxx
binfilter/inc/bf_svx/editdata.hxx
binfilter/inc/bf_svx/editobj.hxx
binfilter/inc/bf_svx/editstat.hxx
binfilter/inc/bf_svx/editview.hxx
binfilter/inc/bf_svx/extrud3d.hxx
binfilter/inc/bf_svx/fmmodel.hxx
binfilter/inc/bf_svx/fmpage.hxx
binfilter/inc/bf_svx/forbiddencharacterstable.hxx
binfilter/inc/bf_svx/gallery.hxx
binfilter/inc/bf_svx/grfcrop.hxx
binfilter/inc/bf_svx/lathe3d.hxx
binfilter/inc/bf_svx/light3d.hxx
binfilter/inc/bf_svx/linkmgr.hxx
binfilter/inc/bf_svx/obj3d.hxx
binfilter/inc/bf_svx/outliner.hxx
binfilter/inc/bf_svx/outlobj.hxx
binfilter/inc/bf_svx/plight3d.hxx
binfilter/inc/bf_svx/pntobj3d.hxx
binfilter/inc/bf_svx/poly3d.hxx
binfilter/inc/bf_svx/polygn3d.hxx
binfilter/inc/bf_svx/polyob3d.hxx
binfilter/inc/bf_svx/polysc3d.hxx
binfilter/inc/bf_svx/scene3d.hxx
binfilter/inc/bf_svx/sdginitm.hxx
binfilter/inc/bf_svx/sdooitm.hxx
binfilter/inc/bf_svx/sdshitm.hxx
binfilter/inc/bf_svx/sdtagitm.hxx
binfilter/inc/bf_svx/sdtaiitm.hxx
binfilter/inc/bf_svx/sdtcfitm.hxx
binfilter/inc/bf_svx/sdynitm.hxx
binfilter/inc/bf_svx/sphere3d.hxx
binfilter/inc/bf_svx/svdattr.hxx
binfilter/inc/bf_svx/svddrag.hxx
binfilter/inc/bf_svx/svdetc.hxx
binfilter/inc/bf_svx/svdhdl.hxx
binfilter/inc/bf_svx/svdhlpln.hxx
binfilter/inc/bf_svx/svdio.hxx
binfilter/inc/bf_svx/svditer.hxx
binfilter/inc/bf_svx/svdlayer.hxx
binfilter/inc/bf_svx/svdmark.hxx
binfilter/inc/bf_svx/svdmodel.hxx
binfilter/inc/bf_svx/svdmrkv.hxx
binfilter/inc/bf_svx/svdoattr.hxx
binfilter/inc/bf_svx/svdocapt.hxx
binfilter/inc/bf_svx/svdocirc.hxx
binfilter/inc/bf_svx/svdoedge.hxx
binfilter/inc/bf_svx/svdograf.hxx
binfilter/inc/bf_svx/svdogrp.hxx
binfilter/inc/bf_svx/svdomeas.hxx
binfilter/inc/bf_svx/svdoole2.hxx
binfilter/inc/bf_svx/svdopage.hxx
binfilter/inc/bf_svx/svdopath.hxx
binfilter/inc/bf_svx/svdorect.hxx
binfilter/inc/bf_svx/svdosmbr.hxx
binfilter/inc/bf_svx/svdosmev.hxx
binfilter/inc/bf_svx/svdosmrt.hxx
binfilter/inc/bf_svx/svdotext.hxx
binfilter/inc/bf_svx/svdouno.hxx
binfilter/inc/bf_svx/svdovirt.hxx
binfilter/inc/bf_svx/svdpage.hxx
binfilter/inc/bf_svx/svdpagv.hxx
binfilter/inc/bf_svx/svdpntv.hxx
binfilter/inc/bf_svx/svdpool.hxx
binfilter/inc/bf_svx/svdsob.hxx
binfilter/inc/bf_svx/svdtouch.hxx
binfilter/inc/bf_svx/svdtypes.hxx
binfilter/inc/bf_svx/svdundo.hxx
binfilter/inc/bf_svx/svdviter.hxx
binfilter/inc/bf_svx/svdvmark.hxx
binfilter/inc/bf_svx/svimbase.hxx
binfilter/inc/bf_svx/svx3ditems.hxx
binfilter/inc/bf_svx/svxfont.hxx
binfilter/inc/bf_svx/swafopt.hxx
binfilter/inc/bf_svx/sxcaitm.hxx
binfilter/inc/bf_svx/sxcecitm.hxx
binfilter/inc/bf_svx/sxcllitm.hxx
binfilter/inc/bf_svx/sxmbritm.hxx
binfilter/inc/bf_svx/sxmspitm.hxx
binfilter/inc/bf_svx/sxmsuitm.hxx
binfilter/inc/bf_svx/sxmtaitm.hxx
binfilter/inc/bf_svx/sxmtfitm.hxx
binfilter/inc/bf_svx/sxmtritm.hxx
binfilter/inc/bf_svx/sxopitm.hxx
binfilter/inc/bf_svx/unoedsrc.hxx
binfilter/inc/bf_svx/unoforou.hxx
binfilter/inc/bf_svx/unolingu.hxx
binfilter/inc/bf_svx/unoshape.hxx
binfilter/inc/bf_svx/unotext.hxx
binfilter/inc/bf_svx/unoviwed.hxx
binfilter/inc/bf_svx/unoviwou.hxx
binfilter/inc/bf_svx/viewpt3d.hxx
binfilter/inc/bf_svx/volume3d.hxx
binfilter/inc/bf_svx/xbitmap.hxx
binfilter/inc/bf_svx/xflbckit.hxx
binfilter/inc/bf_svx/xflbmsli.hxx
binfilter/inc/bf_svx/xflbmtit.hxx
binfilter/inc/bf_svx/xflbstit.hxx
binfilter/inc/bf_svx/xflftrit.hxx
binfilter/inc/bf_svx/xflgrit.hxx
binfilter/inc/bf_svx/xflhtit.hxx
binfilter/inc/bf_svx/xftmrit.hxx
binfilter/inc/bf_svx/xit.hxx
binfilter/inc/bf_svx/xlndsit.hxx
binfilter/inc/bf_svx/xlnedcit.hxx
binfilter/inc/bf_svx/xlnstcit.hxx
binfilter/inc/bf_svx/xmlcnitm.hxx
binfilter/inc/bf_svx/xmlgrhlp.hxx
binfilter/inc/bf_svx/xoutbmp.hxx
binfilter/inc/bf_svx/xoutx.hxx
binfilter/inc/bf_svx/xpoly.hxx
binfilter/inc/bf_svx/xpolyimp.hxx
binfilter/inc/bf_svx/xpool.hxx
binfilter/inc/bf_svx/xtextit0.hxx
binfilter/inc/bf_svx/zoomitem.hxx
binfilter/inc/bf_sw/accessibilityoptions.hxx
binfilter/inc/bf_sw/authfld.hxx
binfilter/inc/bf_sw/authratr.hxx
binfilter/inc/bf_sw/bparr.hxx
binfilter/inc/bf_sw/breakit.hxx
binfilter/inc/bf_sw/calbck.hxx
binfilter/inc/bf_sw/cellatr.hxx
binfilter/inc/bf_sw/cellfml.hxx
binfilter/inc/bf_sw/charatr.hxx
binfilter/inc/bf_sw/crsrsh.hxx
binfilter/inc/bf_sw/crsskip.hxx
binfilter/inc/bf_sw/cshtyp.hxx
binfilter/inc/bf_sw/ddefld.hxx
binfilter/inc/bf_sw/docary.hxx
binfilter/inc/bf_sw/docfac.hxx
binfilter/inc/bf_sw/docsh.hxx
binfilter/inc/bf_sw/docstat.hxx
binfilter/inc/bf_sw/docufld.hxx
binfilter/inc/bf_sw/dpage.hxx
binfilter/inc/bf_sw/drawdoc.hxx
binfilter/inc/bf_sw/editsh.hxx
binfilter/inc/bf_sw/errhdl.hxx
binfilter/inc/bf_sw/expfld.hxx
binfilter/inc/bf_sw/fesh.hxx
binfilter/inc/bf_sw/fmtanchr.hxx
binfilter/inc/bf_sw/fmtclds.hxx
binfilter/inc/bf_sw/fmtcnct.hxx
binfilter/inc/bf_sw/fmtcntnt.hxx
binfilter/inc/bf_sw/fmtfordr.hxx
binfilter/inc/bf_sw/fmtfsize.hxx
binfilter/inc/bf_sw/fmtftntx.hxx
binfilter/inc/bf_sw/fmthdft.hxx
binfilter/inc/bf_sw/fmtline.hxx
binfilter/inc/bf_sw/fmtlsplt.hxx
binfilter/inc/bf_sw/fmtornt.hxx
binfilter/inc/bf_sw/fmtsrnd.hxx
binfilter/inc/bf_sw/format.hxx
binfilter/inc/bf_sw/frmatr.hxx
binfilter/inc/bf_sw/frmfmt.hxx
binfilter/inc/bf_sw/ftninfo.hxx
binfilter/inc/bf_sw/grfatr.hxx
binfilter/inc/bf_sw/hintids.hxx
binfilter/inc/bf_sw/hints.hxx
binfilter/inc/bf_sw/index.hxx
binfilter/inc/bf_sw/iodetect.hxx
binfilter/inc/bf_sw/linetype.hxx
binfilter/inc/bf_sw/mdiexp.hxx
binfilter/inc/bf_sw/ndarr.hxx
binfilter/inc/bf_sw/ndindex.hxx
binfilter/inc/bf_sw/ndole.hxx
binfilter/inc/bf_sw/ndtxt.hxx
binfilter/inc/bf_sw/ndtyp.hxx
binfilter/inc/bf_sw/newhdl.hxx
binfilter/inc/bf_sw/pagedesc.hxx
binfilter/inc/bf_sw/pageiter.hxx
binfilter/inc/bf_sw/paratr.hxx
binfilter/inc/bf_sw/poolfmt.awk
binfilter/inc/bf_sw/poolfmt.hxx
binfilter/inc/bf_sw/pvprtdat.hxx
binfilter/inc/bf_sw/redline.hxx
binfilter/inc/bf_sw/reffld.hxx
binfilter/inc/bf_sw/shellio.hxx
binfilter/inc/bf_sw/sw3io.hxx
binfilter/inc/bf_sw/swatrset.hxx
binfilter/inc/bf_sw/swcrsr.hxx
binfilter/inc/bf_sw/swdbdata.hxx
binfilter/inc/bf_sw/swdbtoolsclient.hxx
binfilter/inc/bf_sw/swevent.hxx
binfilter/inc/bf_sw/swgpar.hxx
binfilter/inc/bf_sw/swgstr.hxx
binfilter/inc/bf_sw/swmodule.hxx
binfilter/inc/bf_sw/swprtopt.hxx
binfilter/inc/bf_sw/swrect.hxx
binfilter/inc/bf_sw/swregion.hxx
binfilter/inc/bf_sw/swserv.hxx
binfilter/inc/bf_sw/swtable.hxx
binfilter/inc/bf_sw/swtypes.hxx
binfilter/inc/bf_sw/swunohelper.hxx
binfilter/inc/bf_sw/swwait.hxx
binfilter/inc/bf_sw/tgrditem.hxx
binfilter/inc/bf_sw/toxwrap.hxx
binfilter/inc/bf_sw/txatbase.hxx
binfilter/inc/bf_sw/txatritr.hxx
binfilter/inc/bf_sw/txtatr.hxx
binfilter/inc/bf_sw/txtftn.hxx
binfilter/inc/bf_sw/txtinet.hxx
binfilter/inc/bf_sw/undobj.hxx
binfilter/inc/bf_sw/unoatxt.hxx
binfilter/inc/bf_sw/unocoll.hxx
binfilter/inc/bf_sw/unocrsr.hxx
binfilter/inc/bf_sw/unodraw.hxx
binfilter/inc/bf_sw/unoevtlstnr.hxx
binfilter/inc/bf_sw/unofield.hxx
binfilter/inc/bf_sw/unoframe.hxx
binfilter/inc/bf_sw/unoidx.hxx
binfilter/inc/bf_sw/unoobj.hxx
binfilter/inc/bf_sw/unoport.hxx
binfilter/inc/bf_sw/unoprnms.hxx
binfilter/inc/bf_sw/unoredline.hxx
binfilter/inc/bf_sw/unoredlines.hxx
binfilter/inc/bf_sw/unosrch.hxx
binfilter/inc/bf_sw/unostyle.hxx
binfilter/inc/bf_sw/unotbl.hxx
binfilter/inc/bf_sw/unotxdoc.hxx
binfilter/inc/bf_sw/viewopt.hxx
binfilter/inc/bf_sw/viewsh.hxx
binfilter/inc/bf_sw/viscrs.hxx
binfilter/inc/bf_xmloff/NamedBoolPropertyHdl.hxx
binfilter/inc/bf_xmloff/VisAreaContext.hxx
binfilter/inc/bf_xmloff/i18nmap.hxx
binfilter/inc/bf_xmloff/sdxmlexp.hxx
binfilter/inc/bf_xmloff/styleexp.hxx
binfilter/inc/bf_xmloff/txtfldi.hxx
binfilter/inc/bf_xmloff/xexptran.hxx
binfilter/inc/bf_xmloff/xmlcnimp.hxx
binfilter/inc/bf_xmloff/xmlcnitm.hxx
binfilter/inc/bf_xmloff/xmlehelp.hxx
binfilter/inc/bf_xmloff/xmlexp.hxx
binfilter/inc/bf_xmloff/xmlictxt.hxx
binfilter/inc/bf_xmloff/xmlimppr.hxx
binfilter/inc/bf_xmloff/xmlnume.hxx
binfilter/inc/bf_xmloff/xmlnumfi.hxx
binfilter/inc/bf_xmloff/xmlstyle.hxx
binfilter/inc/bf_xmloff/xmltoken.hxx
binfilter/inc/bf_xmloff/xmluconv.hxx
filter/inc/filter/msfilter/escherex.hxx
filter/inc/filter/msfilter/msdffimp.hxx
filter/inc/filter/msfilter/svdfppt.hxx
filter/inc/filter/msfilter/svxmsbas.hxx
filter/inc/registration.hxx
filter/source/docbook/sofftodocbookheadings.xsl
filter/source/flash/swfuno.cxx
filter/source/flash/swfwriter1.cxx
filter/source/graphicfilter/egif/dlgegif.cxx
filter/source/graphicfilter/egif/egif.cxx
filter/source/graphicfilter/egif/makefile.mk
filter/source/graphicfilter/eos2met/dlgeos2.cxx
filter/source/graphicfilter/eos2met/dlgeos2.hxx
filter/source/graphicfilter/eos2met/eos2met.cxx
filter/source/graphicfilter/eos2met/makefile.mk
filter/source/graphicfilter/epbm/dlgepbm.cxx
filter/source/graphicfilter/epbm/epbm.cxx
filter/source/graphicfilter/epbm/makefile.mk
filter/source/graphicfilter/epgm/dlgepgm.cxx
filter/source/graphicfilter/epgm/dlgepgm.hxx
filter/source/graphicfilter/epgm/epgm.cxx
filter/source/graphicfilter/epgm/makefile.mk
filter/source/graphicfilter/epict/dlgepct.cxx
filter/source/graphicfilter/epict/epict.cxx
filter/source/graphicfilter/epict/makefile.mk
filter/source/graphicfilter/eppm/dlgeppm.cxx
filter/source/graphicfilter/eppm/dlgeppm.hxx
filter/source/graphicfilter/eppm/eppm.cxx
filter/source/graphicfilter/eppm/makefile.mk
filter/source/graphicfilter/eps/dlgeps.cxx
filter/source/graphicfilter/eps/dlgeps.hxx
filter/source/graphicfilter/eps/eps.cxx
filter/source/graphicfilter/eps/makefile.mk
filter/source/graphicfilter/eras/eras.cxx
filter/source/graphicfilter/etiff/etiff.cxx
filter/source/graphicfilter/expm/expm.cxx
filter/source/graphicfilter/icgm/actimpr.cxx
filter/source/graphicfilter/idxf/dxf2mtf.cxx
filter/source/graphicfilter/idxf/dxf2mtf.hxx
filter/source/graphicfilter/idxf/dxfgrprd.cxx
filter/source/graphicfilter/idxf/dxfgrprd.hxx
filter/source/graphicfilter/idxf/idxf.cxx
filter/source/graphicfilter/ieps/ieps.cxx
filter/source/graphicfilter/ios2met/ios2met.cxx
filter/source/graphicfilter/ipbm/ipbm.cxx
filter/source/graphicfilter/ipcd/ipcd.cxx
filter/source/graphicfilter/ipcx/ipcx.cxx
filter/source/graphicfilter/ipict/ipict.cxx
filter/source/graphicfilter/ipict/makefile.mk
filter/source/graphicfilter/ipsd/ipsd.cxx
filter/source/graphicfilter/iras/iras.cxx
filter/source/graphicfilter/itga/itga.cxx
filter/source/graphicfilter/itiff/itiff.cxx
filter/source/msfilter/escherex.cxx
filter/source/msfilter/eschesdo.cxx
filter/source/msfilter/eschesdo.hxx
filter/source/msfilter/makefile.mk
filter/source/msfilter/msdffimp.cxx
filter/source/msfilter/msocximex.cxx
filter/source/msfilter/msoleexp.cxx
filter/source/msfilter/msvbahelper.cxx
filter/source/msfilter/powerpoint/pptimporteruno.cxx
filter/source/msfilter/svdfppt.cxx
filter/source/msfilter/svxmsbas.cxx
filter/source/pdf/pdfexport.cxx
filter/source/pdf/pdfuno.cxx
filter/source/placeware/uno.cxx
filter/source/svg/makefile.mk
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svguno.cxx
filter/source/svg/svgwriter.cxx
filter/source/t602/filterenv.cxx
filter/source/xmlfilteradaptor/genericfilter.cxx
filter/source/xmlfilterdetect/fdcomp.cxx
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
filter/source/xsltdialog/xmlfileview.cxx
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
filter/source/xsltfilter/XSLTFilter.cxx
hwpfilter/source/hwpreader.hxx
oox/inc/oox/core/binarycodec.hxx
oox/inc/oox/core/binaryfilterbase.hxx
oox/inc/oox/core/contexthandler.hxx
oox/inc/oox/core/contexthandler2.hxx
oox/inc/oox/core/fasttokenhandler.hxx
oox/inc/oox/core/filterbase.hxx
oox/inc/oox/core/filterdetect.hxx
oox/inc/oox/core/fragmenthandler.hxx
oox/inc/oox/core/fragmenthandler2.hxx
oox/inc/oox/core/recordparser.hxx
oox/inc/oox/core/relations.hxx
oox/inc/oox/core/relationshandler.hxx
oox/inc/oox/core/xmlfilterbase.hxx
oox/inc/oox/drawingml/chart/axiscontext.hxx
oox/inc/oox/drawingml/chart/axisconverter.hxx
oox/inc/oox/drawingml/chart/axismodel.hxx
oox/inc/oox/drawingml/chart/chartcontextbase.hxx
oox/inc/oox/drawingml/chart/chartconverter.hxx
oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
oox/inc/oox/drawingml/chart/chartspaceconverter.hxx
oox/inc/oox/drawingml/chart/chartspacefragment.hxx
oox/inc/oox/drawingml/chart/chartspacemodel.hxx
oox/inc/oox/drawingml/chart/converterbase.hxx
oox/inc/oox/drawingml/chart/datasourcecontext.hxx
oox/inc/oox/drawingml/chart/datasourceconverter.hxx
oox/inc/oox/drawingml/chart/datasourcemodel.hxx
oox/inc/oox/drawingml/chart/modelbase.hxx
oox/inc/oox/drawingml/chart/objectformatter.hxx
oox/inc/oox/drawingml/chart/plotareacontext.hxx
oox/inc/oox/drawingml/chart/plotareaconverter.hxx
oox/inc/oox/drawingml/chart/plotareamodel.hxx
oox/inc/oox/drawingml/chart/seriescontext.hxx
oox/inc/oox/drawingml/chart/seriesconverter.hxx
oox/inc/oox/drawingml/chart/seriesmodel.hxx
oox/inc/oox/drawingml/chart/titlecontext.hxx
oox/inc/oox/drawingml/chart/titleconverter.hxx
oox/inc/oox/drawingml/chart/titlemodel.hxx
oox/inc/oox/drawingml/chart/typegroupcontext.hxx
oox/inc/oox/drawingml/chart/typegroupconverter.hxx
oox/inc/oox/drawingml/chart/typegroupmodel.hxx
oox/inc/oox/drawingml/textbody.hxx
oox/inc/oox/drawingml/textliststyle.hxx
oox/inc/oox/drawingml/textparagraphproperties.hxx
oox/inc/oox/helper/attributelist.hxx
oox/inc/oox/helper/binaryinputstream.hxx
oox/inc/oox/helper/binaryoutputstream.hxx
oox/inc/oox/helper/binarystreambase.hxx
oox/inc/oox/helper/containerhelper.hxx
oox/inc/oox/helper/graphichelper.hxx
oox/inc/oox/helper/helper.hxx
oox/inc/oox/helper/modelobjecthelper.hxx
oox/inc/oox/helper/progressbar.hxx
oox/inc/oox/helper/propertymap.hxx
oox/inc/oox/helper/propertyset.hxx
oox/inc/oox/helper/textinputstream.hxx
oox/inc/oox/ole/axbinaryreader.hxx
oox/inc/oox/ole/axcontrolfragment.hxx
oox/inc/oox/ole/olehelper.hxx
oox/inc/oox/ole/oleobjecthelper.hxx
oox/inc/oox/ole/vbacontrol.hxx
oox/inc/oox/ole/vbainputstream.hxx
oox/inc/oox/ole/vbamodule.hxx
oox/inc/oox/ole/vbaproject.hxx
oox/inc/oox/ole/vbaprojectfilter.hxx
oox/inc/oox/token/propertynames.hxx
oox/inc/oox/vml/vmldrawing.hxx
oox/inc/oox/vml/vmldrawingfragment.hxx
oox/inc/oox/vml/vmlformatting.hxx
oox/inc/oox/vml/vmlinputstream.hxx
oox/inc/oox/vml/vmlshape.hxx
oox/inc/oox/vml/vmlshapecontainer.hxx
oox/inc/oox/vml/vmlshapecontext.hxx
oox/inc/oox/xls/addressconverter.hxx
oox/inc/oox/xls/biffcodec.hxx
oox/inc/oox/xls/biffdetector.hxx
oox/inc/oox/xls/biffhelper.hxx
oox/inc/oox/xls/biffinputstream.hxx
oox/inc/oox/xls/biffoutputstream.hxx
oox/inc/oox/xls/chartsheetfragment.hxx
oox/inc/oox/xls/commentsbuffer.hxx
oox/inc/oox/xls/commentsfragment.hxx
oox/inc/oox/xls/condformatbuffer.hxx
oox/inc/oox/xls/condformatcontext.hxx
oox/inc/oox/xls/connectionsfragment.hxx
oox/inc/oox/xls/defnamesbuffer.hxx
oox/inc/oox/xls/drawingfragment.hxx
oox/inc/oox/xls/excelchartconverter.hxx
oox/inc/oox/xls/excelfilter.hxx
oox/inc/oox/xls/excelhandlers.hxx
oox/inc/oox/xls/excelvbaproject.hxx
oox/inc/oox/xls/externallinkbuffer.hxx
oox/inc/oox/xls/externallinkfragment.hxx
oox/inc/oox/xls/formulabase.hxx
oox/inc/oox/xls/formulaparser.hxx
oox/inc/oox/xls/numberformatsbuffer.hxx
oox/inc/oox/xls/ooxformulaparser.hxx
oox/inc/oox/xls/pagesettings.hxx
oox/inc/oox/xls/pivotcachebuffer.hxx
oox/inc/oox/xls/pivotcachefragment.hxx
oox/inc/oox/xls/pivottablebuffer.hxx
oox/inc/oox/xls/pivottablefragment.hxx
oox/inc/oox/xls/querytablefragment.hxx
oox/inc/oox/xls/richstring.hxx
oox/inc/oox/xls/richstringcontext.hxx
oox/inc/oox/xls/scenariobuffer.hxx
oox/inc/oox/xls/scenariocontext.hxx
oox/inc/oox/xls/sharedformulabuffer.hxx
oox/inc/oox/xls/sharedstringsbuffer.hxx
oox/inc/oox/xls/sharedstringsfragment.hxx
oox/inc/oox/xls/sheetdatacontext.hxx
oox/inc/oox/xls/stylesbuffer.hxx
oox/inc/oox/xls/stylesfragment.hxx
oox/inc/oox/xls/tablebuffer.hxx
oox/inc/oox/xls/tablefragment.hxx
oox/inc/oox/xls/themebuffer.hxx
oox/inc/oox/xls/unitconverter.hxx
oox/inc/oox/xls/viewsettings.hxx
oox/inc/oox/xls/webquerybuffer.hxx
oox/inc/oox/xls/workbookfragment.hxx
oox/inc/oox/xls/workbooksettings.hxx
oox/inc/oox/xls/worksheetbuffer.hxx
oox/inc/oox/xls/worksheetfragment.hxx
oox/inc/oox/xls/worksheethelper.hxx
oox/inc/oox/xls/worksheetsettings.hxx
oox/prj/build.lst
oox/prj/d.lst
oox/source/core/binarycodec.cxx
oox/source/core/binaryfilterbase.cxx
oox/source/core/contexthandler.cxx
oox/source/core/contexthandler2.cxx
oox/source/core/facreg.cxx
oox/source/core/fasttokenhandler.cxx
oox/source/core/filterbase.cxx
oox/source/core/filterdetect.cxx
oox/source/core/fragmenthandler.cxx
oox/source/core/fragmenthandler2.cxx
oox/source/core/recordparser.cxx
oox/source/core/relations.cxx
oox/source/core/relationshandler.cxx
oox/source/core/xmlfilterbase.cxx
oox/source/docprop/ooxmldocpropimport.cxx
oox/source/docprop/ooxmldocpropimport.hxx
oox/source/drawingml/chart/axiscontext.cxx
oox/source/drawingml/chart/axisconverter.cxx
oox/source/drawingml/chart/axismodel.cxx
oox/source/drawingml/chart/chartcontextbase.cxx
oox/source/drawingml/chart/chartconverter.cxx
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/chart/chartspaceconverter.cxx
oox/source/drawingml/chart/chartspacefragment.cxx
oox/source/drawingml/chart/chartspacemodel.cxx
oox/source/drawingml/chart/converterbase.cxx
oox/source/drawingml/chart/datasourcecontext.cxx
oox/source/drawingml/chart/datasourceconverter.cxx
oox/source/drawingml/chart/datasourcemodel.cxx
oox/source/drawingml/chart/modelbase.cxx
oox/source/drawingml/chart/objectformatter.cxx
oox/source/drawingml/chart/plotareacontext.cxx
oox/source/drawingml/chart/plotareaconverter.cxx
oox/source/drawingml/chart/seriescontext.cxx
oox/source/drawingml/chart/seriesconverter.cxx
oox/source/drawingml/chart/seriesmodel.cxx
oox/source/drawingml/chart/titlecontext.cxx
oox/source/drawingml/chart/titleconverter.cxx
oox/source/drawingml/chart/titlemodel.cxx
oox/source/drawingml/chart/typegroupcontext.cxx
oox/source/drawingml/chart/typegroupconverter.cxx
oox/source/drawingml/chart/typegroupmodel.cxx
oox/source/drawingml/shape.cxx
oox/source/drawingml/shapecontext.cxx
oox/source/drawingml/table/tableproperties.cxx
oox/source/drawingml/textbodypropertiescontext.cxx
oox/source/drawingml/textliststyle.cxx
oox/source/drawingml/transform2dcontext.cxx
oox/source/dump/biffdumper.cxx
oox/source/dump/dffdumper.cxx
oox/source/dump/dumperbase.cxx
oox/source/dump/oledumper.cxx
oox/source/dump/pptxdumper.cxx
oox/source/dump/xlsbdumper.cxx
oox/source/helper/attributelist.cxx
oox/source/helper/binaryinputstream.cxx
oox/source/helper/binarystreambase.cxx
oox/source/helper/containerhelper.cxx
oox/source/helper/graphichelper.cxx
oox/source/helper/modelobjecthelper.cxx
oox/source/helper/progressbar.cxx
oox/source/helper/propertymap.cxx
oox/source/helper/propertyset.cxx
oox/source/helper/textinputstream.cxx
oox/source/ole/axbinaryreader.cxx
oox/source/ole/axcontrol.cxx
oox/source/ole/olehelper.cxx
oox/source/ole/oleobjecthelper.cxx
oox/source/ole/vbacontrol.cxx
oox/source/ole/vbamodule.cxx
oox/source/ole/vbaproject.cxx
oox/source/ole/vbaprojectfilter.cxx
oox/source/ppt/customshowlistcontext.cxx
oox/source/ppt/pptimport.cxx
oox/source/ppt/pptshapegroupcontext.cxx
oox/source/shape/FastTokenHandlerService.cxx
oox/source/shape/FastTokenHandlerService.hxx
oox/source/token/makefile.mk
oox/source/token/namespacemap.cxx
oox/source/token/properties.txt
oox/source/token/propertynames.cxx
oox/source/token/tokenmap.cxx
oox/source/token/tokens.hxx.head
oox/source/vml/vmldrawing.cxx
oox/source/vml/vmldrawingfragment.cxx
oox/source/vml/vmlformatting.cxx
oox/source/vml/vmlinputstream.cxx
oox/source/vml/vmlshape.cxx
oox/source/vml/vmlshapecontainer.cxx
oox/source/vml/vmlshapecontext.cxx
oox/source/vml/vmltextbox.cxx
oox/source/xls/addressconverter.cxx
oox/source/xls/autofiltercontext.cxx
oox/source/xls/biffcodec.cxx
oox/source/xls/biffdetector.cxx
oox/source/xls/biffhelper.cxx
oox/source/xls/biffinputstream.cxx
oox/source/xls/biffoutputstream.cxx
oox/source/xls/chartsheetfragment.cxx
oox/source/xls/commentsbuffer.cxx
oox/source/xls/commentsfragment.cxx
oox/source/xls/condformatbuffer.cxx
oox/source/xls/condformatcontext.cxx
oox/source/xls/connectionsfragment.cxx
oox/source/xls/defnamesbuffer.cxx
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelchartconverter.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/excelhandlers.cxx
oox/source/xls/externallinkbuffer.cxx
oox/source/xls/externallinkfragment.cxx
oox/source/xls/formulabase.cxx
oox/source/xls/formulaparser.cxx
oox/source/xls/numberformatsbuffer.cxx
oox/source/xls/ooxformulaparser.cxx
oox/source/xls/pagesettings.cxx
oox/source/xls/pivotcachebuffer.cxx
oox/source/xls/pivotcachefragment.cxx
oox/source/xls/pivottablebuffer.cxx
oox/source/xls/pivottablefragment.cxx
oox/source/xls/querytablefragment.cxx
oox/source/xls/richstring.cxx
oox/source/xls/richstringcontext.cxx
oox/source/xls/scenariobuffer.cxx
oox/source/xls/scenariocontext.cxx
oox/source/xls/sharedformulabuffer.cxx
oox/source/xls/sharedstringsbuffer.cxx
oox/source/xls/sharedstringsfragment.cxx
oox/source/xls/sheetdatacontext.cxx
oox/source/xls/stylesbuffer.cxx
oox/source/xls/stylesfragment.cxx
oox/source/xls/tablebuffer.cxx
oox/source/xls/tablefragment.cxx
oox/source/xls/themebuffer.cxx
oox/source/xls/unitconverter.cxx
oox/source/xls/webquerybuffer.cxx
oox/source/xls/workbookfragment.cxx
oox/source/xls/workbookhelper.cxx
oox/source/xls/workbooksettings.cxx
oox/source/xls/worksheetbuffer.cxx
oox/source/xls/worksheetfragment.cxx
oox/source/xls/worksheethelper.cxx
oox/source/xls/worksheetsettings.cxx
unoxml/source/rdf/librdf_repository.cxx
unoxml/source/xpath/xpathapi.hxx
writerfilter/inc/resourcemodel/Fraction.hxx
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/XPathLogger.hxx
writerfilter/source/dmapper/BorderHandler.cxx
writerfilter/source/dmapper/CellColorHandler.cxx
writerfilter/source/dmapper/CellColorHandler.hxx
writerfilter/source/dmapper/CellMarginHandler.cxx
writerfilter/source/dmapper/CellMarginHandler.hxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FFDataHandler.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/FontTable.hxx
writerfilter/source/dmapper/GraphicImport.cxx
writerfilter/source/dmapper/GraphicImport.hxx
writerfilter/source/dmapper/MeasureHandler.cxx
writerfilter/source/dmapper/NumberingManager.cxx
writerfilter/source/dmapper/NumberingManager.hxx
writerfilter/source/dmapper/OLEHandler.cxx
writerfilter/source/dmapper/OLEHandler.hxx
writerfilter/source/dmapper/PropertyIds.hxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/PropertyMap.hxx
writerfilter/source/dmapper/PropertyMapHelper.cxx
writerfilter/source/dmapper/PropertyMapHelper.hxx
writerfilter/source/dmapper/SectionColumnHandler.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/StyleSheetTable.hxx
writerfilter/source/dmapper/TDefTableHandler.cxx
writerfilter/source/dmapper/dmapperLoggers.hxx
writerfilter/source/filter/ImportFilter.cxx
writerfilter/source/filter/RtfFilter.cxx
writerfilter/source/filter/RtfFilter.hxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
writerfilter/source/ooxml/OOXMLFastHelper.hxx
writerfilter/source/ooxml/OOXMLParserState.hxx
writerfilter/source/ooxml/factoryimpl_ns.xsl
writerfilter/source/ooxml/model.xml
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/source/resourcemodel/XPathLogger.cxx
writerperfect/prj/build.lst
writerperfect/source/wpdimp/wpft_genericfilter.cxx
Diffstat (limited to 'filter/inc')
-rw-r--r-- | filter/inc/filter.hrc | 13 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/escherex.hxx | 278 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/mscodec.hxx | 67 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 314 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/msocximex.hxx | 28 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/msoleexp.hxx | 8 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/msvbahelper.hxx | 94 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 296 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svxmsbas.hxx | 23 | ||||
-rw-r--r-- | filter/inc/registration.hxx | 93 |
10 files changed, 604 insertions, 610 deletions
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 4bea3330f617..2bbf94ed50c7 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -55,12 +55,11 @@ // 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) -#define HID_FILTER_PDF_OPTIONS (HID_FILTER_START + 100) -#define HID_FILTER_PDF_INITIAL_VIEW (HID_FILTER_START + 101) -#define HID_FILTER_PDF_USER_INTERFACE (HID_FILTER_START + 102) -#define HID_FILTER_PDF_SECURITY (HID_FILTER_START + 103) -#define HID_FILTER_PDF_LINKS (HID_FILTER_START + 104) +#define HID_FILTER_PDF_OPTIONS "HID_FILTER_PDF_OPTIONS" +#define HID_FILTER_PDF_INITIAL_VIEW "HID_FILTER_PDF_INITIAL_VIEW" +#define HID_FILTER_PDF_USER_INTERFACE "HID_FILTER_PDF_USER_INTERFACE" +#define HID_FILTER_PDF_SECURITY "HID_FILTER_PDF_SECURITY" +#define HID_FILTER_PDF_LINKS "HID_FILTER_PDF_LINKS" + #endif diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index 35e560025a5f..b04a18e04041 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -656,15 +656,15 @@ enum ESCHER_LineCap // Transform #define ESCHER_Prop_Rotation 4 /* Fixed Point 16.16 degrees */ // Protection -#define ESCHER_Prop_LockRotation 119 /* BOOL No rotation */ -#define ESCHER_Prop_LockAspectRatio 120 /* BOOL Don't allow changes in aspect ratio */ -#define ESCHER_Prop_LockPosition 121 /* BOOL Don't allow the shape to be moved */ -#define ESCHER_Prop_LockAgainstSelect 122 /* BOOL Shape may not be selected */ -#define ESCHER_Prop_LockCropping 123 /* BOOL No cropping this shape */ -#define ESCHER_Prop_LockVertices 124 /* BOOL Edit Points not allowed */ -#define ESCHER_Prop_LockText 125 /* BOOL Do not edit text */ -#define ESCHER_Prop_LockAdjustHandles 126 /* BOOL Do not adjust */ -#define ESCHER_Prop_LockAgainstGrouping 127 /* BOOL Do not group this shape */ +#define ESCHER_Prop_LockRotation 119 /* sal_Bool No rotation */ +#define ESCHER_Prop_LockAspectRatio 120 /* sal_Bool Don't allow changes in aspect ratio */ +#define ESCHER_Prop_LockPosition 121 /* sal_Bool Don't allow the shape to be moved */ +#define ESCHER_Prop_LockAgainstSelect 122 /* sal_Bool Shape may not be selected */ +#define ESCHER_Prop_LockCropping 123 /* sal_Bool No cropping this shape */ +#define ESCHER_Prop_LockVertices 124 /* sal_Bool Edit Points not allowed */ +#define ESCHER_Prop_LockText 125 /* sal_Bool Do not edit text */ +#define ESCHER_Prop_LockAdjustHandles 126 /* sal_Bool Do not adjust */ +#define ESCHER_Prop_LockAgainstGrouping 127 /* sal_Bool Do not group this shape */ // Text #define ESCHER_Prop_lTxid 128 /* LONG id for the text, value determined by the host */ #define ESCHER_Prop_dxTextLeft 129 /* LONG margins relative to shape's inscribed */ @@ -678,11 +678,11 @@ enum ESCHER_LineCap #define ESCHER_Prop_cdirFont 137 /* MSOCDIR Font rotation */ #define ESCHER_Prop_hspNext 138 /* MSOHSP ID of the next shape (used by Word for linked textboxes) */ #define ESCHER_Prop_txdir 139 /* MSOTXDIR Bi-Di Text direction */ -#define ESCHER_Prop_SelectText 187 /* BOOL TRUE if single click selects text, FALSE if two clicks */ -#define ESCHER_Prop_AutoTextMargin 188 /* BOOL use host's margin calculations */ -#define ESCHER_Prop_RotateText 189 /* BOOL Rotate text with shape */ -#define ESCHER_Prop_FitShapeToText 190 /* BOOL Size shape to fit text size */ -#define ESCHER_Prop_FitTextToShape 191 /* BOOL Size text to fit shape size */ +#define ESCHER_Prop_SelectText 187 /* sal_Bool sal_True if single click selects text, sal_False if two clicks */ +#define ESCHER_Prop_AutoTextMargin 188 /* sal_Bool use host's margin calculations */ +#define ESCHER_Prop_RotateText 189 /* sal_Bool Rotate text with shape */ +#define ESCHER_Prop_FitShapeToText 190 /* sal_Bool Size shape to fit text size */ +#define ESCHER_Prop_FitTextToShape 191 /* sal_Bool Size text to fit shape size */ // GeoText #define ESCHER_Prop_gtextUNICODE 192 /* WCHAR* UNICODE text string */ #define ESCHER_Prop_gtextRTF 193 /* char* RTF text string */ @@ -690,22 +690,22 @@ enum ESCHER_LineCap #define ESCHER_Prop_gtextSize 195 /* LONG default point size */ #define ESCHER_Prop_gtextSpacing 196 /* LONG fixed point 16.16 */ #define ESCHER_Prop_gtextFont 197 /* WCHAR* font family name */ -#define ESCHER_Prop_gtextFReverseRows 240 /* BOOL Reverse row order */ -#define ESCHER_Prop_fGtext 241 /* BOOL Has text effect */ -#define ESCHER_Prop_gtextFVertical 242 /* BOOL Rotate characters */ -#define ESCHER_Prop_gtextFKern 243 /* BOOL Kern characters */ -#define ESCHER_Prop_gtextFTight 244 /* BOOL Tightening or tracking */ -#define ESCHER_Prop_gtextFStretch 245 /* BOOL Stretch to fit shape */ -#define ESCHER_Prop_gtextFShrinkFit 246 /* BOOL Char bounding box */ -#define ESCHER_Prop_gtextFBestFit 247 /* BOOL Scale text-on-path */ -#define ESCHER_Prop_gtextFNormalize 248 /* BOOL Stretch char height */ -#define ESCHER_Prop_gtextFDxMeasure 249 /* BOOL Do not measure along path */ -#define ESCHER_Prop_gtextFBold 250 /* BOOL Bold font */ -#define ESCHER_Prop_gtextFItalic 251 /* BOOL Italic font */ -#define ESCHER_Prop_gtextFUnderline 252 /* BOOL Underline font */ -#define ESCHER_Prop_gtextFShadow 253 /* BOOL Shadow font */ -#define ESCHER_Prop_gtextFSmallcaps 254 /* BOOL Small caps font */ -#define ESCHER_Prop_gtextFStrikethrough 255 /* BOOL Strike through font */ +#define ESCHER_Prop_gtextFReverseRows 240 /* sal_Bool Reverse row order */ +#define ESCHER_Prop_fGtext 241 /* sal_Bool Has text effect */ +#define ESCHER_Prop_gtextFVertical 242 /* sal_Bool Rotate characters */ +#define ESCHER_Prop_gtextFKern 243 /* sal_Bool Kern characters */ +#define ESCHER_Prop_gtextFTight 244 /* sal_Bool Tightening or tracking */ +#define ESCHER_Prop_gtextFStretch 245 /* sal_Bool Stretch to fit shape */ +#define ESCHER_Prop_gtextFShrinkFit 246 /* sal_Bool Char bounding box */ +#define ESCHER_Prop_gtextFBestFit 247 /* sal_Bool Scale text-on-path */ +#define ESCHER_Prop_gtextFNormalize 248 /* sal_Bool Stretch char height */ +#define ESCHER_Prop_gtextFDxMeasure 249 /* sal_Bool Do not measure along path */ +#define ESCHER_Prop_gtextFBold 250 /* sal_Bool Bold font */ +#define ESCHER_Prop_gtextFItalic 251 /* sal_Bool Italic font */ +#define ESCHER_Prop_gtextFUnderline 252 /* sal_Bool Underline font */ +#define ESCHER_Prop_gtextFShadow 253 /* sal_Bool Shadow font */ +#define ESCHER_Prop_gtextFSmallcaps 254 /* sal_Bool Small caps font */ +#define ESCHER_Prop_gtextFStrikethrough 255 /* sal_Bool Strike through font */ // Blip #define ESCHER_Prop_cropFromTop 256 /* LONG 16.16 fraction times total */ #define ESCHER_Prop_cropFromBottom 257 /* LONG image width or height, */ @@ -725,10 +725,10 @@ enum ESCHER_LineCap #define ESCHER_Prop_pibPrint 271 /* IMsoBlip* Blip to display when printing */ #define ESCHER_Prop_pibPrintName 272 /* WCHAR* Blip file name */ #define ESCHER_Prop_pibPrintFlags 273 /* MSOBLIPFLAGS Blip flags */ -#define ESCHER_Prop_fNoHitTestPicture 316 /* BOOL Do not hit test the picture */ -#define ESCHER_Prop_pictureGray 317 /* BOOL grayscale display */ -#define ESCHER_Prop_pictureBiLevel 318 /* BOOL bi-level display */ -#define ESCHER_Prop_pictureActive 319 /* BOOL Server is active (OLE objects only) */ +#define ESCHER_Prop_fNoHitTestPicture 316 /* sal_Bool Do not hit test the picture */ +#define ESCHER_Prop_pictureGray 317 /* sal_Bool grayscale display */ +#define ESCHER_Prop_pictureBiLevel 318 /* sal_Bool bi-level display */ +#define ESCHER_Prop_pictureActive 319 /* sal_Bool Server is active (OLE objects only) */ // Geometry #define ESCHER_Prop_geoLeft 320 /* LONG Defines the G (geometry) coordinate space. */ #define ESCHER_Prop_geoTop 321 /* LONG */ @@ -747,12 +747,12 @@ enum ESCHER_LineCap #define ESCHER_Prop_adjust8Value 334 /* LONG */ #define ESCHER_Prop_adjust9Value 335 /* LONG */ #define ESCHER_Prop_adjust10Value 336 /* LONG */ -#define ESCHER_Prop_fShadowOK 378 /* BOOL Shadow may be set */ -#define ESCHER_Prop_f3DOK 379 /* BOOL 3D may be set */ -#define ESCHER_Prop_fLineOK 380 /* BOOL Line style may be set */ -#define ESCHER_Prop_fGtextOK 381 /* BOOL Text effect (FontWork) supported */ -#define ESCHER_Prop_fFillShadeShapeOK 382 /* BOOL */ -#define ESCHER_Prop_fFillOK 383 /* BOOL OK to fill the shape through the UI or VBA? */ +#define ESCHER_Prop_fShadowOK 378 /* sal_Bool Shadow may be set */ +#define ESCHER_Prop_f3DOK 379 /* sal_Bool 3D may be set */ +#define ESCHER_Prop_fLineOK 380 /* sal_Bool Line style may be set */ +#define ESCHER_Prop_fGtextOK 381 /* sal_Bool Text effect (FontWork) supported */ +#define ESCHER_Prop_fFillShadeShapeOK 382 /* sal_Bool */ +#define ESCHER_Prop_fFillOK 383 /* sal_Bool OK to fill the shape through the UI or VBA? */ // FillStyle #define ESCHER_Prop_fillType 384 /* ESCHER_FillStyle Type of fill */ #define ESCHER_Prop_fillColor 385 /* MSOCLR Foreground color */ @@ -783,11 +783,11 @@ enum ESCHER_LineCap #define ESCHER_Prop_fillShapeOriginX 410 /* LONG */ #define ESCHER_Prop_fillShapeOriginY 411 /* LONG */ #define ESCHER_Prop_fillShadeType 412 /* MSOSHADETYPE Type of shading, if a shaded (gradient) fill. */ -#define ESCHER_Prop_fFilled 443 /* BOOL Is shape filled? */ -#define ESCHER_Prop_fHitTestFill 444 /* BOOL Should we hit test fill? */ -#define ESCHER_Prop_fillShape 445 /* BOOL Register pattern on shape */ -#define ESCHER_Prop_fillUseRect 446 /* BOOL Use the large rect? */ -#define ESCHER_Prop_fNoFillHitTest 447 /* BOOL Hit test a shape as though filled */ +#define ESCHER_Prop_fFilled 443 /* sal_Bool Is shape filled? */ +#define ESCHER_Prop_fHitTestFill 444 /* sal_Bool Should we hit test fill? */ +#define ESCHER_Prop_fillShape 445 /* sal_Bool Register pattern on shape */ +#define ESCHER_Prop_fillUseRect 446 /* sal_Bool Use the large rect? */ +#define ESCHER_Prop_fNoFillHitTest 447 /* sal_Bool Hit test a shape as though filled */ // LineStyle #define ESCHER_Prop_lineColor 448 /* MSOCLR Color of line */ #define ESCHER_Prop_lineOpacity 449 /* LONG Not implemented */ @@ -813,11 +813,11 @@ enum ESCHER_LineCap #define ESCHER_Prop_lineEndArrowLength 469 /* MSOLINEENDLENGTH Arrow at end */ #define ESCHER_Prop_lineJoinStyle 470 /* MSOLINEJOIN How to join lines */ #define ESCHER_Prop_lineEndCapStyle 471 /* MSOLINECAP How to end lines */ -#define ESCHER_Prop_fArrowheadsOK 507 /* BOOL Allow arrowheads if prop. is set */ -#define ESCHER_Prop_fLine 508 /* BOOL Any line? */ -#define ESCHER_Prop_fHitTestLine 509 /* BOOL Should we hit test lines? */ -#define ESCHER_Prop_lineFillShape 510 /* BOOL Register pattern on shape */ -#define ESCHER_Prop_fNoLineDrawDash 511 /* BOOL Draw a dashed line if no line */ +#define ESCHER_Prop_fArrowheadsOK 507 /* sal_Bool Allow arrowheads if prop. is set */ +#define ESCHER_Prop_fLine 508 /* sal_Bool Any line? */ +#define ESCHER_Prop_fHitTestLine 509 /* sal_Bool Should we hit test lines? */ +#define ESCHER_Prop_lineFillShape 510 /* sal_Bool Register pattern on shape */ +#define ESCHER_Prop_fNoLineDrawDash 511 /* sal_Bool Draw a dashed line if no line */ // ShadowStyle #define ESCHER_Prop_shadowType 512 /* MSOSHADOWTYPE Type of effect */ #define ESCHER_Prop_shadowColor 513 /* MSOCLR Foreground color */ @@ -837,8 +837,8 @@ enum ESCHER_LineCap #define ESCHER_Prop_shadowWeight 527 /* LONG scaling factor */ #define ESCHER_Prop_shadowOriginX 528 /* LONG */ #define ESCHER_Prop_shadowOriginY 529 /* LONG */ -#define ESCHER_Prop_fShadow 574 /* BOOL Any shadow? */ -#define ESCHER_Prop_fshadowObscured 575 /* BOOL Excel5-style shadow */ +#define ESCHER_Prop_fShadow 574 /* sal_Bool Any shadow? */ +#define ESCHER_Prop_fshadowObscured 575 /* sal_Bool Excel5-style shadow */ // PerspectiveStyle #define ESCHER_Prop_perspectiveType 576 /* MSOXFORMTYPE Where transform applies */ #define ESCHER_Prop_perspectiveOffsetX 577 /* LONG The LONG values define a */ @@ -852,7 +852,7 @@ enum ESCHER_LineCap #define ESCHER_Prop_perspectiveWeight 585 /* LONG Scaling factor */ #define ESCHER_Prop_perspectiveOriginX 586 /* LONG */ #define ESCHER_Prop_perspectiveOriginY 587 /* LONG */ -#define ESCHER_Prop_fPerspective 639 /* BOOL On/off */ +#define ESCHER_Prop_fPerspective 639 /* sal_Bool On/off */ // 3D Object #define ESCHER_Prop_c3DSpecularAmt 640 /* LONG Fixed-point 16.16 */ #define ESCHER_Prop_c3DDiffuseAmt 641 /* LONG Fixed-point 16.16 */ @@ -863,10 +863,10 @@ enum ESCHER_LineCap #define ESCHER_Prop_c3DExtrudePlane 646 /* LONG Extrusion direction */ #define ESCHER_Prop_c3DExtrusionColor 647 /* MSOCLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. */ #define ESCHER_Prop_c3DCrMod 648 /* MSOCLR Modification for BW views */ -#define ESCHER_Prop_f3D 700 /* BOOL Does this shape have a 3D effect? */ -#define ESCHER_Prop_fc3DMetallic 701 /* BOOL Use metallic specularity? */ -#define ESCHER_Prop_fc3DUseExtrusionColor 702 /* BOOL */ -#define ESCHER_Prop_fc3DLightFace 703 /* BOOL */ +#define ESCHER_Prop_f3D 700 /* sal_Bool Does this shape have a 3D effect? */ +#define ESCHER_Prop_fc3DMetallic 701 /* sal_Bool Use metallic specularity? */ +#define ESCHER_Prop_fc3DUseExtrusionColor 702 /* sal_Bool */ +#define ESCHER_Prop_fc3DLightFace 703 /* sal_Bool */ // 3D Style #define ESCHER_Prop_c3DYRotationAngle 704 /* LONG degrees (16.16) about y axis */ #define ESCHER_Prop_c3DXRotationAngle 705 /* LONG degrees (16.16) about x axis */ @@ -895,22 +895,22 @@ enum ESCHER_LineCap #define ESCHER_Prop_c3DFillY 728 /* LONG tion; only their relative */ #define ESCHER_Prop_c3DFillZ 729 /* LONG magnitudes matter */ #define ESCHER_Prop_c3DFillIntensity 730 /* LONG Fixed point intensity */ -#define ESCHER_Prop_fc3DConstrainRotation 763 /* BOOL */ -#define ESCHER_Prop_fc3DRotationCenterAuto 764 /* BOOL */ -#define ESCHER_Prop_fc3DParallel 765 /* BOOL Parallel projection? */ -#define ESCHER_Prop_fc3DKeyHarsh 766 /* BOOL Is key lighting harsh? */ -#define ESCHER_Prop_fc3DFillHarsh 767 /* BOOL Is fill lighting harsh? */ +#define ESCHER_Prop_fc3DConstrainRotation 763 /* sal_Bool */ +#define ESCHER_Prop_fc3DRotationCenterAuto 764 /* sal_Bool */ +#define ESCHER_Prop_fc3DParallel 765 /* sal_Bool Parallel projection? */ +#define ESCHER_Prop_fc3DKeyHarsh 766 /* sal_Bool Is key lighting harsh? */ +#define ESCHER_Prop_fc3DFillHarsh 767 /* sal_Bool Is fill lighting harsh? */ // Shape #define ESCHER_Prop_hspMaster 769 /* MSOHSP master shape */ #define ESCHER_Prop_cxstyle 771 /* MSOCXSTYLE Type of connector */ #define ESCHER_Prop_bWMode 772 /* ESCHERwMode Settings for modifications to */ #define ESCHER_Prop_bWModePureBW 773 /* ESCHERwMode be made when in different */ #define ESCHER_Prop_bWModeBW 774 /* ESCHERwMode forms of black-and-white mode. */ -#define ESCHER_Prop_fOleIcon 826 /* BOOL For OLE objects, whether the object is in icon form */ -#define ESCHER_Prop_fPreferRelativeResize 827 /* BOOL For UI only. Prefer relative resizing. */ -#define ESCHER_Prop_fLockShapeType 828 /* BOOL Lock the shape type (don't allow Change Shape) */ -#define ESCHER_Prop_fDeleteAttachedObject 830 /* BOOL */ -#define ESCHER_Prop_fBackground 831 /* BOOL If TRUE, this is the background shape. */ +#define ESCHER_Prop_fOleIcon 826 /* sal_Bool For OLE objects, whether the object is in icon form */ +#define ESCHER_Prop_fPreferRelativeResize 827 /* sal_Bool For UI only. Prefer relative resizing. */ +#define ESCHER_Prop_fLockShapeType 828 /* sal_Bool Lock the shape type (don't allow Change Shape) */ +#define ESCHER_Prop_fDeleteAttachedObject 830 /* sal_Bool */ +#define ESCHER_Prop_fBackground 831 /* sal_Bool If sal_True, this is the background shape. */ // Callout #define ESCHER_Prop_spcot 832 /* MSOSPCOT Callout type */ #define ESCHER_Prop_dxyCalloutGap 833 /* LONG Distance from box to first point.(EMUs) */ @@ -918,13 +918,13 @@ enum ESCHER_LineCap #define ESCHER_Prop_spcod 835 /* MSOSPCOD Callout drop type */ #define ESCHER_Prop_dxyCalloutDropSpecified 836 /* LONG if msospcodSpecified, the actual drop distance */ #define ESCHER_Prop_dxyCalloutLengthSpecified 837 /* LONG if fCalloutLengthSpecified, the actual distance */ -#define ESCHER_Prop_fCallout 889 /* BOOL Is the shape a callout? */ -#define ESCHER_Prop_fCalloutAccentBar 890 /* BOOL does callout have accent bar */ -#define ESCHER_Prop_fCalloutTextBorder 891 /* BOOL does callout have a text border */ -#define ESCHER_Prop_fCalloutMinusX 892 /* BOOL */ -#define ESCHER_Prop_fCalloutMinusY 893 /* BOOL */ -#define ESCHER_Prop_fCalloutDropAuto 894 /* BOOL If true, then we occasionally invert the drop distance */ -#define ESCHER_Prop_fCalloutLengthSpecified 895 /* BOOL if true, we look at dxyCalloutLengthSpecified */ +#define ESCHER_Prop_fCallout 889 /* sal_Bool Is the shape a callout? */ +#define ESCHER_Prop_fCalloutAccentBar 890 /* sal_Bool does callout have accent bar */ +#define ESCHER_Prop_fCalloutTextBorder 891 /* sal_Bool does callout have a text border */ +#define ESCHER_Prop_fCalloutMinusX 892 /* sal_Bool */ +#define ESCHER_Prop_fCalloutMinusY 893 /* sal_Bool */ +#define ESCHER_Prop_fCalloutDropAuto 894 /* sal_Bool If true, then we occasionally invert the drop distance */ +#define ESCHER_Prop_fCalloutLengthSpecified 895 /* sal_Bool if true, we look at dxyCalloutLengthSpecified */ // GroupShape #define ESCHER_Prop_wzName 896 /* WCHAR* Shape Name (present only if explicitly set) */ #define ESCHER_Prop_wzDescription 897 /* WCHAR* alternate text */ @@ -937,13 +937,13 @@ enum ESCHER_LineCap #define ESCHER_Prop_lidRegroup 904 /* LONG Regroup ID */ #define ESCHER_Prop_tableProperties 927 #define ESCHER_Prop_tableRowProperties 928 -#define ESCHER_Prop_fEditedWrap 953 /* BOOL Has the wrap polygon been edited? */ -#define ESCHER_Prop_fBehindDocument 954 /* BOOL Word-only (shape is behind text) */ -#define ESCHER_Prop_fOnDblClickNotify 955 /* BOOL Notify client on a double click */ -#define ESCHER_Prop_fIsButton 956 /* BOOL A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. */ -#define ESCHER_Prop_fOneD 957 /* BOOL 1D adjustment */ -#define ESCHER_Prop_fHidden 958 /* BOOL Do not display */ -#define ESCHER_Prop_fPrint 959 /* BOOL Print this shape */ +#define ESCHER_Prop_fEditedWrap 953 /* sal_Bool Has the wrap polygon been edited? */ +#define ESCHER_Prop_fBehindDocument 954 /* sal_Bool Word-only (shape is behind text) */ +#define ESCHER_Prop_fOnDblClickNotify 955 /* sal_Bool Notify client on a double click */ +#define ESCHER_Prop_fIsButton 956 /* sal_Bool A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. */ +#define ESCHER_Prop_fOneD 957 /* sal_Bool 1D adjustment */ +#define ESCHER_Prop_fHidden 958 /* sal_Bool Do not display */ +#define ESCHER_Prop_fPrint 959 /* sal_Bool Print this shape */ #define ESCHER_PERSISTENTRY_PREALLOCATE 64 @@ -1027,9 +1027,9 @@ struct EscherPropertyValueHelper struct EscherPersistEntry { - UINT32 mnID; - UINT32 mnOffset; - EscherPersistEntry( UINT32 nId, UINT32 nOffset ) { mnID = nId; mnOffset = nOffset; }; + sal_uInt32 mnID; + sal_uInt32 mnOffset; + EscherPersistEntry( sal_uInt32 nId, sal_uInt32 nOffset ) { mnID = nId; mnOffset = nOffset; }; }; @@ -1043,12 +1043,12 @@ class EscherBlibEntry protected: - UINT32 mnIdentifier[ 4 ]; - UINT32 mnPictureOffset; // offset auf die grafik im PictureStreams - UINT32 mnSize; // size of real graphic + sal_uInt32 mnIdentifier[ 4 ]; + sal_uInt32 mnPictureOffset; // offset auf die grafik im PictureStreams + sal_uInt32 mnSize; // size of real graphic - UINT32 mnRefCount; // !! reference count - UINT32 mnSizeExtra; // !! size of preceding header + sal_uInt32 mnRefCount; // !! reference count + sal_uInt32 mnSizeExtra; // !! size of preceding header ESCHER_BlibType meBlibType; @@ -1068,7 +1068,7 @@ class EscherBlibEntry void WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0 ); sal_Bool IsEmpty() const { return mbIsEmpty; }; - BOOL operator==( const EscherBlibEntry& ) const; + sal_Bool operator==( const EscherBlibEntry& ) const; }; // --------------------------------------------------------------------------------------------- @@ -1086,7 +1086,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider protected : - UINT32 ImplInsertBlib( EscherBlibEntry* p_EscherBlibEntry ); + sal_uInt32 ImplInsertBlib( EscherBlibEntry* p_EscherBlibEntry ); public : @@ -1263,13 +1263,13 @@ class MSFILTER_DLLPUBLIC EscherPersistTable public: List maPersistTable; - BOOL PtIsID( UINT32 nID ); - void PtInsert( UINT32 nID, UINT32 nOfs ); - UINT32 PtDelete( UINT32 nID ); - UINT32 PtGetOffsetByID( UINT32 nID ); - UINT32 PtReplace( UINT32 nID, UINT32 nOfs ); - UINT32 PtReplaceOrInsert( UINT32 nID, UINT32 nOfs ); - UINT32 PtGetCount() const { return maPersistTable.Count(); }; + sal_Bool PtIsID( sal_uInt32 nID ); + void PtInsert( sal_uInt32 nID, sal_uInt32 nOfs ); + sal_uInt32 PtDelete( sal_uInt32 nID ); + sal_uInt32 PtGetOffsetByID( sal_uInt32 nID ); + sal_uInt32 PtReplace( sal_uInt32 nID, sal_uInt32 nOfs ); + sal_uInt32 PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOfs ); + sal_uInt32 PtGetCount() const { return maPersistTable.Count(); }; EscherPersistTable(); virtual ~EscherPersistTable(); @@ -1309,7 +1309,7 @@ public: class InteractionInfo { - bool mbHasInteraction; + bool mbHasInteraction; std::auto_ptr<SvMemoryStream> mpHyperlinkRecord; InteractionInfo(); public: @@ -1329,11 +1329,11 @@ private: EscherExClientRecord_Base* pClientTextbox; InteractionInfo* pInteractionInfo; // ignore single shape if entire pages are written - BOOL bDontWriteShape; + sal_Bool bDontWriteShape; public: EscherExHostAppData() : pClientAnchor(0), pClientData(0), - pClientTextbox(0), pInteractionInfo(0), bDontWriteShape(FALSE) + pClientTextbox(0), pInteractionInfo(0), bDontWriteShape(sal_False) {} void SetInteractionInfo( InteractionInfo* p ) @@ -1344,7 +1344,7 @@ public: { pClientData = p; } void SetClientTextbox( EscherExClientRecord_Base* p ) { pClientTextbox = p; } - void SetDontWriteShape( BOOL b ) + void SetDontWriteShape( sal_Bool b ) { bDontWriteShape = b; } InteractionInfo* GetInteractionInfo() const { return pInteractionInfo; } @@ -1356,13 +1356,13 @@ public: { return pClientTextbox; } void WriteClientAnchor( EscherEx& rEx, const Rectangle& rRect ) - { if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); } + { if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); } void WriteClientData( EscherEx& rEx ) - { if( pClientData ) pClientData->WriteData( rEx ); } + { if( pClientData ) pClientData->WriteData( rEx ); } void WriteClientTextbox( EscherEx& rEx ) - { if( pClientTextbox ) pClientTextbox->WriteData( rEx ); } + { if( pClientTextbox ) pClientTextbox->WriteData( rEx ); } - BOOL DontWriteShape() const { return bDontWriteShape; } + sal_Bool DontWriteShape() const { return bDontWriteShape; } }; @@ -1462,22 +1462,22 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable EscherExGlobalRef mxGlobal; ImplEscherExSdrPtr mpImplEscherExSdr; SvStream* mpOutStrm; - UINT32 mnStrmStartOfs; + sal_uInt32 mnStrmStartOfs; std::vector< sal_uInt32 > mOffsets; std::vector< sal_uInt16 > mRecTypes; - UINT32 mnCurrentDg; - UINT32 mnCountOfs; + sal_uInt32 mnCurrentDg; + sal_uInt32 mnCountOfs; - UINT32 mnGroupLevel; - UINT16 mnHellLayerId; + sal_uInt32 mnGroupLevel; + sal_uInt16 mnHellLayerId; - BOOL mbEscherSpgr; - BOOL mbEscherDg; - BOOL mbOleEmf; // OLE is EMF instead of WMF + sal_Bool mbEscherSpgr; + sal_Bool mbEscherDg; + sal_Bool mbOleEmf; // OLE is EMF instead of WMF - virtual BOOL DoSeek( UINT32 nKey ); + virtual sal_Bool DoSeek( sal_uInt32 nKey ); public: explicit EscherEx( const EscherExGlobalRef& rxGlobal, SvStream& rOutStrm ); @@ -1525,17 +1525,17 @@ public: */ 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 + void InsertPersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ); // Es wird nicht geprueft, ob sich jener schluessel schon in der PersistantTable befindet + void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ); + sal_uInt32 GetPersistOffset( sal_uInt32 nKey ); + sal_Bool SeekToPersistOffset( sal_uInt32 nKey ); + virtual sal_Bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue );// nValue wird im Stream an entrsprechender Stelle eingefuegt(overwrite modus), ohne dass sich die // aktuelle StreamPosition aendert SvStream& GetStream() const { return *mpOutStrm; } - ULONG GetStreamPos() const { return mpOutStrm->Tell(); } + sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } - virtual BOOL SeekBehindRecHeader( UINT16 nRecType ); // der stream muss vor einem gueltigen Record Header oder Atom stehen + virtual sal_Bool SeekBehindRecHeader( sal_uInt16 nRecType ); // der stream muss vor einem gueltigen Record Header oder Atom stehen // features beim erzeugen folgender Container: // @@ -1544,29 +1544,29 @@ public: // ESCHER_SpgrContainer: // ESCHER_SpContainer: - virtual void OpenContainer( UINT16 nEscherContainer, int nRecInstance = 0 ); + virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); virtual void CloseContainer(); virtual void BeginAtom(); - virtual void EndAtom( UINT16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - virtual void AddAtom( UINT32 nAtomSitze, UINT16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); + virtual void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); + virtual void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); virtual void AddChildAnchor( const Rectangle& rRectangle ); virtual void AddClientAnchor( const Rectangle& rRectangle ); - virtual UINT32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 ); - UINT32 EnterGroup( const Rectangle* pBoundRect = NULL ); - UINT32 GetGroupLevel() const { return mnGroupLevel; }; - virtual BOOL SetGroupSnapRect( UINT32 nGroupLevel, const Rectangle& rRect ); - virtual BOOL SetGroupLogicRect( UINT32 nGroupLevel, const Rectangle& rRect ); + virtual sal_uInt32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 ); + sal_uInt32 EnterGroup( const Rectangle* pBoundRect = NULL ); + sal_uInt32 GetGroupLevel() const { return mnGroupLevel; }; + virtual sal_Bool SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); + virtual sal_Bool SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect ); virtual void LeaveGroup(); // ein ESCHER_Sp wird geschrieben ( Ein ESCHER_DgContainer muss dazu geoeffnet sein !!) - virtual void AddShape( UINT32 nShpInstance, UINT32 nFlagIds, UINT32 nShapeID = 0 ); + virtual void AddShape( sal_uInt32 nShpInstance, sal_uInt32 nFlagIds, sal_uInt32 nShapeID = 0 ); virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); - UINT32 GetColor( const UINT32 nColor, BOOL bSwap = TRUE ); - UINT32 GetColor( const Color& rColor, BOOL bSwap = TRUE ); + sal_uInt32 GetColor( const sal_uInt32 nColor, sal_Bool bSwap = sal_True ); + sal_uInt32 GetColor( const Color& rColor, sal_Bool bSwap = sal_True ); // ...Sdr... implemented in eschesdo.cxx @@ -1574,7 +1574,7 @@ public: void AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); /// returns the ShapeID - UINT32 AddSdrObject( const SdrObject& rObj ); + sal_uInt32 AddSdrObject( const SdrObject& rObj ); /// If objects are written through AddSdrObject the /// SolverContainer has to be written, and maybe some @@ -1590,7 +1590,7 @@ public: /// Called after a shape is written to inform the application /// of the resulted shape type and ID. - virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ); /// Called before an AdditionalText EnterGroup occurs. /// The current shape will be written in three parts: @@ -1611,14 +1611,14 @@ public: virtual EscherExHostAppData* EnterAdditionalTextGroup(); /// 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 ); + virtual sal_uInt32 QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, sal_uInt32 nShapeId ); // add an dummy rectangle shape into the escher stream - UINT32 AddDummyShape(); + sal_uInt32 AddDummyShape(); static const SdrObject* GetSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape ); - void SetHellLayerId( UINT16 nId ) { mnHellLayerId = nId; } - UINT16 GetHellLayerId() const { return mnHellLayerId; } + void SetHellLayerId( sal_uInt16 nId ) { mnHellLayerId = nId; } + sal_uInt16 GetHellLayerId() const { return mnHellLayerId; } private: EscherEx( const EscherEx& ); diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx index b455267b0154..63afd9456078 100644 --- a/filter/inc/filter/msfilter/mscodec.hxx +++ b/filter/inc/filter/msfilter/mscodec.hxx @@ -29,8 +29,11 @@ #ifndef SVX_MSCODEC_HXX #define SVX_MSCODEC_HXX -#include "rtl/cipher.h" -#include "rtl/digest.h" +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/beans/NamedValue.hpp> + +#include <rtl/cipher.h> +#include <rtl/digest.h> #include "filter/msfilter/msfilterdllapi.h" namespace msfilter { @@ -53,6 +56,23 @@ public: */ void InitKey( const sal_uInt8 pnPassData[ 16 ] ); + /** Initializes the algorithm with the encryption data. + + @param aData + The sequence contains the necessary data to initialize + the codec. + */ + sal_Bool InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); + + /** Retrieves the encryption data + + @return + The sequence contains the necessary data to initialize + the codec. + */ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData(); + + /** Verifies the validity of the password using the passed key and hash. @precond @@ -106,16 +126,6 @@ public: */ void Skip( sal_Size nBytes ); - // static ----------------------------------------------------------------- - - /** Calculates the 16-bit hash value for the given password. - - The password data may be longer than 16 bytes. The array does not need - to be terminated with a NULL byte (but it can without invalidating the - result). - */ - static sal_uInt16 GetHash( const sal_uInt8* pnPassData, sal_Size nSize ); - protected: sal_uInt8 mpnKey[ 16 ]; /// Encryption key. sal_Size mnOffset; /// Key offset. @@ -186,17 +196,34 @@ public: explicit MSCodec_Std97(); ~MSCodec_Std97(); + /** Initializes the algorithm with the encryption data. + + @param aData + The sequence contains the necessary data to initialize + the codec. + */ + sal_Bool InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); + + /** Retrieves the encryption data + + @return + The sequence contains the necessary data to initialize + the codec. + */ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData(); + + /** Initializes the algorithm with the specified password and document ID. @param pPassData Wide character array containing the password. Must be zero terminated, which results in a maximum length of 15 characters. - @param pUnique + @param pDocId Unique document identifier read from or written to the file. */ void InitKey( const sal_uInt16 pPassData[ 16 ], - const sal_uInt8 pUnique[ 16 ] ); + const sal_uInt8 pDocId[ 16 ] ); /** Verifies the validity of the password using the passed salt data. @@ -321,16 +348,26 @@ public: sal_uInt8 pSaltData[16], sal_uInt8 pSaltDigest[16]); -private: + /* allows to get the unique document id from the codec + */ + void GetDocId( sal_uInt8 pDocId[16] ); + void GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] ); private: + void InitKeyImpl( + const sal_uInt8 pKeyData[64], + const sal_uInt8 pDocId[16] ); + + +private: MSFILTER_DLLPRIVATE MSCodec_Std97( const MSCodec_Std97& ); MSFILTER_DLLPRIVATE MSCodec_Std97& operator=( const MSCodec_Std97& ); rtlCipher m_hCipher; rtlDigest m_hDigest; sal_uInt8 m_pDigestValue[ RTL_DIGEST_LENGTH_MD5 ]; + sal_uInt8 m_pDocId[16]; }; // ============================================================================ diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index a75b8e455f7d..ffe80ed493e7 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -66,17 +66,17 @@ class MSFILTER_DLLPUBLIC DffRecordHeader { public: - BYTE nRecVer; // may be DFF_PSFLAG_CONTAINER - UINT16 nRecInstance; - UINT16 nImpVerInst; - UINT16 nRecType; - UINT32 nRecLen; - ULONG nFilePos; + sal_uInt8 nRecVer; // may be DFF_PSFLAG_CONTAINER + sal_uInt16 nRecInstance; + sal_uInt16 nImpVerInst; + sal_uInt16 nRecType; + sal_uInt32 nRecLen; + sal_uLong nFilePos; public: DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {} bool IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; } - ULONG GetRecBegFilePos() const { return nFilePos; } - ULONG GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; } + sal_uLong GetRecBegFilePos() const { return nFilePos; } + sal_uLong GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; } void SeekToEndOfRecord(SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen ); } void SeekToContent( SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE ); } void SeekToBegOfRecord(SvStream& rIn) const { rIn.Seek( nFilePos ); } @@ -87,10 +87,10 @@ public: struct DffPropFlags { - BYTE bSet : 1; - BYTE bComplex : 1; - BYTE bBlip : 1; - BYTE bSoftAttr : 1; + sal_uInt8 bSet : 1; + sal_uInt8 bComplex : 1; + sal_uInt8 bBlip : 1; + sal_uInt8 bSoftAttr : 1; }; class SvxMSDffManager; @@ -99,23 +99,23 @@ class MSFILTER_DLLPUBLIC DffPropSet : public Table { protected : - UINT32 mpContents[ 1024 ]; + sal_uInt32 mpContents[ 1024 ]; DffPropFlags mpFlags[ 1024 ]; public : - DffPropSet( BOOL bInitialize = FALSE ){ if ( bInitialize ) + DffPropSet( sal_Bool bInitialize = sal_False ){ if ( bInitialize ) memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) ); }; - inline BOOL IsProperty( UINT32 nRecType ) const { return ( mpFlags[ nRecType & 0x3ff ].bSet ); }; - BOOL IsHardAttribute( UINT32 nId ) const; - UINT32 GetPropertyValue( UINT32 nId, UINT32 nDefault = 0 ) const; + inline sal_Bool IsProperty( sal_uInt32 nRecType ) const { return ( mpFlags[ nRecType & 0x3ff ].bSet ); }; + sal_Bool IsHardAttribute( sal_uInt32 nId ) const; + sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault = 0 ) const; /** Returns a boolean property by its real identifier. */ - bool GetPropertyBool( UINT32 nId, bool bDefault = false ) const; + bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const; /** Returns a string property. */ - ::rtl::OUString GetPropertyString( UINT32 nId, SvStream& rStrm ) const; - void SetPropertyValue( UINT32 nId, UINT32 nValue ) const; - BOOL SeekToContent( UINT32 nRecType, SvStream& rSt ) const; + ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; + void SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const; + sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void Merge( DffPropSet& rMasterPropSet ) const; void InitializePropSet() const; friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet ); @@ -138,19 +138,19 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet public: - INT32 mnFix16Angle; + sal_Int32 mnFix16Angle; DffPropertyReader( const SvxMSDffManager& rManager ); ~DffPropertyReader(); - INT32 Fix16ToAngle( INT32 nAngle ) const; + sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const; #ifdef DBG_CUSTOMSHAPE - void ReadPropSet( SvStream& rIn, void* pClientData, UINT32 nShapeType = 0 ) const; + void ReadPropSet( SvStream& rIn, void* pClientData, sal_uInt32 nShapeType = 0 ) const; #else void ReadPropSet( SvStream& rIn, void* pClientData ) const; #endif - void SetDefaultPropSet( SvStream& rIn, UINT32 nOffDgg ) const; + void SetDefaultPropSet( SvStream& rIn, sal_uInt32 nOffDgg ) const; void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const; void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const; }; @@ -237,8 +237,8 @@ struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer struct FIDCL { - UINT32 dgid; // DG owning the SPIDs in this cluster - UINT32 cspidCur; // number of SPIDs used so far + sal_uInt32 dgid; // DG owning the SPIDs in this cluster + sal_uInt32 cspidCur; // number of SPIDs used so far }; //--------------------------------------------------------------------------- @@ -246,9 +246,9 @@ struct FIDCL //--------------------------------------------------------------------------- struct MSDffTxId { - USHORT nTxBxS; - USHORT nSequence; - MSDffTxId(USHORT nTxBxS_, USHORT nSequence_ ) + sal_uInt16 nTxBxS; + sal_uInt16 nSequence; + MSDffTxId(sal_uInt16 nTxBxS_, sal_uInt16 nSequence_ ) : nTxBxS( nTxBxS_ ), nSequence( nSequence_ ){} MSDffTxId(const MSDffTxId& rCopy) @@ -263,15 +263,15 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec SdrObject* pObj; Polygon* pWrapPolygon; char* pClientAnchorBuffer; - UINT32 nClientAnchorLen; + sal_uInt32 nClientAnchorLen; char* pClientDataBuffer; - UINT32 nClientDataLen; - UINT32 nXAlign; - UINT32 *pXRelTo; - UINT32 nYAlign; - UINT32 *pYRelTo; - UINT32 nLayoutInTableCell; - UINT32 nFlags; + sal_uInt32 nClientDataLen; + sal_uInt32 nXAlign; + sal_uInt32 *pXRelTo; + sal_uInt32 nYAlign; + sal_uInt32 *pYRelTo; + sal_uInt32 nLayoutInTableCell; + sal_uInt32 nFlags; long nTextRotationAngle; long nDxTextLeft; // Abstand der Textbox vom umgebenden Shape long nDyTextTop; @@ -286,26 +286,26 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec long nCropFromLeft; long nCropFromRight; MSDffTxId aTextId; // Kennungen fuer Textboxen - ULONG nNextShapeId; // fuer verlinkte Textboxen - ULONG nShapeId; + sal_uLong nNextShapeId; // fuer verlinkte Textboxen + sal_uLong nShapeId; MSO_SPT eShapeType; MSO_LineStyle eLineStyle; // Umrandungs-Arten MSO_LineDashing eLineDashing; - BOOL bDrawHell :1; - BOOL bHidden :1; - BOOL bReplaceByFly :1; - BOOL bLastBoxInChain :1; - BOOL bHasUDefProp :1; - BOOL bVFlip :1; - BOOL bHFlip :1; - BOOL bAutoWidth :1; + sal_Bool bDrawHell :1; + sal_Bool bHidden :1; + sal_Bool bReplaceByFly :1; + sal_Bool bLastBoxInChain :1; + sal_Bool bHasUDefProp :1; + sal_Bool bVFlip :1; + sal_Bool bHFlip :1; + sal_Bool bAutoWidth :1; SvxMSDffImportRec(); SvxMSDffImportRec(const SvxMSDffImportRec& rCopy); ~SvxMSDffImportRec(); - BOOL operator==( const SvxMSDffImportRec& rEntry ) const + sal_Bool operator==( const SvxMSDffImportRec& rEntry ) const { return nShapeId == rEntry.nShapeId; } - BOOL operator<( const SvxMSDffImportRec& rEntry ) const + sal_Bool operator<( const SvxMSDffImportRec& rEntry ) const { return nShapeId < rEntry.nShapeId; } private: SvxMSDffImportRec &operator=(const SvxMSDffImportRec&); @@ -330,13 +330,13 @@ struct SvxMSDffImportData SvxMSDffImportData(const Rectangle& rParentRect) :aParentRect( rParentRect ) {} - void SetNewRect(INT32 l, INT32 o, - INT32 r, INT32 u ){ aNewRect = Rectangle(l,o, r,u); } - BOOL HasParRect() const { return aParentRect.IsEmpty(); } - BOOL HasNewRect() const { return aNewRect.IsEmpty() ; } - BOOL HasRecords() const { return 0 != aRecords.Count(); } - USHORT GetRecCount() const { return aRecords.Count(); } - SvxMSDffImportRec* GetRecord(USHORT iRecord) const + void SetNewRect(sal_Int32 l, sal_Int32 o, + sal_Int32 r, sal_Int32 u ){ aNewRect = Rectangle(l,o, r,u); } + sal_Bool HasParRect() const { return aParentRect.IsEmpty(); } + sal_Bool HasNewRect() const { return aNewRect.IsEmpty() ; } + sal_Bool HasRecords() const { return 0 != aRecords.Count(); } + sal_uInt16 GetRecCount() const { return aRecords.Count(); } + SvxMSDffImportRec* GetRecord(sal_uInt16 iRecord) const { return aRecords.GetObject( iRecord ); } }; @@ -347,16 +347,16 @@ struct DffObjData Rectangle aBoundRect; Rectangle aChildAnchor; - UINT32 nShapeId; - UINT32 nSpFlags; + sal_uInt32 nShapeId; + sal_uInt32 nSpFlags; MSO_SPT eShapeType; - BOOL bShapeType : 1; - BOOL bClientAnchor : 1; - BOOL bClientData : 1; - BOOL bChildAnchor : 1; - BOOL bOpt : 1; - BOOL bIsAutoText : 1; + sal_Bool bShapeType : 1; + sal_Bool bClientAnchor : 1; + sal_Bool bClientData : 1; + sal_Bool bChildAnchor : 1; + sal_Bool bOpt : 1; + sal_Bool bIsAutoText : 1; int nCalledByGroup; @@ -368,12 +368,12 @@ struct DffObjData nShapeId( 0 ), nSpFlags( 0 ), eShapeType( mso_sptNil ), - bShapeType( FALSE ), - bClientAnchor( FALSE ), - bClientData( FALSE ), - bChildAnchor( FALSE ), - bOpt( FALSE ), - bIsAutoText( FALSE ), + bShapeType( sal_False ), + bClientAnchor( sal_False ), + bClientData( sal_False ), + bChildAnchor( sal_False ), + bOpt( sal_False ), + bIsAutoText( sal_False ), nCalledByGroup( nClByGroup ){} }; @@ -381,8 +381,8 @@ struct DffObjData struct DffRecordList { - UINT32 nCount; - UINT32 nCurrent; + sal_uInt32 nCount; + sal_uInt32 nCurrent; DffRecordList* pPrev; DffRecordList* pNext; @@ -406,10 +406,10 @@ class MSFILTER_DLLPUBLIC DffRecordManager : public DffRecordList DffRecordList* pCList; void Clear(); - void Consume( SvStream& rIn, BOOL bAppend = FALSE, UINT32 nStOfs = 0 ); + void Consume( SvStream& rIn, sal_Bool bAppend = sal_False, sal_uInt32 nStOfs = 0 ); - BOOL SeekToContent( SvStream& rIn, UINT16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); - DffRecordHeader* GetRecordHeader( UINT16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); + sal_Bool SeekToContent( SvStream& rIn, sal_uInt16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); + DffRecordHeader* GetRecordHeader( sal_uInt16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); DffRecordManager(); DffRecordManager( SvStream& rIn ); @@ -439,10 +439,10 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader SvxMSDffBLIPInfos* pBLIPInfos; SvxMSDffShapeInfos* pShapeInfos; SvxMSDffShapeOrders* pShapeOrders; - ULONG nDefaultFontHeight; + sal_uLong nDefaultFontHeight; long nOffsDgg; - USHORT nBLIPCount; - USHORT nShapeCount; + sal_uInt16 nBLIPCount; + sal_uInt16 nShapeCount; sal_uInt32 nGroupShapeFlags; void CheckTxBxStoryChain(); @@ -451,9 +451,9 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader protected : String maBaseURL; - UINT32 mnCurMaxShapeId; // we need this information to - UINT32 mnDrawingsSaved; // access the right drawing - UINT32 mnIdClusters; // while only knowing the shapeid + sal_uInt32 mnCurMaxShapeId; // we need this information to + sal_uInt32 mnDrawingsSaved; // access the right drawing + sal_uInt32 mnIdClusters; // while only knowing the shapeid FIDCL* mpFidcls; Table maDgOffsetTable; // array of fileoffsets @@ -473,8 +473,8 @@ protected : long nPntMul; long nPntDiv; bool bNeedMap; - UINT32 nSvxMSDffSettings; - UINT32 nSvxMSDffOLEConvFlags; + sal_uInt32 nSvxMSDffSettings; + sal_uInt32 nSvxMSDffOLEConvFlags; /** stores a reference to an imported SdrObject with its shape id if it has one @@ -483,25 +483,25 @@ protected : void GetCtrlData( long nOffsDgg ); void GetDrawingGroupContainerData( SvStream& rSt, - ULONG nLenDgg ); + sal_uLong nLenDgg ); // #156763# // Add internal drawing container id as parameter to the sub methods of // reading the control information about the drawing objects. // The drawing container id is used to distinguish the text ids of drawing // objects in different drawing containers. void GetDrawingContainerData( SvStream& rSt, - ULONG nLenDg, + sal_uLong nLenDg, const unsigned long nDrawingContainerId ); - BOOL GetShapeGroupContainerData( SvStream& rSt, - ULONG nLenShapeGroupCont, - BOOL bPatriarch, + sal_Bool GetShapeGroupContainerData( SvStream& rSt, + sal_uLong nLenShapeGroupCont, + sal_Bool bPatriarch, const unsigned long nDrawingContainerId ); - BOOL GetShapeContainerData( SvStream& rSt, - ULONG nLenShapeCont, - ULONG nPosGroup, + sal_Bool GetShapeContainerData( SvStream& rSt, + sal_uLong nLenShapeCont, + sal_uLong nPosGroup, const unsigned long nDrawingContainerId ); - bool ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const; + bool ReadGraphic( SvStream& rSt, sal_uLong nIndex, Graphic& rGraphic ) const; SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const; SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const; // #i32596# - pass <nCalledByGroup> to method @@ -517,7 +517,7 @@ protected : static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf ); #ifndef SVX_LIGHT static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj( - UINT32 nConvertFlags, SotStorage& rSrcStg, + sal_uInt32 nConvertFlags, SotStorage& rSrcStg, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, const Graphic& rGrf, const Rectangle& rVisArea ); @@ -526,12 +526,12 @@ protected : /* folgende Methoden sind zum Excel-Import zu ueberschreiben: */ - virtual BOOL ProcessClientAnchor(SvStream& rStData, ULONG nDatLen, char*& rpBuff, UINT32& rBuffLen ) const; + virtual sal_Bool ProcessClientAnchor(SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const; virtual void ProcessClientAnchor2( SvStream& rStData, DffRecordHeader& rHd, void* pData, DffObjData& ); - virtual BOOL ProcessClientData( SvStream& rStData, ULONG nDatLen, char*& rpBuff, UINT32& rBuffLen ) const; + virtual sal_Bool ProcessClientData( SvStream& rStData, sal_uLong nDatLen, char*& rpBuff, sal_uInt32& rBuffLen ) const; virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL); - virtual ULONG Calc_nBLIPPos( ULONG nOrgVal, ULONG nStreamPos ) const; - virtual bool GetColorFromPalette(USHORT nNum, Color& rColor) const; + virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const; + virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const; bool ReadDffString(SvStream& rSt, String& rTxt) const; bool ReadObjText(SvStream& rSt, SdrObject* pObj) const; @@ -544,7 +544,7 @@ protected : folgende Methode ist von allen zu ueberschreiben, die OLE-Objecte importieren moechten: */ - virtual BOOL GetOLEStorageName( long nOLEId, String& rStorageName, + virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName, SotStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg ) const; @@ -553,9 +553,9 @@ protected : folgende Methode ist von allen zu ueberschreiben, die verhindern moechten, dass (abgerundete) Rechtecke mit umgebrochenem Text immer in SdrRectObj( OBJ_TEXT ) umgewandelt werden: - TRUE bedeutet umwandeln. + sal_True bedeutet umwandeln. */ - virtual BOOL ShapeHasText(ULONG nShapeId, ULONG nFilePos) const; + virtual sal_Bool ShapeHasText(sal_uLong nShapeId, sal_uLong nFilePos) const; public: @@ -572,18 +572,18 @@ public: Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; Color MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nContextProperty = DFF_Prop_lineColor ) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - bool SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const; - bool SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const; - - static void MSDFFReadZString( SvStream& rIn, String& rStr, ULONG nMaxLen, bool bUniCode = FALSE ); - - static BOOL ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn ); - static BOOL ReadCommonRecordHeader( SvStream& rSt, - BYTE& rVer, - USHORT& rInst, - USHORT& rFbt, - UINT32& rLength ); + virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; + bool SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd = NULL, sal_uLong nSkipCount = 0 ) const; + bool SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd = NULL, sal_uLong nSkipCount = 0 ) const; + + static void MSDFFReadZString( SvStream& rIn, String& rStr, sal_uLong nMaxLen, bool bUniCode = FALSE ); + + static sal_Bool ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn ); + static sal_Bool ReadCommonRecordHeader( SvStream& rSt, + sal_uInt8& rVer, + sal_uInt16& rInst, + sal_uInt16& rFbt, + sal_uInt32& rLength ); /* Konstruktor =========== @@ -610,7 +610,7 @@ public: SdrModel* pSdrModel_ = 0, long nApplicationScale = 0, ColorData mnDefaultColor_ = COL_DEFAULT, - ULONG nDefaultFontHeight_ = 24, + sal_uLong nDefaultFontHeight_ = 24, SvStream* pStData2_ = 0, MSFilterTracer* pTracer = NULL ); @@ -622,11 +622,11 @@ public: virtual ~SvxMSDffManager(); - UINT32 GetSvxMSDffSettings() const { return nSvxMSDffSettings; }; - void SetSvxMSDffSettings( UINT32 nSettings ) { nSvxMSDffSettings = nSettings; }; + sal_uInt32 GetSvxMSDffSettings() const { return nSvxMSDffSettings; }; + void SetSvxMSDffSettings( sal_uInt32 nSettings ) { nSvxMSDffSettings = nSettings; }; - static BOOL MakeContentStream( SotStorage * pStor, const GDIMetaFile & ); - static BOOL ConvertToOle2( SvStream& rStm, UINT32 nLen, const GDIMetaFile*, + static sal_Bool MakeContentStream( SotStorage * pStor, const GDIMetaFile & ); + static sal_Bool ConvertToOle2( SvStream& rStm, sal_uInt32 nLen, const GDIMetaFile*, const SotStorageRef & rDest ); void SetModel(SdrModel* pModel, long nApplicationScale); @@ -638,8 +638,8 @@ public: void Scale(Polygon& rPoly) const; void Scale(PolyPolygon& rPoly) const; void ScaleEmu(sal_Int32& rVal) const; - UINT32 ScalePt( UINT32 nPt ) const; - INT32 ScalePoint( INT32 nVal ) const; + sal_uInt32 ScalePt( sal_uInt32 nPt ) const; + sal_Int32 ScalePoint( sal_Int32 nVal ) const; /* GetBLIP() - Anforderung eines bestimmten BLIP @@ -650,9 +650,9 @@ public: Output: rData - bereits fertig konvertierte Daten ( direkt als Grafik in unsere Dokumente einzusetzen ) - Rueckgabewert: TRUE, im Erfolgsfalls, FALSE bei Fehler + Rueckgabewert: sal_True, im Erfolgsfalls, sal_False bei Fehler */ - BOOL GetBLIP( ULONG nIdx, Graphic& rData, Rectangle* pVisArea = NULL ) const; + sal_Bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = NULL ) const; /* GetBLIPDirect() -Einlesen eines BLIP aus schon positioniertem Stream @@ -663,11 +663,11 @@ public: Output: rData -bereits fertig konvertierte Daten ( direkt als Grafik in unsere Dokumente einzusetzen ) - Rueckgabewert: TRUE, im Erfolgsfalls, FALSE bei Fehler + Rueckgabewert: sal_True, im Erfolgsfalls, sal_False bei Fehler */ - BOOL GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL ) const; + sal_Bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL ) const; - BOOL GetShape(ULONG nId, + sal_Bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData); /* @@ -682,7 +682,7 @@ public: 1.. - Anzahl der BLIPs USHRT_MAX - Fehler: kein korrektes Drawing File Format */ - USHORT GetBLIPCount() const{ return nBLIPCount; } + sal_uInt16 GetBLIPCount() const{ return nBLIPCount; } /* ZCodecDecompressed() - Dekomprimierung eines komp. WMF oder Enhanced WMF @@ -692,9 +692,9 @@ public: rOut -bereits korrekt positionierter Ausgabe-Stream, bLookForEnd -Flag, ob das komp. Bild bis zum Stream-Ende reicht. - Falls TRUE, wird jeweils geprueft, ob das gelesene noch + Falls sal_True, wird jeweils geprueft, ob das gelesene noch zum Bild gehoert. - Falls FALSE, wird bis zum Stream-Ende gelesen. + Falls sal_False, wird bis zum Stream-Ende gelesen. Output: rIn -Der Stream steht hinter dem Ende des komp. Bildes. (es kann aber noch eine Ende-Kennung und CRC-Sum folgen) @@ -702,12 +702,12 @@ public: Der Stream wird auf den Anfang des Bildes positioniert. (also dorthin, wo der Stream vor der Verarbeitung stand) - Rueckgabewert: TRUE, im Erfolgsfall - FALSE bei Fehler oder Null Bytes geschrieben + Rueckgabewert: sal_True, im Erfolgsfall + sal_False bei Fehler oder Null Bytes geschrieben */ -// static BOOL ZCodecDecompressed( SvStream& rIn, +// static sal_Bool ZCodecDecompressed( SvStream& rIn, // SvStream& rOut, -// BOOL bLookForEnd ); +// sal_Bool bLookForEnd ); // SdrObject* ImportObj(SvStream& rSt, void* pData, Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int nCalledByGroup = 0, sal_Int32* pShapeId = NULL); @@ -733,20 +733,20 @@ public: return pShapeOrders; } - void StoreShapeOrder(ULONG nId, - ULONG nTxBx, + void StoreShapeOrder(sal_uLong nId, + sal_uLong nTxBx, SdrObject* pObject, SwFlyFrmFmt* pFly = 0, short nHdFtSection = 0) const; void ExchangeInShapeOrder(SdrObject* pOldObject, - ULONG nTxBx, + sal_uLong nTxBx, SwFlyFrmFmt* pFly, SdrObject* pObject) const; void RemoveFromShapeOrder( SdrObject* pObject ) const; - UINT32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; } + sal_uInt32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; } static SdrOle2Obj* CreateSdrOLEFromStorage( const String& rStorageName, SotStorageRef& rSrcStorage, @@ -756,7 +756,7 @@ public: const Rectangle& rVisArea, SvStream* pDataStrrm, ErrCode& rError, - UINT32 nConvertFlags, + sal_uInt32 nConvertFlags, sal_Int64 nAspect ); /* the method SolveSolver will create connections between shapes, it should be called after a page is imported. @@ -777,33 +777,33 @@ public: struct SvxMSDffBLIPInfo { - USHORT nBLIPType; // Art des BLIP: z.B. 6 fuer PNG - ULONG nFilePos; // Offset des BLIP im Daten-Stream - ULONG nBLIPSize; // Anzahl Bytes, die der BLIP im Stream einnimmt - SvxMSDffBLIPInfo(USHORT nBType, ULONG nFPos, ULONG nBSize): + sal_uInt16 nBLIPType; // Art des BLIP: z.B. 6 fuer PNG + sal_uLong nFilePos; // Offset des BLIP im Daten-Stream + sal_uLong nBLIPSize; // Anzahl Bytes, die der BLIP im Stream einnimmt + SvxMSDffBLIPInfo(sal_uInt16 nBType, sal_uLong nFPos, sal_uLong nBSize): nBLIPType( nBType ), nFilePos( nFPos ), nBLIPSize( nBSize ){} }; struct SvxMSDffShapeInfo { sal_uInt32 nShapeId; // Shape Id, verwendet im PLCF SPA und im mso_fbtSp (FSP) - ULONG nFilePos; // Offset des Shape im Kontroll-Stream fuer eventuelle + sal_uLong nFilePos; // Offset des Shape im Kontroll-Stream fuer eventuelle // erneute Zugriffe auf dieses Shape sal_uInt32 nTxBxComp; - BOOL bReplaceByFly :1; // Shape darf im Writer durch Rahmen ersetzt werden. - BOOL bSortByShapeId :1; - BOOL bLastBoxInChain:1; + sal_Bool bReplaceByFly :1; // Shape darf im Writer durch Rahmen ersetzt werden. + sal_Bool bSortByShapeId :1; + sal_Bool bLastBoxInChain:1; - SvxMSDffShapeInfo(ULONG nFPos, sal_uInt32 nId=0, // ULONG nBIdx=0, - USHORT nSeqId=0, USHORT nBoxId=0): + SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0, + sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0): nShapeId( nId ), nFilePos( nFPos ), nTxBxComp( (nSeqId << 16) + nBoxId ) { - bReplaceByFly = FALSE; - bSortByShapeId = FALSE; - bLastBoxInChain = TRUE; + bReplaceByFly = sal_False; + bSortByShapeId = sal_False; + bLastBoxInChain = sal_True; } SvxMSDffShapeInfo(SvxMSDffShapeInfo& rInfo): nShapeId( rInfo.nShapeId ), @@ -814,12 +814,12 @@ struct SvxMSDffShapeInfo bSortByShapeId = rInfo.bSortByShapeId; bLastBoxInChain = rInfo.bLastBoxInChain; } - BOOL operator==( const SvxMSDffShapeInfo& rEntry ) const + sal_Bool operator==( const SvxMSDffShapeInfo& rEntry ) const { return bSortByShapeId ? (nShapeId == rEntry.nShapeId) : (nTxBxComp == rEntry.nTxBxComp && this == &rEntry); } - BOOL operator<( const SvxMSDffShapeInfo& rEntry ) const + sal_Bool operator<( const SvxMSDffShapeInfo& rEntry ) const { return bSortByShapeId ? (nShapeId < rEntry.nShapeId) : (nTxBxComp < rEntry.nTxBxComp); @@ -828,9 +828,9 @@ struct SvxMSDffShapeInfo struct SvxMSDffShapeOrder { - ULONG nShapeId; // Shape Id, verwendet im PLCF SPA und im mso_fbtSp (FSP) + sal_uLong nShapeId; // Shape Id, verwendet im PLCF SPA und im mso_fbtSp (FSP) - ULONG nTxBxComp; // Ketten- und Boxnummer in der Text-Box-Story (bzw. Null) + sal_uLong nTxBxComp; // Ketten- und Boxnummer in der Text-Box-Story (bzw. Null) SwFlyFrmFmt* pFly; // Frame-Format eines statt des Sdr-Text-Objektes im // Writer eingefuegten Rahmens: zur Verkettung benoetigt! @@ -844,14 +844,14 @@ struct SvxMSDffShapeOrder // nur die Shape-Ids vermerkt, // Text-Box-Nummer und der Objekt-Pointer werden nur dann // gespeichert, wenn das Shape tatsaechlich importiert wird! - SvxMSDffShapeOrder( ULONG nId ): + SvxMSDffShapeOrder( sal_uLong nId ): nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0 ){} - BOOL operator==( const SvxMSDffShapeOrder& rEntry ) const + sal_Bool operator==( const SvxMSDffShapeOrder& rEntry ) const { return (nTxBxComp == rEntry.nTxBxComp); } - BOOL operator<( const SvxMSDffShapeOrder& rEntry ) const + sal_Bool operator<( const SvxMSDffShapeOrder& rEntry ) const { return (nTxBxComp < rEntry.nTxBxComp); } diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx index e88108d05363..9e09d67bd80b 100644 --- a/filter/inc/filter/msfilter/msocximex.hxx +++ b/filter/inc/filter/msfilter/msocximex.hxx @@ -99,14 +99,14 @@ public: sal_Bool ReadOCXStream( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef=0, - BOOL bFloatingCtrl=FALSE ); + sal_Bool bFloatingCtrl=sal_False ); //Excel has a nasty kludged mechanism for this, read //the comments in the source to follow it sal_Bool ReadOCXExcelKludgeStream(SotStorageStreamRef& rSrc1, com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShapeRef,BOOL bFloatingCtrl); + com::sun::star::drawing::XShape > *pShapeRef,sal_Bool bFloatingCtrl); //Writes the given Uno Control into the given storage @@ -137,7 +137,7 @@ public: const com::sun::star::awt::Size& /*rSize*/, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >* /*pShape*/, - BOOL /*bFloatingCtrl*/ ) {return sal_False;} + sal_Bool /*bFloatingCtrl*/ ) {return sal_False;} /*begin: Backwards compatability with office 95 import, modify later*/ const com::sun::star::uno::Reference< @@ -179,7 +179,7 @@ class OCX_FontData public: OCX_FontData() : nFontNameLen(0), fBold(0), fItalic(0), fUnderline(0), fStrike(0), nFontSize(12), nJustification(1), pFontName(0), - bHasAlign(FALSE), bHasFont(TRUE) {} + bHasAlign(sal_False), bHasFont(sal_True) {} ~OCX_FontData() { if (pFontName) delete [] pFontName; @@ -230,7 +230,7 @@ class MSFILTER_DLLPUBLIC OCX_Control public: OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0), mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0), - bSetInDialog(FALSE), mpParent( parent ) {} + bSetInDialog(sal_False), mpParent( parent ) {} sal_Bool FullRead(SotStorageStream *pS) { return Read(pS) && ReadFontData(pS); @@ -698,7 +698,7 @@ public: msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" )); mnBackColor = 0x80000005L; mnForeColor = 0x80000008L; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } using OCX_ModernControl::Import; // to not hide the other two import methods @@ -725,7 +725,7 @@ public: msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" )); mnBackColor = 0x80000005L; mnForeColor = 0x80000008L; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } using OCX_ModernControl::Import; // to not hide the other two import methods @@ -753,7 +753,7 @@ public: mnBackColor = 0x80000005L; mnForeColor = 0x80000008L; nBorderColor = 0x80000006L; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } using OCX_ModernControl::Import; // to not hide the other two import methods @@ -800,7 +800,7 @@ public: mnBackColor = 0x8000000F; mnForeColor = 0x80000012; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); aFontData.nJustification = 3; // centered by default } static OCX_Control *Create() { return new OCX_ToggleButton;} @@ -827,7 +827,7 @@ public: mnBackColor = 0x80000005; mnForeColor = 0x80000008; nBorderColor = 0x80000006; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } static OCX_Control *Create() { return new OCX_ComboBox;} using OCX_ModernControl::Import; // to not hide the other two import methods @@ -853,7 +853,7 @@ public: mnBackColor = 0x80000005; mnForeColor = 0x80000008; nBorderColor = 0x80000006; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } static OCX_Control *Create() { return new OCX_ListBox;} using OCX_ModernControl::Import; // to not hide the other two import methods @@ -952,8 +952,8 @@ class OCX_ImageButton: public OCX_CommandButton { public: OCX_ImageButton() { - aFontData.SetHasAlign(FALSE); - aFontData.SetHasFont(FALSE); + aFontData.SetHasAlign(sal_False); + aFontData.SetHasFont(sal_False); } static OCX_Control *Create() { return new OCX_ImageButton;} sal_Bool Export(SotStorageRef &rObj, @@ -997,7 +997,7 @@ public: msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" )); mnForeColor = 0x80000008; mnBackColor = 0x80000005; - aFontData.SetHasAlign(TRUE); + aFontData.SetHasAlign(sal_True); } ~OCX_Label() { diff --git a/filter/inc/filter/msfilter/msoleexp.hxx b/filter/inc/filter/msfilter/msoleexp.hxx index 3611d11a077d..9693215833f3 100644 --- a/filter/inc/filter/msfilter/msoleexp.hxx +++ b/filter/inc/filter/msfilter/msoleexp.hxx @@ -44,12 +44,12 @@ class SotStorage; class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects { - UINT32 nConvertFlags; + sal_uInt32 nConvertFlags; public: - SvxMSExportOLEObjects( UINT32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {} + SvxMSExportOLEObjects( sal_uInt32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {} - void SetFlags( UINT32 n ) { nConvertFlags = n; } - UINT32 GetFlags() const { return nConvertFlags; } + void SetFlags( sal_uInt32 n ) { nConvertFlags = n; } + sal_uInt32 GetFlags() const { return nConvertFlags; } void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg ); void ExportOLEObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ); diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx index 6acdb690ae20..04fb21c57a14 100644 --- a/filter/inc/filter/msfilter/msvbahelper.hxx +++ b/filter/inc/filter/msfilter/msvbahelper.hxx @@ -29,30 +29,82 @@ #define _MSVBAHELPER_HXX #include <sfx2/objsh.hxx> +#include <cppuhelper/implbase3.hxx> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/script/vba/XVBAMacroResolver.hpp> #include "filter/msfilter/msfilterdllapi.h" -namespace ooo { namespace vba +namespace ooo { +namespace vba { + +// ============================================================================ + +struct MSFILTER_DLLPUBLIC MacroResolvedInfo +{ + SfxObjectShell* mpDocContext; + String msResolvedMacro; + bool mbFound; + + inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = 0 ) : mpDocContext( pDocContext ), mbFound( false ) {} +}; + +MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName ); +MSFILTER_DLLPUBLIC ::rtl::OUString extractMacroName( const ::rtl::OUString& rMacroUrl ); +MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const ::rtl::OUString& rMacroName, 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 ); + +// ============================================================================ + +typedef ::cppu::WeakImplHelper3< + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::lang::XInitialization, + ::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase; + +class VBAMacroResolver : public VBAMacroResolverBase { - 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 ::rtl::OUString extractMacroName( const ::rtl::OUString& rMacroUrl ); - 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 ); -} } +public: + explicit VBAMacroResolver(); + virtual ~VBAMacroResolver(); + + // com.sun.star.lang.XServiceInfo interface ------------------------------- + + virtual ::rtl::OUString SAL_CALL + getImplementationName() throw (::com::sun::star::uno::RuntimeException); + + virtual sal_Bool SAL_CALL + supportsService( const ::rtl::OUString& rService ) + throw (::com::sun::star::uno::RuntimeException); + + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + + // com.sun.star.lang.XInitialization interface ---------------------------- + + virtual void SAL_CALL initialize( + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // com.sun.star.script.vba.XVBAMacroResolver interface -------------------- + + virtual ::rtl::OUString SAL_CALL + resolveVBAMacroToScriptURL( const ::rtl::OUString& rVBAMacroName ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + + virtual ::rtl::OUString SAL_CALL + resolveScriptURLtoVBAMacro( const ::rtl::OUString& rScriptURL ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + +private: + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + SfxObjectShell* mpObjShell; + ::rtl::OUString maProjectName; +}; + +// ============================================================================ + +} // namespace vba +} // namespace ooo #endif diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 1bdf54fbb774..b4c3f9a4d928 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -121,18 +121,18 @@ struct SdHyperlinkEntry // Hilfsklasse zum Einlesen der PPT InteractiveInfoAtom struct MSFILTER_DLLPUBLIC PptInteractiveInfoAtom { - UINT32 nSoundRef; - UINT32 nExHyperlinkId; - UINT8 nAction; - UINT8 nOleVerb; - UINT8 nJump; - UINT8 nFlags; - UINT8 nHyperlinkType; + sal_uInt32 nSoundRef; + sal_uInt32 nExHyperlinkId; + sal_uInt8 nAction; + sal_uInt8 nOleVerb; + sal_uInt8 nJump; + sal_uInt8 nFlags; + sal_uInt8 nHyperlinkType; // unknown, da Gesamtgroesse 16 ist - UINT8 nUnknown1; - UINT8 nUnknown2; - UINT8 nUnknown3; + sal_uInt8 nUnknown1; + sal_uInt8 nUnknown2; + sal_uInt8 nUnknown3; public: @@ -150,7 +150,7 @@ enum PptPageFormat PPTPF_CUSTOM }; -// Werte fuer den ULONG im PPT_PST_TextHeaderAtom +// Werte fuer den sal_uLong im PPT_PST_TextHeaderAtom enum PPT_TextHeader { PPTTH_TITLE, @@ -175,10 +175,10 @@ enum PPT_TextHeader #define TSS_TYPE_QUARTERBODY (8) // Inventor-Id fuer PPT UserData -const UINT32 PPTInventor =UINT32('P')*0x00000001+ - UINT32('P')*0x00000100+ - UINT32('T')*0x00010000+ - UINT32('0')*0x01000000; +const sal_uInt32 PPTInventor =sal_uInt32('P')*0x00000001+ + sal_uInt32('P')*0x00000100+ + sal_uInt32('T')*0x00010000+ + sal_uInt32('0')*0x01000000; // Object-Ids fuer StarDraw UserData #define PPT_OBJECTINFO_ID (1) @@ -188,9 +188,9 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom Size aSlidesPageSize; // Seitengroesse der Slides in 576DPI Size aNotesPageSize; // Seitengroesse der Notes in 576DPI // RatioAtom erstmal weggelassen - UINT32 nNotesMasterPersist; // 0=nicht vorhanden - UINT32 nHandoutMasterPersist; // 0=nicht vorhanden - UINT16 n1stPageNumber; // Seitennummer des ersten Slides + sal_uInt32 nNotesMasterPersist; // 0=nicht vorhanden + sal_uInt32 nHandoutMasterPersist; // 0=nicht vorhanden + sal_uInt16 n1stPageNumber; // Seitennummer des ersten Slides PptPageFormat eSlidesPageFormat; // Seitenformat der Slides sal_Bool bEmbeddedTrueType : 1; // TrueType direkt im File? sal_Bool bTitlePlaceholdersOmitted : 1; @@ -208,9 +208,9 @@ public: struct PptSlideLayoutAtom { - INT32 eLayout; // 0..18 - BYTE aPlaceholderId[ 8 ]; - ULONG aPlacementId[ 8 ]; + sal_Int32 eLayout; // 0..18 + sal_uInt8 aPlaceholderId[ 8 ]; + sal_uLong aPlacementId[ 8 ]; public: @@ -224,9 +224,9 @@ public: struct PptSlideAtom { PptSlideLayoutAtom aLayout; - UINT32 nMasterId; - UINT32 nNotesId; - UINT16 nFlags; + sal_uInt32 nMasterId; + sal_uInt32 nNotesId; + sal_uInt16 nFlags; public: @@ -238,11 +238,11 @@ public: struct PptSlidePersistAtom { - UINT32 nPsrReference; - UINT32 nFlags; - UINT32 nNumberTexts; - UINT32 nSlideId; - UINT32 nReserved; // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible ) + sal_uInt32 nPsrReference; + sal_uInt32 nFlags; + sal_uInt32 nNumberTexts; + sal_uInt32 nSlideId; + sal_uInt32 nReserved; // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible ) public: @@ -254,8 +254,8 @@ public: struct PptNotesAtom { - UINT32 nSlideId; - UINT16 nFlags; + sal_uInt32 nSlideId; + sal_uInt16 nFlags; public: @@ -267,12 +267,12 @@ public: struct PptColorSchemeAtom { - BYTE aData[32]; + sal_uInt8 aData[32]; public: PptColorSchemeAtom () { Clear(); } void Clear(); - Color GetColor( USHORT nNum ) const; + Color GetColor( sal_uInt16 nNum ) const; friend SvStream& operator>>(SvStream& rIn, PptColorSchemeAtom& rAtom); }; @@ -297,13 +297,13 @@ class PptFontCollection; struct PptUserEditAtom { DffRecordHeader aHd; - INT32 nLastSlideID; // ID of last visible slide - UINT32 nVersion; // This is major/minor/build which did the edit - UINT32 nOffsetLastEdit; // File offset of prev PptUserEditAtom - UINT32 nOffsetPersistDirectory; // Offset to PersistPtrs for this file version. - UINT32 nDocumentRef; - UINT32 nMaxPersistWritten; // Gesamtanzahl der Persisteintraege bis hierher. - INT16 eLastViewType; // enum view type + sal_Int32 nLastSlideID; // ID of last visible slide + sal_uInt32 nVersion; // This is major/minor/build which did the edit + sal_uInt32 nOffsetLastEdit; // File offset of prev PptUserEditAtom + sal_uInt32 nOffsetPersistDirectory; // Offset to PersistPtrs for this file version. + sal_uInt32 nDocumentRef; + sal_uInt32 nMaxPersistWritten; // Gesamtanzahl der Persisteintraege bis hierher. + sal_Int16 eLastViewType; // enum view type public: @@ -314,9 +314,9 @@ public: struct PptOEPlaceholderAtom { - UINT32 nPlacementId; - BYTE nPlaceholderId; - BYTE nPlaceholderSize; // 0=Full size, 1=Half size, 2=Quarter of Slide + sal_uInt32 nPlacementId; + sal_uInt8 nPlaceholderId; + sal_uInt8 nPlaceholderSize; // 0=Full size, 1=Half size, 2=Quarter of Slide public: @@ -358,7 +358,7 @@ struct PptSlidePersistEntry public: PptSlidePersistEntry(); ~PptSlidePersistEntry(); - UINT32 GetSlideId() const { return aPersistAtom.nSlideId; } + sal_uInt32 GetSlideId() const { return aPersistAtom.nSlideId; } }; SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16) @@ -370,7 +370,7 @@ class MSFILTER_DLLPUBLIC PptSlidePersistList: public _PptSlidePersistList public: - USHORT FindPage( UINT32 nId ) const; + sal_uInt16 FindPage( sal_uInt32 nId ) const; }; class SfxObjectShell; @@ -393,12 +393,12 @@ struct PPTOleEntry struct PptExOleObjAtom { - UINT32 nAspect; - UINT32 nDummy1; - UINT32 nId; - UINT32 nDummy2; - UINT32 nPersistPtr; - UINT32 nDummy4; + sal_uInt32 nAspect; + sal_uInt32 nDummy1; + sal_uInt32 nId; + sal_uInt32 nDummy2; + sal_uInt32 nPersistPtr; + sal_uInt32 nDummy4; public: @@ -454,11 +454,11 @@ public: SdrEscherImport( PowerPointImportParam&, const String& rBaseURL ); virtual ~SdrEscherImport(); - virtual bool GetColorFromPalette( USHORT nNum, Color& rColor ) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - PptFontEntityAtom* GetFontEnityAtom( UINT32 nNum ) const; - CharSet GetCharSet( UINT32 nNum ) const; - BOOL IsFontAvailable( UINT32 nNum ) const; + virtual bool GetColorFromPalette( sal_uint16 nNum, Color& rColor ) const; + virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; + PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; + CharSet GetCharSet( sal_uInt32 nNum ) const; + sal_Bool IsFontAvailable( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); using SvxMSDffManager::ReadObjText; virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; @@ -479,8 +479,8 @@ public: class SvxFieldItem; struct MSFILTER_DLLPUBLIC PPTFieldEntry { - UINT16 nPos; - UINT16 nTextRangeEnd; + sal_uInt16 nPos; + sal_uInt16 nTextRangeEnd; SvxFieldItem* pField1; SvxFieldItem* pField2; String* pString; @@ -488,7 +488,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2( NULL ), pString( NULL ) {}; ~PPTFieldEntry(); - void SetDateTime( UINT32 nType ); + void SetDateTime( sal_uInt32 nType ); // converting PPT date time format: static void GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateFormat, SvxTimeFormat& eTimeFormat ); @@ -500,8 +500,8 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry String pPlaceholder[ 4 ]; sal_uInt32 nAtom; - sal_uInt32 GetMaskForInstance( UINT32 nInstance ); - sal_uInt32 IsToDisplay( UINT32 nInstance ); + sal_uInt32 GetMaskForInstance( sal_uInt32 nInstance ); + sal_uInt32 IsToDisplay( sal_uInt32 nInstance ); sal_uInt32 NeedToImportInstance( const sal_uInt32 nInstance, const PptSlidePersistEntry& rSlidePersist ); HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL ); @@ -537,12 +537,12 @@ protected: friend struct PPTStyleSheet; friend class PPTNumberFormatCreator; - BOOL bOk; + sal_Bool bOk; PptUserEditAtom aUserEditAtom; PptColorSchemeAtom aPageColors; List aHyperList; - UINT32* pPersistPtr; - ULONG nPersistPtrAnz; + sal_uInt32* pPersistPtr; + sal_uLong nPersistPtrAnz; const PPTStyleSheet* pPPTStyleSheet; // this is the current stylesheet; const PPTStyleSheet* pDefaultSheet; // this is a sheet we are using if no masterpage can be found, but that should @@ -550,9 +550,9 @@ protected: PptSlidePersistList* pMasterPages; PptSlidePersistList* pSlidePages; PptSlidePersistList* pNotePages; - USHORT nAktPageNum; - ULONG nDocStreamPos; - USHORT nPageColorsNum; + sal_uInt16 nAktPageNum; + sal_uLong nDocStreamPos; + sal_uInt16 nPageColorsNum; PptPageKind ePageColorsKind; PptPageKind eAktPageKind; @@ -573,35 +573,35 @@ protected: const Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const; - SvMemoryStream* ImportExOleObjStg( UINT32 nPersistPtr, UINT32& nOleId ) const; + SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const; SdrPage* MakeBlancPage(sal_Bool bMaster) const; sal_Bool ReadFontCollection(); - sal_Bool ForceFontCollection() const { return pFonts!=NULL?TRUE:((SdrPowerPointImport*)this)->ReadFontCollection(); } + sal_Bool ForceFontCollection() const { return pFonts!=NULL?sal_True:((SdrPowerPointImport*)this)->ReadFontCollection(); } PptSlidePersistList* GetPageList(PptPageKind ePageKind) const; - UINT32 GetAktPageId(); - UINT32 GetMasterPageId(USHORT nPageNum, PptPageKind ePageKind) const; - UINT32 GetNotesPageId(USHORT nPageNum ) const; + sal_uInt32 GetAktPageId(); + sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const; + sal_uInt32 GetNotesPageId(sal_uInt16 nPageNum ) const; SdrOutliner* GetDrawOutliner( SdrTextObj* pSdrText ) const; void SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions ); public: SdrPowerPointImport( PowerPointImportParam&, const String& rBaseURL ); virtual ~SdrPowerPointImport(); - USHORT GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const; - void SetPageNum( USHORT nPageNum, PptPageKind = PPT_SLIDEPAGE ); - USHORT GetPageNum() const { return nAktPageNum; } + sal_uInt16 GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const; + void SetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE ); + sal_uInt16 GetPageNum() const { return nAktPageNum; } PptPageKind GetPageKind() const { return eAktPageKind; } Size GetPageSize() const; SdrObject* ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, sal_Bool bForce ); - sal_Bool IsNoteOrHandout( USHORT nPageNum, PptPageKind ePageKind ) const; - sal_Bool HasMasterPage( USHORT nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; - USHORT GetMasterPageIndex( USHORT nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; + sal_Bool IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind ePageKind ) const; + sal_Bool HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; + sal_uInt16 GetMasterPageIndex( sal_uInt16 nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL ); - virtual bool GetColorFromPalette(USHORT nNum, Color& rColor) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - sal_Unicode PPTSubstitute( UINT16 nFont, sal_Unicode nChar, - UINT32& nMappedFontId, Font& rFont, char nDefault ) const; + virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const; + virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; + sal_Unicode PPTSubstitute( sal_uInt16 nFont, sal_Unicode nChar, + sal_uInt32& nMappedFontId, Font& rFont, char nDefault ) const; const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; } virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ); @@ -684,10 +684,10 @@ struct PPTExtParaSheet struct PPTBuGraEntry { - UINT32 nInstance; + sal_uInt32 nInstance; Graphic aBuGra; - PPTBuGraEntry( Graphic& rGraphic, UINT32 nInstance ); + PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance ); }; class PPTExtParaProv @@ -695,13 +695,13 @@ class PPTExtParaProv List aBuGraList; public : - BOOL bStyles; - BOOL bGraphics; + sal_Bool bStyles; + sal_Bool bGraphics; DffRecordManager aExtendedPresRules; PPTExtParaSheet aExtParaSheet[ PPT_STYLESHEETENTRYS ]; - BOOL GetGraphic( UINT32 nInstance, Graphic& rGraphic ) const; + sal_Bool GetGraphic( sal_uInt32 nInstance, Graphic& rGraphic ) const; PPTExtParaProv( SdrPowerPointImport& rManager, SvStream& rSt, const DffRecordHeader* pMainMasterHd ); @@ -766,18 +766,18 @@ struct PPTParaSheet class PPTParagraphObj; class PPTNumberFormatCreator { - UINT32 nIsBullet; - UINT32 nBulletChar; - UINT32 nBulletFont; - UINT32 nBulletHeight; - UINT32 nBulletColor; - UINT32 nTextOfs; - UINT32 nBulletOfs; - - void ImplGetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel ); - BOOL ImplGetExtNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel, - UINT32 nInstance, UINT32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering, - UINT32 nFontHeight, PPTParagraphObj* pPara ); + sal_uInt32 nIsBullet; + sal_uInt32 nBulletChar; + sal_uInt32 nBulletFont; + sal_uInt32 nBulletHeight; + sal_uInt32 nBulletColor; + sal_uInt32 nTextOfs; + sal_uInt32 nBulletOfs; + + void ImplGetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel ); + sal_Bool ImplGetExtNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel, + sal_uInt32 nInstance, sal_uInt32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering, + sal_uInt32 nFontHeight, PPTParagraphObj* pPara ); protected : @@ -788,11 +788,11 @@ class PPTNumberFormatCreator PPTExtParaProv* pExtParaProv; - void GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel, - const PPTParaLevel& rParaLevel, const PPTCharLevel& rCharLevel, UINT32 nInstance ); + void GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, sal_uInt32 nLevel, + const PPTParaLevel& rParaLevel, const PPTCharLevel& rCharLevel, sal_uInt32 nInstance ); - BOOL GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, - PPTParagraphObj* pPara, UINT32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering ); + sal_Bool GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, + PPTParagraphObj* pPara, sal_uInt32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering ); }; class SvxNumBulletItem; @@ -870,7 +870,7 @@ struct PPTCharPropSet ImplPPTCharPropSet* pCharSet; - void SetFont( UINT16 nFont ); + void SetFont( sal_uInt16 nFont ); void SetColor( sal_uInt32 nColor ); PPTCharPropSet( sal_uInt32 nParagraph ); @@ -893,14 +893,14 @@ struct PPTTabEntry struct PPTRuler { - UINT32 nRefCount; + sal_uInt32 nRefCount; - INT32 nFlags; - UINT16 nDefaultTab; - UINT16 nTextOfs[ 5 ]; - UINT16 nBulletOfs[ 5 ]; + sal_Int32 nFlags; + sal_uInt16 nDefaultTab; + sal_uInt16 nTextOfs[ 5 ]; + sal_uInt16 nBulletOfs[ 5 ]; PPTTabEntry* pTab; - UINT16 nTabCount; + sal_uInt16 nTabCount; PPTRuler(); ~PPTRuler(); @@ -912,15 +912,15 @@ struct PPTTextRulerInterpreter PPTTextRulerInterpreter(); PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler ); - PPTTextRulerInterpreter( UINT32 nFileOfs, SdrPowerPointImport&, DffRecordHeader& rHd, SvStream& rIn ); + PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerPointImport&, DffRecordHeader& rHd, SvStream& rIn ); ~PPTTextRulerInterpreter(); sal_uInt16 GetTabOffsetByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nOffset; }; sal_uInt16 GetTabStyleByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nStyle; }; - UINT16 GetTabCount() const { return mpImplRuler->nTabCount; }; - BOOL GetDefaultTab( UINT32 nLevel, UINT16& nValue ) const; - BOOL GetTextOfs( UINT32 nLevel, UINT16& nValue ) const; - BOOL GetBulletOfs( UINT32 nLevel, UINT16& nValue ) const; + sal_uInt16 GetTabCount() const { return mpImplRuler->nTabCount; }; + sal_Bool GetDefaultTab( sal_uInt32 nLevel, sal_uInt16& nValue ) const; + sal_Bool GetTextOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const; + sal_Bool GetBulletOfs( sal_uInt32 nLevel, sal_uInt16& nValue ) const; PPTTextRulerInterpreter& operator=( PPTTextRulerInterpreter& rRuler ); }; @@ -989,24 +989,24 @@ class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet friend class PPTParagraphObj; const PPTStyleSheet& mrStyleSheet; - UINT32 mnInstance; - UINT32 mnDepth; + sal_uInt32 mnInstance; + sal_uInt32 mnDepth; public : - BOOL GetAttrib( UINT32 nAttr, UINT32& nVal, UINT32 nInstanceInSheet ); + sal_Bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet ); SvxFieldItem* GetTextField(); - PPTPortionObj( const PPTStyleSheet&, UINT32 nInstance, UINT32 nDepth ); - PPTPortionObj( PPTCharPropSet&, const PPTStyleSheet&, UINT32 nInstance, UINT32 nDepth ); + PPTPortionObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth ); + PPTPortionObj( PPTCharPropSet&, const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt32 nDepth ); PPTPortionObj( PPTPortionObj& ); ~PPTPortionObj(); // the following function should be removed during next full update - void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet ); - void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet, const PPTTextObj* pTextObj ); - UINT32 Count() const { return ( mpFieldItem ) ? 1 : maString.Len(); }; - BOOL HasTabulator(); + void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet ); + void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet, const PPTTextObj* pTextObj ); + sal_uInt32 Count() const { return ( mpFieldItem ) ? 1 : maString.Len(); }; + sal_Bool HasTabulator(); }; class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumberFormatCreator, public PPTTextRulerInterpreter @@ -1015,7 +1015,7 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumb friend class PPTNumberFormatCreator; const PPTStyleSheet& mrStyleSheet; - UINT32 mnInstance; + sal_uInt32 mnInstance; protected : @@ -1023,25 +1023,25 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumb public : - BOOL mbTab; // if true, this paragraph has tabulators in text + sal_Bool mbTab; // if true, this paragraph has tabulators in text - UINT32 mnCurrentObject; - UINT32 mnPortionCount; + sal_uInt32 mnCurrentObject; + sal_uInt32 mnPortionCount; PPTPortionObj** mpPortionList; void UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const; - BOOL GetAttrib( UINT32 nAttr, UINT32& nVal, UINT32 nInstanceInSheet ); + sal_Bool GetAttrib( sal_uInt32 nAttr, sal_uInt32& nVal, sal_uInt32 nInstanceInSheet ); - PPTParagraphObj( const PPTStyleSheet&, UINT32 nInstance, UINT16 nDepth ); - PPTParagraphObj( PPTStyleTextPropReader&, const PPTStyleSheet&, UINT32 nInstance, PPTTextRulerInterpreter& rRuler ); + PPTParagraphObj( const PPTStyleSheet&, sal_uInt32 nInstance, sal_uInt16 nDepth ); + PPTParagraphObj( PPTStyleTextPropReader&, const PPTStyleSheet&, sal_uInt32 nInstance, PPTTextRulerInterpreter& rRuler ); ~PPTParagraphObj(); - UINT32 GetTextSize(); + sal_uInt32 GetTextSize(); PPTPortionObj* First(); PPTPortionObj* Next(); void AppendPortion( PPTPortionObj& rPortion ); - void ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet, const PPTParagraphObj* pPrev ); + void ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport& rManager, sal_uInt32 nInstanceInSheet, const PPTParagraphObj* pPrev ); }; #define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT 1 @@ -1052,16 +1052,16 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumb struct ImplPPTTextObj { - UINT32 mnRefCount; - UINT32 mnShapeId; - UINT32 mnShapeMaster; + sal_uInt32 mnRefCount; + sal_uInt32 mnShapeId; + sal_uInt32 mnShapeMaster; PptOEPlaceholderAtom* mpPlaceHolderAtom; - UINT16 mnInstance; - UINT16 mnDestinationInstance; + sal_uInt16 mnInstance; + sal_uInt16 mnDestinationInstance; MSO_SPT meShapeType; - UINT32 mnCurrentObject; - UINT32 mnParagraphCount; + sal_uInt32 mnCurrentObject; + sal_uInt32 mnParagraphCount; PPTParagraphObj** mpParagraphList; PptSlidePersistEntry& mrPersistEntry; @@ -1081,15 +1081,15 @@ class PPTTextObj PPTTextObj( PPTTextObj& rTextObj ); ~PPTTextObj(); - UINT32 GetCurrentIndex() const { return mpImplTextObj->mnCurrentObject; }; - UINT32 Count() const { return mpImplTextObj->mnParagraphCount; }; + sal_uInt32 GetCurrentIndex() const { return mpImplTextObj->mnCurrentObject; }; + sal_uInt32 Count() const { return mpImplTextObj->mnParagraphCount; }; PPTParagraphObj* First(); PPTParagraphObj* Next(); MSO_SPT GetShapeType() const { return mpImplTextObj->meShapeType; }; - UINT32 GetInstance() const { return mpImplTextObj->mnInstance; }; - void SetInstance( UINT16 nInstance ) { mpImplTextObj->mnInstance = nInstance; }; - UINT32 GetDestinationInstance() const { return mpImplTextObj->mnDestinationInstance; }; - void SetDestinationInstance( UINT16 nInstance ) { mpImplTextObj->mnDestinationInstance = nInstance; }; + sal_uInt32 GetInstance() const { return mpImplTextObj->mnInstance; }; + void SetInstance( sal_uInt16 nInstance ) { mpImplTextObj->mnInstance = nInstance; }; + sal_uInt32 GetDestinationInstance() const { return mpImplTextObj->mnDestinationInstance; }; + void SetDestinationInstance( sal_uInt16 nInstance ) { mpImplTextObj->mnDestinationInstance = nInstance; }; PptOEPlaceholderAtom* GetOEPlaceHolderAtom() const { return mpImplTextObj->mpPlaceHolderAtom; }; sal_uInt32 GetTextFlags() const { return mpImplTextObj->mnTextFlags; }; void SetVertical( sal_Bool bVertical ) @@ -1120,7 +1120,7 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls com::sun::star::form::XFormComponent > &rFComp, const com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape, - BOOL bFloatingCtrl ); + sal_Bool bFloatingCtrl ); }; // Powerpoint Recordtypen @@ -1222,7 +1222,7 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls #define PPT_PST_ExtendedParagraphMasterAtom 4013 #define PPT_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, #define PPT_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj - // the first UINT32 in this atom indices the current slideId + // the first sal_uInt32 in this atom indices the current slideId #define PPT_PST_NewlyAddedAtom4016 4016 #define PPT_PST_FontEntityAtom 4023 diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx index 76138ec6ebea..bf8adf3bd179 100644 --- a/filter/inc/filter/msfilter/svxmsbas.hxx +++ b/filter/inc/filter/msfilter/svxmsbas.hxx @@ -63,7 +63,7 @@ class MSFILTER_DLLPUBLIC SvxImportMSVBasic { public: SvxImportMSVBasic( SfxObjectShell &rDocS, SotStorage &rRoot, - BOOL bImportCode = TRUE, BOOL bCopyStorage = TRUE ) + sal_Bool bImportCode = sal_True, sal_Bool bCopyStorage = sal_True ) : xRoot(&rRoot), rDocSh(rDocS), bImport(bImportCode), bCopy(bCopyStorage) {} @@ -72,40 +72,39 @@ public: // bit 0 = 1 -> any code is imported to the SO-Basic // bit 1 = 1 -> the VBA - storage is copy to the ObjectShell storage int Import( const String& rStorageName, const String &rSubStorageName, - BOOL bAsComment=TRUE, BOOL bStripped=TRUE ); + sal_Bool bAsComment=sal_True, sal_Bool bStripped=sal_True ); int Import( const String& rStorageName, const String &rSubStorageName, const std::vector< String >& codeNames, - BOOL bAsComment=TRUE, BOOL bStripped=TRUE ); + sal_Bool bAsComment=sal_True, sal_Bool bStripped=sal_True ); // only for the export - copy or delete the saved VBA-macro-storage // form the ObjectShell // - returns a warning code if a modified basic exist, in all other // cases return ERRCODE_NONE. - ULONG SaveOrDelMSVBAStorage( BOOL bSaveInto, const String& rStorageName ); + sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const String& rStorageName ); // check if the MS-VBA-Storage exist in the RootStorage of the DocShell. // If it exist, then return the WarningId for loosing the information. - - const ControlAttributeInfo& ControlNameForObjectId(){ return m_ModuleNameToObjIdHash; } - static ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); + static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); + const ControlAttributeInfo& ControlNameForObjectId(){ return m_ModuleNameToObjIdHash; } static String GetMSBasicStorageName(); rtl::OUString GetVBAProjectName() { return msProjectName; } private: SotStorageRef xRoot; SfxObjectShell &rDocSh; - BOOL bImport; - BOOL bCopy; + sal_Bool bImport; + sal_Bool bCopy; ControlAttributeInfo m_ModuleNameToObjIdHash; MSFILTER_DLLPRIVATE void extractAttribute( const String& rAttribute, const String& rModName ); - MSFILTER_DLLPRIVATE BOOL ImportCode_Impl( const String& rStorageName, + MSFILTER_DLLPRIVATE sal_Bool ImportCode_Impl( const String& rStorageName, const String &rSubStorageName, const std::vector< String >& codeNames, - BOOL bAsComment, BOOL bStripped); + sal_Bool bAsComment, sal_Bool bStripped); MSFILTER_DLLPRIVATE bool ImportForms_Impl(const String& rStorageName, const String &rSubStorageName, BOOL bVBAMode); - MSFILTER_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName, + MSFILTER_DLLPRIVATE sal_Bool CopyStorage_Impl( const String& rStorageName, const String &rSubStorageName); rtl::OUString msProjectName; MSFILTER_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, const std::vector< String >&, BOOL, BOOL ); diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx index 76c54cf23eec..8c46eaa52b35 100644 --- a/filter/inc/registration.hxx +++ b/filter/inc/registration.hxx @@ -32,10 +32,8 @@ //_______________________________________________ // includes -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/registry/InvalidRegistryException.hpp> #include <rtl/ustrbuf.hxx> #include <cppuhelper/factory.hxx> @@ -60,97 +58,6 @@ namespace comphelper{ //_______________________________________________ -/** @short creates a new key inside component registry. - - @descr using: a) _COMPHELPER_COMPONENTINFO( MyClass, - MyClass::st_getImplName(), - MyClass::st_getServNames()) - - b) _COMPHELPER_COMPONENTINFO( MyClass, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "css.MyClass" )), - lServiceNames) - - @param CLASS - must be the class name of the implementation - of an uno service, which should be registered here. - - @param IMPLEMENTATIONNAME - can be an uno implementation name from type [::rtl::OUString] - directly or any possible method call, which returns such - name. - - @param SERVICENAME - a list of supported uno service names from type - [::com::sun::star::uno::Sequence< ::rtl::OUString >] - or any possible method call, which returns such - list. - */ -#define _COMPHELPER_COMPONENTINFO(CLASS, IMPLEMENTATIONNAME, SERVICENAMES) \ - /*define new scope to prevent multiple using of the same variables ... */ \ - { \ - /* build new key name */ \ - ::rtl::OUStringBuffer sKeyBuf(256); \ - sKeyBuf.appendAscii("/" ); \ - sKeyBuf.append (IMPLEMENTATIONNAME); \ - sKeyBuf.appendAscii("/UNO/SERVICES" ); \ - ::rtl::OUString sKey = sKeyBuf.makeStringAndClear(); \ - \ - /* try to register this service ... thrown exception will be catched by COMPONENT_WRITEINFO! */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey = xRoot->createKey(sKey); \ - if (!xKey.is()) \ - throw ::com::sun::star::registry::InvalidRegistryException(sKey, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()); \ - \ - /* dont optimize it! it must work for simple types and function calls! */ \ - const ::com::sun::star::uno::Sequence< ::rtl::OUString > lServiceNames = SERVICENAMES; \ - const ::rtl::OUString* pServiceNames = lServiceNames.getConstArray(); \ - sal_Int32 nCount = lServiceNames.getLength(); \ - \ - for (sal_Int32 i=0; i<nCount; ++i) \ - xKey->createKey(pServiceNames[i]); \ - } - -//_______________________________________________ - -/** @short implments extern C function component_writeInfo - - @descr using: _COMPHELPER_COMPONENT_WRITEINFO - ( - _COMPHELPER_COMPONENTINFO(...) - .. - _COMPHELPER_COMPONENTINFO(...) - ) - - @param INFOLIST - list of macros of type COMPONENTINFO without(!) any - seperator signs between two elements. - */ -#define _COMPHELPER_COMPONENT_WRITEINFO(INFOLIST) \ - extern "C" sal_Bool SAL_CALL component_writeInfo(void* pServiceManager, \ - void* pRegistryKey ) \ - { \ - if (!pServiceManager || !pRegistryKey) \ - return sal_False; \ - \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xRoot = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >(pRegistryKey); \ - \ - /*if one of following registration will fail ... an exception is thrown! */ \ - try \ - { \ - /* This parameter will expand to: */ \ - /* _COMPHELPER_COMPONENTINFO(1) */ \ - /* ... */ \ - /* _COMPHELPER_COMPONENTINFO(n) */ \ - INFOLIST \ - } \ - catch(const ::com::sun::star::registry::InvalidRegistryException&) \ - { \ - return sal_False; \ - } \ - return sal_True; \ - } - -//_______________________________________________ - /** TODO doc */ #define _COMPHELPER_MULTIINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES, FACTORYMETHOD) \ |