summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/bolnitem.hxx2
-rw-r--r--svx/inc/bulitem.hxx2
-rw-r--r--svx/inc/charhiddenitem.hxx4
-rw-r--r--svx/inc/chrtitem.hxx2
-rw-r--r--svx/inc/clipboardctl.hxx2
-rw-r--r--svx/inc/clipfmtitem.hxx2
-rw-r--r--svx/inc/connect.hrc48
-rw-r--r--svx/inc/countryid.hxx321
-rw-r--r--svx/inc/defdlgname.hxx43
-rw-r--r--svx/inc/dlgutil.hxx4
-rw-r--r--svx/inc/drawitem.hxx2
-rw-r--r--svx/inc/editund2.hxx2
-rw-r--r--svx/inc/extrusioncontrols.hxx2
-rw-r--r--svx/inc/flstitem.hxx2
-rw-r--r--svx/inc/fmhelp.hrc12
-rw-r--r--svx/inc/fontitem.hxx2
-rw-r--r--svx/inc/fwdtitem.hxx2
-rw-r--r--svx/inc/galbrws2.hxx2
-rw-r--r--svx/inc/galctrl.hxx5
-rw-r--r--svx/inc/galdlg.hxx72
-rw-r--r--svx/inc/gallery.hrc55
-rw-r--r--svx/inc/galobj.hxx16
-rw-r--r--svx/inc/galtheme.hxx46
-rw-r--r--svx/inc/grafctrl.hxx4
-rw-r--r--svx/inc/helpid.hrc1043
-rw-r--r--svx/inc/hlmarkwn_def.hxx39
-rw-r--r--svx/inc/hlnkitem.hxx4
-rw-r--r--svx/inc/htmlcfg.hxx3
-rw-r--r--svx/inc/linectrl.hxx2
-rw-r--r--svx/inc/mscodec.hxx343
-rw-r--r--svx/inc/msoleexp.hxx63
-rw-r--r--svx/inc/multipat.hrc47
-rw-r--r--svx/inc/nlbkitem.hxx2
-rw-r--r--svx/inc/ofaitem.hxx2
-rw-r--r--svx/inc/opaqitem.hxx2
-rw-r--r--svx/inc/optaccessibility.hrc87
-rw-r--r--svx/inc/optasian.hrc52
-rw-r--r--svx/inc/optcolor.hrc222
-rw-r--r--svx/inc/optctl.hrc61
-rw-r--r--svx/inc/optgenrl.hrc88
-rw-r--r--svx/inc/optgrid.hxx2
-rw-r--r--svx/inc/optimprove.hrc53
-rw-r--r--svx/inc/optinet2.hrc175
-rw-r--r--svx/inc/optitems.hxx2
-rw-r--r--svx/inc/optjsearch.hrc53
-rw-r--r--svx/inc/optpath.hrc46
-rw-r--r--svx/inc/optsave.hrc84
-rw-r--r--svx/inc/optspell.hrc45
-rw-r--r--svx/inc/pch/precompiled_svx.hxx134
-rw-r--r--svx/inc/pgrditem.hxx2
-rw-r--r--svx/inc/postattr.hxx2
-rw-r--r--svx/inc/prntitem.hxx2
-rw-r--r--svx/inc/protitem.hxx2
-rw-r--r--svx/inc/radiobtnbox.hxx66
-rw-r--r--svx/inc/rotmodit.hxx2
-rw-r--r--svx/inc/rulritem.hxx2
-rw-r--r--svx/inc/srchdlg.hxx4
-rwxr-xr-xsvx/inc/svx/EnhancedCustomShapeFunctionParser.hxx (renamed from svx/inc/EnhancedCustomShapeFunctionParser.hxx)0
-rw-r--r--svx/inc/svx/SmartTagItem.hxx2
-rw-r--r--svx/inc/svx/adjitem.hxx2
-rw-r--r--svx/inc/svx/akrnitem.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx4
-rw-r--r--svx/inc/svx/blnkitem.hxx4
-rw-r--r--svx/inc/svx/borderline.hxx2
-rw-r--r--svx/inc/svx/boxitem.hxx2
-rw-r--r--svx/inc/svx/brkitem.hxx2
-rw-r--r--svx/inc/svx/brshitem.hxx2
-rw-r--r--svx/inc/svx/charreliefitem.hxx2
-rw-r--r--svx/inc/svx/charrotateitem.hxx2
-rw-r--r--svx/inc/svx/charscaleitem.hxx2
-rw-r--r--svx/inc/svx/cmapitem.hxx2
-rw-r--r--svx/inc/svx/cntritem.hxx2
-rw-r--r--svx/inc/svx/colrctrl.hxx2
-rw-r--r--svx/inc/svx/colritem.hxx2
-rw-r--r--svx/inc/svx/crsditem.hxx2
-rw-r--r--svx/inc/svx/dialogs.hrc841
-rw-r--r--svx/inc/svx/dlgctl3d.hxx2
-rw-r--r--svx/inc/svx/dlgctrl.hxx1
-rw-r--r--svx/inc/svx/e3ditem.hxx2
-rw-r--r--svx/inc/svx/editdata.hxx2
-rw-r--r--svx/inc/svx/editobj.hxx2
-rw-r--r--svx/inc/svx/emphitem.hxx2
-rw-r--r--svx/inc/svx/escherex.hxx1513
-rw-r--r--svx/inc/svx/escpitem.hxx2
-rw-r--r--svx/inc/svx/exthelpid.hrc (renamed from svx/source/cui/multifil.hxx)46
-rw-r--r--svx/inc/svx/fhgtitem.hxx2
-rw-r--r--svx/inc/svx/fillctrl.hxx2
-rw-r--r--svx/inc/svx/flditem.hxx2
-rw-r--r--svx/inc/svx/fmsearch.hxx2
-rw-r--r--svx/inc/svx/fmtools.hxx (renamed from svx/source/inc/fmtools.hxx)2
-rw-r--r--svx/inc/svx/fntctl.hxx2
-rw-r--r--svx/inc/svx/forbiddenruleitem.hxx2
-rw-r--r--svx/inc/svx/frmdiritem.hxx2
-rw-r--r--svx/inc/svx/gallery1.hxx (renamed from svx/inc/gallery1.hxx)6
-rw-r--r--svx/inc/svx/galmisc.hxx (renamed from svx/inc/galmisc.hxx)36
-rw-r--r--svx/inc/svx/grfcrop.hxx2
-rw-r--r--svx/inc/svx/hngpnctitem.hxx2
-rw-r--r--svx/inc/svx/hyznitem.hxx2
-rw-r--r--svx/inc/svx/impgrf.hxx (renamed from svx/inc/impgrf.hxx)0
-rw-r--r--svx/inc/svx/itemtype.hxx2
-rw-r--r--svx/inc/svx/keepitem.hxx2
-rw-r--r--svx/inc/svx/kernitem.hxx2
-rw-r--r--svx/inc/svx/langitem.hxx2
-rw-r--r--svx/inc/svx/lrspitem.hxx2
-rw-r--r--svx/inc/svx/lspcitem.hxx2
-rw-r--r--svx/inc/svx/msdffdef.hxx93
-rw-r--r--svx/inc/svx/msdffimp.hxx773
-rw-r--r--svx/inc/svx/msfiltertracer.hxx99
-rw-r--r--svx/inc/svx/msocximex.hxx1423
-rw-r--r--svx/inc/svx/msvbahelper.hxx58
-rw-r--r--svx/inc/svx/nhypitem.hxx2
-rw-r--r--svx/inc/svx/numfmtsh.hxx2
-rw-r--r--svx/inc/svx/numinf.hxx2
-rw-r--r--svx/inc/svx/numitem.hxx4
-rw-r--r--svx/inc/svx/obj3d.hxx2
-rw-r--r--svx/inc/svx/optimprove.hxx143
-rw-r--r--svx/inc/svx/optlingu.hxx185
-rw-r--r--svx/inc/svx/orphitem.hxx2
-rw-r--r--svx/inc/svx/outliner.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx2
-rw-r--r--svx/inc/svx/paravertalignitem.hxx2
-rw-r--r--svx/inc/svx/pbinitem.hxx2
-rw-r--r--svx/inc/svx/pmdlitem.hxx2
-rw-r--r--svx/inc/svx/postitem.hxx2
-rw-r--r--svx/inc/svx/prszitem.hxx2
-rw-r--r--svx/inc/svx/ruler.hxx2
-rw-r--r--svx/inc/svx/scriptspaceitem.hxx2
-rw-r--r--svx/inc/svx/scripttypeitem.hxx4
-rw-r--r--svx/inc/svx/sdangitm.hxx2
-rw-r--r--svx/inc/svx/sdasaitm.hxx2
-rw-r--r--svx/inc/svx/sdasitm.hxx2
-rw-r--r--svx/inc/svx/sdggaitm.hxx2
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdmetitm.hxx2
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdprcitm.hxx2
-rw-r--r--svx/inc/svx/sdr/contact/objectcontact.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaytools.hxx10
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx16
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx6
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx21
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx10
-rw-r--r--svx/inc/svx/sdr/properties/attributeproperties.hxx2
-rw-r--r--svx/inc/svx/sdrpagewindow.hxx2
-rw-r--r--svx/inc/svx/sdtaaitm.hxx2
-rw-r--r--svx/inc/svx/sdtacitm.hxx2
-rw-r--r--svx/inc/svx/sdtaditm.hxx2
-rw-r--r--svx/inc/svx/sdtaitm.hxx2
-rw-r--r--svx/inc/svx/sdtakitm.hxx2
-rw-r--r--svx/inc/svx/sdtayitm.hxx2
-rw-r--r--svx/inc/svx/sdtfsitm.hxx2
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/inc/svx/shaditem.hxx2
-rw-r--r--svx/inc/svx/shdditem.hxx2
-rw-r--r--svx/inc/svx/sizeitem.hxx2
-rw-r--r--svx/inc/svx/spltitem.hxx2
-rw-r--r--svx/inc/svx/svdattr.hxx2
-rw-r--r--svx/inc/svx/svdfppt.hxx1445
-rw-r--r--svx/inc/svx/svdhdl.hxx2
-rw-r--r--svx/inc/svx/svdmodel.hxx6
-rw-r--r--svx/inc/svx/svdobj.hxx2
-rw-r--r--svx/inc/svx/svdpage.hxx3
-rw-r--r--svx/inc/svx/svdpagv.hxx2
-rw-r--r--svx/inc/svx/svdpntv.hxx14
-rw-r--r--svx/inc/svx/svdundo.hxx4
-rw-r--r--svx/inc/svx/svdview.hxx5
-rw-r--r--svx/inc/svx/svx3ditems.hxx4
-rw-r--r--svx/inc/svx/svxacorr.hxx2
-rw-r--r--svx/inc/svx/svxbox.hxx2
-rw-r--r--svx/inc/svx/svxdlg.hxx75
-rw-r--r--svx/inc/svx/svxids.hrc9
-rw-r--r--svx/inc/svx/svxitems.hrc2
-rw-r--r--svx/inc/svx/sxcecitm.hxx2
-rw-r--r--svx/inc/svx/sxcikitm.hxx2
-rw-r--r--svx/inc/svx/sxctitm.hxx2
-rw-r--r--svx/inc/svx/sxekitm.hxx2
-rw-r--r--svx/inc/svx/sxfiitm.hxx2
-rw-r--r--svx/inc/svx/sxlayitm.hxx4
-rw-r--r--svx/inc/svx/sxmfsitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx2
-rw-r--r--svx/inc/svx/sxmtpitm.hxx2
-rw-r--r--svx/inc/svx/sxmuitm.hxx2
-rw-r--r--svx/inc/svx/sxonitm.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx2
-rw-r--r--svx/inc/svx/tstpitem.hxx2
-rw-r--r--svx/inc/svx/twolinesitem.hxx2
-rw-r--r--svx/inc/svx/udlnitem.hxx2
-rw-r--r--svx/inc/svx/ulspitem.hxx2
-rw-r--r--svx/inc/svx/unoedsrc.hxx4
-rw-r--r--svx/inc/svx/unoipset.hxx2
-rw-r--r--svx/inc/svx/unopage.hxx2
-rw-r--r--svx/inc/svx/unoprov.hxx2
-rw-r--r--svx/inc/svx/unoshape.hxx2
-rw-r--r--svx/inc/svx/unoshprp.hxx2
-rw-r--r--svx/inc/svx/unotext.hxx6
-rw-r--r--svx/inc/svx/viewlayoutitem.hxx2
-rw-r--r--svx/inc/svx/wghtitem.hxx2
-rw-r--r--svx/inc/svx/widwitem.hxx2
-rw-r--r--svx/inc/svx/writingmodeitem.hxx2
-rw-r--r--svx/inc/svx/wrlmitem.hxx2
-rw-r--r--svx/inc/svx/xfillit.hxx2
-rw-r--r--svx/inc/svx/xfillit0.hxx2
-rw-r--r--svx/inc/svx/xflasit.hxx2
-rw-r--r--svx/inc/svx/xflbckit.hxx2
-rw-r--r--svx/inc/svx/xflbmpit.hxx2
-rw-r--r--svx/inc/svx/xflbmsli.hxx2
-rw-r--r--svx/inc/svx/xflbmsxy.hxx2
-rw-r--r--svx/inc/svx/xflbmtit.hxx2
-rw-r--r--svx/inc/svx/xflboxy.hxx2
-rw-r--r--svx/inc/svx/xflbstit.hxx2
-rw-r--r--svx/inc/svx/xflbtoxy.hxx2
-rw-r--r--svx/inc/svx/xfltrit.hxx2
-rw-r--r--svx/inc/svx/xftadit.hxx2
-rw-r--r--svx/inc/svx/xftdiit.hxx2
-rw-r--r--svx/inc/svx/xftmrit.hxx2
-rw-r--r--svx/inc/svx/xftshit.hxx2
-rw-r--r--svx/inc/svx/xftshtit.hxx2
-rw-r--r--svx/inc/svx/xftshxy.hxx2
-rw-r--r--svx/inc/svx/xftstit.hxx2
-rw-r--r--svx/inc/svx/xgrscit.hxx2
-rw-r--r--svx/inc/svx/xit.hxx2
-rw-r--r--svx/inc/svx/xlineit.hxx4
-rw-r--r--svx/inc/svx/xlineit0.hxx2
-rw-r--r--svx/inc/svx/xlinjoit.hxx (renamed from svx/inc/xlinjoit.hxx)2
-rw-r--r--svx/inc/svx/xlnasit.hxx2
-rw-r--r--svx/inc/svx/xlnedcit.hxx2
-rw-r--r--svx/inc/svx/xlnedwit.hxx2
-rw-r--r--svx/inc/svx/xlnstcit.hxx2
-rw-r--r--svx/inc/svx/xlnstwit.hxx2
-rw-r--r--svx/inc/svx/xlntrit.hxx2
-rw-r--r--svx/inc/svx/xlnwtit.hxx2
-rw-r--r--svx/inc/svx/xpool.hxx2
-rw-r--r--svx/inc/svx/xsetit.hxx4
-rw-r--r--svx/inc/svx/xtextit.hxx4
-rw-r--r--svx/inc/svx/xtextit0.hxx2
-rw-r--r--svx/inc/svx/zoomitem.hxx2
-rw-r--r--svx/inc/svx/zoomslideritem.hxx2
-rw-r--r--svx/inc/svxgrahicitem.hxx2
-rw-r--r--svx/inc/svxmsbas.hxx97
-rw-r--r--svx/inc/svxrtf.hxx4
-rw-r--r--svx/inc/txtrange.hxx2
-rw-r--r--svx/inc/unoapi.hxx2
-rw-r--r--svx/inc/unoedhlp.hxx2
-rw-r--r--svx/inc/unofdesc.hxx2
-rw-r--r--svx/inc/unolingu.hxx4
-rw-r--r--svx/inc/xattr.hxx2
-rw-r--r--svx/inc/xmlcnitm.hxx2
-rw-r--r--svx/prj/build.lst6
-rw-r--r--svx/prj/d.lst288
-rw-r--r--svx/sdi/makefile.mk5
-rw-r--r--svx/sdi/svxslots.sdi7
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx4
-rw-r--r--svx/source/accessibility/AccessibleStaticTextBase.cxx4
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx2
-rw-r--r--svx/source/cui/ControlFocusHelper.hxx51
-rw-r--r--svx/source/cui/SpellAttrib.cxx178
-rw-r--r--svx/source/cui/SpellAttrib.hxx176
-rw-r--r--svx/source/cui/SpellDialog.cxx2167
-rw-r--r--svx/source/cui/SpellDialog.hrc58
-rw-r--r--svx/source/cui/SpellDialog.src245
-rw-r--r--svx/source/cui/acccfg.cxx1700
-rw-r--r--svx/source/cui/acccfg.hrc78
-rw-r--r--svx/source/cui/acccfg.hxx288
-rw-r--r--svx/source/cui/acccfg.src360
-rw-r--r--svx/source/cui/align.cxx303
-rw-r--r--svx/source/cui/align.hrc87
-rw-r--r--svx/source/cui/align.hxx113
-rw-r--r--svx/source/cui/align.src251
-rw-r--r--svx/source/cui/autocdlg.cxx2780
-rw-r--r--svx/source/cui/autocdlg.hrc162
-rw-r--r--svx/source/cui/autocdlg.hxx508
-rw-r--r--svx/source/cui/autocdlg.src856
-rw-r--r--svx/source/cui/backgrnd.cxx1990
-rw-r--r--svx/source/cui/backgrnd.hrc73
-rw-r--r--svx/source/cui/backgrnd.hxx173
-rw-r--r--svx/source/cui/backgrnd.src307
-rw-r--r--svx/source/cui/bbdlg.cxx79
-rw-r--r--svx/source/cui/bbdlg.hxx59
-rw-r--r--svx/source/cui/bbdlg.src88
-rw-r--r--svx/source/cui/border.cxx1274
-rw-r--r--svx/source/cui/border.hrc109
-rw-r--r--svx/source/cui/border.hxx179
-rw-r--r--svx/source/cui/border.src431
-rw-r--r--svx/source/cui/borderconn.cxx318
-rw-r--r--svx/source/cui/borderconn.hxx79
-rw-r--r--svx/source/cui/cfg.cxx6056
-rw-r--r--svx/source/cui/cfg.hrc108
-rw-r--r--svx/source/cui/cfg.hxx836
-rw-r--r--svx/source/cui/cfg.src875
-rw-r--r--svx/source/cui/cfgchart.cxx327
-rw-r--r--svx/source/cui/cfgchart.hxx118
-rw-r--r--svx/source/cui/cfgutil.cxx1801
-rw-r--r--svx/source/cui/cfgutil.hxx220
-rw-r--r--svx/source/cui/chardlg.cxx4070
-rw-r--r--svx/source/cui/chardlg.h74
-rw-r--r--svx/source/cui/chardlg.hrc184
-rw-r--r--svx/source/cui/chardlg.hxx400
-rw-r--r--svx/source/cui/chardlg.src1133
-rw-r--r--svx/source/cui/charmap.hrc54
-rw-r--r--svx/source/cui/charmap.src161
-rw-r--r--svx/source/cui/commonlingui.cxx294
-rw-r--r--svx/source/cui/commonlingui.hxx174
-rw-r--r--svx/source/cui/commonlingui.src156
-rw-r--r--svx/source/cui/connect.cxx569
-rw-r--r--svx/source/cui/connect.hxx133
-rw-r--r--svx/source/cui/connect.src268
-rw-r--r--svx/source/cui/connpoolconfig.cxx231
-rw-r--r--svx/source/cui/connpoolconfig.hxx57
-rw-r--r--svx/source/cui/connpooloptions.cxx516
-rw-r--r--svx/source/cui/connpooloptions.hrc52
-rw-r--r--svx/source/cui/connpooloptions.hxx95
-rw-r--r--svx/source/cui/connpooloptions.src169
-rw-r--r--svx/source/cui/connpoolsettings.cxx126
-rw-r--r--svx/source/cui/connpoolsettings.hxx111
-rw-r--r--svx/source/cui/cuicharmap.cxx594
-rw-r--r--svx/source/cui/cuicharmap.hxx146
-rw-r--r--svx/source/cui/cuiexp.cxx58
-rw-r--r--svx/source/cui/cuifmsearch.cxx984
-rw-r--r--svx/source/cui/cuifmsearch.hxx230
-rw-r--r--svx/source/cui/cuigaldlg.cxx1290
-rw-r--r--svx/source/cui/cuigaldlg.hxx377
-rw-r--r--svx/source/cui/cuigrfflt.cxx762
-rw-r--r--svx/source/cui/cuigrfflt.hxx256
-rw-r--r--svx/source/cui/cuihyperdlg.cxx423
-rw-r--r--svx/source/cui/cuihyperdlg.hxx117
-rwxr-xr-xsvx/source/cui/cuiimapdlg.hrc50
-rwxr-xr-xsvx/source/cui/cuiimapdlg.src151
-rw-r--r--svx/source/cui/cuiimapwnd.cxx105
-rw-r--r--svx/source/cui/cuiimapwnd.hxx54
-rw-r--r--svx/source/cui/cuioptgenrl.hxx137
-rw-r--r--svx/source/cui/cuisrchdlg.cxx112
-rw-r--r--svx/source/cui/cuisrchdlg.hxx90
-rw-r--r--svx/source/cui/cuitabarea.hxx805
-rw-r--r--svx/source/cui/cuitabline.hxx433
-rw-r--r--svx/source/cui/cuitbxform.cxx84
-rw-r--r--svx/source/cui/cuitbxform.hxx29
-rw-r--r--svx/source/cui/dbregister.cxx534
-rw-r--r--svx/source/cui/dbregister.hrc45
-rw-r--r--svx/source/cui/dbregister.hxx163
-rw-r--r--svx/source/cui/dbregister.src97
-rw-r--r--svx/source/cui/dbregisterednamesconfig.cxx152
-rw-r--r--svx/source/cui/dbregisterednamesconfig.hxx57
-rw-r--r--svx/source/cui/dbregistersettings.cxx83
-rw-r--r--svx/source/cui/dbregistersettings.hxx98
-rw-r--r--svx/source/cui/dlgfact.cxx2393
-rw-r--r--svx/source/cui/dlgfact.hxx818
-rw-r--r--svx/source/cui/dlgname.cxx243
-rw-r--r--svx/source/cui/dlgname.hrc49
-rw-r--r--svx/source/cui/dlgname.hxx207
-rw-r--r--svx/source/cui/dlgname.src272
-rw-r--r--svx/source/cui/doclinkdialog.cxx235
-rw-r--r--svx/source/cui/doclinkdialog.hrc53
-rw-r--r--svx/source/cui/doclinkdialog.hxx96
-rw-r--r--svx/source/cui/doclinkdialog.src154
-rw-r--r--svx/source/cui/dstribut.cxx251
-rw-r--r--svx/source/cui/dstribut.hrc58
-rw-r--r--svx/source/cui/dstribut.hxx128
-rw-r--r--svx/source/cui/dstribut.src293
-rw-r--r--svx/source/cui/eventdlg.cxx250
-rw-r--r--svx/source/cui/eventdlg.hrc46
-rw-r--r--svx/source/cui/eventdlg.src114
-rw-r--r--svx/source/cui/fontsubs.cxx625
-rw-r--r--svx/source/cui/fontsubs.hrc65
-rw-r--r--svx/source/cui/fontsubs.hxx132
-rw-r--r--svx/source/cui/fontsubs.src200
-rw-r--r--svx/source/cui/grfflt.hrc83
-rw-r--r--svx/source/cui/grfflt.src456
-rw-r--r--svx/source/cui/grfpage.cxx858
-rw-r--r--svx/source/cui/grfpage.hrc56
-rw-r--r--svx/source/cui/grfpage.hxx143
-rw-r--r--svx/source/cui/grfpage.src334
-rw-r--r--svx/source/cui/hangulhanjadlg.cxx1929
-rw-r--r--svx/source/cui/hangulhanjadlg.hrc200
-rw-r--r--svx/source/cui/hangulhanjadlg.hxx355
-rw-r--r--svx/source/cui/hangulhanjadlg.src431
-rwxr-xr-xsvx/source/cui/headertablistbox.hxx71
-rw-r--r--svx/source/cui/hldocntp.cxx525
-rw-r--r--svx/source/cui/hldocntp.hxx81
-rw-r--r--svx/source/cui/hldoctp.cxx387
-rw-r--r--svx/source/cui/hldoctp.hxx96
-rw-r--r--svx/source/cui/hlinettp.cxx550
-rw-r--r--svx/source/cui/hlinettp.hxx110
-rw-r--r--svx/source/cui/hlmailtp.cxx367
-rw-r--r--svx/source/cui/hlmailtp.hxx80
-rw-r--r--svx/source/cui/hlmarkwn.cxx549
-rw-r--r--svx/source/cui/hlmarkwn.src98
-rw-r--r--svx/source/cui/hltpbase.cxx880
-rw-r--r--svx/source/cui/hltpbase.hxx218
-rw-r--r--svx/source/cui/iconcdlg.cxx1445
-rw-r--r--svx/source/cui/iconcdlg.hxx292
-rw-r--r--svx/source/cui/iconcdlg.src63
-rw-r--r--svx/source/cui/init.cxx60
-rw-r--r--svx/source/cui/insdlg.cxx1064
-rw-r--r--svx/source/cui/insdlg.hxx217
-rw-r--r--svx/source/cui/insrc.cxx88
-rw-r--r--svx/source/cui/insrc.hrc43
-rw-r--r--svx/source/cui/insrc.hxx72
-rw-r--r--svx/source/cui/insrc.src118
-rw-r--r--svx/source/cui/internationaloptions.cxx172
-rw-r--r--svx/source/cui/internationaloptions.hrc75
-rw-r--r--svx/source/cui/internationaloptions.hxx61
-rw-r--r--svx/source/cui/internationaloptions.src105
-rw-r--r--svx/source/cui/labdlg.cxx657
-rw-r--r--svx/source/cui/labdlg.hrc80
-rw-r--r--svx/source/cui/labdlg.hxx147
-rw-r--r--svx/source/cui/labdlg.src301
-rw-r--r--svx/source/cui/linkdlg.cxx721
-rw-r--r--svx/source/cui/linkdlg.hxx137
-rw-r--r--svx/source/cui/macroass.cxx719
-rw-r--r--svx/source/cui/macroass.hrc85
-rwxr-xr-xsvx/source/cui/macroass.hxx146
-rw-r--r--svx/source/cui/macroass.src143
-rw-r--r--svx/source/cui/macropg.cxx1060
-rw-r--r--svx/source/cui/macropg.hrc104
-rw-r--r--svx/source/cui/macropg.hxx178
-rw-r--r--svx/source/cui/macropg.src461
-rwxr-xr-xsvx/source/cui/makefile.mk234
-rw-r--r--svx/source/cui/measure.cxx881
-rw-r--r--svx/source/cui/measure.hrc56
-rw-r--r--svx/source/cui/measure.hxx132
-rw-r--r--svx/source/cui/measure.src310
-rw-r--r--svx/source/cui/multifil.cxx191
-rw-r--r--svx/source/cui/multipat.cxx367
-rw-r--r--svx/source/cui/multipat.hxx92
-rw-r--r--svx/source/cui/newtabledlg.cxx78
-rw-r--r--svx/source/cui/newtabledlg.hrc38
-rw-r--r--svx/source/cui/newtabledlg.hxx65
-rw-r--r--svx/source/cui/newtabledlg.src138
-rw-r--r--svx/source/cui/numfmt.cxx1957
-rw-r--r--svx/source/cui/numfmt.hrc77
-rw-r--r--svx/source/cui/numfmt.hxx206
-rw-r--r--svx/source/cui/numfmt.src297
-rw-r--r--svx/source/cui/numpages.cxx4087
-rw-r--r--svx/source/cui/numpages.hrc135
-rw-r--r--svx/source/cui/numpages.hxx472
-rw-r--r--svx/source/cui/numpages.src910
-rw-r--r--svx/source/cui/optHeaderTabListbox.cxx93
-rw-r--r--svx/source/cui/optHeaderTabListbox.hxx48
-rw-r--r--svx/source/cui/optaccessibility.cxx191
-rw-r--r--svx/source/cui/optaccessibility.hxx68
-rw-r--r--svx/source/cui/optasian.cxx475
-rw-r--r--svx/source/cui/optasian.hxx84
-rw-r--r--svx/source/cui/optchart.cxx244
-rw-r--r--svx/source/cui/optchart.hxx92
-rw-r--r--svx/source/cui/optcolor.cxx1642
-rw-r--r--svx/source/cui/optcolor.hxx84
-rw-r--r--svx/source/cui/optctl.cxx182
-rw-r--r--svx/source/cui/optctl.hxx73
-rw-r--r--svx/source/cui/optdict.cxx817
-rw-r--r--svx/source/cui/optdict.hxx191
-rw-r--r--svx/source/cui/optfltr.cxx444
-rw-r--r--svx/source/cui/optfltr.hrc58
-rw-r--r--svx/source/cui/optfltr.hxx118
-rw-r--r--svx/source/cui/optfltr.src204
-rw-r--r--svx/source/cui/optgdlg.cxx1926
-rw-r--r--svx/source/cui/optgdlg.hrc208
-rw-r--r--svx/source/cui/optgdlg.hxx217
-rw-r--r--svx/source/cui/optgdlg.src642
-rw-r--r--svx/source/cui/optgenrl.cxx587
-rw-r--r--svx/source/cui/opthtml.cxx275
-rw-r--r--svx/source/cui/opthtml.hrc66
-rw-r--r--svx/source/cui/opthtml.hxx104
-rw-r--r--svx/source/cui/opthtml.src290
-rw-r--r--svx/source/cui/optimprove.cxx233
-rw-r--r--svx/source/cui/optimprove2.cxx276
-rw-r--r--svx/source/cui/optinet2.cxx2356
-rw-r--r--svx/source/cui/optinet2.hxx357
-rw-r--r--svx/source/cui/optjava.cxx1142
-rw-r--r--svx/source/cui/optjava.hrc86
-rw-r--r--svx/source/cui/optjava.hxx221
-rw-r--r--svx/source/cui/optjava.src290
-rw-r--r--svx/source/cui/optjsearch.cxx393
-rw-r--r--svx/source/cui/optjsearch.hxx96
-rw-r--r--svx/source/cui/optmemory.cxx287
-rw-r--r--svx/source/cui/optmemory.hrc89
-rw-r--r--svx/source/cui/optmemory.hxx92
-rw-r--r--svx/source/cui/optmemory.src210
-rw-r--r--svx/source/cui/optpath.cxx871
-rw-r--r--svx/source/cui/optpath.hxx119
-rw-r--r--svx/source/cui/optsave.cxx826
-rw-r--r--svx/source/cui/optsave.hxx108
-rw-r--r--svx/source/cui/optupdt.cxx424
-rw-r--r--svx/source/cui/optupdt.hrc52
-rw-r--r--svx/source/cui/optupdt.hxx84
-rw-r--r--svx/source/cui/optupdt.src114
-rw-r--r--svx/source/cui/page.cxx1788
-rw-r--r--svx/source/cui/page.h74
-rw-r--r--svx/source/cui/page.hrc87
-rw-r--r--svx/source/cui/page.hxx256
-rw-r--r--svx/source/cui/page.src668
-rw-r--r--svx/source/cui/paragrph.cxx2394
-rw-r--r--svx/source/cui/paragrph.hrc124
-rw-r--r--svx/source/cui/paragrph.hxx336
-rw-r--r--svx/source/cui/paragrph.src734
-rw-r--r--svx/source/cui/pastedlg.cxx314
-rw-r--r--svx/source/cui/pastedlg.hxx98
-rw-r--r--svx/source/cui/plfilter.cxx133
-rw-r--r--svx/source/cui/postdlg.cxx273
-rw-r--r--svx/source/cui/postdlg.hrc54
-rw-r--r--svx/source/cui/postdlg.hxx129
-rw-r--r--svx/source/cui/postdlg.src161
-rw-r--r--svx/source/cui/readonlyimage.cxx88
-rw-r--r--svx/source/cui/readonlyimage.hxx46
-rw-r--r--svx/source/cui/readonlyimage.src55
-rw-r--r--svx/source/cui/scriptdlg.cxx1695
-rw-r--r--svx/source/cui/scriptdlg.hrc83
-rw-r--r--svx/source/cui/scriptdlg.hxx251
-rw-r--r--svx/source/cui/scriptdlg.src310
-rw-r--r--svx/source/cui/sdbcdriverenum.cxx136
-rw-r--r--svx/source/cui/sdbcdriverenum.hxx79
-rw-r--r--svx/source/cui/sdrcelldlg.cxx106
-rw-r--r--svx/source/cui/sdrcelldlg.hxx66
-rw-r--r--svx/source/cui/sdrcelldlg.src142
-rw-r--r--svx/source/cui/securityoptions.cxx116
-rw-r--r--svx/source/cui/securityoptions.hrc83
-rw-r--r--svx/source/cui/securityoptions.hxx94
-rw-r--r--svx/source/cui/securityoptions.src168
-rw-r--r--svx/source/cui/selector.cxx1262
-rw-r--r--svx/source/cui/selector.hrc60
-rw-r--r--svx/source/cui/selector.hxx249
-rw-r--r--svx/source/cui/selector.src215
-rw-r--r--svx/source/cui/showcols.cxx144
-rw-r--r--svx/source/cui/showcols.hxx69
-rw-r--r--svx/source/cui/splitcelldlg.cxx120
-rw-r--r--svx/source/cui/splitcelldlg.hrc45
-rw-r--r--svx/source/cui/splitcelldlg.hxx72
-rw-r--r--svx/source/cui/splitcelldlg.src135
-rw-r--r--svx/source/cui/srchxtra.cxx306
-rw-r--r--svx/source/cui/srchxtra.hrc54
-rw-r--r--svx/source/cui/srchxtra.hxx111
-rw-r--r--svx/source/cui/srchxtra.src281
-rw-r--r--svx/source/cui/svuidlg.hrc139
-rw-r--r--svx/source/cui/svuidlg.src711
-rw-r--r--svx/source/cui/swpossizetabpage.cxx1977
-rw-r--r--svx/source/cui/swpossizetabpage.hrc62
-rw-r--r--svx/source/cui/swpossizetabpage.hxx163
-rw-r--r--svx/source/cui/swpossizetabpage.src299
-rw-r--r--svx/source/cui/tabarea.cxx382
-rw-r--r--svx/source/cui/tabarea.hrc190
-rw-r--r--svx/source/cui/tabarea.src1541
-rw-r--r--svx/source/cui/tabline.cxx306
-rw-r--r--svx/source/cui/tabline.hrc109
-rw-r--r--svx/source/cui/tabline.src803
-rw-r--r--svx/source/cui/tabstpge.cxx755
-rw-r--r--svx/source/cui/tabstpge.hrc66
-rw-r--r--svx/source/cui/tabstpge.hxx161
-rw-r--r--svx/source/cui/tabstpge.src234
-rw-r--r--svx/source/cui/textanim.cxx763
-rw-r--r--svx/source/cui/textanim.hrc50
-rw-r--r--svx/source/cui/textanim.hxx131
-rw-r--r--svx/source/cui/textanim.src322
-rw-r--r--svx/source/cui/textattr.cxx807
-rw-r--r--svx/source/cui/textattr.hrc49
-rw-r--r--svx/source/cui/textattr.hxx138
-rw-r--r--svx/source/cui/textattr.src247
-rw-r--r--svx/source/cui/tparea.cxx2586
-rw-r--r--svx/source/cui/tpbitmap.cxx1179
-rw-r--r--svx/source/cui/tpcolor.cxx1286
-rw-r--r--svx/source/cui/tpgradnt.cxx948
-rw-r--r--svx/source/cui/tphatch.cxx912
-rw-r--r--svx/source/cui/tpline.cxx1959
-rw-r--r--svx/source/cui/tplnedef.cxx1027
-rw-r--r--svx/source/cui/tplneend.cxx762
-rw-r--r--svx/source/cui/tpshadow.cxx620
-rw-r--r--svx/source/cui/transfrm.cxx1706
-rw-r--r--svx/source/cui/transfrm.hrc79
-rw-r--r--svx/source/cui/transfrm.hxx308
-rw-r--r--svx/source/cui/transfrm.src612
-rw-r--r--svx/source/cui/treeopt.cxx2861
-rw-r--r--svx/source/cui/treeopt.hrc103
-rw-r--r--svx/source/cui/treeopt.hxx362
-rw-r--r--svx/source/cui/treeopt.src386
-rw-r--r--svx/source/cui/webconninfo.cxx386
-rw-r--r--svx/source/cui/webconninfo.hrc65
-rw-r--r--svx/source/cui/webconninfo.hxx88
-rw-r--r--svx/source/cui/webconninfo.src106
-rw-r--r--svx/source/cui/winpluginlib.cpp233
-rw-r--r--svx/source/cui/zoom.cxx541
-rw-r--r--svx/source/cui/zoom.hrc56
-rw-r--r--svx/source/cui/zoom.hxx120
-rw-r--r--svx/source/cui/zoom.src159
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx1
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.hxx5
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx118
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/charmap.cxx2
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx2
-rw-r--r--svx/source/dialog/dialmgr.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx25
-rw-r--r--svx/source/dialog/dlgutil.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/frmdirlbox.src96
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/grfflt.cxx2
-rw-r--r--svx/source/dialog/hangulhanja.cxx6
-rw-r--r--svx/source/dialog/hdft.cxx4
-rw-r--r--svx/source/dialog/hyperdlg.cxx6
-rw-r--r--svx/source/dialog/hyperdlg.src971
-rw-r--r--svx/source/dialog/hyprlink.cxx48
-rw-r--r--svx/source/dialog/imapdlg.cxx12
-rw-r--r--svx/source/dialog/imapwnd.cxx4
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/impgrf.cxx14
-rw-r--r--svx/source/dialog/makefile.mk13
-rw-r--r--svx/source/dialog/opengrf.cxx6
-rw-r--r--svx/source/dialog/radiobtnbox.cxx124
-rw-r--r--svx/source/dialog/rlrcitem.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/sdstring.src209
-rw-r--r--svx/source/dialog/srchctrl.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx60
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx16
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src130
-rw-r--r--svx/source/dialog/svxdlg.cxx9
-rw-r--r--svx/source/dialog/svxruler.cxx11
-rw-r--r--svx/source/dialog/thesdlg.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectExport.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectImport.cxx2
-rw-r--r--svx/source/editeng/acorrcfg.cxx8
-rw-r--r--svx/source/editeng/editattr.hxx2
-rw-r--r--svx/source/editeng/editdbg.hxx2
-rw-r--r--svx/source/editeng/editdoc.hxx6
-rw-r--r--svx/source/editeng/editdoc2.cxx2
-rw-r--r--svx/source/editeng/editeng.cxx6
-rw-r--r--svx/source/editeng/editeng.hrc2
-rw-r--r--svx/source/editeng/editobj.cxx4
-rw-r--r--svx/source/editeng/editobj2.hxx2
-rw-r--r--svx/source/editeng/editview.cxx18
-rw-r--r--svx/source/editeng/edtspell.cxx4
-rw-r--r--svx/source/editeng/eehtml.hxx2
-rw-r--r--svx/source/editeng/eeobj.cxx2
-rw-r--r--svx/source/editeng/eerdll.cxx4
-rw-r--r--svx/source/editeng/eertfpar.cxx2
-rw-r--r--svx/source/editeng/impedit.cxx2
-rw-r--r--svx/source/editeng/impedit.hxx2
-rw-r--r--svx/source/editeng/impedit2.cxx4
-rw-r--r--svx/source/editeng/impedit3.cxx4
-rw-r--r--svx/source/editeng/impedit5.cxx2
-rw-r--r--svx/source/editeng/svxacorr.cxx14
-rw-r--r--svx/source/editeng/txtrange.cxx2
-rw-r--r--svx/source/editeng/unolingu.cxx8
-rw-r--r--svx/source/engine3d/float3d.cxx6
-rw-r--r--svx/source/engine3d/helperminimaldepth3d.cxx4
-rw-r--r--svx/source/engine3d/obj3d.cxx4
-rw-r--r--svx/source/engine3d/polysc3d.cxx4
-rw-r--r--svx/source/engine3d/scene3d.cxx4
-rw-r--r--svx/source/engine3d/view3d.cxx11
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx10
-rw-r--r--svx/source/fmcomp/fmgridif.cxx3
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/fmcomp/gridcols.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/fmcomp/makefile.mk3
-rw-r--r--svx/source/fmcomp/showcols.src106
-rw-r--r--svx/source/form/ParseContext.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx28
-rw-r--r--svx/source/form/filtnav.cxx1
-rw-r--r--svx/source/form/fmcontrollayout.cxx3
-rw-r--r--svx/source/form/fmexch.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmobjfac.cxx1
-rw-r--r--svx/source/form/fmpage.cxx1
-rw-r--r--svx/source/form/fmpgeimp.cxx2
-rw-r--r--svx/source/form/fmsearch.src333
-rw-r--r--svx/source/form/fmshell.cxx17
-rw-r--r--svx/source/form/fmshimp.cxx5
-rw-r--r--svx/source/form/fmsrccfg.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx6
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx10
-rw-r--r--svx/source/form/fmtools.cxx4
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmview.cxx17
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/form/formcontrolling.cxx2
-rw-r--r--svx/source/form/makefile.mk2
-rw-r--r--svx/source/form/navigatortree.cxx1
-rw-r--r--svx/source/form/navigatortreemodel.cxx1
-rw-r--r--svx/source/form/sdbdatacolumn.cxx10
-rw-r--r--svx/source/form/tabwin.cxx1
-rw-r--r--svx/source/form/tbxform.cxx6
-rw-r--r--svx/source/form/tbxform.src69
-rw-r--r--svx/source/form/typemap.cxx4
-rw-r--r--svx/source/gallery2/galbrws.cxx22
-rw-r--r--svx/source/gallery2/galbrws1.cxx15
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx25
-rw-r--r--svx/source/gallery2/galctrl.cxx28
-rw-r--r--svx/source/gallery2/galexpl.cxx35
-rw-r--r--svx/source/gallery2/gallery.src456
-rw-r--r--svx/source/gallery2/gallery1.cxx41
-rw-r--r--svx/source/gallery2/galmisc.cxx12
-rw-r--r--svx/source/gallery2/galobj.cxx30
-rw-r--r--svx/source/gallery2/galtheme.cxx32
-rw-r--r--svx/source/gengal/gengal.cxx18
-rw-r--r--svx/source/gengal/gengal.sh5
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/SpellDialog.hxx261
-rw-r--r--svx/source/inc/eventdlg.hxx81
-rw-r--r--svx/source/inc/filtnav.hxx7
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx7
-rw-r--r--svx/source/inc/fmitems.hxx2
-rw-r--r--svx/source/inc/fmresids.hrc16
-rw-r--r--svx/source/inc/fmsearch.hrc72
-rw-r--r--svx/source/inc/fmshimp.hxx11
-rw-r--r--svx/source/inc/fmsrcimp.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/hlmarkwn.hrc37
-rw-r--r--svx/source/inc/hlmarkwn.hxx114
-rw-r--r--svx/source/inc/hyperdlg.hrc103
-rw-r--r--svx/source/inc/macropg_impl.hxx76
-rw-r--r--svx/source/inc/optchart.hrc40
-rw-r--r--svx/source/inc/optdict.hrc68
-rw-r--r--svx/source/inc/svdoimp.hxx2
-rw-r--r--svx/source/inc/unoedprx.hxx2
-rw-r--r--svx/source/intro/iso.src2
-rw-r--r--svx/source/intro/ooo.src2
-rw-r--r--svx/source/items/SmartTagItem.cxx2
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/flditem.cxx2
-rw-r--r--svx/source/items/frmitems.cxx6
-rw-r--r--svx/source/items/makefile.mk1
-rw-r--r--svx/source/items/numfmtsh.cxx4
-rw-r--r--svx/source/items/page.src258
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/items/paraitem.cxx8
-rw-r--r--svx/source/items/textitem.cxx6
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx2
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx4
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx2
-rw-r--r--svx/source/msfilter/countryid.cxx345
-rw-r--r--svx/source/msfilter/escherex.cxx4848
-rw-r--r--svx/source/msfilter/eschesdo.cxx1244
-rw-r--r--svx/source/msfilter/eschesdo.hxx208
-rw-r--r--svx/source/msfilter/makefile.mk78
-rw-r--r--svx/source/msfilter/mscodec.cxx537
-rw-r--r--svx/source/msfilter/msdffimp.cxx8197
-rw-r--r--svx/source/msfilter/msfiltertracer.cxx254
-rw-r--r--svx/source/msfilter/msocximex.cxx5975
-rw-r--r--svx/source/msfilter/msoleexp.cxx376
-rw-r--r--svx/source/msfilter/msvbahelper.cxx384
-rw-r--r--svx/source/msfilter/msvbasic.cxx677
-rw-r--r--svx/source/msfilter/msvbasic.hxx131
-rw-r--r--svx/source/msfilter/svxmsbas.cxx406
-rw-r--r--svx/source/msfilter/svxmsbas2.cxx88
-rw-r--r--svx/source/msfilter/viscache.hxx85
-rw-r--r--svx/source/options/asiancfg.cxx2
-rw-r--r--svx/source/options/htmlcfg.cxx5
-rw-r--r--svx/source/options/makefile.mk20
-rw-r--r--svx/source/options/multipat.src153
-rw-r--r--svx/source/options/optaccessibility.src155
-rw-r--r--svx/source/options/optasian.src177
-rw-r--r--svx/source/options/optchart.src86
-rw-r--r--svx/source/options/optcolor.src552
-rw-r--r--svx/source/options/optctl.src119
-rw-r--r--svx/source/options/optdict.src282
-rw-r--r--svx/source/options/optgenrl.src333
-rw-r--r--svx/source/options/optimprove.src123
-rw-r--r--svx/source/options/optinet2.src647
-rw-r--r--svx/source/options/optjsearch.src223
-rw-r--r--svx/source/options/optlingu.cxx2563
-rw-r--r--svx/source/options/optlingu.hrc91
-rw-r--r--svx/source/options/optlingu.src357
-rw-r--r--svx/source/options/optpath.src203
-rw-r--r--svx/source/options/optsave.src325
-rw-r--r--svx/source/options/optspell.src128
-rw-r--r--svx/source/options/srchcfg.cxx2
-rw-r--r--svx/source/outliner/outl_pch.hxx2
-rw-r--r--svx/source/outliner/outleeng.cxx2
-rw-r--r--svx/source/outliner/outlin2.cxx2
-rw-r--r--svx/source/outliner/outliner.cxx8
-rw-r--r--svx/source/outliner/outliner.hrc2
-rw-r--r--svx/source/outliner/outlvw.cxx4
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx4
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx39
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx34
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcircobj.cxx30
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx16
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrole2obj.cxx10
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpathobj.cxx33
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrrectobj.cxx32
-rw-r--r--svx/source/sdr/contact/viewobjectcontact.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx28
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx28
-rw-r--r--svx/source/sdr/overlay/overlayselection.cxx11
-rw-r--r--svx/source/sdr/overlay/overlaytools.cxx18
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx8
-rw-r--r--svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx6
-rw-r--r--svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx6
-rw-r--r--svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx18
-rw-r--r--svx/source/sdr/primitive2d/sdrdecompositiontools.cxx35
-rw-r--r--svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx18
-rw-r--r--svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx6
-rw-r--r--svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx15
-rw-r--r--svx/source/sdr/primitive2d/sdrole2primitive2d.cxx60
-rw-r--r--svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx18
-rw-r--r--svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx6
-rw-r--r--svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx6
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx20
-rw-r--r--svx/source/sdr/primitive3d/sdrattributecreator3d.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx4
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx4
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dextrudeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dlatheproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsphereproperties.cxx2
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx2
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx4
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx4
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx4
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx8
-rw-r--r--svx/source/src/app.hrc6
-rw-r--r--svx/source/src/app.src32
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/stbctrls/modctrl.cxx2
-rw-r--r--svx/source/stbctrls/pszctrl.cxx6
-rw-r--r--svx/source/stbctrls/selctrl.cxx2
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx6
-rw-r--r--svx/source/svdraw/gradtrns.cxx25
-rw-r--r--svx/source/svdraw/makefile.mk6
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svddrgmt.cxx34
-rw-r--r--svx/source/svdraw/svdedtv1.cxx6
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx8
-rw-r--r--svx/source/svdraw/svdetc.cxx62
-rw-r--r--svx/source/svdraw/svdfmtf.cxx113
-rw-r--r--svx/source/svdraw/svdfmtf.hxx2
-rw-r--r--svx/source/svdraw/svdfppt.cxx7813
-rw-r--r--svx/source/svdraw/svdibrow.cxx10
-rw-r--r--svx/source/svdraw/svdmark.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx10
-rw-r--r--svx/source/svdraw/svdoashp.cxx35
-rw-r--r--svx/source/svdraw/svdoattr.cxx12
-rw-r--r--svx/source/svdraw/svdobj.cxx26
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx62
-rw-r--r--svx/source/svdraw/svdoedge.cxx4
-rw-r--r--svx/source/svdraw/svdograf.cxx8
-rw-r--r--svx/source/svdraw/svdogrp.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx19
-rw-r--r--svx/source/svdraw/svdoole2.cxx6
-rw-r--r--svx/source/svdraw/svdopage.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx57
-rw-r--r--svx/source/svdraw/svdotext.cxx45
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx128
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx12
-rw-r--r--svx/source/svdraw/svdotxat.cxx12
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
-rw-r--r--svx/source/svdraw/svdotxtr.cxx2
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/svdraw/svdovirt.cxx5
-rw-r--r--svx/source/svdraw/svdpage.cxx6
-rw-r--r--svx/source/svdraw/svdpntv.cxx22
-rw-r--r--svx/source/svdraw/svdtext.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx16
-rw-r--r--svx/source/svdraw/svdviter.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx6
-rw-r--r--svx/source/svrtf/rtfgrf.cxx4
-rw-r--r--svx/source/svrtf/rtfitem.cxx4
-rw-r--r--svx/source/svrtf/svxrtf.cxx6
-rw-r--r--svx/source/svxlink/fileobj.cxx4
-rw-r--r--svx/source/svxlink/linkmgr.cxx12
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/table/celleditsource.cxx6
-rw-r--r--svx/source/table/svdotable.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/table/viewcontactoftableobj.cxx20
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx22
-rw-r--r--svx/source/tbxctrls/layctrl.cxx2
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx8
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx22
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx2
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx4
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx46
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx10
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx8
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx6
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx2
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx6
-rw-r--r--svx/source/unodraw/unoctabl.cxx12
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unofdesc.cxx2
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unoipset.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unomtabl.cxx8
-rw-r--r--svx/source/unodraw/unonrule.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx13
-rw-r--r--svx/source/unodraw/unoshtxt.cxx9
-rw-r--r--svx/source/unodraw/unottabl.cxx4
-rw-r--r--svx/source/unoedit/unoedsrc.cxx2
-rw-r--r--svx/source/unoedit/unofored.cxx2
-rw-r--r--svx/source/unoedit/unoforou.cxx6
-rw-r--r--svx/source/unoedit/unotext.cxx8
-rw-r--r--svx/source/unoedit/unotext2.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx12
-rw-r--r--svx/source/unogallery/unogaltheme.cxx126
-rw-r--r--svx/source/unogallery/unogaltheme.hxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx80
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xml/xmltxtexp.cxx4
-rw-r--r--svx/source/xml/xmltxtimp.cxx2
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx6
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx2
-rw-r--r--svx/source/xoutdev/xexch.cxx8
-rw-r--r--svx/source/xoutdev/xpool.cxx2
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx2
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx4
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtablend.cxx2
-rw-r--r--svx/util/cui.map7
-rw-r--r--svx/util/hidother.src424
-rw-r--r--svx/util/makefile.mk90
-rw-r--r--svx/workben/edittest.cxx8
-rw-r--r--svx/workben/msview/msview.cxx2
962 files changed, 3085 insertions, 194141 deletions
diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx
index 9a05a6910e..117b0d24a4 100644
--- a/svx/inc/bolnitem.hxx
+++ b/svx/inc/bolnitem.hxx
@@ -34,7 +34,7 @@
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx
index 4f2b665408..050c92f6ee 100644
--- a/svx/inc/bulitem.hxx
+++ b/svx/inc/bulitem.hxx
@@ -66,7 +66,7 @@
#define VALID_STYLE 0x0040
#define VALID_PREVTEXT 0x0080
#define VALID_FOLLOWTEXT 0x0100
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <vcl/font.hxx>
#include <goodies/grfmgr.hxx>
diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx
index 1cff33a509..739bde77eb 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/svx/inc/charhiddenitem.hxx
@@ -32,8 +32,8 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
// class SvxCharHiddenItem -------------------------------------------------
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx
index d1ba824d6d..6a53f92fde 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/chrtitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
//------------------------------------------------------------------------
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx
index 773b84773e..40563867d6 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/clipboardctl.hxx
@@ -33,7 +33,7 @@
#include <sfx2/tbxctrl.hxx>
#include <sfx2/ctrlitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx
index f77f9dd09d..8c9f7a60d4 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/clipfmtitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
// class SvxClipboardFmtItem ----------------------------------------------
diff --git a/svx/inc/connect.hrc b/svx/inc/connect.hrc
deleted file mode 100644
index 39c174da28..0000000000
--- a/svx/inc/connect.hrc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: connect.hrc,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define FL_DISTANCE 1
-#define FL_DELTA 2
-#define FT_LINE_1 1
-#define FT_LINE_2 2
-#define FT_LINE_3 3
-#define MTR_FLD_LINE_1 1
-#define MTR_FLD_LINE_2 2
-#define MTR_FLD_LINE_3 3
-#define FT_HORZ_1 4
-#define FT_HORZ_2 5
-#define MTR_FLD_HORZ_1 4
-#define MTR_FLD_HORZ_2 5
-#define MTR_FLD_VERT_1 6
-#define MTR_FLD_VERT_2 7
-#define FT_VERT_2 7
-#define FT_VERT_1 6
-#define FT_TYPE 8
-#define LB_TYPE 1
-#define CTL_PREVIEW 1
diff --git a/svx/inc/countryid.hxx b/svx/inc/countryid.hxx
deleted file mode 100644
index 7ade5f1008..0000000000
--- a/svx/inc/countryid.hxx
+++ /dev/null
@@ -1,321 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: countryid.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// ============================================================================
-
-#ifndef INCLUDED_SVX_COUNTRYID_HXX
-#define INCLUDED_SVX_COUNTRYID_HXX
-
-#include <sal/types.h>
-#include <i18npool/lang.h>
-#include "svx/svxdllapi.h"
-
-// ----------------------------------------------------------------------------
-
-namespace svx {
-
-// Windows Country IDs ========================================================
-
-/** Represents a Windows country ID.
-
- The country IDs used in Windows are equal to the international calling
- code of each country, i.e. the code 353 represents Ireland (+353).
-
- ATTENTION: These country codes are not supposed to be used anywhere in core
- structures! They shall ONLY be used in the import/export filters for
- Microsoft Office documents!
- */
-typedef sal_uInt16 CountryId;
-
-const CountryId COUNTRY_DONTKNOW = 0;
-const CountryId COUNTRY_USA = 1;
-const CountryId COUNTRY_DOMINICAN_REPUBLIC = 1; // NANP
-const CountryId COUNTRY_GUAM = 1; // NANP
-const CountryId COUNTRY_JAMAICA = 1; // NANP
-const CountryId COUNTRY_PUERTO_RICO = 1; // NANP
-const CountryId COUNTRY_TRINIDAD_Y_TOBAGO = 1; // NANP
-const CountryId COUNTRY_CANADA = 2;
-const CountryId COUNTRY_RUSSIA = 7;
-const CountryId COUNTRY_KAZAKHSTAN = 7; // no own ID
-const CountryId COUNTRY_TATARSTAN = 7; // no own ID
-const CountryId COUNTRY_EGYPT = 20;
-const CountryId COUNTRY_SOUTH_AFRICA = 27;
-const CountryId COUNTRY_GREECE = 30;
-const CountryId COUNTRY_NETHERLANDS = 31;
-const CountryId COUNTRY_BELGIUM = 32;
-const CountryId COUNTRY_FRANCE = 33;
-const CountryId COUNTRY_SPAIN = 34;
-const CountryId COUNTRY_HUNGARY = 36;
-const CountryId COUNTRY_ITALY = 39;
-const CountryId COUNTRY_ROMANIA = 40;
-const CountryId COUNTRY_SWITZERLAND = 41;
-const CountryId COUNTRY_AUSTRIA = 43;
-const CountryId COUNTRY_UNITED_KINGDOM = 44;
-const CountryId COUNTRY_DENMARK = 45;
-const CountryId COUNTRY_SWEDEN = 46;
-const CountryId COUNTRY_NORWAY = 47;
-const CountryId COUNTRY_POLAND = 48;
-const CountryId COUNTRY_GERMANY = 49;
-const CountryId COUNTRY_PERU = 51;
-const CountryId COUNTRY_MEXICO = 52;
-const CountryId COUNTRY_CUBA = 53;
-const CountryId COUNTRY_ARGENTINIA = 54;
-const CountryId COUNTRY_BRAZIL = 55;
-const CountryId COUNTRY_CHILE = 56;
-const CountryId COUNTRY_COLOMBIA = 57;
-const CountryId COUNTRY_VENEZUELA = 58;
-const CountryId COUNTRY_MALAYSIA = 60;
-const CountryId COUNTRY_AUSTRALIA = 61;
-const CountryId COUNTRY_INDONESIA = 62;
-const CountryId COUNTRY_PHILIPPINES = 63;
-const CountryId COUNTRY_NEW_ZEALAND = 64;
-const CountryId COUNTRY_SINGAPORE = 65;
-const CountryId COUNTRY_THAILAND = 66;
-const CountryId COUNTRY_JAPAN = 81;
-const CountryId COUNTRY_SOUTH_KOREA = 82;
-const CountryId COUNTRY_VIET_NAM = 84;
-const CountryId COUNTRY_PR_CHINA = 86;
-const CountryId COUNTRY_TIBET = 86; // no own ID
-const CountryId COUNTRY_TURKEY = 90;
-const CountryId COUNTRY_INDIA = 91;
-const CountryId COUNTRY_PAKISTAN = 92;
-const CountryId COUNTRY_AFGHANISTAN = 93;
-const CountryId COUNTRY_SRI_LANKA = 94;
-const CountryId COUNTRY_MYANMAR = 95;
-const CountryId COUNTRY_MOROCCO = 212;
-const CountryId COUNTRY_ALGERIA = 213;
-const CountryId COUNTRY_TUNISIA = 216;
-const CountryId COUNTRY_LIBYA = 218;
-const CountryId COUNTRY_GAMBIA = 220;
-const CountryId COUNTRY_SENEGAL = 221;
-const CountryId COUNTRY_MAURITANIA = 222;
-const CountryId COUNTRY_MALI = 223;
-const CountryId COUNTRY_GUINEA = 224;
-const CountryId COUNTRY_COTE_D_IVOIRE = 225;
-const CountryId COUNTRY_BURKINA_FARSO = 226;
-const CountryId COUNTRY_NIGER = 227;
-const CountryId COUNTRY_TOGO = 228;
-const CountryId COUNTRY_BENIN = 229;
-const CountryId COUNTRY_MAURITIUS = 230;
-const CountryId COUNTRY_LIBERIA = 231;
-const CountryId COUNTRY_SIERRA_LEONE = 232;
-const CountryId COUNTRY_GHANA = 233;
-const CountryId COUNTRY_NIGERIA = 234;
-const CountryId COUNTRY_CHAD = 235;
-const CountryId COUNTRY_CENTRAL_AFR_REP = 236;
-const CountryId COUNTRY_CAMEROON = 237;
-const CountryId COUNTRY_CAPE_VERDE = 238;
-const CountryId COUNTRY_SAO_TOME = 239;
-const CountryId COUNTRY_EQUATORIAL_GUINEA = 240;
-const CountryId COUNTRY_GABON = 241;
-const CountryId COUNTRY_CONGO = 242;
-const CountryId COUNTRY_ZAIRE = 243;
-const CountryId COUNTRY_ANGOLA = 244;
-const CountryId COUNTRY_GUINEA_BISSAU = 245;
-const CountryId COUNTRY_DIEGO_GARCIA = 246;
-const CountryId COUNTRY_ASCENSION_ISLAND = 247;
-const CountryId COUNTRY_SEYCHELLES = 248;
-const CountryId COUNTRY_SUDAN = 249;
-const CountryId COUNTRY_RWANDA = 250;
-const CountryId COUNTRY_ETHIOPIA = 251;
-const CountryId COUNTRY_SOMALIA = 252;
-const CountryId COUNTRY_DJIBOUTI = 253;
-const CountryId COUNTRY_KENYA = 254;
-const CountryId COUNTRY_TANZANIA = 255;
-const CountryId COUNTRY_UGANDA = 256;
-const CountryId COUNTRY_BURUNDI = 257;
-const CountryId COUNTRY_MOZAMBIQUE = 258;
-const CountryId COUNTRY_ZANZIBAR = 259;
-const CountryId COUNTRY_ZAMBIA = 260;
-const CountryId COUNTRY_MADAGASKAR = 261;
-const CountryId COUNTRY_REUNION = 262;
-const CountryId COUNTRY_ZIMBABWE = 263;
-const CountryId COUNTRY_NAMIBIA = 264;
-const CountryId COUNTRY_MALAWI = 265;
-const CountryId COUNTRY_LESOTHO = 266;
-const CountryId COUNTRY_BOTSWANA = 267;
-const CountryId COUNTRY_SWAZILAND = 268;
-const CountryId COUNTRY_COMOROS_MAYOTTE = 269;
-const CountryId COUNTRY_ST_HELENA = 290;
-const CountryId COUNTRY_ERITREA = 291;
-const CountryId COUNTRY_ARUBA = 297;
-const CountryId COUNTRY_FAEROE_ISLANDS = 298;
-const CountryId COUNTRY_GREEN_ISLAND = 299;
-const CountryId COUNTRY_GIBRALTAR = 350;
-const CountryId COUNTRY_PORTUGAL = 351;
-const CountryId COUNTRY_LUXEMBOURG = 352;
-const CountryId COUNTRY_IRELAND = 353;
-const CountryId COUNTRY_ICELAND = 354;
-const CountryId COUNTRY_ALBANIA = 355;
-const CountryId COUNTRY_MALTA = 356;
-const CountryId COUNTRY_CYPRUS = 357;
-const CountryId COUNTRY_FINLAND = 358;
-const CountryId COUNTRY_BULGARIA = 359;
-const CountryId COUNTRY_LITHUANIA = 370;
-const CountryId COUNTRY_LATVIA = 371;
-const CountryId COUNTRY_ESTONIA = 372;
-const CountryId COUNTRY_MOLDOVA = 373;
-const CountryId COUNTRY_ARMENIA = 374;
-const CountryId COUNTRY_BELARUS = 375;
-const CountryId COUNTRY_ANDORRA = 376;
-const CountryId COUNTRY_MONACO = 377;
-const CountryId COUNTRY_SAN_MARINO = 378;
-const CountryId COUNTRY_VATICAN_CITY = 379;
-const CountryId COUNTRY_UKRAINE = 380;
-const CountryId COUNTRY_SERBIA = 381;
-const CountryId COUNTRY_CROATIA = 385;
-const CountryId COUNTRY_SLOVENIA = 386;
-const CountryId COUNTRY_BOSNIA = 387;
-const CountryId COUNTRY_MACEDONIA = 389;
-const CountryId COUNTRY_CZECH = 420;
-const CountryId COUNTRY_SLOVAK = 421;
-const CountryId COUNTRY_LIECHTENSTEIN = 423;
-const CountryId COUNTRY_FALKLAND_ISLANDS = 500;
-const CountryId COUNTRY_BELIZE = 501;
-const CountryId COUNTRY_GUATEMALA = 502;
-const CountryId COUNTRY_EL_SALVADOR = 503;
-const CountryId COUNTRY_HONDURAS = 504;
-const CountryId COUNTRY_NICARAGUA = 505;
-const CountryId COUNTRY_COSTA_RICA = 506;
-const CountryId COUNTRY_PANAMA = 507;
-const CountryId COUNTRY_ST_PIERRE = 508;
-const CountryId COUNTRY_HAITI = 509;
-const CountryId COUNTRY_GUADELOUPE = 590;
-const CountryId COUNTRY_BOLIVIA = 591;
-const CountryId COUNTRY_GUYANA = 592;
-const CountryId COUNTRY_ECUADOR = 593;
-const CountryId COUNTRY_FRENCH_GUIANA = 594;
-const CountryId COUNTRY_PARAGUAY = 595;
-const CountryId COUNTRY_MARTINIQUE = 596;
-const CountryId COUNTRY_SURINAME = 597;
-const CountryId COUNTRY_URUGUAY = 598;
-const CountryId COUNTRY_NETHERL_ANTILLES = 599;
-const CountryId COUNTRY_EAST_TIMOR = 670;
-const CountryId COUNTRY_ANTARCTICA = 672;
-const CountryId COUNTRY_BRUNEI_DARUSSALAM = 673;
-const CountryId COUNTRY_NARUPU = 674;
-const CountryId COUNTRY_PAPUA_NEW_GUINEA = 675;
-const CountryId COUNTRY_TONGA = 676;
-const CountryId COUNTRY_SOLOMON_ISLANDS = 677;
-const CountryId COUNTRY_VANUATU = 678;
-const CountryId COUNTRY_FIJI = 679;
-const CountryId COUNTRY_PALAU = 680;
-const CountryId COUNTRY_WALLIS_AND_FUTUNA = 681;
-const CountryId COUNTRY_COOK_ISLANDS = 682;
-const CountryId COUNTRY_NIUE_ISLAND = 683;
-const CountryId COUNTRY_AMERICAN_SAMOA = 684;
-const CountryId COUNTRY_WESTERN_SAMOA = 685;
-const CountryId COUNTRY_KIRIBATI = 686;
-const CountryId COUNTRY_NEW_CALEDONIA = 687;
-const CountryId COUNTRY_TUVALU = 688;
-const CountryId COUNTRY_FRENCH_POLYNESIA = 689;
-const CountryId COUNTRY_TOKELAU = 690;
-const CountryId COUNTRY_MICRONESIA = 691;
-const CountryId COUNTRY_MARSHALL_ISLANDS = 692;
-const CountryId COUNTRY_NORTH_KOREA = 850;
-const CountryId COUNTRY_HONG_KONG = 852;
-const CountryId COUNTRY_MACAU = 853;
-const CountryId COUNTRY_CAMBODIA = 855;
-const CountryId COUNTRY_LAOS = 856;
-const CountryId COUNTRY_BANGLADESH = 880;
-const CountryId COUNTRY_TAIWAN = 886;
-const CountryId COUNTRY_MALDIVES = 960;
-const CountryId COUNTRY_LEBANON = 961;
-const CountryId COUNTRY_JORDAN = 962;
-const CountryId COUNTRY_SYRIA = 963;
-const CountryId COUNTRY_IRAQ = 964;
-const CountryId COUNTRY_KUWAIT = 965;
-const CountryId COUNTRY_SAUDI_ARABIA = 966;
-const CountryId COUNTRY_YEMEN = 967;
-const CountryId COUNTRY_OMAN = 968;
-const CountryId COUNTRY_PALESTINE = 970;
-const CountryId COUNTRY_UAE = 971;
-const CountryId COUNTRY_ISRAEL = 972;
-const CountryId COUNTRY_BAHRAIN = 973;
-const CountryId COUNTRY_QATAR = 974;
-const CountryId COUNTRY_BHUTAN = 975;
-const CountryId COUNTRY_MONGOLIA = 976;
-const CountryId COUNTRY_NEPAL = 977;
-const CountryId COUNTRY_IRAN = 981;
-const CountryId COUNTRY_TAJIKISTAN = 992;
-const CountryId COUNTRY_TURKMENISTAN = 993;
-const CountryId COUNTRY_AZERBAIJAN = 994;
-const CountryId COUNTRY_GEORGIA = 995;
-const CountryId COUNTRY_KYRGYZSTAN = 996;
-const CountryId COUNTRY_UZBEKISTAN = 998;
-
-// Country ID <-> Language type conversion ====================================
-
-/** Converts a language type to a Windows country ID.
-
- The function regards the sub type of the passed language, and tries to
- return the appropriate country, i.e. COUNTRY_IRELAND for
- LANGUAGE_ENGLISH_EIRE.
-
- A few countries do not have an own associated country ID. Most of these
- countries are mapped to another related country, i.e. Kazakhstan is
- mapped to Russia.
-
- If no country can be found, the value COUNTRY_DONTKNOW will be returned.
-
- @param eLanguage
- A language type, defined in tools/lang.hxx.
-
- @return
- The best Windows country ID for the passed language type, or
- COUNTRY_DONTKNOW on error.
- */
-SVX_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage );
-
-/** Converts a Windows country ID to a language type.
-
- The function returns the most used language for the passed country
- (hopefully), i.e. LANGUAGE_ENGLISH_EIRE for COUNTRY_IRELAND.
-
- If the passed country ID is not valid, the value LANGUAGE_DONTKNOW will be
- returned.
-
- @param eCountry
- A Windows country ID, defined above.
-
- @return
- The most used language type in the passed country, or LANGUAGE_DONTKNOW
- on error.
- */
-SVX_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry );
-
-// ============================================================================
-
-} // namespace svx
-
-// ============================================================================
-
-#endif
-
diff --git a/svx/inc/defdlgname.hxx b/svx/inc/defdlgname.hxx
deleted file mode 100644
index c94f5f6167..0000000000
--- a/svx/inc/defdlgname.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: defdlgname.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_DEF_DLG_NAME_HXX
-#define _SVX_DEF_DLG_NAME_HXX
-
-// define ----------------------------------------------------------------
-
-#define MESS_BTN_1 ((USHORT)0)
-#define MESS_BTN_2 ((USHORT)1)
-
-// const -----------------------------------------------------------------
-
-const short RET_BTN_1 = 100;
-const short RET_BTN_2 = 101;
-
-#endif
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx
index 8b840a44cf..380464c06e 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/dlgutil.hxx
@@ -34,8 +34,8 @@
#ifndef _FIELD_HXX
#include <vcl/field.hxx>
#endif
-#include <svtools/poolitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/intitem.hxx>
#include "svx/svxdllapi.h"
// macro -----------------------------------------------------------------
diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx
index 6acf482ef5..f0fd60cc7f 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/drawitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/drawing/LineDash.hpp>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx
index 2f294295a3..df48708e34 100644
--- a/svx/inc/editund2.hxx
+++ b/svx/inc/editund2.hxx
@@ -32,7 +32,7 @@
#define _EDITUND2_HXX
#include "svx/svxdllapi.h"
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
class ImpEditEngine;
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
index b2d03ec397..54d9fef468 100644
--- a/svx/inc/extrusioncontrols.hxx
+++ b/svx/inc/extrusioncontrols.hxx
@@ -31,7 +31,7 @@
#define _SVX_EXTRUSION_CONTROLS_HXX
#include <svtools/valueset.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svtools/svtreebx.hxx>
#ifndef _SV_BUTTON_HXX
diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx
index 9bb53a2942..fccbc48fb5 100644
--- a/svx/inc/flstitem.hxx
+++ b/svx/inc/flstitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Sequence.h>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index b984e74c38..77029029c2 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -31,10 +31,9 @@
#define _SVX_FMHELP_HRC
// include -----------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Help-Ids --------------------------------------------------------------
-
#define HID_DLG_DBMSG ( HID_FORMS_START + 1)
#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2)
#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3)
@@ -45,7 +44,7 @@
#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8)
#define HID_SEARCH_TEXT ( HID_FORMS_START + 9)
#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10)
-#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11)
+//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11)
#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12)
#define HID_SEARCH_POSITION ( HID_FORMS_START + 13)
#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14)
@@ -75,9 +74,9 @@
#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38)
#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39)
#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40)
-#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41)
-#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42)
-#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43)
+//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41)
+//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42)
+//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43)
#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44)
#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45)
#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46)
@@ -103,7 +102,6 @@
// if you add a new define here, please adjust the overflow check
// at the end of the file!!
-
// -----------------------------------------------------------------------
// "Uberlaufpr"ufung -----------------------------------------------------
// -----------------------------------------------------------------------
diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx
index 82efbf7dbe..b83f593bb9 100644
--- a/svx/inc/fontitem.hxx
+++ b/svx/inc/fontitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <tools/string.hxx>
#ifndef _FONT_HXX //autogen
#include <vcl/font.hxx>
diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx
index 7f5367a47a..12a4662222 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/svx/inc/fwdtitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
// class SvxFontWidthItem -----------------------------------------------
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index b1e619c218..b86057e353 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -37,7 +37,7 @@
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
#include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/miscopt.hxx>
#include "galbrws.hxx"
diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index 5611332119..79eab3f4a1 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -41,12 +41,12 @@
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
#include <vcl/sound.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
#include <svtools/transfer.hxx>
#include <svtools/valueset.hxx>
#include <svtools/brwbox.hxx>
#include <goodies/grfmgr.hxx>
-#include "galmisc.hxx"
+#include "svx/galmisc.hxx"
#include "svx/svxdllapi.h"
// ------------
@@ -95,6 +95,7 @@ public:
~GalleryPreview();
void SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); }
+ bool SetGraphic( const INetURLObject& );
void PreviewMedia( const INetURLObject& rURL );
};
diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx
deleted file mode 100644
index 07570c76d8..0000000000
--- a/svx/inc/galdlg.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: galdlg.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_GALDLG_HXX_
-#define _SVX_GALDLG_HXX_
-
-
-#include <vos/thread.hxx>
-#include <bootstrp/sstring.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/sound.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/transfer.hxx>
-#include <goodies/grfmgr.hxx>
-#include <sfx2/tabdlg.hxx>
-#include "galctrl.hxx"
-#include "galmisc.hxx"
-
-// ------------
-// - Forwards -
-// ------------
-
-class GalleryTheme;
-
-// ----------------
-// - ExchangeData -
-// ----------------
-
-struct ExchangeData
-{
- GalleryTheme* pTheme;
- String aEditedTitle;
- Date aThemeChangeDate;
- Time aThemeChangeTime;
-};
-
-
-#endif // _SVX_GALDLG_HXX_
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 718c84c7aa..31efc2ca6e 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -36,27 +36,10 @@
// - Defines -
// -----------
-// Gallery-TabDialoge/-TabPages
-#define RID_SVXTABDLG_GALLERY (RID_SVX_GALLERY_START)
-#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_SVX_GALLERY_START + 1)
-
-#define RID_SVXTABDLG_GALLERYTHEME (RID_SVX_GALLERY_START + 2)
-#define RID_SVXTABPAGE_GALLERYTHEME_GENERAL (RID_SVX_GALLERY_START + 3)
-#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_SVX_GALLERY_START + 4)
-
// Dialoge
#define RID_SVXDLG_GALLERYBROWSER (RID_SVX_GALLERY_START + 5)
-#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_SVX_GALLERY_START + 6)
-#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_SVX_GALLERY_START + 7)
-#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 8)
-#define RID_SVXDLG_GALLERY_THEMEID (RID_SVX_GALLERY_START + 9)
// Gallery-Strings
-#define RID_SVXSTR_GALLERY_ACTUALIZE (RID_SVX_GALLERY_START + 10)
-#define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11)
-#define RID_SVXSTR_GALLERY_NOFILES (RID_SVX_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13)
-#define RID_SVXSTR_GALLERY_DELETEOBJ (RID_SVX_GALLERY_START + 14)
#define RID_SVXSTR_EXTFORMAT1_SYS (RID_SVX_GALLERY_START + 15)
#define RID_SVXSTR_EXTFORMAT1_UI (RID_SVX_GALLERY_START + 16)
#define RID_SVXSTR_EXTFORMAT2_SYS (RID_SVX_GALLERY_START + 17)
@@ -67,42 +50,38 @@
#define RID_SVXSTR_EXTFORMAT4_UI (RID_SVX_GALLERY_START + 22)
#define RID_SVXSTR_EXTFORMAT5_SYS (RID_SVX_GALLERY_START + 23)
#define RID_SVXSTR_EXTFORMAT5_UI (RID_SVX_GALLERY_START + 24)
+#define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11)
+#define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13)
+#define RID_SVXSTR_GALLERY_DELETEOBJ (RID_SVX_GALLERY_START + 14)
#define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 25)
#define RID_SVXSTR_GALLERY_FILTER (RID_SVX_GALLERY_START + 26)
#define RID_SVXSTR_GALLERY_LENGTH (RID_SVX_GALLERY_START + 27)
#define RID_SVXSTR_GALLERY_SIZE (RID_SVX_GALLERY_START + 28)
#define RID_SVXSTR_GALLERY_DELETEDD (RID_SVX_GALLERY_START + 29)
-#define RID_SVXSTR_GALLERY_SEARCH (RID_SVX_GALLERY_START + 30)
#define RID_SVXSTR_GALLERY_SGIERROR (RID_SVX_GALLERY_START + 31)
#define RID_SVXSTR_GALLERY_NEWTHEME (RID_SVX_GALLERY_START + 32)
#define RID_SVXSTR_GALLERY_BROWSER (RID_SVX_GALLERY_START + 33)
#define RID_SVXSTR_GALLERY_THEMEERR (RID_SVX_GALLERY_START + 34)
+#define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41)
+#define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42)
+#define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80)
+#define RID_SVXSTR_GALLERY_DELETETHEME (RID_SVX_GALLERY_START + 83)
+#define RID_SVXSTR_GALLERY_TITLE (RID_SVX_GALLERY_START + 84)
+#define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85)
+#define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86)
+#define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87)
// Controls fuer Gallery
-#define RID_SVXDLG_GALLERY_CBX (RID_SVX_GALLERY_START + 35)
#define RID_SVXMN_GALLERY1 (RID_SVX_GALLERY_START + 36)
#define RID_SVXMN_GALLERY2 (RID_SVX_GALLERY_START + 37)
-// zus. Strings
-#define RID_SVXSTR_GALLERYPROPS_THEME (RID_SVX_GALLERY_START + 38)
-#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_SVX_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_GALLERY_START + 40)
-#define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41)
-#define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42)
-#define RID_SVXSTR_GALLERY_READONLY (RID_SVX_GALLERY_START + 43)
-#define RID_SVXSTR_GALLERY_ALLFILES (RID_SVX_GALLERY_START + 44)
-
// Images
#define RID_SVXBMP_GALLERY (RID_SVX_GALLERY_START + 46)
#define RID_SVXBMP_THEME (RID_SVX_GALLERY_START + 47)
#define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48)
-#define RID_SVXBMP_THEME_NORMAL_BIG (RID_SVX_GALLERY_START + 49)
#define RID_SVXBMP_THEME_IMPORTED (RID_SVX_GALLERY_START + 50)
-#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_SVX_GALLERY_START + 51)
#define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52)
-#define RID_SVXBMP_THEME_READONLY_BIG (RID_SVX_GALLERY_START + 53)
#define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54)
-#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_SVX_GALLERY_START + 55)
#define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56)
#define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57)
#define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58)
@@ -119,16 +98,6 @@
#define RID_SVXBMP_GALLERY_SOUND_7 (RID_SVX_GALLERY_START + 68)
#define RID_SVXBMP_GALLERY_MEDIA (RID_SVX_GALLERY_START + 71)
-// weitere IDs
-#define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80)
-#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_SVX_GALLERY_START + 81)
-#define RID_SVXDLG_GALLERY_TITLE (RID_SVX_GALLERY_START + 82)
-#define RID_SVXSTR_GALLERY_DELETETHEME (RID_SVX_GALLERY_START + 83)
-#define RID_SVXSTR_GALLERY_TITLE (RID_SVX_GALLERY_START + 84)
-#define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85)
-#define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86)
-#define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87)
-
// lokale Defines
#define BTN_OK 1
#define BTN_CANCEL 1
@@ -194,8 +163,6 @@
#define BTN_THEME 2
#define BTN_RECOVER 3
#define BTN_CLOSEBROWSER 7
-#define BTN_MADDIN1 8
-#define BTN_MADDIN2 9
#define LBX_THEME2 1
#define FL_THEME2 1
#define BTN_NEWTHEME2 1
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index d106f4b6ce..6eb1e79b2c 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -33,6 +33,7 @@
#include <tools/urlobj.hxx>
#include <vcl/graph.hxx>
+#include "svx/galmisc.hxx"
// -----------
// - Defines -
@@ -50,21 +51,6 @@
#define SGA_FORMAT_SVDRAW 0x00010000L
#define SGA_FORMAT_ALL 0xFFFFFFFFL
-// --------------
-// - SgaObjKind -
-// --------------
-
-enum SgaObjKind
-{
- SGA_OBJ_NONE = 0, // Abstraktes Objekt
- SGA_OBJ_BMP = 1, // Bitmap-Objekt
- SGA_OBJ_SOUND = 2, // Sound-Objekt
- SGA_OBJ_VIDEO = 3, // Video-Objekt
- SGA_OBJ_ANIM = 4, // Animations-Objekt
- SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt
- SGA_OBJ_INET = 6 // Grafik aus dem Internet
-};
-
// ----------------
// - GalSoundType -
// ----------------
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 2ff2d26d60..4f8fd1cee2 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -38,17 +38,21 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/salctype.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
#include <svtools/transfer.hxx>
#include <sot/storage.hxx>
-#include "galobj.hxx"
-#include "galmisc.hxx"
-#include "gallery1.hxx"
+#include <svx/svdmodel.hxx>
+//#include <svx/galobj.hxx>
+#include <svx/galmisc.hxx>
+//#include <svx/gallery1.hxx>
// -----------------
// - GalleryObject -
// -----------------
+// --------------
+// - SgaObjKind -
+// --------------
struct GalleryObject
{
@@ -60,6 +64,11 @@ struct GalleryObject
DECLARE_LIST( GalleryObjectList, GalleryObject* )
+class GalleryThemeEntry;
+class SgaObject;
+class FmFormModel;
+class ListBox;
+
// -----------------
// - GalDragParams -
// -----------------
@@ -116,7 +125,7 @@ private:
ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
INetURLObject ImplGetURL( const GalleryObject* pObject ) const;
INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
- void ImplSetModified( BOOL bModified ) { pThm->SetModified( bModified ); }
+ void ImplSetModified( BOOL bModified );
void ImplBroadcast( ULONG nUpdatePos );
GalleryTheme();
@@ -136,20 +145,20 @@ public:
SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos );
BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos );
- const String& GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
- const String& GetRealName() const { return pThm->GetThemeName(); }
+ SVX_DLLPUBLIC const String& GetName() const;
+ const String& GetRealName() const;
const String& GetImportName() const { return aImportName; }
void SetImportName(const String& rImportName) { aImportName = rImportName; }
const String& GetDestDir() const { return m_aDestDir; }
void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; }
- const INetURLObject& GetThmURL() const { return pThm->GetThmURL(); }
- const INetURLObject& GetSdgURL() const { return pThm->GetSdgURL(); }
- const INetURLObject& GetSdvURL() const { return pThm->GetSdvURL(); }
+ const INetURLObject& GetThmURL() const;
+ SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const;
+ const INetURLObject& GetSdvURL() const;
- UINT32 GetId() const { return pThm->GetId(); }
- void SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+ SVX_DLLPUBLIC UINT32 GetId() const;
+ void SetId( UINT32 nNewId, BOOL bResetThemeName );
void SetDragging( BOOL bSet ) { bDragging = bSet; }
BOOL IsDragging() const { return bDragging; }
@@ -164,12 +173,12 @@ public:
void SetDragPos( ULONG nPos ) { nDragPos = nPos; }
ULONG GetDragPos() const { return nDragPos; }
- BOOL IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+ BOOL IsThemeNameFromResource() const;
- BOOL IsImported() const { return pThm->IsImported(); }
- BOOL IsReadOnly() const { return pThm->IsReadOnly(); }
- BOOL IsDefault() const { return pThm->IsDefault(); }
- BOOL IsModified() const { return pThm->IsModified(); }
+ SVX_DLLPUBLIC BOOL IsImported() const;
+ SVX_DLLPUBLIC BOOL IsReadOnly() const;
+ SVX_DLLPUBLIC BOOL IsDefault() const;
+ BOOL IsModified() const;
SVX_DLLPUBLIC void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
void AbortActualize() { bAbortActualize = TRUE; }
@@ -216,6 +225,7 @@ public:
SvStream& WriteData( SvStream& rOut ) const;
SvStream& ReadData( SvStream& rIn );
+ static SVX_DLLPUBLIC void InsertAllThemes( ListBox& rListBox );
};
SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme );
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx
index 78b24e8d15..82d1c31a4a 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/grafctrl.hxx
@@ -31,8 +31,8 @@
#ifndef _SVX_GRAFCTRL_HXX
#define _SVX_GRAFCTRL_HXX
-#include <svtools/lstner.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/lstner.hxx>
+#include <svl/intitem.hxx>
#include <sfx2/tbxctrl.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 22d3175fa1..3e9fbfb64b 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -31,794 +31,258 @@
#define _SVX_HELPID_HRC
// include ---------------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
-// Help-Ids --------------------------------------------------------------
-
-#define HID_GALLERY_BROWSER (HID_SVX_START + 0)
-#define HID_GALLERY_THEME (HID_SVX_START + 1)
-#define HID_GALLERY_NEW_THEME (HID_SVX_START + 2)
-#define HID_GALLERY_RENAME_THEME (HID_SVX_START + 3)
-#define HID_GALLERY_SEARCH (HID_SVX_START + 4)
-#define HID_GALLERY_APPLY (HID_SVX_START + 5)
-#define HID_GALLERY_ACTUALIZE (HID_SVX_START + 6)
-#define HID_GALLERY_WINDOW (HID_SVX_START + 7)
-#define HID_GALLERY_RENAME (HID_SVX_START + 8)
-#define HID_GALLERY_PROPERTIES (HID_SVX_START + 9)
-
-#define HID_TRANS_POSITION (HID_SVX_START + 10)
-#define HID_TRANS_SIZE (HID_SVX_START + 11)
-#define HID_TRANS_ANGLE (HID_SVX_START + 12)
-#define HID_TRANS_SLANT (HID_SVX_START + 13)
-
-#define HID_TABULATOR (HID_SVX_START + 14)
-#define HID_BORDER (HID_SVX_START + 15)
-#define HID_BACKGROUND (HID_SVX_START + 16)
-#define HID_ALIGNMENT (HID_SVX_START + 17)
-#define HID_NUMBERFORMAT (HID_SVX_START + 18)
-#define HID_CAPTION (HID_SVX_START + 19)
-
-#define HID_FORMAT_PAGE (HID_SVX_START + 20)
-#define HID_FORMAT_HEADER (HID_SVX_START + 21)
-#define HID_FORMAT_FOOTER (HID_SVX_START + 22)
-#define HID_FORMAT_CHAR_STD (HID_SVX_START + 23)
-#define HID_FORMAT_CHAR_EXT (HID_SVX_START + 24)
-#define HID_FORMAT_PARAGRAPH_STD (HID_SVX_START + 25)
-#define HID_FORMAT_PARAGRAPH_EXT (HID_SVX_START + 26)
-#define HID_FORMAT_PARAGRAPH_ALIGN (HID_SVX_START + 27)
-
-#define HID_AREA_AREA (HID_SVX_START + 30)
-#define HID_AREA_HATCH (HID_SVX_START + 31)
-#define HID_AREA_BITMAP (HID_SVX_START + 32)
-#define HID_AREA_GRADIENT (HID_SVX_START + 33)
-#define HID_LINE_LINE (HID_SVX_START + 34)
-#define HID_LINE_DEF (HID_SVX_START + 35)
-#define HID_LINE_ENDDEF (HID_SVX_START + 36)
-#define HID_AREA_SHADOW (HID_SVX_START + 37)
-#define HID_AREA_TRANSPARENCE (HID_SVX_START + 38)
-
-#define HID_OPTIONS_COLOR (HID_SVX_START + 40)
-#define HID_OPTIONS_SAVE (HID_SVX_START + 41)
-#define HID_OPTIONS_PATH (HID_SVX_START + 42)
-#define HID_OPTIONS_GENERAL (HID_SVX_START + 43)
-#define HID_OPTIONS_LINGU (HID_SVX_START + 44)
-#define HID_OPTIONS_SPELL (HID_SVX_START + 45)
-#define HID_OPTIONS_DICT_NEW (HID_SVX_START + 46)
-#define HID_OPTIONS_DICT_EDIT (HID_SVX_START + 47)
-#define HID_OPTIONS_GRID (HID_SVX_START + 48)
-#define HID_OPTIONS_INET (HID_SVX_START + 49)
-
-#define HID_DLG_NAME (HID_SVX_START + 50)
-#define HID_DLG_MESSBOX (HID_SVX_START + 51)
-#define HID_SEARCHATTR (HID_SVX_START + 52)
-#define HID_HYPHENATE (HID_SVX_START + 53)
-#define HID_SPELLCHECK (HID_SVX_START + 54)
-#define HID_SEARCHSIMILARITY (HID_SVX_START + 55)
-#define HID_PASSWORD (HID_SVX_START + 56)
-#define HID_MULTIPATH (HID_SVX_START + 57)
-
-#define HID_GALLERY_PROPERTIES_GENERAL (HID_SVX_START + 58)
-
-// #i68101#
-#define HID_DLG_OBJECT_NAME (HID_SVX_START + 59)
-#define HID_DLG_OBJECT_TITLE_DESC (HID_SVX_START + 60)
-
-//#define HID_BASICIDE_OBJECTS (HID_SVX_START + 59)
-//#define HID_MACRO_OPTIONS (HID_SVX_START + 60)
-//#define HID_BASICIDE_BRKPNTS (HID_SVX_START + 61)
-//#define HID_BASICIDE_MODULS (HID_SVX_START + 62)
-//#define HID_BASICIDE_LIBS_TP (HID_SVX_START + 63)
-//#define HID_BASICIDE_LIBS_DLG (HID_SVX_START + 64)
-//#define HID_BASICIDE_CONTROLS (HID_SVX_START + 65)
-//#define HID_BASICIDE_MACROS (HID_SVX_START + 66)
-//#define HID_BASICIDE_LIBS (HID_SVX_START + 67)
-//#define HID_BASICIDE_ORG_TC (HID_SVX_START + 68)
-
-#define HID_POPUP_COLOR (HID_SVX_START + 70)
-#define HID_POPUP_BRUSH (HID_SVX_START + 71)
-#define HID_POPUP_FRAME (HID_SVX_START + 72)
-#define HID_POPUP_LINE (HID_SVX_START + 73)
-
-#define HID_OPTIONS_MAIL (HID_SVX_START + 74)
-#define HID_THES_LANGUAGE (HID_SVX_START + 75)
-
-#define HID_OPTIONS_PROXY (HID_SVX_START + 76)
-#define HID_OPTIONS_CACHE (HID_SVX_START + 77)
-#define HID_OPTIONS_TYPE (HID_SVX_START + 78)
-#define HID_OPTIONS_SEARCH (HID_SVX_START + 79)
-
-//#define HID_BASICIDE_MODULES_TREE (HID_SVX_START + 80)
-//#define HID_BASICIDE_LIBS_TREE (HID_SVX_START + 81)
-//#define HID_BASICIDE_LIBSDLG_TREE (HID_SVX_START + 82)
-//#define HID_BASICIDE_OBJECTCAT (HID_SVX_START + 83)
-
-#define HID_PAGE_LIGHT3D (HID_SVX_START + 84)
-#define HID_PAGE_MEASURE (HID_SVX_START + 85)
-#define HID_PAGE_TEXTATTR (HID_SVX_START + 86)
-#define HID_PAGE_3DATTR (HID_SVX_START + 87)
-#define HID_CTRL_COLOR (HID_SVX_START + 88)
-#define HID_PAGE_CONNECTION (HID_SVX_START + 89)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_SVX_START + 90)
-#define HID_PAGE_DISTRIBUTE (HID_SVX_START + 91)
-
-#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 92)
-#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 93)
-#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 94)
-
-#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_SVX_START + 100)
-#define HID_BACKGROUND_CTL_PATTERNSET (HID_SVX_START + 101)
-#define HID_BACKGROUND_CTL_PATCOLORSET (HID_SVX_START + 102)
-#define HID_BACKGROUND_CTL_POSITION (HID_SVX_START + 103)
-#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 104)
-#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 105)
-#define HID_BORDER_CTL_PRESETS (HID_SVX_START + 106)
-#define HID_BORDER_CTL_SHADOWS (HID_SVX_START + 107)
-#define HID_CHARMAP_CTL_SHOWSET (HID_SVX_START + 108)
-#define HID_CHARMAP_CTL_SHOWTEXT (HID_SVX_START + 109)
-#define HID_CHARMAP_CTL_SHOWCHAR (HID_SVX_START + 110)
-#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 111)
-#define HID_LIGHT3D_CTL_LIGHT (HID_SVX_START + 112)
-#define HID_MEASURE_CTL_POSITION (HID_SVX_START + 113)
-#define HID_MEASURE_CTL_PREVIEW (HID_SVX_START + 114)
-#define HID_SEARCHATTR_CTL_ATTR (HID_SVX_START + 115)
-#define HID_TEXTATTR_CTL_POSITION (HID_SVX_START + 116)
-#define HID_3DATTR_CTL_DISTANCE (HID_SVX_START + 117)
-#define HID_3DATTR_CTL_FOCALLENGTH (HID_SVX_START + 118)
-#define HID_COLOR_CTL_COLORS (HID_SVX_START + 119)
-#define HID_OPTPATH_CTL_PATH (HID_SVX_START + 120)
-#define HID_OPTLINGU_CTL_DICTS (HID_SVX_START + 121)
-#define HID_OPTINET2_CTL_TYPES (HID_SVX_START + 122)
-#define HID_OPTIONS_DICT_DELETE (HID_SVX_START + 123)
-
-#define HID_TPCOLOR_RGB_1 (HID_SVX_START + 124)
-#define HID_TPCOLOR_RGB_2 (HID_SVX_START + 125)
-#define HID_TPCOLOR_RGB_3 (HID_SVX_START + 126)
-#define HID_TPCOLOR_CMYK_1 (HID_SVX_START + 127)
-#define HID_TPCOLOR_CMYK_2 (HID_SVX_START + 128)
-#define HID_TPCOLOR_CMYK_3 (HID_SVX_START + 129)
-
-#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 130)
-//#define HID_BASICIDE_PROP_BROWSER (HID_SVX_START + 131)
-#define HID_STYLE_LISTBOX (HID_SVX_START + 132)
-
-#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 133)
-#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 134)
-#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 135)
-#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 136)
-#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 137)
-#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 138)
-#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 139)
-#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 140)
-#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 141)
-#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 142)
-#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 143)
-#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 144)
-#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 145)
-#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 146)
-#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 147)
-
-#define HID_NUMBERFORMAT_TBI_ADD (HID_SVX_START + 148)
-#define HID_NUMBERFORMAT_TBI_REMOVE (HID_SVX_START + 149)
-
-#define HID_CONTDLG_APPLY (HID_SVX_START + 150)
-#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 151)
-#define HID_CONTDLG_SELECT (HID_SVX_START + 152)
-#define HID_CONTDLG_RECT (HID_SVX_START + 153)
-#define HID_CONTDLG_CIRCLE (HID_SVX_START + 154)
-#define HID_CONTDLG_POLY (HID_SVX_START + 155)
-#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 156)
-#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 157)
-#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 158)
-#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 159)
-#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 160)
-#define HID_CONTDLG_UNDO (HID_SVX_START + 161)
-#define HID_CONTDLG_REDO (HID_SVX_START + 162)
-#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 163)
-#define HID_CONTDLG_PIPETTE (HID_SVX_START + 164)
-
-//#define HID_BASICIDE_PROP_BROWSER_LBOX (HID_SVX_START + 165)
-#define HID_DRAWTOOL_TBX (HID_SVX_START + 166)
-#define HID_ALIGN_TBX (HID_SVX_START + 167)
-
-#define HID_IMAPDLG_APPLY (HID_SVX_START + 168)
-#define HID_IMAPDLG_OPEN (HID_SVX_START + 169)
-#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 170)
-#define HID_IMAPDLG_SELECT (HID_SVX_START + 171)
-#define HID_IMAPDLG_RECT (HID_SVX_START + 172)
-#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 173)
-#define HID_IMAPDLG_POLY (HID_SVX_START + 174)
-#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 175)
-#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 176)
-#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 177)
-#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 178)
-#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 179)
-#define HID_IMAPDLG_UNDO (HID_SVX_START + 180)
-#define HID_IMAPDLG_REDO (HID_SVX_START + 181)
-#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 182)
-#define HID_IMAPDLG_MACRO (HID_SVX_START + 183)
-#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 184)
-
-#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 185)
-#define HID_SVXTBX_DRAW (HID_SVX_START + 186)
-
-#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 187)
-#define HID_GALLERY_MN_ADD (HID_SVX_START + 188)
-#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 189)
-#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 190)
-#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 191)
-#define HID_GALLERY_MN_DELETE (HID_SVX_START + 192)
-#define HID_GALLERY_TITLE (HID_SVX_START + 193)
-#define HID_GALLERY_TITLE_EDIT (HID_SVX_START + 194)
-
-//#define HID_BASICIDE_OBJCAT_SHOW (HID_SVX_START + 195)
-//#define HID_BASICIDE_OBJCAT_PROPS (HID_SVX_START + 196)
-//#define HID_BASICIDE_OBJCAT_HELP (HID_SVX_START + 197)
-
-#define HID_IMPGRF_BTN_STANDARD (HID_SVX_START + 198)
-#define HID_IMPGRF_BTN_INTERNET (HID_SVX_START + 199)
-#define HID_IMPGRF_BTN_PROPERTIES (HID_SVX_START + 200)
-#define HID_IMPGRF_BTN_FILTER (HID_SVX_START + 201)
-#define HID_IMPGRF_CB_LINK (HID_SVX_START + 202)
-#define HID_IMPGRF_CB_PREVIEW (HID_SVX_START + 203)
-
-//#define HID_BASICIDE_BRKDLG (HID_SVX_START + 204)
-//#define HID_BASICIDE_ACTIV (HID_SVX_START + 205)
-//#define HID_BASICIDE_BRKPROPS (HID_SVX_START + 206)
-//#define HID_BASICIDE_REMOVEWATCH (HID_SVX_START + 207)
-//#define HID_BASICIDE_GOTOALL (HID_SVX_START + 208)
-
-#define HID_SVX_OPT_EXT_LINGU (HID_SVX_START + 209)
-#define HID_CACHE_EXTRA_DLG (HID_SVX_START + 210)
-
-#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 211)
-#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 212)
-
-#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 213)
-#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 214)
-
-#define HID_OPTLINGU_TOOLBOX (HID_SVX_START + 215)
-
-#define HID_OPTLDAP_SERVERLIST (HID_SVX_START + 216)
-#define HID_OPTLDAP_EDITSERVER (HID_SVX_START + 217)
-
-#define HID_SPELLDLG_EXTRAS_AUDIT (HID_SVX_START + 218)
-#define HID_SPELLDLG_EXTRAS_AUTOCORR (HID_SVX_START + 219)
-#define HID_SPELLDLG_EXTRAS_THESAURUS (HID_SVX_START + 220)
-#define HID_SPELLDLG_EXTRAS_OPTIONS (HID_SVX_START + 221)
-
-#define HID_TPSHADOW_CTRL (HID_SVX_START + 222)
-#define HID_TPHATCH_CTRL (HID_SVX_START + 223)
-#define HID_TPPOSITION_CTRL (HID_SVX_START + 224)
-#define HID_TPSIZE_CTRL (HID_SVX_START + 225)
-#define HID_TPROTATION_CTRL1 (HID_SVX_START + 226)
-#define HID_TPROTATION_CTRL2 (HID_SVX_START + 227)
-
-#define HID_OPTIONS_SSLSITE (HID_SVX_START + 228)
-#define HID_OPTIONS_SSLPERSONAL (HID_SVX_START + 229)
-#define HID_OPTIONS_COOKIES (HID_SVX_START + 230)
-#define HID_OPTINET2_CTL_COOKIES (HID_SVX_START + 231)
-#define HID_OPTIONS_CHANNELS (HID_SVX_START + 232)
-#define HID_OPTINET2_CTL_CHANNELS (HID_SVX_START + 233)
-
-#define HID_CAPTION_CTL_TYPE (HID_SVX_START + 234)
-
-#define HID_NUMBERFORMAT_TBI_INFO (HID_SVX_START + 235)
-#define HID_NUMBERFORMAT_LB_FORMAT (HID_SVX_START + 236)
-
-#define HID_ALIGNMENT_CTR_DIAL (HID_SVX_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_SVX_START + 238)
-
-#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 239)
-#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 240)
-#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 241)
-#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 242)
-#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 243)
-#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 244)
-#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 245)
-#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 246)
-#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 247)
-#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 248)
-#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 249)
-#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 250)
-#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 251)
-#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 252)
-#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 253)
-
-#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 254)
-#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 255)
-#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 256)
-#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 257)
-#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 258)
-#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 259)
-
-#define HID_MNU_ZOOM_200 (HID_SVX_START + 260)
-#define HID_MNU_ZOOM_150 (HID_SVX_START + 261)
-#define HID_MNU_ZOOM_100 (HID_SVX_START + 262)
-#define HID_MNU_ZOOM_75 (HID_SVX_START + 263)
-#define HID_MNU_ZOOM_50 (HID_SVX_START + 264)
-#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 265)
-#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 266)
-#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 267)
-
-#define HID_MNU_FUNC_AVG (HID_SVX_START + 268)
-#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 269)
-#define HID_MNU_FUNC_COUNT (HID_SVX_START + 270)
-#define HID_MNU_FUNC_MAX (HID_SVX_START + 271)
-#define HID_MNU_FUNC_MIN (HID_SVX_START + 272)
-#define HID_MNU_FUNC_SUM (HID_SVX_START + 273)
-#define HID_MNU_FUNC_NONE (HID_SVX_START + 274)
-#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 275)
-
-#define HID_REDLINING_DLG (HID_SVX_START + 276)
-#define HID_REDLINING_EDIT (HID_SVX_START + 277)
-#define HID_REDLINING_PREV (HID_SVX_START + 278)
-#define HID_REDLINING_NEXT (HID_SVX_START + 279)
-#define HID_REDLINING_TABCONTROL (HID_SVX_START + 280)
-
-#define HID_VALUESET_SINGLENUM (HID_SVX_START + 281)
-#define HID_VALUESET_BULLET (HID_SVX_START + 282)
-#define HID_VALUESET_NUM (HID_SVX_START + 283)
-#define HID_VALUESET_NUMBMP (HID_SVX_START + 284)
-#define HID_SVXPAGE_PICK_NUM (HID_SVX_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_SVX_START + 286)
-#define HID_SVXPAGE_PICK_BMP (HID_SVX_START + 287)
-#define HID_SVXPAGE_PICK_BULLET (HID_SVX_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS (HID_SVX_START + 289)
-#define HID_SVXPAGE_NUM_POSITION (HID_SVX_START + 290)
-
-//#define HID_BASICIDE_MODULWINDOW (HID_SVX_START + 291)
-//#define HID_BASICIDE_DIALOGWINDOW (HID_SVX_START + 292)
-
-#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 293)
-#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 294)
-#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 295)
+#include <svx/exthelpid.hrc>
-#define HID_OPTIONS_EXTERN_BROWSER (HID_SVX_START + 296)
-
-#define HID_EDITENG_SPELLER_START (HID_SVX_START + 297)
-#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 298)
-#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 299)
-#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 300)
-
-#define HID_OPTPATH_HEADERBAR (HID_SVX_START + 301)
-#define HID_OPTCOOKIES_HEADERBAR (HID_SVX_START + 302)
-
-#define HID_TPPAGE_FULLSIZE (HID_SVX_START + 303)
-
-#define HID_POPUP_LINEEND (HID_SVX_START + 304)
-#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 305)
-
-#define HID_SPELLDLG_SETWORD (HID_SVX_START + 306)
-
-#define HID_HYPERLINK_INTERNET (HID_SVX_START + 315)
-#define HID_HYPERLINK_MAIL (HID_SVX_START + 316)
-#define HID_HYPERLINK_DOCUMENT (HID_SVX_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT (HID_SVX_START + 318)
-#define HID_HYPERLINK_MARKWND (HID_SVX_START + 319)
-
-#define HID_ICCDIALOG_RESET_BTN (HID_SVX_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL (HID_SVX_START + 321)
-
-#define HID_HYPERDLG_INET_PATH (HID_SVX_START + 322)
-#define HID_HYPERDLG_MAIL_PATH (HID_SVX_START + 323)
-#define HID_HYPERDLG_DOC_PATH (HID_SVX_START + 324)
-#define HID_ICCDIALOG_OK_BTN (HID_SVX_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN (HID_SVX_START + 326)
-
-#define HID_HYPERLINK_MARKWND_APPLY (HID_SVX_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE (HID_SVX_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE (HID_SVX_START + 329)
-
-#define HID_AUTOCORR_HELP_START (HID_SVX_START + 331)
-#define HID_AUTOCORR_HELP_END (HID_SVX_START + 370)
-
-#define HID_SVXPAGE_GRFCROP (HID_SVX_START + 375)
-
-// #i58240# set HelpIDs for scrollbars and switcher
-#define HID_CTRL3D_HSCROLL (HID_SVX_START + 376)
-#define HID_CTRL3D_VSCROLL (HID_SVX_START + 377)
-#define HID_CTRL3D_SWITCHER (HID_SVX_START + 378)
-
-#define HID_GRFFILTER (HID_SVX_START + 380)
-#define HID_GRFFILTER_INVERT (HID_SVX_START + 381)
-#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 382)
-#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 383)
-#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 384)
-#define HID_GRFFILTER_SOBEL (HID_SVX_START + 385)
-#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 386)
-#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 387)
-#define HID_GRFFILTER_POSTER (HID_SVX_START + 388)
-#define HID_GRFFILTER_POPART (HID_SVX_START + 389)
-#define HID_GRFFILTER_SEPIA (HID_SVX_START + 390)
-#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 391)
-
-#define HID_SVXPAGE_CHAR_NAME (HID_SVX_START + 392)
-#define HID_SVXPAGE_CHAR_EFFECTS (HID_SVX_START + 393)
-#define HID_SVXPAGE_CHAR_POSITION (HID_SVX_START + 394)
-#define HID_SVXPAGE_CHAR_TWOLINES (HID_SVX_START + 395)
-#define HID_SVXPAGE_CHAR_EFFECTS_CTRL (HID_SVX_START + 396)
-
-#define HID_LNGDLG_NUM_PREBREAK (HID_SVX_START + 400)
-
-#define HID_EDIT_MODULES (HID_SVX_START + 401)
-#define HID_CLB_EDIT_MODULES_DICS (HID_SVX_START + 402)
-#define HID_CLB_EDIT_MODULES_MODULES (HID_SVX_START + 403)
-#define HID_CLB_LINGU_MODULES (HID_SVX_START + 404)
-#define HID_CLB_LINGU_OPTIONS (HID_SVX_START + 405)
-
-#define HID_SVXPAGE_PARA_ASIAN (HID_SVX_START + 406)
-
-#define HID_GRFFILTER_EMBOSS_LIGHT (HID_SVX_START + 408)
-
-#define HID_GALLERY_NEWTHEME (HID_SVX_START + 410)
-#define HID_GALLERY_THEMELIST (HID_SVX_START + 411)
-
-#define HID_SVX_PROPBRW (HID_SVX_START + 412)
-#define HID_SVXDLG_PROPBRW (HID_SVX_START + 413)
-#define HID_SVX_DLG_LABELCONTROL (HID_SVX_START + 414)
-
-#define HID_OPTIONS_ASIAN_LAYOUT (HID_SVX_START + 415)
-#define HID_SVXTBX_FORM (HID_SVX_START + 416)
-
-#define HID_WARN_NAME_DUPLICATE (HID_SVX_START + 417)
-#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 418)
-
-#define HID_RUBY_DIALOG (HID_SVX_START + 419)
-
-#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_SVX_START + 420)
-
-#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 421)
-
-#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 422)
-#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 423)
-#define HID_GALLERY_PREVIEW (HID_SVX_START + 424)
-#define HID_GALLERY_ICONVIEW (HID_SVX_START + 425)
-#define HID_GALLERY_LISTVIEW (HID_SVX_START + 426)
-#define HID_SVXDLG_FILTER_WARNING (HID_SVX_START + 427)
-
-#define HID_TRANS_POSITION_SIZE (HID_SVX_START + 428)
-#define HID_OPTIONS_COLORCONFIG (HID_SVX_START + 429)
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_SVX_START + 430)
-#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_SVX_START + 431)
-
-//no new entries here!! HID_SVX_EXT0_START == 39868
-
-#define HID_FILL_ATTR_LISTBOX (HID_SVX_EXT0_START + 1)
-#define HID_FILL_TYPE_LISTBOX (HID_SVX_EXT0_START + 2)
-#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_SVX_EXT0_START + 3)
-#define HID_OPTIONS_SSO (HID_SVX_EXT0_START + 4)
-#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_EXT0_START + 5)
-#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_EXT0_START + 6)
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_SVX_EXT0_START + 7)
-#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_SVX_EXT0_START + 8)
-#define HID_GALLERY_NEWTHEME_FINDFILES (HID_SVX_EXT0_START + 9)
-#define HID_GALLERY_NEWTHEME_ADDFILES (HID_SVX_EXT0_START + 10)
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_SVX_EXT0_START + 11)
-#define HID_OPTIONS_CTL (HID_SVX_EXT0_START + 12)
-#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_EXT0_START + 13)
-#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_EXT0_START + 14)
-#define HID_DIALOG_HANGULHANJA (HID_SVX_EXT0_START + 15)
-#define HID_SPLDLG_BUTTON_CLOSE (HID_SVX_EXT0_START + 16)
-#define HID_SPLDLG_BUTTON_IGNORE (HID_SVX_EXT0_START + 17)
-#define HID_SPLDLG_BUTTON_IGNOREALL (HID_SVX_EXT0_START + 18)
-#define HID_SPLDLG_BUTTON_CHANGE (HID_SVX_EXT0_START + 19)
-#define HID_SPLDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 20)
-#define HID_HANGULDLG_BUTTON_CLOSE (HID_SVX_EXT0_START + 21)
-#define HID_HANGULDLG_BUTTON_IGNORE (HID_SVX_EXT0_START + 22)
-#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_SVX_EXT0_START + 23)
-#define HID_HANGULDLG_BUTTON_CHANGE (HID_SVX_EXT0_START + 24)
-#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 25)
-#define HID_SPLDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 26)
-#define HID_HANGULDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 27)
-#define HID_DLG_SECURITY_OPTIONS (HID_SVX_EXT0_START + 28)
-#define HID_DLG_WEBCONNECTION_INFO (HID_SVX_EXT0_START + 29)
-#define HID_SPLDLG_BUTTON_EXPLAIN (HID_SVX_EXT0_START + 30)
-#define HID_SPLDLG_CHECKBOX_CHECKGRAMMAR (HID_SVX_EXT0_START + 31)
-
-#define HID_AUTOCORR_DLG (HID_OFA_START + 0)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_OFA_START + 1)
-#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_OFA_START + 2)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_OFA_START + 3)
-#define HID_OFACTL_AUTOCORR_REPLACE (HID_OFA_START + 4)
-#define HID_OFAWIN_MAIL_HEADER (HID_OFA_START + 5)
-#define HID_OFAWIN_MAIL_ATTACH (HID_OFA_START + 6)
-#define HID_OFACTL_MAIL_ATTACH (HID_OFA_START + 7)
-#define HID_OFA_TP_MISC (HID_OFA_START + 8)
-#define HID_OFA_HYPERLINK (HID_OFA_START + 10)
-#define HID_OFA_DLGTABNEW (HID_OFA_START + 11)
-#define HID_OFA_HYPERLINK_DLG (HID_OFA_START + 12)
-#define HID_OFA_MAILHEAD_ROLE_LB (HID_OFA_START + 13)
-#define HID_OFA_MAILHEAD_RCPT_ED (HID_OFA_START + 14)
-#define HID_OFA_MAILHEAD_RCPT_LB (HID_OFA_START + 15)
-#define HID_OFA_MAILHEAD_SUBJECT_ED (HID_OFA_START + 16)
-#define HID_OFA_MAILHEAD_RECEIPT_CB (HID_OFA_START + 17)
-#define HID_OFA_MAILHEAD_PRIORITY_LB (HID_OFA_START + 18)
-#define HID_OFA_MAILHEAD_HEAD_WIN (HID_OFA_START + 19)
-#define HID_OFA_MAILATTACH_ATTACH_LB (HID_OFA_START + 20)
-#define HID_OFA_MAILATTACH_ASCII_CB (HID_OFA_START + 21)
-#define HID_OFA_MAILATTACH_HTML_CB (HID_OFA_START + 22)
-#define HID_OFA_MAILATTACH_RTF_CB (HID_OFA_START + 23)
-#define HID_OFA_MAILATTACH_OFFICE_CB (HID_OFA_START + 24)
-#define HID_OFA_HYPERLINK_TARGET (HID_OFA_START + 25)
-#define HID_OFA_HYPERLINK_SEARCH (HID_OFA_START + 26)
-#define HID_OFA_MAILTOOLBOX (HID_OFA_START + 27)
-#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_OFA_START + 28)
-#define HID_OFA_TP_VIEW (HID_OFA_START + 29)
-#define HID_OFA_MAILMENU_OPEN (HID_OFA_START + 30)
-#define HID_OFA_MAILMENU_DELETE (HID_OFA_START + 31)
-#define HID_OFA_MAILMENU_RENAME (HID_OFA_START + 32)
-#define HID_OFA_MAILMENU_SAVEAS (HID_OFA_START + 33)
-#define HID_OFA_MAILMENU_ADDADDRESS (HID_OFA_START + 34)
-#define HID_OFA_MAILMENU_COPYLINK (HID_OFA_START + 35)
-#define HID_OFA_MAILMENU_SIG1 (HID_OFA_START + 36)
-#define HID_OFA_MAILMENU_SIG2 (HID_OFA_START + 37)
-#define HID_OFA_MAILMENU_SIG3 (HID_OFA_START + 38)
-#define HID_OFA_MAILMENU_SIG4 (HID_OFA_START + 39)
-#define HID_OFA_MAILHEAD_PROTOCOL_LB (HID_OFA_START + 42)
-#define HID_OFA_MAILATTACH_RECEIPT_CB (HID_OFA_START + 43)
-#define HID_OFA_MAILATTACH_PRIORITY_LB (HID_OFA_START + 44)
-#define HID_OFA_MAILATTACH_TABBAR (HID_OFA_START + 45)
-#define HID_OFAPAGE_AUTOCORR_CLB (HID_OFA_START + 46)
-#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_OFA_START + 47)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_OFA_START + 48)
-#define HID_OFA_DLGFORMNEW (HID_OFA_START + 49)
-#define HID_OFA_TP_APPEARANCE (HID_OFA_START + 50)
-#define HID_OFA_HYPERLINK_NAME (HID_OFA_START + 51)
-#define HID_OFA_HYPERLINK_URL_TXT (HID_OFA_START + 52)
-#define HID_OFA_HYPERLINK_URL (HID_OFA_START + 53)
-#define HID_OFA_MAILMENU_FILE (HID_OFA_START + 54)
-#define HID_OFA_FONT_SUBSTITUTION (HID_OFA_START + 55)
-#define HID_OFA_FONT_SUBST_CLB (HID_OFA_START + 56)
-#define HID_OFA_SUBST_APPLY (HID_OFA_START + 57)
-#define HID_OFA_SUBST_DELETE (HID_OFA_START + 58)
-#define HID_OFADLG_REGISTRATION (HID_OFA_START + 59)
-#define HID_OFA_TP_DESKTOP (HID_OFA_START + 60)
-#define HID_REGISTRATION_REGISTER (HID_OFA_START + 61)
-#define HID_REGISTRATION_ENABLE_KEY (HID_OFA_START + 62)
-#define HID_AUTOCORR_LANGUAGE (HID_OFA_START + 63)
-#define HID_OFA_MAILHEAD_RCPT_CB (HID_OFA_START + 64)
-#define HID_OFA_SENDMENU_PLAIN (HID_OFA_START + 65)
-#define HID_OFA_SENDMENU_ENCRYPT (HID_OFA_START + 66)
-#define HID_OFA_SENDMENU_SIGN (HID_OFA_START + 67)
-#define HID_OFA_SENDMENU_SIGNANDENCRYPT (HID_OFA_START + 68)
-#define HID_OFADLG_OPTIONS_TREE (HID_OFA_START + 69)
-#define HID_OFADLG_TREELISTBOX (HID_OFA_START + 70)
-#define HID_OFADLG_TREE_GENERAL (HID_OFA_START + 71)
-#define HID_OFADLG_TREE_INTERNET (HID_OFA_START + 72)
-#define HID_OFADLG_TREE_BROWSER (HID_OFA_START + 73)
-#define HID_OFADLG_TREE_TEXT (HID_OFA_START + 74)
-#define HID_OFADLG_TREE_HTML (HID_OFA_START + 75)
-#define HID_OFADLG_TREE_CALC (HID_OFA_START + 76)
-#define HID_OFADLG_TREE_PRESENTATION (HID_OFA_START + 77)
-#define HID_OFADLG_TREE_DRAWING (HID_OFA_START + 78)
-#define HID_OFADLG_TREE_IMAGE (HID_OFA_START + 79)
-#define HID_OFADLG_TREE_FORMULA (HID_OFA_START + 80)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_OFA_START + 113)
-#define HID_OFADLG_TREE_CHART (HID_OFA_START + 115)
-#define HID_OFADLG_TREE_BASE (HID_OFA_START + 116)
-#define HID_OFADLG_TREE_FILTER (HID_OFA_START + 117)
-#define HID_OFAPAGE_MSFLTR2_CLB (HID_OFA_START + 118)
-#define HID_OFA_TP_LANGUAGES (HID_OFA_START + 119)
-#define HID_OFADLG_TREE_LANGUAGE (HID_OFA_START + 120)
-#define HID_OFA_CONNPOOL_DRIVERLIST (HID_OFA_START + 121)
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_OFA_START + 122)
-// #define HID_OFA_TP_HELPERPROG (HID_OFA_START + 123)
-#define HID_OFA_TP_MEMORY (HID_OFA_START + 124)
-#define HID_DBPATH_CTL_PATH (HID_OFA_START + 125)
-#define HID_DBPATH_HEADERBAR (HID_OFA_START + 126)
-#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_OFA_START + 127)
-
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_SVX_EXT0_START + 28)
-
-#define HID_COLORPAGE_LISTBOX_START (HID_SVX_EXT0_START + 29)
-#define HID_COLORPAGE_DOCCOLOR_LB (HID_SVX_EXT0_START + 29)
-#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_SVX_EXT0_START + 30)
-#define HID_COLORPAGE_APPBACKGROUND_LB (HID_SVX_EXT0_START + 31)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_SVX_EXT0_START + 32)
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_SVX_EXT0_START + 33)
-#define HID_COLORPAGE_FONTCOLOR_LB (HID_SVX_EXT0_START + 34)
-#define HID_COLORPAGE_LINKS_LB (HID_SVX_EXT0_START + 35)
-#define HID_COLORPAGE_LINKSVISITED_LB (HID_SVX_EXT0_START + 36)
-#define HID_COLORPAGE_ANCHOR_LB (HID_SVX_EXT0_START + 37)
-#define HID_COLORPAGE_SPELL_LB (HID_SVX_EXT0_START + 38)
-#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_SVX_EXT0_START + 39)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_SVX_EXT0_START + 40)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_SVX_EXT0_START + 41)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_SVX_EXT0_START + 42)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_SVX_EXT0_START + 43)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_SVX_EXT0_START + 44)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_SVX_EXT0_START + 45)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_SVX_EXT0_START + 46)
-#define HID_COLORPAGE_HTMLSGML_LB (HID_SVX_EXT0_START + 47)
-#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_SVX_EXT0_START + 48)
-#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_SVX_EXT0_START + 49)
-#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_SVX_EXT0_START + 50)
-#define HID_COLORPAGE_CALCGRID_LB (HID_SVX_EXT0_START + 51)
-#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_SVX_EXT0_START + 52)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_SVX_EXT0_START + 53)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_SVX_EXT0_START + 54)
-#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_SVX_EXT0_START + 55)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_SVX_EXT0_START + 56)
-#define HID_COLORPAGE_CALCREFERENCE_LB (HID_SVX_EXT0_START + 57)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_SVX_EXT0_START + 58)
-#define HID_COLORPAGE_DRAWGRID_LB (HID_SVX_EXT0_START + 59)
-#define HID_COLORPAGE_DRAWDRAWING_LB (HID_SVX_EXT0_START + 60)
-#define HID_COLORPAGE_DRAWFILL_LB (HID_SVX_EXT0_START + 61)
-#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_SVX_EXT0_START + 62)
-#define HID_COLORPAGE_BASICCOMMENT_LB (HID_SVX_EXT0_START + 63)
-#define HID_COLORPAGE_BASICNUMBER_LB (HID_SVX_EXT0_START + 64)
-#define HID_COLORPAGE_BASICSTRING_LB (HID_SVX_EXT0_START + 65)
-#define HID_COLORPAGE_BASICOPERATOR_LB (HID_SVX_EXT0_START + 66)
-#define HID_COLORPAGE_BASICKEYWORD_LB (HID_SVX_EXT0_START + 67)
-#define HID_COLORPAGE_BASICERROR_LB (HID_SVX_EXT0_START + 68)
-
-#define HID_COLORPAGE_CHECKBOX_START (HID_SVX_EXT0_START + 69)
-#define HID_COLORPAGE_DOCCOLOR_CB (HID_SVX_EXT0_START + 69)
-#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_SVX_EXT0_START + 70)
-#define HID_COLORPAGE_APPBACKGROUND_CB (HID_SVX_EXT0_START + 71)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_SVX_EXT0_START + 72)
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_SVX_EXT0_START + 73)
-#define HID_COLORPAGE_FONTCOLOR_CB (HID_SVX_EXT0_START + 74)
-#define HID_COLORPAGE_LINKS_CB (HID_SVX_EXT0_START + 75)
-#define HID_COLORPAGE_LINKSVISITED_CB (HID_SVX_EXT0_START + 76)
-#define HID_COLORPAGE_ANCHOR_CB (HID_SVX_EXT0_START + 77)
-#define HID_COLORPAGE_SPELL_CB (HID_SVX_EXT0_START + 78)
-#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_SVX_EXT0_START + 79)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_SVX_EXT0_START + 80)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_SVX_EXT0_START + 81)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_SVX_EXT0_START + 82)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_SVX_EXT0_START + 83)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_SVX_EXT0_START + 84)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_SVX_EXT0_START + 85)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_SVX_EXT0_START + 86)
-#define HID_COLORPAGE_HTMLSGML_CB (HID_SVX_EXT0_START + 87)
-#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_SVX_EXT0_START + 88)
-#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_SVX_EXT0_START + 89)
-#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_SVX_EXT0_START + 90)
-#define HID_COLORPAGE_CALCGRID_CB (HID_SVX_EXT0_START + 91)
-#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_SVX_EXT0_START + 92)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_SVX_EXT0_START + 93)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_SVX_EXT0_START + 94)
-#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_SVX_EXT0_START + 95)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_SVX_EXT0_START + 96)
-#define HID_COLORPAGE_CALCREFERENCE_CB (HID_SVX_EXT0_START + 97)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_SVX_EXT0_START + 98)
-#define HID_COLORPAGE_DRAWGRID_CB (HID_SVX_EXT0_START + 99)
-#define HID_COLORPAGE_DRAWDRAWING_CB (HID_SVX_EXT0_START + 100)
-#define HID_COLORPAGE_DRAWFILL_CB (HID_SVX_EXT0_START + 101)
-#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_SVX_EXT0_START + 102)
-#define HID_COLORPAGE_BASICCOMMENT_CB (HID_SVX_EXT0_START + 103)
-#define HID_COLORPAGE_BASICNUMBER_CB (HID_SVX_EXT0_START + 104)
-#define HID_COLORPAGE_BASICSTRING_CB (HID_SVX_EXT0_START + 105)
-#define HID_COLORPAGE_BASICOPERATOR_CB (HID_SVX_EXT0_START + 106)
-#define HID_COLORPAGE_BASICKEYWORD_CB (HID_SVX_EXT0_START + 107)
-#define HID_COLORPAGE_BASICERROR_CB (HID_SVX_EXT0_START + 108)
-#define HID_SVXPAGE_SWPOSSIZE (HID_SVX_EXT0_START + 109)
-
-#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_EXT0_START + 110)
-#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 111)
-#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_EXT0_START + 112)
-#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_EXT0_START + 113)
-#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_EXT0_START + 114)
-#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_EXT0_START + 115)
-#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 116)
-#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_EXT0_START + 117)
-#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_EXT0_START + 118)
-#define HID_SCRIPTORG_DIALOG (HID_SVX_EXT0_START + 119)
-#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_EXT0_START + 120)
-#define HID_GALLERY_EDIT_MSNAME (HID_SVX_EXT0_START + 121)
-
-// Hangul Hanja extensions
-#define HID_HANGULHANJA_OPT_DLG (HID_SVX_EXT0_START + 122)
-#define HID_HANGULHANJA_NEWDICT_DLG (HID_SVX_EXT0_START + 123)
-#define HID_HANGULHANJA_EDIT_DLG (HID_SVX_EXT0_START + 124)
-#define HID_HANGULDLG_BUTTON_OPTIONS (HID_SVX_EXT0_START + 125)
-#define HID_HANGULHANJA_OPT_DICTS_LB (HID_SVX_EXT0_START + 126)
-#define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES (HID_SVX_EXT0_START + 127)
-#define HID_OPTIONS_JAVA (HID_SVX_EXT0_START + 128)
-#define HID_OPTIONS_JAVA_LIST (HID_SVX_EXT0_START + 129)
-#define HID_OPTIONS_JAVA_PARAMETER (HID_SVX_EXT0_START + 130)
-#define HID_OPTIONS_JAVA_CLASSPATH (HID_SVX_EXT0_START + 131)
-
-// listbox for event config
-#define HID_SVX_MACRO_LB_EVENT (HID_SVX_EXT0_START + 132)
-#define HID_SVX_CONFIG_EVENT (HID_SVX_EXT0_START + 133)
-#define HID_CONFIG_EVENT_OFFICE_BASED (HID_SVX_EXT0_START + 134)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_SVX_EXT0_START + 135)
-
-#define HID_SELECTOR_CATEGORIES (HID_SVX_EXT0_START + 136)
-#define HID_SELECTOR_COMMANDS (HID_SVX_EXT0_START + 137)
-#define HID_SELECTOR_DIALOG (HID_SVX_EXT0_START + 138)
-#define HID_SVX_CONFIG_MENU (HID_SVX_EXT0_START + 139)
-#define HID_SVX_CONFIG_MENU_CONTENTS (HID_SVX_EXT0_START + 140)
-#define HID_SVX_CONFIG_TOOLBAR (HID_SVX_EXT0_START + 141)
-#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_SVX_EXT0_START + 142)
-#define HID_SCRIPTSBOX (HID_SVX_EXT0_START + 143)
-#define HID_SVX_RUN_MACRO (HID_SVX_EXT0_START + 144)
-#define HID_SVX_BASIC_MACRO_ORGANIZER (HID_SVX_EXT0_START + 145)
-#define HID_SVX_BASIC_DIALOG_ORGANIZER (HID_SVX_EXT0_START + 146)
-#define HID_SVX_COMMON_MACRO_ORGANIZER (HID_SVX_EXT0_START + 147)
-#define HID_XMLSEC_CALL (HID_SVX_EXT0_START + 148)
-
-// chinese simplified traditional dialogs
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_EXT0_START + 149)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_EXT0_START + 150)
-#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_EXT0_START + 151)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_EXT0_START + 152)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_EXT0_START + 153)
-#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_EXT0_START + 154)
-#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_EXT0_START + 155)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_EXT0_START + 156)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_EXT0_START + 157)
-
-#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_EXT0_START + 158)
-#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_EXT0_START + 159)
-
-// pb: duplicate (see: HID_SVX_EXT0_START + 127)
-// #define HID_SVXTBX_TEXT_CONTROL_ATTRIBUTES (HID_SVX_EXT0_START + 160)
-
-#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_EXT0_START + 161)
-#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_EXT0_START + 162)
-#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_EXT0_START + 163)
-#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_EXT0_START + 164)
-#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_EXT0_START + 165)
-#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_EXT0_START + 166)
-#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_EXT0_START + 167)
-#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_EXT0_START + 168)
-#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_EXT0_START + 169)
-
-#define HID_HANGULDLG_SUGGESTIONS (HID_SVX_EXT0_START + 170)
-#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_SVX_EXT0_START + 171)
-#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_SVX_EXT0_START + 172)
-
-#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_SVX_EXT0_START + 173)
-#define HID_SVX_SAVE_IN (HID_SVX_EXT0_START + 174)
-#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_SVX_EXT0_START + 175)
-#define HID_SVX_CONFIG_ICON_SELECTOR (HID_SVX_EXT0_START + 176)
-#define HID_SVX_CONFIG_NAME_SUBMENU (HID_SVX_EXT0_START + 177)
-#define HID_SVX_CONFIG_RENAME_MENU (HID_SVX_EXT0_START + 178)
-#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_SVX_EXT0_START + 179)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_SVX_EXT0_START + 180)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_SVX_EXT0_START + 181)
-#define HID_SVX_NEW_TOOLBAR (HID_SVX_EXT0_START + 182)
-#define HID_SVX_MODIFY_TOOLBAR (HID_SVX_EXT0_START + 183)
-#define HID_SVX_NEW_TOOLBAR_ITEM (HID_SVX_EXT0_START + 184)
-#define HID_SVX_CONFIG_MENU_LISTBOX (HID_SVX_EXT0_START + 185)
-#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_SVX_EXT0_START + 186)
-#define HID_OPTIONS_CHART_DEFCOLORS (HID_SVX_EXT0_START + 187)
-#define HID_OPTIONS_MULTIPATH_LIST (HID_SVX_EXT0_START + 188)
-
-#define HID_COLORPAGE_DBREPORTHEADER_CB (HID_SVX_EXT0_START + 189)
-#define HID_COLORPAGE_DBREPORTFOOTER_CB (HID_SVX_EXT0_START + 190)
-#define HID_COLORPAGE_DBPAGEHEADER_CB (HID_SVX_EXT0_START + 191)
-#define HID_COLORPAGE_DBPAGEFOOTER_CB (HID_SVX_EXT0_START + 192)
-#define HID_COLORPAGE_DBGROUPHEADER_CB (HID_SVX_EXT0_START + 193)
-#define HID_COLORPAGE_DBGROUPFOOTER_CB (HID_SVX_EXT0_START + 194)
-#define HID_COLORPAGE_DBCOLUMNHEADER_CB (HID_SVX_EXT0_START + 195)
-#define HID_COLORPAGE_DBCOLUMNFOOTER_CB (HID_SVX_EXT0_START + 196)
-#define HID_COLORPAGE_DBDETAIL_CB (HID_SVX_EXT0_START + 197)
-#define HID_COLORPAGE_DBREPORTHEADER_LB (HID_SVX_EXT0_START + 198)
-#define HID_COLORPAGE_DBREPORTFOOTER_LB (HID_SVX_EXT0_START + 199)
-#define HID_COLORPAGE_DBPAGEHEADER_LB (HID_SVX_EXT0_START + 200)
-#define HID_COLORPAGE_DBPAGEFOOTER_LB (HID_SVX_EXT0_START + 201)
-#define HID_COLORPAGE_DBGROUPHEADER_LB (HID_SVX_EXT0_START + 202)
-#define HID_COLORPAGE_DBGROUPFOOTER_LB (HID_SVX_EXT0_START + 203)
-#define HID_COLORPAGE_DBCOLUMNHEADER_LB (HID_SVX_EXT0_START + 204)
-#define HID_COLORPAGE_DBCOLUMNFOOTER_LB (HID_SVX_EXT0_START + 205)
-#define HID_COLORPAGE_DBDETAIL_LB (HID_SVX_EXT0_START + 206)
-
-#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_SVX_EXT0_START + 207)
-#define HID_SPLDLG_BUTTON_IGNORERULE (HID_SVX_EXT0_START + 208)
-
-#define HID_CONFIG_ACCEL (HID_SVX_EXT0_START + 209)
-#define HID_ACCELCONFIG_LISTBOX (HID_SVX_EXT0_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX (HID_SVX_EXT0_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_SVX_EXT0_START + 212)
-#define HID_MACRO_LB_EVENT (HID_SVX_EXT0_START + 213)
-#define HID_MACRO_GROUP (HID_SVX_EXT0_START + 214)
-#define HID_MACRO_MACROS (HID_SVX_EXT0_START + 215)
-#define HID_MACROCHECKDIALOG (HID_SVX_EXT0_START + 216)
-#define HID_MACRO_HEADERTABLISTBOX (HID_SVX_EXT0_START + 217)
+// Help-Ids --------------------------------------------------------------
+#define HID_ALIGN_TBX (HID_SVX_START + 1)
+#define HID_AUTOCORR_HELP_END (HID_SVX_START + 2)
+#define HID_AUTOCORR_HELP_START (HID_SVX_START + 3)
+#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4)
+#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5)
+#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6)
+#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7)
+#define HID_CONTDLG_APPLY (HID_SVX_START + 8)
+#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9)
+#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10)
+#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11)
+#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12)
+#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13)
+#define HID_CONTDLG_POLY (HID_SVX_START + 14)
+#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15)
+#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16)
+#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17)
+#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18)
+#define HID_CONTDLG_RECT (HID_SVX_START + 19)
+#define HID_CONTDLG_REDO (HID_SVX_START + 20)
+#define HID_CONTDLG_SELECT (HID_SVX_START + 21)
+#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22)
+#define HID_CONTDLG_UNDO (HID_SVX_START + 23)
+#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24)
+#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25)
+#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26)
+#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27)
+#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28)
+#define HID_CTRL_COLOR (HID_SVX_START + 29)
+#define HID_DRAWTOOL_TBX (HID_SVX_START + 30)
+#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31)
+#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32)
+#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33)
+#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34)
+#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35)
+#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36)
+#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37)
+#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38)
+#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39)
+#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40)
+#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41)
+#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42)
+#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43)
+#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44)
+#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45)
+#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46)
+#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47)
+#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48)
+#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49)
+#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50)
+#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51)
+#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52)
+#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53)
+#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54)
+#define HID_FORMAT_FOOTER (HID_SVX_START + 55)
+#define HID_FORMAT_HEADER (HID_SVX_START + 56)
+// free
+#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58)
+#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59)
+#define HID_GALLERY_MN_ADD (HID_SVX_START + 60)
+#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61)
+#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62)
+#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63)
+#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64)
+#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65)
+#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66)
+#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67)
+#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68)
+#define HID_GALLERY_PREVIEW (HID_SVX_START + 69)
+#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70)
+#define HID_GALLERY_RENAME (HID_SVX_START + 71)
+#define HID_GALLERY_THEMELIST (HID_SVX_START + 72)
+// free
+#define HID_GALLERY_WINDOW (HID_SVX_START + 74)
+#define HID_GRFFILTER (HID_SVX_START + 75)
+#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76)
+#define HID_GRFFILTER_INVERT (HID_SVX_START + 77)
+#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78)
+#define HID_GRFFILTER_POPART (HID_SVX_START + 79)
+#define HID_GRFFILTER_POSTER (HID_SVX_START + 80)
+#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81)
+#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82)
+#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83)
+#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84)
+#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85)
+#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86)
+#define HID_HYPHENATE (HID_SVX_START + 87)
+#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88)
+#define HID_IMAPDLG_APPLY (HID_SVX_START + 89)
+#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90)
+#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91)
+#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92)
+#define HID_IMAPDLG_MACRO (HID_SVX_START + 93)
+#define HID_IMAPDLG_OPEN (HID_SVX_START + 94)
+#define HID_IMAPDLG_POLY (HID_SVX_START + 95)
+#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96)
+#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97)
+#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98)
+#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99)
+#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100)
+#define HID_IMAPDLG_RECT (HID_SVX_START + 101)
+#define HID_IMAPDLG_REDO (HID_SVX_START + 102)
+#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103)
+#define HID_IMAPDLG_SELECT (HID_SVX_START + 104)
+#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105)
+#define HID_IMAPDLG_UNDO (HID_SVX_START + 106)
+#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107)
+#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108)
+#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109)
+#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110)
+#define HID_MNU_FUNC_AVG (HID_SVX_START + 111)
+#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112)
+#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113)
+#define HID_MNU_FUNC_MAX (HID_SVX_START + 114)
+#define HID_MNU_FUNC_MIN (HID_SVX_START + 115)
+#define HID_MNU_FUNC_NONE (HID_SVX_START + 116)
+#define HID_MNU_FUNC_SUM (HID_SVX_START + 117)
+#define HID_MNU_ZOOM_100 (HID_SVX_START + 118)
+#define HID_MNU_ZOOM_150 (HID_SVX_START + 119)
+#define HID_MNU_ZOOM_200 (HID_SVX_START + 120)
+#define HID_MNU_ZOOM_50 (HID_SVX_START + 121)
+#define HID_MNU_ZOOM_75 (HID_SVX_START + 122)
+#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123)
+#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124)
+#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125)
+#define HID_OPTIONS_GRID (HID_SVX_START + 126)
+#define HID_PASSWORD (HID_SVX_START + 127)
+#define HID_POPUP_COLOR (HID_SVX_START + 128)
+#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129)
+#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130)
+#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131)
+#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132)
+#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133)
+#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134)
+#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135)
+#define HID_POPUP_FRAME (HID_SVX_START + 136)
+#define HID_POPUP_LINE (HID_SVX_START + 137)
+#define HID_POPUP_LINEEND (HID_SVX_START + 138)
+#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139)
+#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140)
+#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141)
+#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142)
+#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143)
+#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144)
+#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145)
+#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146)
+#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147)
+#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148)
+#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149)
+#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150)
+#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151)
+#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152)
+#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153)
+#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154)
+#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155)
+#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156)
+#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157)
+#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158)
+#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159)
+#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160)
+#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161)
+#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162)
+#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163)
+#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164)
+#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165)
+#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166)
+#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167)
+#define HID_RUBY_DIALOG (HID_SVX_START + 168)
+#define HID_STYLE_LISTBOX (HID_SVX_START + 169)
+#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170)
+#define HID_SVXTBX_DRAW (HID_SVX_START + 171)
+#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172)
+#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173)
+#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174)
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175)
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176)
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177)
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178)
+#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179)
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180)
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181)
+#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182)
+#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183)
+#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184)
+#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185)
+#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186)
+#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187)
+#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188)
+#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189)
+#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190)
+#define HID_THES_LANGUAGE (HID_SVX_START + 191)
+#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192)
+#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193)
+#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194)
+#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195)
+#define HID_XMLSEC_CALL (HID_SVX_START + 196)
+#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197)
+#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198)
+#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199)
+#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200)
+#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201)
+#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202)
+#define HID_AUTOCORR_DLG (HID_SVX_START + 203)
+#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204)
+#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205)
+#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206)
+#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207)
+#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208)
+#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209)
+#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210)
+#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211)
+#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212)
+#define HID_SVX_DLGTABNEW (HID_SVX_START + 213)
+#define HID_SVX_HYPERLINK (HID_SVX_START + 214)
+#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215)
+#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216)
+#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217)
+#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218)
+#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219)
+#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220)
+#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221)
+#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222)
+#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223)
+#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224)
+#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225)
+#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226)
+#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227)
+#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228)
+#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229)
+#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230)
+#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231)
+#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232)
+#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233)
+#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234)
+#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235)
+#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236)
+#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237)
+#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238)
+#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239)
+#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240)
+#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241)
+#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242)
+#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243)
+#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244)
+#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245)
+#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246)
+#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247)
// please adjust ACT_SVX_HID_END2 below if you add entries here!
@@ -826,15 +290,10 @@
// Overrun check ---------------------------------------------------------
// -----------------------------------------------------------------------
-#define ACT_SVX_HID_END HID_OPTIONS_ACCESSIBILITYCONFIG
+#define ACT_SVX_HID_END (HID_SVX_START+247)
#if ACT_SVX_HID_END > HID_SVX_END
#error Resource-Ueberlauf in #line, #file
#endif
-#define ACT_SVX_HID_END2 (HID_SVX_EXT0_START + 215)
-#if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
-#error resource overrun in #line, #file
-#endif
-
#endif
diff --git a/svx/inc/hlmarkwn_def.hxx b/svx/inc/hlmarkwn_def.hxx
deleted file mode 100644
index 11e283f1c8..0000000000
--- a/svx/inc/hlmarkwn_def.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: hlmarkwn_def.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_BKWND_HYPERLINK_DEF_HXX
-#define _SVX_BKWND_HYPERLINK_DEF_HXX
-
-#define LERR_NOERROR 0
-#define LERR_NOENTRIES 1
-#define LERR_DOCNOTOPEN 2
-
-#endif
-
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
index 70541df263..30f90f7c7b 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/hlnkitem.hxx
@@ -31,9 +31,9 @@
#define _SVX_HLNKITEM_HXX
#include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <sfx2/sfxsids.hrc>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
#include "svx/svxdllapi.h"
#define HYPERDLG_EVENT_MOUSEOVER_OBJECT 0x0001
diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx
index 785bddde20..98b114085d 100644
--- a/svx/inc/htmlcfg.hxx
+++ b/svx/inc/htmlcfg.hxx
@@ -61,7 +61,8 @@ public:
SvxHtmlOptions();
~SvxHtmlOptions();
- virtual void Commit();
+ virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
USHORT GetFontSize(USHORT nPos) const;
void SetFontSize(USHORT nPos, USHORT nSize);
diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx
index e3d3a5dfbb..bb13dfc0e4 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/linectrl.hxx
@@ -32,7 +32,7 @@
#include <svtools/valueset.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/mscodec.hxx b/svx/inc/mscodec.hxx
deleted file mode 100644
index b80a778f1c..0000000000
--- a/svx/inc/mscodec.hxx
+++ /dev/null
@@ -1,343 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: mscodec.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_MSCODEC_HXX
-#define SVX_MSCODEC_HXX
-
-#include "rtl/cipher.h"
-#include "rtl/digest.h"
-#include "svx/svxdllapi.h"
-
-namespace svx {
-
-// ============================================================================
-
-/** Encodes and decodes data from protected MSO 95- documents.
- */
-class SVX_DLLPUBLIC MSCodec_Xor95
-{
-public:
- explicit MSCodec_Xor95(int nRotateDistance);
- virtual ~MSCodec_Xor95();
-
- /** Initializes the algorithm with the specified password.
-
- @param pPassData
- Character array containing the password. Must be zero terminated,
- which results in a maximum length of 15 characters.
- */
- void InitKey( const sal_uInt8 pnPassData[ 16 ] );
-
- /** Verifies the validity of the password using the passed key and hash.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param nKey
- Password key value read from the file.
- @param nHash
- Password hash value read from the file.
-
- @return
- true = Test was successful.
- */
- bool VerifyKey( sal_uInt16 nKey, sal_uInt16 nHash ) const;
-
- /** Reinitializes the codec to start a new memory block.
-
- Resets the internal key offset to 0.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
- */
- void InitCipher();
-
- /** Decodes a block of memory inplace.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param pnData
- Encrypted data block. Will contain the decrypted data afterwards.
- @param nBytes
- Size of the passed data block.
- */
- virtual void Decode( sal_uInt8* pnData, sal_Size nBytes )=0;
-
- /** Lets the cipher skip a specific amount of bytes.
-
- This function sets the cipher to the same state as if the specified
- amount of data has been decoded with one or more calls of Decode().
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param nBytes
- Number of bytes to be skipped (cipher "seeks" forward).
- */
- 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.
-
-private:
- SVX_DLLPRIVATE MSCodec_Xor95( const MSCodec_Xor95& );
- SVX_DLLPRIVATE MSCodec_Xor95& operator=( const MSCodec_Xor95& );
-
- sal_uInt16 mnKey; /// Base key from password.
- sal_uInt16 mnHash; /// Hash value from password.
- int mnRotateDistance;
-};
-
-/** Encodes and decodes data from protected MSO XLS 95- documents.
- */
-class SVX_DLLPUBLIC MSCodec_XorXLS95 : public MSCodec_Xor95
-{
-public:
- explicit MSCodec_XorXLS95() : MSCodec_Xor95(2) {}
-
- /** Decodes a block of memory inplace.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param pnData
- Encrypted data block. Will contain the decrypted data afterwards.
- @param nBytes
- Size of the passed data block.
- */
- virtual void Decode( sal_uInt8* pnData, sal_Size nBytes );
-};
-
-/** Encodes and decodes data from protected MSO Word 95- documents.
- */
-class SVX_DLLPUBLIC MSCodec_XorWord95 : public MSCodec_Xor95
-{
-public:
- explicit MSCodec_XorWord95() : MSCodec_Xor95(7) {}
-
- /** Decodes a block of memory inplace.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param pnData
- Encrypted data block. Will contain the decrypted data afterwards.
- @param nBytes
- Size of the passed data block.
- */
- virtual void Decode( sal_uInt8* pnData, sal_Size nBytes );
-};
-
-
-// ============================================================================
-
-/** Encodes and decodes data from protected MSO 97+ documents.
-
- This is a wrapper class around low level cryptographic functions from RTL.
- Implementation is based on the wvDecrypt package by Caolan McNamara:
- http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html
- */
-class SVX_DLLPUBLIC MSCodec_Std97
-{
-public:
- explicit MSCodec_Std97();
- ~MSCodec_Std97();
-
- /** 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
- Unique document identifier read from or written to the file.
- */
- void InitKey(
- const sal_uInt16 pPassData[ 16 ],
- const sal_uInt8 pUnique[ 16 ] );
-
- /** Verifies the validity of the password using the passed salt data.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param pSaltData
- Salt data block read from the file.
- @param pSaltDigest
- Salt digest read from the file.
-
- @return
- true = Test was successful.
- */
- bool VerifyKey(
- const sal_uInt8 pSaltData[ 16 ],
- const sal_uInt8 pSaltDigest[ 16 ] );
-
- /** Rekeys the codec using the specified counter.
-
- After reading a specific amount of data the cipher algorithm needs to
- be rekeyed using a counter that counts the data blocks.
-
- The block size is for example 512 Bytes for Word files and 1024 Bytes
- for Excel files.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param nCounter
- Block counter used to rekey the cipher.
- */
- bool InitCipher( sal_uInt32 nCounter );
-
- /** Creates an MD5 digest of salt digest. */
- bool CreateSaltDigest(
- const sal_uInt8 nSaltData[16], sal_uInt8 nSaltDigest[16] );
-
- /** Encodes a block of memory.
-
- @see rtl_cipher_encode()
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used. The destination buffer must be able to take all
- unencoded data from the source buffer (usually this means it must be
- as long as or longer than the source buffer).
-
- @param pData
- Unencrypted source data block.
- @param nDatLen
- Size of the passed source data block.
- @param pBuffer
- Destination buffer for the encrypted data.
- @param nBufLen
- Size of the destination buffer.
-
- @return
- true = Encoding was successful (no error occured).
- */
- bool Encode(
- const void* pData, sal_Size nDatLen,
- sal_uInt8* pBuffer, sal_Size nBufLen );
-
- /** Decodes a block of memory.
-
- @see rtl_cipher_decode()
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used. The destination buffer must be able to take all
- encoded data from the source buffer (usually this means it must be
- as long as or longer than the source buffer).
-
- @param pData
- Encrypted source data block.
- @param nDatLen
- Size of the passed source data block.
- @param pBuffer
- Destination buffer for the decrypted data.
- @param nBufLen
- Size of the destination buffer.
-
- @return
- true = Decoding was successful (no error occured).
- */
- bool Decode(
- const void* pData, sal_Size nDatLen,
- sal_uInt8* pBuffer, sal_Size nBufLen );
-
- /** Lets the cipher skip a specific amount of bytes.
-
- This function sets the cipher to the same state as if the specified
- amount of data has been decoded with one or more calls of Decode().
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param nDatLen
- Number of bytes to be skipped (cipher "seeks" forward).
- */
- bool Skip( sal_Size nDatLen );
-
- /** Gets salt data and salt digest.
-
- @precond
- The codec must be initialized with InitKey() before this function
- can be used.
-
- @param pSalt
- Salt, a random number.
- @param pSaltData
- Salt data block generated from the salt.
- @param pSaltDigest
- Salt digest generated from the salt.
- */
- void GetEncryptKey (
- const sal_uInt8 pSalt[16],
- sal_uInt8 pSaltData[16],
- sal_uInt8 pSaltDigest[16]);
-
-private:
- void GetDigestFromSalt( const sal_uInt8 pSaltData[16], sal_uInt8 pDigest[16] );
-
-private:
- SVX_DLLPRIVATE MSCodec_Std97( const MSCodec_Std97& );
- SVX_DLLPRIVATE MSCodec_Std97& operator=( const MSCodec_Std97& );
-
- rtlCipher m_hCipher;
- rtlDigest m_hDigest;
- sal_uInt8 m_pDigestValue[ RTL_DIGEST_LENGTH_MD5 ];
-};
-
-// ============================================================================
-
-} // namespace svx
-
-#endif
-
diff --git a/svx/inc/msoleexp.hxx b/svx/inc/msoleexp.hxx
deleted file mode 100644
index 12ac521b87..0000000000
--- a/svx/inc/msoleexp.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: msoleexp.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _MSOLEEXP_HXX
-#define _MSOLEEXP_HXX
-
-#include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
-
-// for the CreateSdrOLEFromStorage we need the information, how we handle
-// convert able OLE-Objects - this ist stored in
-#define OLE_STARMATH_2_MATHTYPE 0x0001
-#define OLE_STARWRITER_2_WINWORD 0x0002
-#define OLE_STARCALC_2_EXCEL 0x0004
-#define OLE_STARIMPRESS_2_POWERPOINT 0x0008
-
-class SotStorage;
-
-#include <svtools/embedhlp.hxx>
-
-class SVX_DLLPUBLIC SvxMSExportOLEObjects
-{
- UINT32 nConvertFlags;
-public:
- SvxMSExportOLEObjects( UINT32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {}
-
- void SetFlags( UINT32 n ) { nConvertFlags = n; }
- 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 );
-};
-
-
-
-#endif
-
diff --git a/svx/inc/multipat.hrc b/svx/inc/multipat.hrc
deleted file mode 100644
index 67d0d8277a..0000000000
--- a/svx/inc/multipat.hrc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: multipat.hrc,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_MULTIPAT_HRC
-#define _SVX_MULTIPAT_HRC
-
-// defines ---------------------------------------------------------------
-
-#define FL_MULTIPATH 10
-#define LB_MULTIPATH 11
-#define LB_RADIOBUTTON 12
-#define FT_RADIOBUTTON 13
-#define BTN_ADD_MULTIPATH 14
-#define BTN_DEL_MULTIPATH 15
-#define BTN_MULTIPATH_OK 16
-#define BTN_MULTIPATH_CANCEL 17
-#define BTN_MULTIPATH_HELP 18
-#define STR_HEADER_PATHS 19
-
-#endif
-
diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx
index 57e48f6492..3b01a4c374 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/svx/inc/nlbkitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
// class SvxNoLinebreakItem ----------------------------------------------
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx
index 8be5742c6d..a16e3316b0 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/ofaitem.hxx
@@ -32,7 +32,7 @@
// include ----------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
// class OfaPtrItem ------------------------------------------------------
diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx
index 61bae7ff80..2d8241db3b 100644
--- a/svx/inc/opaqitem.hxx
+++ b/svx/inc/opaqitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
class SvXMLUnitConverter;
diff --git a/svx/inc/optaccessibility.hrc b/svx/inc/optaccessibility.hrc
deleted file mode 100644
index 447283ad30..0000000000
--- a/svx/inc/optaccessibility.hrc
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optaccessibility.hrc,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTACCESSIBILITY_HRC
-#define _SVX_OPTACCESSIBILITY_HRC
-
-#include <svtools/controldims.hrc>
-
-// defines for positions and sizes
-
-#define GB_WIDTH 248
-#define CB_WIDTH 240
-#define EDIT_WIDTH 25
-
-#define COL0 6
-#define COL1 (COL0+6)
-#define COL2 (COL1+10)
-#define COL3 (COL1+(CB_WIDTH * 2/3))
-#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X)
-
-#define UNIT_WIDTH (COL1+CB_WIDTH-COL4)
-
-#define ROWSPACE RSC_SP_CTRL_DESC_Y
-#define LINESPACE 1
-#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2
-#define ROWA_0 3
-#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE )
-#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-
-#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE )
-#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE )
-#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-
-#define WHOLE_HEIGHT 185
-#define LASTTEXT_HEIGHT (WHOLE_HEIGHT-ROWB_8)
-#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define DIFF(v1,v2) (v2-v1)
-#define SUM(v1,v2) (v2+v1)
-
-//
-
-#define FL_MISCELLANEOUS 1
-#define CB_PAGE_PREVIEWS 2
-#define FL_HC_OPTIONS 3
-#define CB_TIPHELP 4
-#define NF_TIPHELP 5
-#define FT_TIPHELP 6
-#define CB_ANIMATED_GRAPHICS 7
-#define CB_ANIMATED_TEXTS 8
-#define CB_AUTOMATIC_FONT_COLOR 9
-#define CB_SYSTEM_FONT 10
-#define CB_ACCESSIBILITY_TOOL 11
-#define CB_TEXTSELECTION 12
-#define CB_AUTO_DETECT_HC 13
-
-#endif
-
diff --git a/svx/inc/optasian.hrc b/svx/inc/optasian.hrc
deleted file mode 100644
index 7f52fbc683..0000000000
--- a/svx/inc/optasian.hrc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optasian.hrc,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTASIAN_HRC
-#define _SVX_OPTASIAN_HRC
-
-#define GB_KERNING 1
-#define RB_CHAR_KERNING 2
-#define RB_CHAR_PUNCT 3
-#define GB_CHAR_DIST 4
-#define RB_NO_COMP 5
-#define RB_PUNCT_COMP 6
-#define RB_PUNCT_KANA_COMP 7
-#define GB_START_END 8
-#define CB_STANDARD 9
-
-#define FT_LANGUAGE 11
-#define LB_LANGUAGE 12
-#define FT_START 13
-#define ED_START 14
-#define FT_END 15
-#define ED_END 16
-#define FT_HINT 17
-
-#endif
-
diff --git a/svx/inc/optcolor.hrc b/svx/inc/optcolor.hrc
deleted file mode 100644
index 53f9494005..0000000000
--- a/svx/inc/optcolor.hrc
+++ /dev/null
@@ -1,222 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optcolor.hrc,v $
- * $Revision: 1.8.196.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTCOLOR_HRC
-#define _SVX_OPTCOLOR_HRC
-
-//Color config page
-#define FL_COLORSCHEME 1
-#define FT_COLORSCHEME 2
-#define LB_COLORSCHEME 3
-#define PB_SAVESCHEME 4
-#define PB_DELETESCHEME 5
-#define FL_CUSTOMCOLORS 6
-#define CT_COLORCONFIG 7
-
-#define HB_HEADER 10
-#define VB_VSCROLL 11
-#define WN_SCROLL 12
-#define ST_ON 17
-#define ST_UIELEM 18
-#define ST_COLSET 19
-#define ST_PREVIEW 20
-
-#define FT_GENERAL 30
-#define FT_DOCCOLOR 31
-#define LB_DOCCOLOR 32
-#define WN_DOCCOLOR 33
-#define CB_DOCBOUND 34
-#define LB_DOCBOUND 35
-#define WN_DOCBOUND 36
-#define FT_APPBACKGROUND 37
-#define LB_APPBACKGROUND 38
-#define WN_APPBACKGROUND 39
-#define CB_OBJECTBOUNDARIES 40
-#define LB_OBJECTBOUNDARIES 41
-#define WN_OBJECTBOUNDARIES 42
-#define CB_TABLEBOUNDARIES 43
-#define LB_TABLEBOUNDARIES 44
-#define WN_TABLEBOUNDARIES 45
-#define FT_FONTCOLOR 46
-#define LB_FONTCOLOR 47
-#define WN_FONTCOLOR 48
-#define CB_LINKS 49
-#define LB_LINKS 50
-#define WN_LINKS 51
-#define CB_LINKSVISITED 52
-#define LB_LINKSVISITED 53
-#define WN_LINKSVISITED 54
-
-#define FT_SPELL 58
-#define LB_SPELL 59
-#define WN_SPELL 60
-
-#define FT_WRITER 61
-#define FT_WRITERTEXTGRID 62
-#define LB_WRITERTEXTGRID 63
-#define WN_WRITERTEXTGRID 64
-#define CB_WRITERFIELDSHADINGS 65
-#define LB_WRITERFIELDSHADINGS 66
-#define WN_WRITERFIELDSHADINGS 67
-#define CB_WRITERIDXSHADINGS 68
-#define LB_WRITERIDXSHADINGS 69
-#define WN_WRITERIDXSHADINGS 70
-#define LB_WRITERDIRECTCURSOR 71
-#define FT_WRITERDIRECTCURSOR 72
-#define WN_WRITERDIRECTCURSOR 73
-#define LB_WRITERSCRIPTINDICATOR 77
-#define FT_WRITERSCRIPTINDICATOR 78
-#define WN_WRITERSCRIPTINDICATOR 79
-#define LB_WRITERSECTIONBOUNDARIES 80
-#define CB_WRITERSECTIONBOUNDARIES 81
-#define WN_WRITERSECTIONBOUNDARIES 82
-#define LB_WRITERPAGEBREAKS 83
-#define FT_WRITERPAGEBREAKS 84
-#define WN_WRITERPAGEBREAKS 85
-
-#define FT_HTML 88
-#define FT_HTMLSGML 89
-#define LB_HTMLSGML 90
-#define WN_HTMLSGML 91
-#define FT_HTMLCOMMENT 92
-#define LB_HTMLCOMMENT 93
-#define WN_HTMLCOMMENT 94
-#define FT_HTMLKEYWORD 95
-#define LB_HTMLKEYWORD 96
-#define WN_HTMLKEYWORD 97
-#define FT_HTMLUNKNOWN 98
-#define LB_HTMLUNKNOWN 99
-#define WN_HTMLUNKNOWN 100
-
-#define FT_CALC 103
-#define FT_CALCGRID 104
-#define LB_CALCGRID 105
-#define WN_CALCGRID 106
-#define FT_CALCPAGEBREAK 107
-#define LB_CALCPAGEBREAK 108
-#define WN_CALCPAGEBREAK 109
-#define FT_CALCPAGEBREAKMANUAL 100
-#define LB_CALCPAGEBREAKMANUAL 101
-#define WN_CALCPAGEBREAKMANUAL 112
-#define FT_CALCPAGEBREAKAUTO 113
-#define LB_CALCPAGEBREAKAUTO 114
-#define WN_CALCPAGEBREAKAUTO 115
-#define FT_CALCDETECTIVE 116
-#define LB_CALCDETECTIVE 117
-#define WN_CALCDETECTIVE 118
-#define FT_CALCDETECTIVEERROR 119
-#define LB_CALCDETECTIVEERROR 120
-#define WN_CALCDETECTIVEERROR 121
-#define FT_CALCREFERENCE 122
-#define LB_CALCREFERENCE 123
-#define WN_CALCREFERENCE 124
-#define FT_CALCNOTESBACKGROUND 125
-#define LB_CALCNOTESBACKGROUND 126
-#define WN_CALCNOTESBACKGROUND 127
-#define FT_DRAW 128
-#define FT_DRAWGRID 132
-#define LB_DRAWGRID 133
-#define WN_DRAWGRID 134
-#define FT_BASICIDENTIFIER 141
-#define LB_BASICIDENTIFIER 142
-#define WN_BASICIDENTIFIER 143
-#define FT_BASICCOMMENT 144
-#define LB_BASICCOMMENT 145
-#define WN_BASICCOMMENT 146
-#define FT_BASICNUMBER 147
-#define LB_BASICNUMBER 148
-#define WN_BASICNUMBER 142
-#define FT_BASICSTRING 153
-#define LB_BASICSTRING 154
-#define WN_BASICSTRING 155
-#define FT_BASICOPERATOR 156
-#define LB_BASICOPERATOR 157
-#define WN_BASICOPERATOR 158
-#define FT_BASICKEYWORD 159
-#define LB_BASICKEYWORD 160
-#define WN_BASICKEYWORD 161
-#define FT_BASIC 162
-#define FT_BASICERROR 163
-#define LB_BASICERROR 164
-#define WN_BASICERROR 165
-
-#define FT_SQL_COMMAND 173
-#define FT_SQLIDENTIFIER 174
-#define LB_SQLIDENTIFIER 175
-#define WN_SQLIDENTIFIER 176
-#define FT_SQLNUMBER 177
-#define LB_SQLNUMBER 178
-#define WN_SQLNUMBER 179
-#define FT_SQLSTRING 180
-#define LB_SQLSTRING 181
-#define WN_SQLSTRING 182
-#define FT_SQLOPERATOR 183
-#define LB_SQLOPERATOR 184
-#define WN_SQLOPERATOR 185
-#define FT_SQLKEYWORD 186
-#define LB_SQLKEYWORD 187
-#define WN_SQLKEYWORD 188
-#define FT_SQLPARAMETER 189
-#define LB_SQLPARAMETER 190
-#define WN_SQLPARAMETER 191
-#define FT_SQLCOMMENT 192
-#define LB_SQLCOMMENT 193
-#define WN_SQLCOMMENT 194
-
-#define ST_EXTENSION 166
-
-
-
-#define _FT_WIDTH 120
-#define _LINE_HEIGHT 15
-#define _FT_HEIGHT 10
-#define _CB_WIDTH 130
-#define _FT_XPOS 14
-#define _CB_XPOS 6
-#define _LB_XPOS 139
-#define _LB_WIDTH 50
-#define _LB_HEIGHT 50
-#define _WN_WIDTH 30
-#define _WN_HEIGHT 12
-#define _WN_XPOS 195
-
-#define FT_SMARTTAGS 168
-#define LB_SMARTTAGS 169
-#define WN_SMARTTAGS 170
-
-#define ST_SPELL_CHECK_HIGHLIGHTING 171
-#define ST_GRAMMAR_CHECK_HIGHLIGHTING 172
-
-
-#endif
-
-
-
-
-
diff --git a/svx/inc/optctl.hrc b/svx/inc/optctl.hrc
deleted file mode 100644
index b85b008256..0000000000
--- a/svx/inc/optctl.hrc
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optctl.hrc,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTCTL_HRC
-#define _SVX_OPTCTL_HRC
-
-#include <svtools/controldims.hrc>
-
-#define FL_SEQUENCECHECKING 10
-#define CB_SEQUENCECHECKING 11
-#define CB_RESTRICTED 12
-#define CB_TYPE_REPLACE 13
-
-#define FL_CURSORCONTROL 20
-#define FT_MOVEMENT 21
-#define RB_MOVEMENT_LOGICAL 22
-#define RB_MOVEMENT_VISUAL 23
-
-#define FL_GENERAL 30
-#define FT_NUMERALS 31
-#define LB_NUMERALS 32
-
-#define EXTRA_SPACE_Y 16
-#define ROW_0 (RSC_SP_TBPG_INNERBORDER_TOP)
-#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_2 (ROW_1+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
-#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_5 (ROW_4+(RSC_CD_RADIOBUTTON_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define ROW_6 (ROW_5+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_Y+EXTRA_SPACE_Y)
-#define ROW_7 (ROW_6+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_8 (ROW_7+(RSC_CD_DROPDOWN_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-
-#endif // #ifndef _SVX_OPTCTL_HRC
-
diff --git a/svx/inc/optgenrl.hrc b/svx/inc/optgenrl.hrc
deleted file mode 100644
index 898b66b520..0000000000
--- a/svx/inc/optgenrl.hrc
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optgenrl.hrc,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTGENRL_HRC
-#define _SVX_OPTGENRL_HRC
-
-// defines ------------------------------------------------------------------
-
-#define FT_COMPANY 10
-#define ED_COMPANY 11
-#define FT_NAME 12
-#define FT_NAME_RUSS 13
-#define ED_FATHERNAME 14
-#define ED_FIRSTNAME 15
-#define ED_NAME 16
-#define ED_SHORTNAME 17
-#define FT_STREET 18
-#define FT_STREET_RUSS 19
-#define ED_STREET 20
-#define ED_APARTMENTNR 21
-#define FT_CITY 22
-#define ED_PLZ 23
-#define ED_CITY 24
-#define ED_US_CITY 25
-#define ED_US_STATE 26
-#define ED_US_ZIPCODE 27
-#define FT_COUNTRY 28
-#define ED_COUNTRY 29
-#define FT_TITLEPOS 30
-#define ED_TITLE 31
-#define ED_POSITION 32
-#define FT_PHONE 33
-#define ED_TELPRIVAT 34
-#define ED_TELCOMPANY 35
-#define FT_FAXMAIL 36
-#define ED_FAX 37
-#define ED_EMAIL 38
-#define GB_ADDRESS 39
-#define CB_USEDATA 40
-#define FT_NAME_EASTERN 41
-
-#define STR_US_STATE 10
-#define STR_QUERY_REG 11
-
-// Positionierungshilfen f"ur den Dialog
-
-#define HSPACE 2
-#define VSPACE 3
-#define LINEH 12
-#define FLINEH 8
-#define LEFT 12
-#define MID 100
-#define RIGHT 248
-#define TOP 10
-#define LINE(y) (14+y*15)
-#define FLINE(y) (16+y*15)
-#define NAMELEN 74
-
-#endif // #ifndef _SVX_OPTGENRL_HRC
-
-// ******************************************************************* EOF
-
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index c219a9e542..fb17b4b5c8 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#include <sfx2/tabdlg.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
diff --git a/svx/inc/optimprove.hrc b/svx/inc/optimprove.hrc
deleted file mode 100644
index 919b01c6fb..0000000000
--- a/svx/inc/optimprove.hrc
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optimprove.hrc,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTIMPROVE_HRC
-#define _SVX_OPTIMPROVE_HRC
-
-// defines ---------------------------------------------------------------
-
-#define FL_IMPROVE 10
-#define FT_INVITATION 11
-#define RB_YES 12
-#define RB_NO 13
-#define FL_DATA 14
-#define FT_NR_REPORTS 15
-#define FT_NR_REPORTS_VALUE 16
-#define FT_NR_ACTIONS 17
-#define FT_NR_ACTIONS_VALUE 18
-#define PB_SHOWDATA 19
-#define FI_INFO 20
-#define WIN_INFO 21
-#define BTN_OK 22
-
-#define STR_INFO 10
-#define STR_MOREINFO 11
-
-#endif
-
diff --git a/svx/inc/optinet2.hrc b/svx/inc/optinet2.hrc
deleted file mode 100644
index aa2442eb05..0000000000
--- a/svx/inc/optinet2.hrc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optinet2.hrc,v $
- * $Revision: 1.11 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTINET_HRC
-#define _SVX_OPTINET_HRC
-
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include <svtools/controldims.hrc>
-#endif
-
-// Proxy ------------------------------------------------------------------
-#define GB_SETTINGS 1
-#define FT_PROXYMODE 2
-#define LB_PROXYMODE 2
-#define FT_HTTP_PROXY 3
-#define ED_HTTP_PROXY 3
-#define FT_HTTP_PORT 4
-#define ED_HTTP_PORT 4
-#define FT_FTP_PROXY 5
-#define ED_FTP_PROXY 5
-#define FT_FTP_PORT 6
-#define ED_FTP_PORT 6
-#define FT_SOCKS_PROXY 7
-#define ED_SOCKS_PROXY 7
-#define FT_SOCKS_PORT 8
-#define ED_SOCKS_PORT 8
-#define FT_NOPROXYFOR 11
-#define ED_NOPROXYFOR 11
-#define ED_NOPROXYDESC 12
-#define ST_PROXY_FROM_BROWSER 13
-#define FT_HTTPS_PROXY 14
-#define ED_HTTPS_PROXY 14
-#define FT_HTTPS_PORT 15
-#define ED_HTTPS_PORT 15
-
-// Search ------------------------------------------------------------------
-#define GB_SEARCH 40
-#define LB_SEARCH 40
-#define FT_SEARCH_NAME 41
-#define ED_SEARCH_NAME 41
-#define FT_SEARCH 42
-#define RB_AND 43
-#define RB_OR 44
-#define RB_EXACT 45
-#define FT_URL 46
-#define ED_URL 46
-#define FT_POSTFIX 47
-#define ED_POSTFIX 47
-#define FT_SEPARATOR 48
-#define ED_SEPARATOR 48
-#define FT_CASE 49
-#define ED_CASE 49
-#define PB_CHANGE 53
-#define PB_DELETE 54
-#define PB_ADD 55
-#define PB_NEW 56
-#define MSG_MODIFY 57
-
-// Protocols --------------------------------------------------------------
-#define GB_DNS 105
-#define RB_DNS_AUTO 106
-#define RB_DNS_MANUAL 107
-#define ED_DNS 107
-
-#define ST_MSG_255_0 111
-#define ST_MSG_255_1 112
-
-// Site Certificate --------------------------------------------------------
-#define GB_SITECERT 120
-#define LB_SITECERT 121
-#define LB_FILTERCERT 122
-#define PB_EDIT_CERT 123
-#define PB_DELETE_CERT 124
-
-// personal Certificate ----------------------------------------------------
-#define GB_PERSCERT 130
-#define LB_PERSCERT 131
-#define PB_NEW_PERSCERT 132
-#define PB_INFO_PERSCERT 133
-#define PB_DELETE_PERSCERT 134
-
-// Security -------------------------------------------------------------
-
-#define FL_SEC_SECURITYOPTIONS 10
-#define FI_SEC_SECURITYOPTIONS 11
-#define PB_SEC_SECURITYOPTIONS 12
-#define FL_SEC_PASSWORDS 13
-#define CB_SEC_SAVEPASSWORDS 14
-#define PB_SEC_CONNECTIONS 15
-#define CB_SEC_MASTERPASSWORD 16
-#define FI_SEC_MASTERPASSWORD 17
-#define PB_SEC_MASTERPASSWORD 18
-#define FL_SEC_MACROSEC 19
-#define FI_SEC_MACROSEC 20
-#define PB_SEC_MACROSEC 21
-#define FL_SEC_FILESHARING 22
-#define CB_SEC_RECOMMREADONLY 23
-#define CB_SEC_RECORDCHANGES 24
-#define PB_SEC_PROTRECORDS 25
-
-#define STR_SEC_PROTRECORDS 10
-#define STR_SEC_UNPROTRECORDS 11
-#define STR_SEC_NOPASSWDSAVE 12
-
-#define TP_WIDTH 260
-#define TP_HEIGHT 185
-#define OFFS_BUTTON_Y (-6)
-#define BORDER_OFFSET 8
-#define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define COL_1 (COL_0+RSC_SP_FLGR_SPACE_X)
-#define COL_1a (COL_1+RSC_SP_CHK_TEXTINDENT)
-#define COL_4 (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define COL_3 (COL_4-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_2 (COL_3-RSC_SP_CTRL_DESC_X)
-
-#define ROW_0 (RSC_SP_FLGR_INNERBORDER_TOP)
-#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2 (ROW_1+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2a (ROW_2-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_3 (ROW_2+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y-1)
-#define ROW_4a (ROW_4+RSC_CD_CHECKBOX_HEIGHT+1)
-#define ROW_5 (ROW_4a+4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_6 (ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_7 (ROW_6+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_8 (ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9 (ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
-
-// Defines - JavaScriptDisableQueryBox_Impl -------------------------------
-
-#define IMG_JSCPT_WARNING 220
-#define FT_JSCPT_WARNING 221
-#define CB_JSCPT_DISABLE 222
-#define GB_JSCPT_WARNING 223
-#define BTN_JSCPT_YES 224
-#define BTN_JSCPT_NO 225
-
-// Defines - SvxEMailTabPage_Impl
-#define FL_MAIL 1
-#define FT_MAILERURL 2
-#define FI_MAILERURL 3
-#define ED_MAILERURL 4
-#define PB_MAILERURL 5
-#define STR_DEFAULT_FILENAME 6
-
-#endif // #ifndef _SVX_OPTINET_HRC
-
-// ******************************************************************* EOF
-
diff --git a/svx/inc/optitems.hxx b/svx/inc/optitems.hxx
index 4d6b6a0040..0d55fa4638 100644
--- a/svx/inc/optitems.hxx
+++ b/svx/inc/optitems.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/optjsearch.hrc b/svx/inc/optjsearch.hrc
deleted file mode 100644
index 7f5765a4b3..0000000000
--- a/svx/inc/optjsearch.hrc
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optjsearch.hrc,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define FL_TREAT_AS_EQUAL 100
-#define CB_MATCH_CASE 101
-#define CB_MATCH_FULL_HALF_WIDTH 102
-#define CB_MATCH_HIRAGANA_KATAKANA 103
-#define CB_MATCH_CONTRACTIONS 104
-#define CB_MATCH_MINUS_DASH_CHOON 105
-#define CB_MATCH_REPEAT_CHAR_MARKS 106
-#define CB_MATCH_VARIANT_FORM_KANJI 107
-#define CB_MATCH_OLD_KANA_FORMS 108
-#define CB_MATCH_DIZI_DUZU 109
-#define CB_MATCH_BAVA_HAFA 110
-#define CB_MATCH_TSITHICHI_DHIZI 111
-#define CB_MATCH_HYUFYU_BYUVYU 112
-#define CB_MATCH_SESHE_ZEJE 113
-#define CB_MATCH_IAIYA 114
-#define CB_MATCH_KIKU 115
-
-#define FL_IGNORE 200
-#define CB_IGNORE_PUNCTUATION 201
-#define CB_IGNORE_WHITESPACES 202
-#define CB_MATCH_PROLONGED_SOUNDMARK 203
-#define CB_IGNORE_MIDDLE_DOT 204
-
diff --git a/svx/inc/optpath.hrc b/svx/inc/optpath.hrc
deleted file mode 100644
index 8dcb7df10d..0000000000
--- a/svx/inc/optpath.hrc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optpath.hrc,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTPATH_HRC
-#define _SVX_OPTPATH_HRC
-
-// defines ---------------------------------------------------------------
-
-#define FT_TYPE 10
-#define FT_PATH 11
-#define LB_PATH 12
-#define BTN_PATH 13
-#define BTN_STANDARD 14
-#define GB_STD 15
-#define IMG_LOCK 16
-#define IMG_LOCK_HC 17
-#define STR_MULTIPATHDLG 18
-
-#endif
-
diff --git a/svx/inc/optsave.hrc b/svx/inc/optsave.hrc
deleted file mode 100644
index 10fe7e584a..0000000000
--- a/svx/inc/optsave.hrc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optsave.hrc,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_OPTSAVE_HRC
-#define _SVX_OPTSAVE_HRC
-
-// defines ------------------------------------------------------------------
-
-#define LB_LOAD 10
-#define CB_LOAD_SETTINGS 11
-#define CB_LOAD_DOCPRINTER 12
-#define GB_SAVE 13
-#define BTN_DOCINFO 14
-#define BTN_BACKUP 15
-#define BTN_AUTOSAVE 16
-#define ED_AUTOSAVE 17
-#define FT_MINUTE 18
-#define BTN_AUTOSAVEPROMPT 19
-#define BTN_NOPRETTYPRINTING 20
-#define FI_BACKUP 21
-#define BTN_WARNALIENFORMAT 22
-#define FT_ODF_VERSION 23
-#define LB_ODF_VERSION 24
-
-#define GB_RELATIVE 40
-#define BTN_RELATIVE_FSYS 41
-#define BTN_RELATIVE_INET 42
-
-#define FL_FILTER 43
-#define FT_APP 44
-#define LB_APP 45
-#define FT_FILTER 46
-#define LB_FILTER 47
-#define FI_FILTER 48
-#define FT_WARN 49
-#define FI_ODF_WARNING 50
-
-#define IMG_ODF_WARNING 1
-#define IMG_ODF_WARNING_HC 2
-
-#define APP_WRITER 0
-#define APP_WRITER_WEB 1
-#define APP_WRITER_GLOBAL 2
-#define APP_CALC 3
-#define APP_IMPRESS 4
-#define APP_DRAW 5
-#define APP_MATH 6
-#define APP_COUNT 7
-
-//Filter warning
-#define PB_OK 1
-#define FT_FILTER_WARNING 2
-#define CB_DONT_SHOW_AGAIN 3
-#define IMG_WARNING 4
-#define PB_CANCEL 5
-
-#endif // #ifndef _SVX_OPTSAVE_HRC
-
diff --git a/svx/inc/optspell.hrc b/svx/inc/optspell.hrc
deleted file mode 100644
index ad38af0d87..0000000000
--- a/svx/inc/optspell.hrc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: optspell.hrc,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// defines ---------------------------------------------------------------
-
-#define BTN_OK 10
-#define BTN_CANCEL 11
-#define BTN_BOOK 12
-
-#define LB_BOOK 20
-#define GB_BOOK 21
-
-#define BTN_CAPS 30
-#define BTN_NUMS 31
-#define BTN_UPLOW 32
-#define GB_AUDIT 33
-
-
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index b5a092b87e..fe96105025 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -753,29 +753,29 @@
#include <vector>
#include "svtools/FilterConfigItem.hxx"
#include "svtools/accessibilityoptions.hxx"
-#include "svtools/adrparse.hxx"
+#include "svl/adrparse.hxx"
#include "svtools/apearcfg.hxx"
-#include "svtools/brdcst.hxx"
-#include "svtools/cacheoptions.hxx"
-#include "svtools/cancel.hxx"
-#include "svtools/cjkoptions.hxx"
-#include "svtools/cmdoptions.hxx"
-#include "svtools/cntwall.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
#include "svtools/colorcfg.hxx"
-#include "svtools/ctloptions.hxx"
-#include "svtools/defaultoptions.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
#include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
-#include "svtools/eventcfg.hxx"
-#include "svtools/extendedsecurityoptions.hxx"
-#include "svtools/filenotation.hxx"
-#include "svtools/flagitem.hxx"
-#include "svtools/fltrcfg.hxx"
-#include "svtools/fontoptions.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
#include "svtools/fontsubstconfig.hxx"
#include "svtools/helpopt.hxx"
-#include "svtools/hint.hxx"
+#include "svl/hint.hxx"
#include "svtools/htmlkywd.hxx"
#include "svtools/htmltokn.h"
#include "svtools/imagemgr.hxx"
@@ -784,70 +784,70 @@
#include "svtools/imappoly.hxx"
#include "svtools/imaprect.hxx"
#include "svtools/inetimg.hxx"
-#include "svtools/inetoptions.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/javaoptions.hxx"
-#include "svtools/languageoptions.hxx"
-#include "svtools/lingucfg.hxx"
-#include "svtools/linguprops.hxx"
-#include "svtools/lngmisc.hxx"
+#include "unotools/inetoptions.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
#include "svtools/localresaccess.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/macitem.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
#include "svtools/menuoptions.hxx"
-#include "svtools/metitem.hxx"
-#include "svtools/misccfg.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
#include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/optionsdlg.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
#include "svtools/parhtml.hxx"
#include "svtools/parrtf.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/pickerhelper.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/printwarningoptions.hxx"
-#include "svtools/ptitem.hxx"
-#include "svtools/rectitem.hxx"
-#include "svtools/rngitem.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
#include "svtools/rtfkeywd.hxx"
#include "svtools/rtfout.hxx"
#include "svtools/rtftoken.h"
-#include "svtools/saveopt.hxx"
-#include "svtools/searchopt.hxx"
-#include "svtools/securityoptions.hxx"
-#include "svtools/sfontitm.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
#include "svtools/soerr.hxx"
-#include "svtools/sourceviewconfig.hxx"
-#include "svtools/startoptions.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
#include "svtools/stdmenu.hxx"
#include "svtools/stringtransfer.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svstdarr.hxx"
-#include "svtools/syslocaleoptions.hxx"
-#include "svtools/szitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
#include "svtools/textdata.hxx"
#include "svtools/transfer.hxx"
#include "svtools/txtcmp.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/undoopt.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
#include "svtools/unoevent.hxx"
#include "svtools/unoimap.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
-#include "svtools/useroptions.hxx"
-#include "svtools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
#include "sys/stat.h"
#include "sys/types.h"
#include "toolkit/awt/vclxdevice.hxx"
@@ -927,7 +927,7 @@
#include "vcl/dndhelp.hxx"
#include "vcl/fldunit.hxx"
#include "vcl/fntstyle.hxx"
-#include "vcl/fontcvt.hxx"
+#include "unotools/fontcvt.hxx"
#include "vcl/gdimtf.hxx"
#include "vcl/help.hxx"
#include "vcl/image.hxx"
diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx
index f0a15bc7f3..c6871a7e16 100644
--- a/svx/inc/pgrditem.hxx
+++ b/svx/inc/pgrditem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
// class SvxParaGridItem -------------------------------------------------
diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx
index 7771e5ba73..0b1cf0c12f 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/postattr.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include "svx/svxdllapi.h"
// class SvxPostItAuthorItem ---------------------------------------------
diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx
index 8f510cf8ba..ab94837ffe 100644
--- a/svx/inc/prntitem.hxx
+++ b/svx/inc/prntitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx
index fc8ddbab23..4a9b3e3765 100644
--- a/svx/inc/protitem.hxx
+++ b/svx/inc/protitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
class SvXMLUnitConverter;
diff --git a/svx/inc/radiobtnbox.hxx b/svx/inc/radiobtnbox.hxx
deleted file mode 100644
index 27e041b985..0000000000
--- a/svx/inc/radiobtnbox.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: radiobtnbox.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_RADIOBTNBOX_HXX
-#define _SVX_RADIOBTNBOX_HXX
-
-// include ---------------------------------------------------------------
-
-#include <svx/simptabl.hxx>
-#include "svx/svxdllapi.h"
-
-namespace svx {
-
-// class SvxRadioButtonListBox -------------------------------------------
-
-class SVX_DLLPUBLIC SvxRadioButtonListBox : public SvxSimpleTable
-{
- using SvxSimpleTable::SetTabs;
-
-private:
- Point m_aCurMousePoint;
-
-protected:
- virtual void SetTabs();
- virtual void MouseButtonUp( const MouseEvent& _rMEvt );
- virtual void KeyInput( const KeyEvent& rKEvt );
-
-public:
- SvxRadioButtonListBox( Window* _pParent, const ResId& _rId );
- ~SvxRadioButtonListBox();
-
- void HandleEntryChecked( SvLBoxEntry* _pEntry );
-
- const Point& GetCurMousePoint() const;
-};
-
-} // end of namespace ::svx
-
-#endif // #ifndef _SVX_RADIOBTNBOX_HXX
-
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
index 6314e3ba00..1fc02c558d 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/rotmodit.hxx
@@ -31,7 +31,7 @@
#ifndef _SVX_ROTMODIT_HXX
#define _SVX_ROTMODIT_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include "svx/svxdllapi.h"
//----------------------------------------------------------------------------
diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
index 7237316d4f..b9186a61db 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/rulritem.hxx
@@ -34,7 +34,7 @@
#include <tools/gen.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
// class SvxLongLRSpaceItem ----------------------------------------------
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index 1df6e3da9f..411d2f941e 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -57,9 +57,9 @@
#endif
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <sfx2/srchdefs.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
index cdfa4dadad..cdfa4dadad 100755
--- a/svx/inc/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index 51400570db..05b44e3a8a 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx
index 818c3c8596..f82c492c46 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/svx/inc/svx/adjitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#ifndef _SVX_SVXIDS_HRC
diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx
index 54e7785b81..059f301efe 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/svx/inc/svx/akrnitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index 81473875b4..c2644b9bce 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -33,8 +33,8 @@
// include ---------------------------------------------------------------
#include <svx/svxids.hrc>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx
index 37430bc883..7f5d7bb7f5 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/svx/inc/svx/blnkitem.hxx
@@ -32,8 +32,8 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx
index 2337c66f79..1e117d040f 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/svx/inc/svx/borderline.hxx
@@ -32,7 +32,7 @@
#define SVX_BORDERLINE_HXX
#include <tools/color.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
// Line defaults in twips (former Writer defaults):
diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx
index 82736c7410..a4ad27dc6f 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/svx/inc/svx/boxitem.hxx
@@ -30,7 +30,7 @@
#ifndef _SVX_BOXITEM_HXX
#define _SVX_BOXITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <svx/borderline.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx
index 30fd5ea1a7..eaa800a899 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/svx/inc/svx/brkitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx
index baf4b12ff5..901c489a34 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/svx/inc/svx/brshitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx
index b23e3c6c15..0d5a901f7e 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/svx/inc/svx/charreliefitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <vcl/fntstyle.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx
index d81fbf6567..67933f26b2 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/svx/inc/svx/charrotateitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx
index 9a635dac25..36a7f38f7b 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/svx/inc/svx/charscaleitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#ifndef _SFXENUMITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx
index 76179a11bc..625ec28ca5 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/svx/inc/svx/cmapitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx
index fc8e5d19bc..fa9bc7da76 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/svx/inc/svx/cntritem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 08b80f77d5..bcc09258b0 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -34,7 +34,7 @@
#include <sfx2/childwin.hxx>
#include <svtools/valueset.hxx>
#include <svtools/transfer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include "svx/svxdllapi.h"
class XColorTable;
diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx
index b8d300e14a..da04d2120f 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/svx/inc/svx/colritem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx
index 4ee7fdb7dc..caa835b89a 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/svx/inc/svx/crsditem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#include <vcl/vclenum.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 08652fad52..b87d987b2d 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -40,39 +40,141 @@
// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
#define RID_SVX_FIRSTFREE 305
-// ResId fuer die Hintergrund-TabPage
-#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1)
-
-// ResId fuer die Tabulator-TabPage
-#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2)
+// some strings also used in CUI
+#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145)
+#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149)
+#define RID_SVXERRCTX (RID_SVX_START + 351)
+#define RID_SVXSTR_COLOR (RID_SVX_START + 179)
+#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190)
+#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841)
+#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178)
+#define RID_SVXSTR_NONE (RID_SVX_START + 183)
+#define RID_SVXSTR_SOLID (RID_SVX_START + 160)
+#define RID_SVXSTR_LINEEND (RID_SVX_START + 237)
+#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161)
+#define RID_SVXSTR_HATCH (RID_SVX_START + 180)
+#define RID_SVXSTR_BITMAP (RID_SVX_START + 167)
+#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173)
+#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311)
+#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250)
-// ResId's fuer die Zeichen-TabPages
-#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3)
-#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4)
-// new char pages
+// factory IDs of tabpages implemented in CUI
+#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242)
+#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7)
+#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238)
#define RID_SVXPAGE_CHAR_NAME (RID_SVX_START + 239)
#define RID_SVXPAGE_CHAR_EFFECTS (RID_SVX_START + 240)
#define RID_SVXPAGE_CHAR_POSITION (RID_SVX_START + 241)
-#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242)
-
-// ResId fuer die Umrahmung-TabPage
+#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6)
+#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187)
+#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245)
+#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2)
+#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123)
+#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41)
+#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90)
#define RID_SVXPAGE_BORDER (RID_SVX_START + 5)
+#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1)
+#define RID_SVXPAGE_PAGE (RID_SVX_START + 25)
+#define RID_SVXPAGE_LINE (RID_SVX_START + 51)
+#define RID_SVXPAGE_AREA (RID_SVX_START + 56)
+#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61)
+#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54)
+#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153)
+#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184)
+#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161)
+#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191)
+#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52)
+#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53)
+#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219)
+#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220)
+#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215)
+#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216)
+#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217)
+#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218)
+#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150)
+#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288)
+#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87)
+#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303)
+#define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
+#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
+#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
+#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48)
+#define RID_SVXPAGE_SLANT (RID_SVX_START + 49)
+#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236)
+#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302)
+#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296)
-// ResId's fuer die Absatz-TabPages
-#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6)
-#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187)
-#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7)
+
+// why extra defines for pages that already exist?
+#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998)
+#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999)
+
+// ID of tabpages implemented in SVX, but used in CUI
+#define RID_SVXPAGE_GRID (RID_SVX_START + 152)
+
+// factory IDs of dialogs implemented in CUI
+#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334)
+#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335)
+#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332)
+#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333)
+#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336)
+#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21)
+#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 )
+#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 )
+
+// only needed for layout:
+#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 )
+
+// IDs of options pages of applications
+#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102)
+#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247)
+#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251)
+#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214)
+#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206)
+#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211)
+#define RID_SW_TP_STD_FONT (RID_OFA_START + 208)
+#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209)
+#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210)
+#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212)
+#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
+#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240)
+#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242)
+#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243)
+#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244)
+#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246)
+#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217)
+#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256)
+#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
+#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
+#define SID_SC_TP_INPUT (RID_OFA_START + 220)
+#define SID_SC_TP_GRID (RID_OFA_START + 221)
+#define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
+#define SID_SC_TP_CALC (RID_OFA_START + 223)
+#define SID_SC_TP_CHANGES (RID_OFA_START + 224)
+#define RID_SC_TP_PRINT (RID_OFA_START + 248)
+#define SID_SI_TP_PRINT (RID_OFA_START + 236)
+#define SID_SI_TP_CONTENTS (RID_OFA_START + 232)
+#define SID_SI_TP_SNAP (RID_OFA_START + 234)
+#define SID_SI_TP_MISC (RID_OFA_START + 237)
+#define SID_SD_TP_PRINT (RID_OFA_START + 220)
+#define SID_SD_TP_CONTENTS (RID_OFA_START + 225)
+#define SID_SD_TP_SNAP (RID_OFA_START + 227)
+#define SID_SD_TP_MISC (RID_OFA_START + 231)
+#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253)
+#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254)
+#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc
+
+//---------------------------------------------------------------------
+// ResId's fuer die Zeichen-TabPages
+#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3)
+#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4)
// moved ids +8 ... +17 to "ModalDialog" resource ids
// ResId fuer den Suchen/Ersetzen-Dialog
#define RID_SVXDLG_SEARCH (RID_SVX_START + 20)
-#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21)
-#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
-#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23)
// ResId fuer die PageDialog
-#define RID_SVXPAGE_PAGE (RID_SVX_START + 25)
#define RID_SVXPAGE_FOOTER (RID_SVX_START + 26)
#define RID_SVXPAGE_HEADER (RID_SVX_START + 27)
#define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28)
@@ -81,7 +183,6 @@
#define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30)
#define RID_SVXDLG_THESAURUS (RID_SVX_START + 31)
#define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38)
-#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32)
// ResIds fuer HM-QueryBoxen und Error-Strings
#define RID_SVXQB_THESAURUS (RID_SVX_START + 33)
@@ -92,49 +193,14 @@
// + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE
#define RID_SVXQB_BW_CONTINUE (RID_SVX_START + 39)
-// ResId fuer den BB-Dialog
-#define RID_SVXDLG_BBDLG (RID_SVX_START + 40)
-
-// ResId fuer die Zahlenformate-Page
-#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41)
-
// ResId's fuer Dialoge aus StarDraw
-#define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45)
#define RID_SVXPAGE_POSITION (RID_SVX_START + 46)
#define RID_SVXPAGE_SIZE (RID_SVX_START + 47)
-#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87)
-#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288)
#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289)
-#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48)
-#define RID_SVXPAGE_SLANT (RID_SVX_START + 49)
-
-#define RID_SVXDLG_LINE (RID_SVX_START + 50)
-#define RID_SVXPAGE_LINE (RID_SVX_START + 51)
-#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52)
-#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53)
-
-#define RID_SVXDLG_AREA (RID_SVX_START + 55)
-#define RID_SVXPAGE_AREA (RID_SVX_START + 56)
-#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54)
-#define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
-#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
-#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
-#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
-#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61)
-
-#define RID_SVXDLG_NAME (RID_SVX_START + 62)
-#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63)
-
-// #i68101#
-#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64)
-
#define RID_SVXIL_FRAME (RID_SVX_START + 65)
#define RID_SVXIL_FRAME_HC (RID_SVX_START + 66)
-// #i68101#
-#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67)
-
#define RID_SVXDLG_3D (RID_SVX_START + 70)
#define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71)
#define RID_SVXPAGE_3DATTR (RID_SVX_START + 72)
@@ -192,9 +258,6 @@
#define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71)
#define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72)
-// Alignment-TabPage
-#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90)
-
// Resource mit Bitmaps fuer die CheckListBox
#define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91)
@@ -224,8 +287,6 @@
#define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 113)
#define RID_SVXCTRL_COLOR (RID_SVX_START + 117)
-#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
-#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119)
// fuer ToolboxControl-Style
#define RID_SVXTBX_STYLE (RID_SVX_START + 120)
@@ -233,39 +294,12 @@
#define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
#define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
-// Dialog bzw TabPage fuer Labelobjekte
-#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150)
-#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
-
-//ResId fuer TabPage Raster
-#define RID_SVXPAGE_GRID (RID_SVX_START + 152)
-
-// ResId fuer TextAttribut-Dialog
-#define RID_SVXDLG_TEXT (RID_SVX_START + 183)
-#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153)
-#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184)
-
// ResId fuer InternetPage
#define RID_SVXPAGE_INTERNET (RID_SVX_START + 154)
-// ResId fuer FontSubstitution
-#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18)
-
-// insert row&col dialog
-#define DLG_INS_ROW_COL (RID_SVX_START + 156)
-
//InetDlg
-#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155)
-#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157)
#define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158)
#define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159)
-#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
-//added by jmeng begin
-#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
-#define GB_MOZPLUGIN 1
-#define CB_MOZPLUGIN_CODE 2
-//added by jmeng end
-#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
#define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202)
#define RID_CACHE_EXTRA_DLG (RID_SVX_START + 203)
@@ -279,9 +313,6 @@
#define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198)
#define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199)
-// ResId fuer Measure-Dialog
-#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161)
-
// 3D-Entfernung/Perspektive Bitmaps
#define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162)
#define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163)
@@ -309,18 +340,12 @@
#define RID_SVXTBX_DRAW (RID_SVX_START + 189)
#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190)
-#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191)
-
// Ids fuer Autokorrektur
#define RID_SVX_AUTOCORR (RID_SVX_START + 192)
// Auswahl ext. Linguitik
#define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193)
-// Extra Dialog f"ur Option Pfade
-#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201)
-#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207)
-
// TabPage und Dialog f"ur LDAP-Server
#define RID_SVXPAGE_LDAP (RID_SVX_START + 204)
#define RID_SVXDLG_LDAP (RID_SVX_START + 205)
@@ -328,71 +353,26 @@
// Dialog fuer Funktionen
#define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206)
-// Errorbox f"ur Optionen/Pfade
-#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208)
-
-// Messboxen f"ur Optionen/Benutzerdaten
-#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214)
-
// QueryBox for Exit Recovery Wizard
#define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215)
// ResId fuer den ImportGraphic-Dialog
#define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499)
-#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215)
-#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216)
-#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217)
-#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218)
-#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219)
-#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220)
-
-
-#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
-#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225)
#define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226)
// ResId's f???r Hyperlink-Dialog-Tabpages
-#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227)
-#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228)
-#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229)
-#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230)
-#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231)
-#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232)
// ResId's for Starone impl. bitmaps
#define RID_UNODRAW_OBJECTS (RID_SVX_START + 233)
#define RID_UNODRAW_OLE2 (RID_SVX_START + 234)
#define RID_UNODRAW_GRAPHICS (RID_SVX_START + 235)
-// ResId fuer Distribute-Dialog
-#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236)
-
-// tabpage for graphic cropping
-#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238)
-
#define RID_SVXIMG_NOTCHECKED (RID_SVX_START + 243)
#define RID_SVXIMG_CHECKED (RID_SVX_START + 244)
-#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245)
-#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
-
#define RID_SVXDLG_RUBY (RID_SVX_START + 247)
-#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248)
-
-#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
-#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
-#define RID_SVXPAGE_SSO (RID_SVX_START + 251)
-#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
-#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
-#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254)
-#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
-#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
-#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
-
-#define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258)
-#define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259)
#define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260)
#define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261)
@@ -406,10 +386,6 @@
#define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269)
#define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270)
#define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271)
-#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272)
-#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273)
-#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274)
-#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275)
#define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276)
#define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277)
#define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278)
@@ -417,29 +393,11 @@
#define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280)
#define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281)
#define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282)
-#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283)
-#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284)
#define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285)
#define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286)
#define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287)
-#define RID_DLG_NEWLIB (RID_SVX_START + 290)
-
-#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
-#define RID_SVXPAGE_MENUS (RID_SVX_START + 292)
-#define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293)
-#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294)
-#define RID_SVXPAGE_EVENTS (RID_SVX_START + 295)
-#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296)
-#define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297)
-#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
-#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
-#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
-#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
-#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302)
-#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303)
-#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304)
// !!! please update RID_SVX_FIRSTFREE !!! see line 46
// Strings ------------------------------------------------------------------
@@ -479,89 +437,56 @@
#define RID_SVXSTR_HMERR_ADDWORD (RID_SVX_START + 95)
#define RID_SVXSTR_HMSTATUS_INVALID_LANG (RID_SVX_START + 96)
-// Strings fuers Paperformat
+// paper formats
#define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 100)
-#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101)
-#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102)
-#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103)
-#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104)
-#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105)
-#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106)
-#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107)
-#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108)
-#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109)
-#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110)
-#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111)
-#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112)
-#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113)
-#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114)
-#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115)
-#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116)
-#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117)
-#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118)
-#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119)
-#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120)
-#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121)
-#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122)
-#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123)
-#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124)
-#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125)
-#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126)
-#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127)
-#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128)
-#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129)
-#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130)
-#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131)
-#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132)
-#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133)
-#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134)
-#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135)
-#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136)
-
-#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
-#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143)
+#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101)
+#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102)
+#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103)
+#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104)
+#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105)
+#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106)
+#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107)
+#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108)
+#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109)
+#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110)
+#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111)
+#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112)
+#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113)
+#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114)
+#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115)
+#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116)
+#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117)
+#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118)
+#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119)
+#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120)
+#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121)
+#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122)
+#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123)
+#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124)
+#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125)
+#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126)
+#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127)
+#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128)
+#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129)
+#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130)
+#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131)
+#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132)
+#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133)
+#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134)
+#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135)
+#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136)
+
#define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144)
-#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145)
// ResIds fuer die verschiedenen Strings des PageDlgs
#define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146)
#define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147)
-#define RID_SVXSTR_WRITER_PAGE (RID_SVX_START + 148)
-
-#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149)
// HM_ERR
#define RID_SVXSTR_HMERR_THESAURUS (RID_SVX_START + 150)
#define RID_SVXSTR_HMERR_HYPH (RID_SVX_START + 151)
-// Strings aus den StarDraw-Dialogen
-#define RID_SVXSTR_SOLID (RID_SVX_START + 160)
-#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161)
-#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
-#define RID_SVXSTR_DEL_GRADIENT (RID_SVX_START + 164)
-#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165)
-#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166)
-#define RID_SVXSTR_BITMAP (RID_SVX_START + 167)
-#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
-#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
-#define RID_SVXSTR_DEL_BITMAP (RID_SVX_START + 170)
-#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171)
-#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172)
-#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173)
-#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
-#define RID_SVXSTR_DEL_LINESTYLE (RID_SVX_START + 175)
-#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176)
-#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
-#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178)
-#define RID_SVXSTR_COLOR (RID_SVX_START + 179)
-#define RID_SVXSTR_HATCH (RID_SVX_START + 180)
-#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
-#define RID_SVXSTR_ADD (RID_SVX_START + 182)
-#define RID_SVXSTR_NONE (RID_SVX_START + 183)
-#define RID_SVXSTR_ASK_CHANGE_LINEEND (RID_SVX_START + 184)
-
// Strings der ToolBox-Controls aus tbcontrl.cxx
-#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190)
#define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191)
#define RID_SVXSTR_FRAME (RID_SVX_START + 192)
#define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194)
@@ -586,36 +511,12 @@
#define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213)
#define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214)
-// Strings fuer ColorTabPage
-#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215)
-#define RID_SVXSTR_DEL_COLOR (RID_SVX_START + 216)
-#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217)
-#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218)
-#define RID_SVXSTR_ASK_DEL_LINEEND (RID_SVX_START + 219)
-
-// "Tabelle"
-#define RID_SVXSTR_TABLE (RID_SVX_START + 220)
-
#define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222)
#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223)
#define RID_SVXSTR_XMLSEC_SIG_NOT_OK (RID_SVX_START + 224)
#define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225)
#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226)
-// Strings von der Hatch-Tabpage
-#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229)
-#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230)
-#define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231)
-#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
-#define RID_SVXSTR_DEL_HATCH (RID_SVX_START + 233)
-#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234)
-#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235)
-#define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236)
-
-// Strings der Linienenden-TabPage
-#define RID_SVXSTR_LINEEND (RID_SVX_START + 237)
-#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238)
-#define RID_SVXSTR_DEL_LINEEND (RID_SVX_START + 239)
// weitere ID bei 219
// String-ResId fuer den ImportGraphic-Dialog
@@ -628,9 +529,6 @@
#define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247)
#define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248)
-// unbekannte Farbe im Zeichen- oder Umrandungs-Dialog
-#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250)
-
// File-/Grafik-Link String, Dialog Name
#define RID_SVXSTR_FILELINK (RID_SVX_START + 255)
#define RID_SVXSTR_GRAFIKLINK (RID_SVX_START + 256)
@@ -686,35 +584,22 @@
#define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307)
// String-Arrays
-#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311)
#define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312)
-// Strings fuer die Optionen-TabPages
-#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
-
// Hyperlink-Dlg
#define RID_SVXMN_HYPERLINK (RID_SVX_START + 321)
// Hyperlink-QueryBoxen
#define RID_SVXQB_NOCONNECT (RID_SVX_START + 322)
#define RID_SVXQB_DONTEXIST (RID_SVX_START + 323)
//color configuration
-#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324)
// Graphic filter
#define RID_SVX_GRFFILTER_START (RID_SVX_START + 330)
#define RID_SVXTBX_GRFFILTER (RID_SVX_START + 331)
-#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332)
-#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333)
-#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334)
-#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335)
-#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336)
-#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337)
#define RID_SVXERRCODE (RID_SVX_START + 350)
-#define RID_SVXERRCTX (RID_SVX_START + 351)
-// Define - Bereich fuer Gallery
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// gallery
#define RID_SVX_GALLERY_START (RID_SVX_START + 360)
#define RID_SVX_GALLERY_END (RID_SVX_START + 410)
@@ -747,13 +632,6 @@
#define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480)
#define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481)
-// ResId's fuer SvxMultiFileDialog
-#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482)
-#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483)
-#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484)
-#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485)
-#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486)
-
// Defines fuer die 3D-Engine
#define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489)
#define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490)
@@ -766,22 +644,24 @@
#define RID_SVX_3D_UNDO_LATHE (RID_SVX_START + 497)
#define RID_SVX_3D_UNDO_BREAK_LATHE (RID_SVX_START + 498)
#define RID_SVX_3D_UNDO_ATTRIBUTES (RID_SVX_START + 499)
+
+#define RID_STR_FULLNUMS_START (RID_SVX_START + 500)//?
+#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START )//?
+#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1)//?
+#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2)//?
+#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3)//?
+#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4)//?
+#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5)//?
+#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6)//?
+#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//?
+#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//?
+
// RID_SVX_END == (RID_SVX_START + 499) !!!
// am besten ab 520 frei (RB)
// seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine
// Obergrenze geben (abgesehen von USHRT_MAX) (os)
-#define RID_STR_FULLNUMS_START (RID_SVX_START + 500)
-#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START )
-#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1)
-#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2)
-#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3)
-#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4)
-#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5)
-#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6)
-#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)
#define RID_STR_BULLET_THEME (RID_SVX_START + 508)
-#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509)
-#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)
+
// ResIds for graphics drawmode
#define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520)
@@ -811,17 +691,6 @@
#define RID_SVXSTR_SEABLUE (RID_SVX_START + 546)
#define RID_SVXSTR_COLOR_SUN (RID_SVX_START + 547)
-#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548)
-#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549)
-#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550)
-#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551)
-#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552)
-#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553)
-#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556)
-#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557)
-#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558)
-#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559)
-
// JP: string resource ids for table-autoformat-names, used in SW/SC
// !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
#define RID_SVXSTR_TBLAFMT_BEGIN (RID_SVX_START + 560)
@@ -843,16 +712,6 @@
#define RID_SVXSTR_TBLAFMT_YELLOW (RID_SVX_START + 575)
#define RID_SVXSTR_TBLAFMT_END (RID_SVX_START + 576)
-#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580)
-#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581)
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583)
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585)
-#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587)
-#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588)
-
// string resources for XLineJoint item
#define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE
#define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 )
@@ -1062,9 +921,6 @@
#define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0
#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND11
-#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800)
-#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
-
#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802)
#define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803)
#define RID_SVXSTR_QRY_PRINT_ALL (RID_SVX_START + 804)
@@ -1075,10 +931,6 @@
#define RID_SVXSTR_DIC_ERR_FULL (RID_SVX_START + 811)
#define RID_SVXSTR_DIC_ERR_READONLY (RID_SVX_START + 812)
-#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813)
-#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814)
-#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815)
-
// strings for graphic attributes/undo
#define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820)
#define RID_SVXSTR_UNDO_GRAFMODE (RID_SVX_START + 821)
@@ -1091,14 +943,6 @@
#define RID_SVXSTR_UNDO_GRAFTRANSPARENCY (RID_SVX_START + 828)
#define RID_SVXSTR_UNDO_GRAFCROP (RID_SVXSTR_GRAFCROP)
-// weitere ResId fuer die Linguistik-Dialoge
-#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
-#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
-
-// Japanese search options TabPage
-#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
-#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841)
-
// listbox control for UNDO and REDO
#define RID_SVXTBX_UNDO_REDO_CTRL (RID_SVX_START + 845)
#define RID_SVXSTR_NUM_UNDO_ACTIONS (RID_SVX_START + 846)
@@ -1115,9 +959,6 @@
#define RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0
#define RID_SVXSTR_BORDER_CONTROL (RID_SVX_START + 852)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853)
-#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
-#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
// Accessibility strings. The actual string ids are defined in
// svx/inc/accessibility.hrc, the strings are defined in
@@ -1125,34 +966,6 @@
#define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860)
#define RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950)
-// string resources for svx::FrameDirectionListBox
-#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
-#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
-#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
-
-#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965)
-#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
-#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
-#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
-
-#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969)
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970)
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971)
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972)
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973)
-
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974)
-#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975)
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976)
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977)
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978)
-
-#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
-#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
-#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
-#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
-
// 984: free
#define RID_SVXFLOAT_EXTRUSION_DIRECTION (RID_SVX_START + 985)
@@ -1184,129 +997,6 @@
RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating
windows, and the following IDs are for strings, so this is no conflict. */
#define RID_SVXSTR_PAGES (RID_SVX_START + 1002)
-#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
-#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)
-#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004)
-#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)
-#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)
-#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)
-#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)
-#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)
-#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)
-#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)
-#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)
-#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)
-#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)
-#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)
-#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)
-#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)
-#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)
-#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)
-#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)
-#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)
-#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)
-#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)
-#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)
-#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)
-
-#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
-
-#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
-#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028)
-#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029)
-#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030)
-#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031)
-#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032)
-#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033)
-#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034)
-#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035)
-#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036)
-#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037)
-#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038)
-
-#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
-#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040)
-#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041)
-
-#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042)
-#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043)
-#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044)
-#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045)
-#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046)
-#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047)
-#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048)
-#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049)
-#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
-#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051)
-#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053)
-#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054)
-#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055)
-#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056)
-#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057)
-#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058)
-#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059)
-#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060)
-#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061)
-#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062)
-#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063)
-#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064)
-#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065)
-#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066)
-//the form/dialog events
-#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
-#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068)
-#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069)
-#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070)
-#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071)
-#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072)
-#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073)
-#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074)
-#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075)
-#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076)
-#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077)
-#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078)
-#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079)
-#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080)
-#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081)
-#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082)
-#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083)
-#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084)
-#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085)
-#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086)
-#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087)
-#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088)
-#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089)
-#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090)
-#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091)
-#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092)
-#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093)
-#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094)
-#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095)
-#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096)
-#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097)
-#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
-#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099)
-#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100)
-#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101)
-#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102)
-#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103)
-#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104)
-#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105)
-#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106)
-#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107)
-#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
-#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
-
-#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110)
-#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111)
-#define STR_NAME_CONFLICT (RID_SVX_START + 1112)
-
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
-#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
-#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115)
-#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116)
-#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117)
#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE (RID_SVX_START + 1118)
#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT (RID_SVX_START + 1119)
@@ -1326,71 +1016,38 @@
#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE (RID_SVX_START + 1133)
#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR (RID_SVX_START + 1134)
-#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135)
-#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136)
-#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137)
-
-#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)
-#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)
-#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)
-#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)
-#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)
-#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)
-#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)
-#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)
-#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)
-#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)
-#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)
-
-#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
-#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355
-#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355
-#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355
#define RID_SVXSTR_SELMODE_BLK (RID_SVX_START + 1167)
#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168)
-#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170)
-#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171)
-
-#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172)
-#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173)
-#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174)
-#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175)
-#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176)
-#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177)
-#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178)
-#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179)
-#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180)
-#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181)
-#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182)
-#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183)
-#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184)
-#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185)
-#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186)
-#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187)
-#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188)
-#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189)
// if you add here, remember to adjust RID_SVXSTR_NEXTFREE
+#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//?
+#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//?
+
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1190)
// ----------------------------------------------------------------------------
@@ -1406,37 +1063,23 @@
// ----------------------------------------------------------------------------
// "Window" resource ids
-#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 )
// ----------------------------------------------------------------------------
// "ModalDialog" resource ids
-#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 )
-#define RID_SVX_MDLG_HANGULHANJA ( RID_SVX_START + 1 )
#define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 )
#define RID_SVX_MDLG_EXTRUSION_DEPTH ( RID_SVX_START + 3 )
-#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 )
-#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 )
-#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 )
-
-#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 )
-#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 )
-#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 )
// ----------------------------------------------------------------------------
// "Menu" resource ids
#define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 )
#define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 )
-// ResId fuer den Notizzettel-Dialog
-#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 )
-
// ResId fuer den ImportClipboard-Dialog
// depricated
//#define RID_SVXDLG_CLIPBOARD ( RID_SVX_START + 9 )
// ResId fuer den Sonderzeichen-Dialog
-#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 )
// allgemeine DBMgr-Dialoge
// depricated
@@ -1463,116 +1106,42 @@
#define RID_SVXPAGE_ERR_REP_SEND ( RID_SVX_START + 11 )
// ----------------------------------------------------------------------------
-// "MessageBox" resource ids
-
-#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 )
-#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 )
-#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 )
-
-// ----------------------------------------------------------------------------
// !!!! double defined ID's (see below) !!!
-#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
-#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
-#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103)
-#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
#define RID_OFA_GENERAL_OPTIONS_DLG (RID_OFA_START + 105)
#define RID_OFADLG_INTERNET (RID_OFA_START + 106)
#define RID_OFA_TABNEW_DLG (RID_OFA_START + 107)
#define RID_OFADLG_BROWSER (RID_OFA_START + 108)
-#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
-#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
-#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
#define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112)
#define RID_OFA_TABPROPERTIES (RID_OFA_START + 113)
#define RID_OFADLG_REGISTRATION (RID_OFA_START + 114)
-#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
-#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
#define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117)
-#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)
-#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
-#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
-#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
-#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
-#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123)
-#define DLG_DOCUMENTLINK (RID_OFA_START + 124)
-#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125)
// TabPages --------------------------------------------------------------
// !!!! double defined ID's (see above) !!!
-#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)
-#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)
-#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102)
-
-#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175)
-#define OFA_TP_MISC (RID_OFA_START + 200)
-
-#define OFA_TP_VIEW (RID_OFA_START + 202)
#define OFA_TP_APPEARANCE (RID_OFA_START + 203)
#define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204)
-#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
//die RID_??_TP_* stehen nochmal im offids.hrc
-#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206)
+
#define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207)
-#define RID_SW_TP_STD_FONT (RID_OFA_START + 208)
-#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209)
-#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210)
-#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211)
-#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212)
#define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213)
-#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214)
#define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215)
#define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216)
-#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217)
-#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
-#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
-#define SID_SC_TP_INPUT (RID_OFA_START + 220)
-#define SID_SC_TP_GRID (RID_OFA_START + 221)
-#define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
-#define SID_SC_TP_CALC (RID_OFA_START + 223)
-#define SID_SC_TP_CHANGES (RID_OFA_START + 224)
-#define SID_SD_TP_CONTENTS (RID_OFA_START + 225)
+#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238)
+#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241)
#define SID_SD_TP_LAYOUT (RID_OFA_START + 226)
-#define SID_SD_TP_SNAP (RID_OFA_START + 227)
#define SID_SD_TP_SCALE (RID_OFA_START + 228)
#define SID_SD_TP_GRID (RID_OFA_START + 229)
-#define SID_SD_TP_PRINT (RID_OFA_START + 220)
-#define SID_SD_TP_MISC (RID_OFA_START + 231)
-#define SID_SI_TP_CONTENTS (RID_OFA_START + 232)
#define SID_SI_TP_LAYOUT (RID_OFA_START + 233)
-#define SID_SI_TP_SNAP (RID_OFA_START + 234)
#define SID_SI_TP_GRID (RID_OFA_START + 235)
-#define SID_SI_TP_PRINT (RID_OFA_START + 236)
-#define SID_SI_TP_MISC (RID_OFA_START + 237)
-#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238)
#define SID_SC_TP_MISC (RID_OFA_START + 239)
-#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240)
-#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241)
-#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242)
-#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243)
-#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244)
#define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245)
-#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246)
-#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247)
-#define RID_SC_TP_PRINT (RID_OFA_START + 248)
#define OFA_TP_HELPERPROG (RID_OFA_START + 249)
-#define OFA_TP_MEMORY (RID_OFA_START + 250)
-#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251)
-#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource
-#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD
-#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress
-#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
-#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
-
-//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001
-#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998)
-#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999)
#endif
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index 8b70601dc8..5d12e900f5 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -34,7 +34,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include "svx/svxdllapi.h"
#include <basegfx/vector/b3dvector.hxx>
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index c60dcd7df7..69e83c1661 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -408,6 +408,7 @@ public:
void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
void SelectEntryByList( const XDashList* pList, const String& rStr,
const XDash& rDash, USHORT nDist = 0 );
+ void FillStyles();
};
/*************************************************************************
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 5056451c63..2f24e8786a 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -31,7 +31,7 @@
#ifndef _SVXE3DITEM_HXX
#define _SVXE3DITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx
index 64949e46d0..de8af1ee9b 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/svx/inc/svx/editdata.hxx
@@ -35,7 +35,7 @@
#include <tools/string.hxx>
#include "svx/svxdllapi.h"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
class SfxItemSet;
class SfxPoolItem;
diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx
index 90a13b7114..f2b1aaabdf 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/svx/inc/svx/editobj.hxx
@@ -34,7 +34,7 @@
#include <tools/stream.hxx>
#include <tools/debug.hxx>
#include <rsc/rscsfx.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <svx/eeitem.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx
index f7aab6ba52..8d5c18b302 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/svx/inc/svx/emphitem.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#include <vcl/vclenum.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/escherex.hxx b/svx/inc/svx/escherex.hxx
deleted file mode 100644
index d021a13466..0000000000
--- a/svx/inc/svx/escherex.hxx
+++ /dev/null
@@ -1,1513 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: escherex.hxx,v $
- * $Revision: 1.6.146.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_ESCHEREX_HXX
-#define _SVX_ESCHEREX_HXX
-
-#include <vector>
-#include <tools/solar.h>
-#include <tools/gen.hxx>
-#include <tools/list.hxx>
-#include <tools/stream.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <goodies/grfmgr.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <svx/msdffdef.hxx>
-#include "svx/svxdllapi.h"
-
- /*Record Name FBT-Value Instance Contents Wrd Exl PPt Ver*/
-// In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
-#define ESCHER_DggContainer 0xF000 /* per-document data X X X */
-#define ESCHER_Dgg 0xF006 /* an FDGG and several FIDCLs X X X 0 */
-#define ESCHER_CLSID 0xF016 /* the CLSID of the application that put the data on the clipboard C C C 0 */
-#define ESCHER_OPT 0xF00B /* count of properties the document-wide default shape properties X X X 3 */
-#define ESCHER_ColorMRU 0xF11A /* count of colors the colors in the MRU swatch X X X 0 */
-#define ESCHER_SplitMenuColors 0xF11E /* count of colors the colors in the top-level split menus X X X 0 */
-#define ESCHER_BstoreContainer 0xF001 /* count of BLIPs all images in the document (JPEGs, metafiles, etc.) X X X */
-#define ESCHER_BSE 0xF007 /* BLIP type an FBSE (one per BLIP) X X X 2 */
-#define ESCHER_BlipFirst 0xF018 /* range of fbts reserved for various kinds of BLIPs X X X */
-#define ESCHER_BlipLast 0xF117 /* range of fbts reserved for various kinds of BLIPs X X X */
-
-#define ESCHER_DgContainer 0xF002 /* per-sheet/page/slide data X X X */
-#define ESCHER_Dg 0xF008 /* drawing ID an FDG X X X 0 */
-#define ESCHER_RegroupItems 0xF118 /* count of regroup entries several FRITs X X X 0 */
-#define ESCHER_ColorScheme 0xF120 /* count of colors the colors of the source host's color scheme C C 0 */
-#define ESCHER_SpgrContainer 0xF003 /* several SpContainers, the first of which is the group shape itself X X X */
-#define ESCHER_SpContainer 0xF004 /* a shape X X X */
-#define ESCHER_Spgr 0xF009 /* an FSPGR; only present if the shape is a group shape X X X 1 */
-#define ESCHER_Sp 0xF00A /* shape type an FSP X X X 2 */
-//#define ESCHER_OPT 0xF00B /* count of properties a shape property table X X X 3 */
-#define ESCHER_Textbox 0xF00C /* RTF text C C C 0 */
-#define ESCHER_ClientTextbox 0xF00D /* host-defined the text in the textbox, in host-defined format X X X */
-#define ESCHER_Anchor 0xF00E /* a RECT, in 100000ths of an inch C C C 0 */
-#define ESCHER_ChildAnchor 0xF00F /* a RECT, in units relative to the parent group X X X 0 */
-#define ESCHER_ClientAnchor 0xF010 /* host-defined the location of the shape, in a host-defined format X X X */
-#define ESCHER_ClientData 0xF011 /* host-defined host-specific data X X X */
-#define ESCHER_OleObject 0xF11F /* a serialized IStorage for an OLE object C C C 0 */
-#define ESCHER_DeletedPspl 0xF11D /* an FPSPL; only present in top-level deleted shapes X 0 */
-#define ESCHER_SolverContainer 0xF005 /* count of rules the rules governing shapes X X X */
-#define ESCHER_ConnectorRule 0xF012 /* an FConnectorRule X X 1 */
-#define ESCHER_AlignRule 0xF013 /* an FAlignRule X X X 0 */
-#define ESCHER_ArcRule 0xF014 /* an FARCRU X X X 0 */
-#define ESCHER_ClientRule 0xF015 /* host-defined host-defined */
-#define ESCHER_CalloutRule 0xF017 /* an FCORU X X X 0 */
-#define ESCHER_Selection 0xF119 /* an FDGSL followed by the SPIDs of the shapes in the selection X 0 */
-#define ESCHER_UDefProp 0xF122
-
-#define SHAPEFLAG_GROUP 0x001 // This shape is a group shape
-#define SHAPEFLAG_CHILD 0x002 // Not a top-level shape
-#define SHAPEFLAG_PATRIARCH 0x004 // This is the topmost group shape. Exactly one of these per drawing.
-#define SHAPEFLAG_DELETED 0x008 // The shape has been deleted
-#define SHAPEFLAG_OLESHAPE 0x010 // The shape is an OLE object
-#define SHAPEFLAG_HAVEMASTER 0x020 // Shape has a hspMaster property
-#define SHAPEFLAG_FLIPH 0x040 // Shape is flipped horizontally
-#define SHAPEFLAG_FLIPV 0x080 // Shape is flipped vertically
-#define SHAPEFLAG_CONNECTOR 0x100 // Connector type of shape
-#define SHAPEFLAG_HAVEANCHOR 0x200 // Shape has an anchor of some kind
-#define SHAPEFLAG_BACKGROUND 0x400 // Background shape
-#define SHAPEFLAG_HAVESPT 0x800 // Shape has a shape type property
-
-#define ESCHER_ShpInst_Min 0
-#define ESCHER_ShpInst_NotPrimitive ESCHER_ShpInst_Min
-#define ESCHER_ShpInst_Rectangle 1
-#define ESCHER_ShpInst_RoundRectangle 2
-#define ESCHER_ShpInst_Ellipse 3
-#define ESCHER_ShpInst_Diamond 4
-#define ESCHER_ShpInst_IsocelesTriangle 5
-#define ESCHER_ShpInst_RightTriangle 6
-#define ESCHER_ShpInst_Parallelogram 7
-#define ESCHER_ShpInst_Trapezoid 8
-#define ESCHER_ShpInst_Hexagon 9
-#define ESCHER_ShpInst_Octagon 10
-#define ESCHER_ShpInst_Plus 11
-#define ESCHER_ShpInst_Star 12
-#define ESCHER_ShpInst_Arrow 13
-#define ESCHER_ShpInst_ThickArrow 14
-#define ESCHER_ShpInst_HomePlate 15
-#define ESCHER_ShpInst_Cube 16
-#define ESCHER_ShpInst_Balloon 17
-#define ESCHER_ShpInst_Seal 18
-#define ESCHER_ShpInst_Arc 19
-#define ESCHER_ShpInst_Line 20
-#define ESCHER_ShpInst_Plaque 21
-#define ESCHER_ShpInst_Can 22
-#define ESCHER_ShpInst_Donut 23
-#define ESCHER_ShpInst_TextSimple 24
-#define ESCHER_ShpInst_TextOctagon 25
-#define ESCHER_ShpInst_TextHexagon 26
-#define ESCHER_ShpInst_TextCurve 27
-#define ESCHER_ShpInst_TextWave 28
-#define ESCHER_ShpInst_TextRing 29
-#define ESCHER_ShpInst_TextOnCurve 30
-#define ESCHER_ShpInst_TextOnRing 31
-#define ESCHER_ShpInst_StraightConnector1 32
-#define ESCHER_ShpInst_BentConnector2 33
-#define ESCHER_ShpInst_BentConnector3 34
-#define ESCHER_ShpInst_BentConnector4 35
-#define ESCHER_ShpInst_BentConnector5 36
-#define ESCHER_ShpInst_CurvedConnector2 37
-#define ESCHER_ShpInst_CurvedConnector3 38
-#define ESCHER_ShpInst_CurvedConnector4 39
-#define ESCHER_ShpInst_CurvedConnector5 40
-#define ESCHER_ShpInst_Callout1 41
-#define ESCHER_ShpInst_Callout2 42
-#define ESCHER_ShpInst_Callout3 43
-#define ESCHER_ShpInst_AccentCallout1 44
-#define ESCHER_ShpInst_AccentCallout2 45
-#define ESCHER_ShpInst_AccentCallout3 46
-#define ESCHER_ShpInst_BorderCallout1 47
-#define ESCHER_ShpInst_BorderCallout2 48
-#define ESCHER_ShpInst_BorderCallout3 49
-#define ESCHER_ShpInst_AccentBorderCallout1 50
-#define ESCHER_ShpInst_AccentBorderCallout2 51
-#define ESCHER_ShpInst_AccentBorderCallout3 52
-#define ESCHER_ShpInst_Ribbon 53
-#define ESCHER_ShpInst_Ribbon2 54
-#define ESCHER_ShpInst_Chevron 55
-#define ESCHER_ShpInst_Pentagon 56
-#define ESCHER_ShpInst_NoSmoking 57
-#define ESCHER_ShpInst_Seal8 58
-#define ESCHER_ShpInst_Seal16 59
-#define ESCHER_ShpInst_Seal32 60
-#define ESCHER_ShpInst_WedgeRectCallout 61
-#define ESCHER_ShpInst_WedgeRRectCallout 62
-#define ESCHER_ShpInst_WedgeEllipseCallout 63
-#define ESCHER_ShpInst_Wave 64
-#define ESCHER_ShpInst_FoldedCorner 65
-#define ESCHER_ShpInst_LeftArrow 66
-#define ESCHER_ShpInst_DownArrow 67
-#define ESCHER_ShpInst_UpArrow 68
-#define ESCHER_ShpInst_LeftRightArrow 69
-#define ESCHER_ShpInst_UpDownArrow 70
-#define ESCHER_ShpInst_IrregularSeal1 71
-#define ESCHER_ShpInst_IrregularSeal2 72
-#define ESCHER_ShpInst_LightningBolt 73
-#define ESCHER_ShpInst_Heart 74
-#define ESCHER_ShpInst_PictureFrame 75
-#define ESCHER_ShpInst_QuadArrow 76
-#define ESCHER_ShpInst_LeftArrowCallout 77
-#define ESCHER_ShpInst_RightArrowCallout 78
-#define ESCHER_ShpInst_UpArrowCallout 79
-#define ESCHER_ShpInst_DownArrowCallout 80
-#define ESCHER_ShpInst_LeftRightArrowCallout 81
-#define ESCHER_ShpInst_UpDownArrowCallout 82
-#define ESCHER_ShpInst_QuadArrowCallout 83
-#define ESCHER_ShpInst_Bevel 84
-#define ESCHER_ShpInst_LeftBracket 85
-#define ESCHER_ShpInst_RightBracket 86
-#define ESCHER_ShpInst_LeftBrace 87
-#define ESCHER_ShpInst_RightBrace 88
-#define ESCHER_ShpInst_LeftUpArrow 89
-#define ESCHER_ShpInst_BentUpArrow 90
-#define ESCHER_ShpInst_BentArrow 91
-#define ESCHER_ShpInst_Seal24 92
-#define ESCHER_ShpInst_StripedRightArrow 93
-#define ESCHER_ShpInst_NotchedRightArrow 94
-#define ESCHER_ShpInst_BlockArc 95
-#define ESCHER_ShpInst_SmileyFace 96
-#define ESCHER_ShpInst_VerticalScroll 97
-#define ESCHER_ShpInst_HorizontalScroll 98
-#define ESCHER_ShpInst_CircularArrow 99
-#define ESCHER_ShpInst_NotchedCircularArrow 100
-#define ESCHER_ShpInst_UturnArrow 101
-#define ESCHER_ShpInst_CurvedRightArrow 102
-#define ESCHER_ShpInst_CurvedLeftArrow 103
-#define ESCHER_ShpInst_CurvedUpArrow 104
-#define ESCHER_ShpInst_CurvedDownArrow 105
-#define ESCHER_ShpInst_CloudCallout 106
-#define ESCHER_ShpInst_EllipseRibbon 107
-#define ESCHER_ShpInst_EllipseRibbon2 108
-#define ESCHER_ShpInst_FlowChartProcess 109
-#define ESCHER_ShpInst_FlowChartDecision 110
-#define ESCHER_ShpInst_FlowChartInputOutput 111
-#define ESCHER_ShpInst_FlowChartPredefinedProcess 112
-#define ESCHER_ShpInst_FlowChartInternalStorage 113
-#define ESCHER_ShpInst_FlowChartDocument 114
-#define ESCHER_ShpInst_FlowChartMultidocument 115
-#define ESCHER_ShpInst_FlowChartTerminator 116
-#define ESCHER_ShpInst_FlowChartPreparation 117
-#define ESCHER_ShpInst_FlowChartManualInput 118
-#define ESCHER_ShpInst_FlowChartManualOperation 119
-#define ESCHER_ShpInst_FlowChartConnector 120
-#define ESCHER_ShpInst_FlowChartPunchedCard 121
-#define ESCHER_ShpInst_FlowChartPunchedTape 122
-#define ESCHER_ShpInst_FlowChartSummingJunction 123
-#define ESCHER_ShpInst_FlowChartOr 124
-#define ESCHER_ShpInst_FlowChartCollate 125
-#define ESCHER_ShpInst_FlowChartSort 126
-#define ESCHER_ShpInst_FlowChartExtract 127
-#define ESCHER_ShpInst_FlowChartMerge 128
-#define ESCHER_ShpInst_FlowChartOfflineStorage 129
-#define ESCHER_ShpInst_FlowChartOnlineStorage 130
-#define ESCHER_ShpInst_FlowChartMagneticTape 131
-#define ESCHER_ShpInst_FlowChartMagneticDisk 132
-#define ESCHER_ShpInst_FlowChartMagneticDrum 133
-#define ESCHER_ShpInst_FlowChartDisplay 134
-#define ESCHER_ShpInst_FlowChartDelay 135
-#define ESCHER_ShpInst_TextPlainText 136
-#define ESCHER_ShpInst_TextStop 137
-#define ESCHER_ShpInst_TextTriangle 138
-#define ESCHER_ShpInst_TextTriangleInverted 139
-#define ESCHER_ShpInst_TextChevron 140
-#define ESCHER_ShpInst_TextChevronInverted 141
-#define ESCHER_ShpInst_TextRingInside 142
-#define ESCHER_ShpInst_TextRingOutside 143
-#define ESCHER_ShpInst_TextArchUpCurve 144
-#define ESCHER_ShpInst_TextArchDownCurve 145
-#define ESCHER_ShpInst_TextCircleCurve 146
-#define ESCHER_ShpInst_TextButtonCurve 147
-#define ESCHER_ShpInst_TextArchUpPour 148
-#define ESCHER_ShpInst_TextArchDownPour 149
-#define ESCHER_ShpInst_TextCirclePour 150
-#define ESCHER_ShpInst_TextButtonPour 151
-#define ESCHER_ShpInst_TextCurveUp 152
-#define ESCHER_ShpInst_TextCurveDown 153
-#define ESCHER_ShpInst_TextCascadeUp 154
-#define ESCHER_ShpInst_TextCascadeDown 155
-#define ESCHER_ShpInst_TextWave1 156
-#define ESCHER_ShpInst_TextWave2 157
-#define ESCHER_ShpInst_TextWave3 158
-#define ESCHER_ShpInst_TextWave4 159
-#define ESCHER_ShpInst_TextInflate 160
-#define ESCHER_ShpInst_TextDeflate 161
-#define ESCHER_ShpInst_TextInflateBottom 162
-#define ESCHER_ShpInst_TextDeflateBottom 163
-#define ESCHER_ShpInst_TextInflateTop 164
-#define ESCHER_ShpInst_TextDeflateTop 165
-#define ESCHER_ShpInst_TextDeflateInflate 166
-#define ESCHER_ShpInst_TextDeflateInflateDeflate 167
-#define ESCHER_ShpInst_TextFadeRight 168
-#define ESCHER_ShpInst_TextFadeLeft 169
-#define ESCHER_ShpInst_TextFadeUp 170
-#define ESCHER_ShpInst_TextFadeDown 171
-#define ESCHER_ShpInst_TextSlantUp 172
-#define ESCHER_ShpInst_TextSlantDown 173
-#define ESCHER_ShpInst_TextCanUp 174
-#define ESCHER_ShpInst_TextCanDown 175
-#define ESCHER_ShpInst_FlowChartAlternateProcess 176
-#define ESCHER_ShpInst_FlowChartOffpageConnector 177
-#define ESCHER_ShpInst_Callout90 178
-#define ESCHER_ShpInst_AccentCallout90 179
-#define ESCHER_ShpInst_BorderCallout90 180
-#define ESCHER_ShpInst_AccentBorderCallout90 181
-#define ESCHER_ShpInst_LeftRightUpArrow 182
-#define ESCHER_ShpInst_Sun 183
-#define ESCHER_ShpInst_Moon 184
-#define ESCHER_ShpInst_BracketPair 185
-#define ESCHER_ShpInst_BracePair 186
-#define ESCHER_ShpInst_Seal4 187
-#define ESCHER_ShpInst_DoubleWave 188
-#define ESCHER_ShpInst_ActionButtonBlank 189
-#define ESCHER_ShpInst_ActionButtonHome 190
-#define ESCHER_ShpInst_ActionButtonHelp 191
-#define ESCHER_ShpInst_ActionButtonInformation 192
-#define ESCHER_ShpInst_ActionButtonForwardNext 193
-#define ESCHER_ShpInst_ActionButtonBackPrevious 194
-#define ESCHER_ShpInst_ActionButtonEnd 195
-#define ESCHER_ShpInst_ActionButtonBeginning 196
-#define ESCHER_ShpInst_ActionButtonReturn 197
-#define ESCHER_ShpInst_ActionButtonDocument 198
-#define ESCHER_ShpInst_ActionButtonSound 199
-#define ESCHER_ShpInst_ActionButtonMovie 200
-#define ESCHER_ShpInst_HostControl 201
-#define ESCHER_ShpInst_TextBox 202
-
-#define ESCHER_ShpInst_COUNT 203
-#define ESCHER_ShpInst_Max 0x0FFF
-#define ESCHER_ShpInst_Nil ESCHER_ShpInst_Max
-
-enum ESCHER_BlibType
-{ // GEL provided types...
- ERROR = 0, // An error occured during loading
- UNKNOWN, // An unknown blip type
- EMF, // Windows Enhanced Metafile
- WMF, // Windows Metafile
- PICT, // Macintosh PICT
- PEG, // JFIF
- PNG, // PNG
- DIB, // Windows DIB
- FirstClient = 32, // First client defined blip type
- LastClient = 255 // Last client defined blip type
-};
-
-enum ESCHER_FillStyle
-{
- ESCHER_FillSolid, // Fill with a solid color
- ESCHER_FillPattern, // Fill with a pattern (bitmap)
- ESCHER_FillTexture, // A texture (pattern with its own color map)
- ESCHER_FillPicture, // Center a picture in the shape
- ESCHER_FillShade, // Shade from start to end points
- ESCHER_FillShadeCenter, // Shade from bounding rectangle to end point
- ESCHER_FillShadeShape, // Shade from shape outline to end point
- ESCHER_FillShadeScale,
- ESCHER_FillShadeTitle,
- ESCHER_FillBackground
-};
-
-enum ESCHER_wMode
-{
- ESCHER_wColor, // only used for predefined shades
- ESCHER_wAutomatic, // depends on object type
- ESCHER_wGrayScale, // shades of gray only
- ESCHER_wLightGrayScale, // shades of light gray only
- ESCHER_wInverseGray, // dark gray mapped to light gray, etc.
- ESCHER_wGrayOutline, // pure gray and white
- ESCHER_wBlackTextLine, // black text and lines, all else grayscale
- ESCHER_wHighContrast, // pure black and white mode (no grays)
- ESCHER_wBlack, // solid black msobwWhite, // solid white
- ESCHER_wDontShow, // object not drawn
- ESCHER_wNumModes // number of Black and white modes
-};
-
-
-//
-enum ESCHER_ShapePath
-{
- ESCHER_ShapeLines, // A line of straight segments
- ESCHER_ShapeLinesClosed, // A closed polygonal object
- ESCHER_ShapeCurves, // A line of Bezier curve segments
- ESCHER_ShapeCurvesClosed, // A closed shape with curved edges
- ESCHER_ShapeComplex // pSegmentInfo must be non-empty
-};
-
-
-enum ESCHER_WrapMode
-{
- ESCHER_WrapSquare,
- ESCHER_WrapByPoints,
- ESCHER_WrapNone,
- ESCHER_WrapTopBottom,
- ESCHER_WrapThrough
-};
-
-//
-enum ESCHER_bwMode
-{
- ESCHER_bwColor, // only used for predefined shades
- ESCHER_bwAutomatic, // depends on object type
- ESCHER_bwGrayScale, // shades of gray only
- ESCHER_bwLightGrayScale, // shades of light gray only
- ESCHER_bwInverseGray, // dark gray mapped to light gray, etc.
- ESCHER_bwGrayOutline, // pure gray and white
- ESCHER_bwBlackTextLine, // black text and lines, all else grayscale
- ESCHER_bwHighContrast, // pure black and white mode (no grays)
- ESCHER_bwBlack, // solid black
- ESCHER_bwWhite, // solid white
- ESCHER_bwDontShow, // object not drawn
- ESCHER_bwNumModes // number of Black and white modes
-};
-
-
-enum ESCHER_AnchorText
-{
- ESCHER_AnchorTop,
- ESCHER_AnchorMiddle,
- ESCHER_AnchorBottom,
- ESCHER_AnchorTopCentered,
- ESCHER_AnchorMiddleCentered,
- ESCHER_AnchorBottomCentered,
- ESCHER_AnchorTopBaseline,
- ESCHER_AnchorBottomBaseline,
- ESCHER_AnchorTopCenteredBaseline,
- ESCHER_AnchorBottomCenteredBaseline
-};
-
-enum ESCHER_cDir
-{
- ESCHER_cDir0, // Right
- ESCHER_cDir90, // Down
- ESCHER_cDir180, // Left
- ESCHER_cDir270 // Up
-};
-
-// connector style
-enum ESCHER_cxSTYLE
-{
- ESCHER_cxstyleStraight = 0,
- ESCHER_cxstyleBent,
- ESCHER_cxstyleCurved,
- ESCHER_cxstyleNone
-};
-
-// text flow
-enum ESCHER_txfl
-{
- ESCHER_txflHorzN, // Horizontal non-@
- ESCHER_txflTtoBA, // Top to Bottom @-font
- ESCHER_txflBtoT, // Bottom to Top non-@
- ESCHER_txflTtoBN, // Top to Bottom non-@
- ESCHER_txflHorzA, // Horizontal @-font
- ESCHER_txflVertN // Vertical, non-@
-};
-
-// text direction (needed for Bi-Di support)
-enum ESCHER_txDir
-{
- ESCHER_txdirLTR, // left-to-right text direction
- ESCHER_txdirRTL, // right-to-left text direction
- ESCHER_txdirContext // context text direction
-};
-
-// Callout Type
-enum ESCHER_spcot
-{
- ESCHER_spcotRightAngle = 1,
- ESCHER_spcotOneSegment = 2,
- ESCHER_spcotTwoSegment = 3,
- ESCHER_spcotThreeSegment = 4
-};
-
-// Callout Angle
-enum ESCHER_spcoa
-{
- ESCHER_spcoaAny,
- ESCHER_spcoa30,
- ESCHER_spcoa45,
- ESCHER_spcoa60,
- ESCHER_spcoa90,
- ESCHER_spcoa0
-};
-
-// Callout Drop
-enum ESCHER_spcod
-{
- ESCHER_spcodTop,
- ESCHER_spcodCenter,
- ESCHER_spcodBottom,
- ESCHER_spcodSpecified
-};
-
-// FontWork alignment
-enum ESCHER_GeoTextAlign
-{
- ESCHER_AlignTextStretch, /* Stretch each line of text to fit width. */
- ESCHER_AlignTextCenter, /* Center text on width. */
- ESCHER_AlignTextLeft, /* Left justify. */
- ESCHER_AlignTextRight, /* Right justify. */
- ESCHER_AlignTextLetterJust, /* Spread letters out to fit width. */
- ESCHER_AlignTextWordJust, /* Spread words out to fit width. */
- ESCHER_AlignTextInvalid /* Invalid */
-};
-
-// flags for pictures
-enum ESCHER_BlipFlags
-{
- ESCHER_BlipFlagDefault = 0,
- ESCHER_BlipFlagComment = 0, // Blip name is a comment
- ESCHER_BlipFlagFile, // Blip name is a file name
- ESCHER_BlipFlagURL, // Blip name is a full URL
- ESCHER_BlipFlagType = 3, // Mask to extract type
- /* Or the following flags with any of the above. */
- ESCHER_BlipFlagDontSave = 4, // A "dont" is the depression in the metal
- // body work of an automobile caused when a
- // cyclist violently thrusts his or her nose
- // at it, thus a DontSave is another name for
- // a cycle lane.
- ESCHER_BlipFlagDoNotSave = 4, // For those who prefer English
- ESCHER_BlipFlagLinkToFile = 8
-};
-
-//
-enum ESCHER_3DRenderMode
-{
- ESCHER_FullRender, // Generate a full rendering
- ESCHER_Wireframe, // Generate a wireframe
- ESCHER_BoundingCube // Generate a bounding cube
-};
-
-//
-enum ESCHER_xFormType
-{
- ESCHER_xFormAbsolute, // Apply transform in absolute space centered on shape
- ESCHER_xFormShape, // Apply transform to shape geometry
- ESCHER_xFormDrawing // Apply transform in drawing space
-};
-
-//
-enum ESCHER_ShadowType
-{
- ESCHER_ShadowOffset, // N pixel offset shadow
- ESCHER_ShadowDouble, // Use second offset too
- ESCHER_ShadowRich, // Rich perspective shadow (cast relative to shape)
- ESCHER_ShadowShape, // Rich perspective shadow (cast in shape space)
- ESCHER_ShadowDrawing, // Perspective shadow cast in drawing space
- ESCHER_ShadowEmbossOrEngrave
-};
-
-// - the type of a (length) measurement
-enum ESCHER_dzType
- {
- ESCHER_dzTypeMin = 0,
- ESCHER_dzTypeDefault = 0, // Default size, ignore the values
- ESCHER_dzTypeA = 1, // Values are in EMUs
- ESCHER_dzTypeV = 2, // Values are in pixels
- ESCHER_dzTypeShape = 3, // Values are 16.16 fractions of shape size
- ESCHER_dzTypeFixedAspect = 4, // Aspect ratio is fixed
- ESCHER_dzTypeAFixed = 5, // EMUs, fixed aspect ratio
- ESCHER_dzTypeVFixed = 6, // Pixels, fixed aspect ratio
- ESCHER_dzTypeShapeFixed = 7, // Proportion of shape, fixed aspect ratio
- ESCHER_dzTypeFixedAspectEnlarge= 8, // Aspect ratio is fixed, favor larger size
- ESCHER_dzTypeAFixedBig = 9, // EMUs, fixed aspect ratio
- ESCHER_dzTypeVFixedBig = 10, // Pixels, fixed aspect ratio
- ESCHER_dzTypeShapeFixedBig= 11, // Proportion of shape, fixed aspect ratio
- ESCHER_dzTypeMax = 11
-};
-
-// how to interpret the colors in a shaded fill.
-enum ESCHER_ShadeType
-{
- ESCHER_ShadeNone = 0, // Interpolate without correction between RGBs
- ESCHER_ShadeGamma = 1, // Apply gamma correction to colors
- ESCHER_ShadeSigma = 2, // Apply a sigma transfer function to position
- ESCHER_ShadeBand = 4, // Add a flat band at the start of the shade
- ESCHER_ShadeOneColor = 8, // This is a one color shade
-
- /* A parameter for the band or sigma function can be stored in the top
- 16 bits of the value - this is a proportion of *each* band of the
- shade to make flat (or the approximate equal value for a sigma
- function). NOTE: the parameter is not used for the sigma function,
- instead a built in value is used. This value should not be changed
- from the default! */
- ESCHER_ShadeParameterShift = 16,
- ESCHER_ShadeParameterMask = 0xffff0000,
-
- ESCHER_ShadeDefault = (ESCHER_ShadeGamma|ESCHER_ShadeSigma|
- (16384<<ESCHER_ShadeParameterShift))
-};
-
-// compound line style
-enum ESCHER_LineStyle
-{
- ESCHER_LineSimple, // Single line (of width lineWidth)
- ESCHER_LineDouble, // Double lines of equal width
- ESCHER_LineThickThin, // Double lines, one thick, one thin
- ESCHER_LineThinThick, // Double lines, reverse order
- ESCHER_LineTriple // Three lines, thin, thick, thin
-};
-
-// how to "fill" the line contour
-enum ESCHER_LineType
-{
- ESCHER_lineSolidType, // Fill with a solid color
- ESCHER_linePattern, // Fill with a pattern (bitmap)
- ESCHER_lineTexture, // A texture (pattern with its own color map)
- ESCHER_linePicture // Center a picture in the shape
-};
-
-// dashed line style
-enum ESCHER_LineDashing
-{
- ESCHER_LineSolid, // Solid (continuous) pen
- ESCHER_LineDashSys, // PS_DASH system dash style
- ESCHER_LineDotSys, // PS_DOT system dash style
- ESCHER_LineDashDotSys, // PS_DASHDOT system dash style
- ESCHER_LineDashDotDotSys, // PS_DASHDOTDOT system dash style
- ESCHER_LineDotGEL, // square dot style
- ESCHER_LineDashGEL, // dash style
- ESCHER_LineLongDashGEL, // long dash style
- ESCHER_LineDashDotGEL, // dash short dash
- ESCHER_LineLongDashDotGEL, // long dash short dash
- ESCHER_LineLongDashDotDotGEL // long dash short dash short dash
-};
-
-// line end effect
-enum ESCHER_LineEnd
-{
- ESCHER_LineNoEnd,
- ESCHER_LineArrowEnd,
- ESCHER_LineArrowStealthEnd,
- ESCHER_LineArrowDiamondEnd,
- ESCHER_LineArrowOvalEnd,
- ESCHER_LineArrowOpenEnd
-};
-
-// size of arrowhead
-enum ESCHER_LineWidth
-{
- ESCHER_LineNarrowArrow,
- ESCHER_LineMediumWidthArrow,
- ESCHER_LineWideArrow
-};
-
-// size of arrowhead
-enum ESCHER_LineEndLenght
-{
- ESCHER_LineShortArrow,
- ESCHER_LineMediumLenArrow,
- ESCHER_LineLongArrow
-};
-
-// line join style.
-enum ESCHER_LineJoin
-{
- ESCHER_LineJoinBevel, // Join edges by a straight line
- ESCHER_LineJoinMiter, // Extend edges until they join
- ESCHER_LineJoinRound // Draw an arc between the two edges
-};
-
-// line cap style (applies to ends of dash segments too).
-enum ESCHER_LineCap
-{
- ESCHER_LineEndCapRound, // Rounded ends - the default
- ESCHER_LineEndCapSquare, // Square protrudes by half line width
- ESCHER_LineEndCapFlat // Line ends at end point
-};
-// Shape Properties
-// 1pt = 12700 EMU (English Metric Units)
-// 1pt = 20 Twip = 20/1440" = 1/72"
-// 1twip=635 EMU
-// 1" = 12700*72 = 914400 EMU
-// 1" = 25.4mm
-// 1mm = 36000 EMU
-// 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 */
-// 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 */
-#define ESCHER_Prop_dyTextTop 130 /* LONG text rectangle (in EMUs) */
-#define ESCHER_Prop_dxTextRight 131 /* LONG */
-#define ESCHER_Prop_dyTextBottom 132 /* LONG */
-#define ESCHER_Prop_WrapText 133 /* MSOWRAPMODE Wrap text at shape margins */
-#define ESCHER_Prop_scaleText 134 /* LONG Text zoom/scale (used if fFitTextToShape) */
-#define ESCHER_Prop_AnchorText 135 /* ESCHER_AnchorText How to anchor the text */
-#define ESCHER_Prop_txflTextFlow 136 /* MSOTXFL Text flow */
-#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 */
-// GeoText
-#define ESCHER_Prop_gtextUNICODE 192 /* WCHAR* UNICODE text string */
-#define ESCHER_Prop_gtextRTF 193 /* char* RTF text string */
-#define ESCHER_Prop_gtextAlign 194 /* MSOGEOTEXTALIGN alignment on curve */
-#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 */
-// Blip
-#define ESCHER_Prop_cropFromTop 256 /* LONG 16.16 fraction times total */
-#define ESCHER_Prop_cropFromBottom 257 /* LONG image width or height, */
-#define ESCHER_Prop_cropFromLeft 258 /* LONG as appropriate. */
-#define ESCHER_Prop_cropFromRight 259 /* LONG */
-#define ESCHER_Prop_pib 260 /* IMsoBlip* Blip to display */
-#define ESCHER_Prop_pibName 261 /* WCHAR* Blip file name */
-#define ESCHER_Prop_pibFlags 262 /* MSOBLIPFLAGS Blip flags */
-#define ESCHER_Prop_pictureTransparent 263 /* LONG transparent color (none if ~0UL) */
-#define ESCHER_Prop_pictureContrast 264 /* LONG contrast setting */
-#define ESCHER_Prop_pictureBrightness 265 /* LONG brightness setting */
-#define ESCHER_Prop_pictureGamma 266 /* LONG 16.16 gamma */
-#define ESCHER_Prop_pictureId 267 /* LONG Host-defined ID for OLE objects (usually a pointer) */
-#define ESCHER_Prop_pictureDblCrMod 268 /* MSOCLR Modification used if shape has double shadow */
-#define ESCHER_Prop_pictureFillCrMod 269 /* MSOCLR */
-#define ESCHER_Prop_pictureLineCrMod 270 /* MSOCLR */
-#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) */
-// Geometry
-#define ESCHER_Prop_geoLeft 320 /* LONG Defines the G (geometry) coordinate space. */
-#define ESCHER_Prop_geoTop 321 /* LONG */
-#define ESCHER_Prop_geoRight 322 /* LONG */
-#define ESCHER_Prop_geoBottom 323 /* LONG */
-#define ESCHER_Prop_shapePath 324 /* MSOSHAPEPATH */
-#define ESCHER_Prop_pVertices 325 /* IMsoArray An array of points, in G units. */
-#define ESCHER_Prop_pSegmentInfo 326 /* IMsoArray */
-#define ESCHER_Prop_adjustValue 327 /* LONG Adjustment values corresponding to */
-#define ESCHER_Prop_adjust2Value 328 /* LONG the positions of the adjust handles */
-#define ESCHER_Prop_adjust3Value 329 /* LONG of the shape. The number of values */
-#define ESCHER_Prop_adjust4Value 330 /* LONG used and their allowable ranges vary */
-#define ESCHER_Prop_adjust5Value 331 /* LONG from shape type to shape type. */
-#define ESCHER_Prop_adjust6Value 332 /* LONG */
-#define ESCHER_Prop_adjust7Value 333 /* LONG */
-#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? */
-// FillStyle
-#define ESCHER_Prop_fillType 384 /* ESCHER_FillStyle Type of fill */
-#define ESCHER_Prop_fillColor 385 /* MSOCLR Foreground color */
-#define ESCHER_Prop_fillOpacity 386 /* LONG Fixed 16.16 */
-#define ESCHER_Prop_fillBackColor 387 /* MSOCLR Background color */
-#define ESCHER_Prop_fillBackOpacity 388 /* LONG Shades only */
-#define ESCHER_Prop_fillCrMod 389 /* MSOCLR Modification for BW views */
-#define ESCHER_Prop_fillBlip 390 /* IMsoBlip* Pattern/texture */
-#define ESCHER_Prop_fillBlipName 391 /* WCHAR* Blip file name */
-#define ESCHER_Prop_fillBlipFlags 392 /* MSOBLIPFLAGS Blip flags */
-#define ESCHER_Prop_fillWidth 393 /* LONG How big (A units) to make a metafile texture. */
-#define ESCHER_Prop_fillHeight 394 /* LONG */
-#define ESCHER_Prop_fillAngle 395 /* LONG Fade angle - degrees in 16.16 */
-#define ESCHER_Prop_fillFocus 396 /* LONG Linear shaded fill focus percent */
-#define ESCHER_Prop_fillToLeft 397 /* LONG Fraction 16.16 */
-#define ESCHER_Prop_fillToTop 398 /* LONG Fraction 16.16 */
-#define ESCHER_Prop_fillToRight 399 /* LONG Fraction 16.16 */
-#define ESCHER_Prop_fillToBottom 400 /* LONG Fraction 16.16 */
-#define ESCHER_Prop_fillRectLeft 401 /* LONG For shaded fills, use the specified rectangle */
-#define ESCHER_Prop_fillRectTop 402 /* LONG instead of the shape's bounding rect to */
-#define ESCHER_Prop_fillRectRight 403 /* LONG define how large the fade is going to be. */
-#define ESCHER_Prop_fillRectBottom 404 /* LONG */
-#define ESCHER_Prop_fillDztype 405 /* MSODZTYPE */
-#define ESCHER_Prop_fillShadePreset 406 /* LONG Special shades */
-#define ESCHER_Prop_fillShadeColors 407 /* IMsoArray a preset array of colors */
-#define ESCHER_Prop_fillOriginX 408 /* LONG */
-#define ESCHER_Prop_fillOriginY 409 /* LONG */
-#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 */
-// LineStyle
-#define ESCHER_Prop_lineColor 448 /* MSOCLR Color of line */
-#define ESCHER_Prop_lineOpacity 449 /* LONG Not implemented */
-#define ESCHER_Prop_lineBackColor 450 /* MSOCLR Background color */
-#define ESCHER_Prop_lineCrMod 451 /* MSOCLR Modification for BW views */
-#define ESCHER_Prop_lineType 452 /* MSOLINETYPE Type of line */
-#define ESCHER_Prop_lineFillBlip 453 /* IMsoBlip* Pattern/texture */
-#define ESCHER_Prop_lineFillBlipName 454 /* WCHAR* Blip file name */
-#define ESCHER_Prop_lineFillBlipFlags 455 /* MSOBLIPFLAGS Blip flags */
-#define ESCHER_Prop_lineFillWidth 456 /* LONG How big (A units) to make */
-#define ESCHER_Prop_lineFillHeight 457 /* LONG a metafile texture. */
-#define ESCHER_Prop_lineFillDztype 458 /* MSODZTYPE How to interpret fillWidth/Height numbers. */
-#define ESCHER_Prop_lineWidth 459 /* LONG A units; 1pt == 12700 EMUs */
-#define ESCHER_Prop_lineMiterLimit 460 /* LONG ratio (16.16) of width */
-#define ESCHER_Prop_lineStyle 461 /* MSOLINESTYLE Draw parallel lines? */
-#define ESCHER_Prop_lineDashing 462 /* MSOLINEDASHING Can be overridden by: */
-#define ESCHER_Prop_lineDashStyle 463 /* IMsoArray As Win32 ExtCreatePen */
-#define ESCHER_Prop_lineStartArrowhead 464 /* MSOLINEEND Arrow at start */
-#define ESCHER_Prop_lineEndArrowhead 465 /* MSOLINEEND Arrow at end */
-#define ESCHER_Prop_lineStartArrowWidth 466 /* MSOLINEENDWIDTH Arrow at start */
-#define ESCHER_Prop_lineStartArrowLength 467 /* MSOLINEENDLENGTH Arrow at end */
-#define ESCHER_Prop_lineEndArrowWidth 468 /* MSOLINEENDWIDTH Arrow at start */
-#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 */
-// ShadowStyle
-#define ESCHER_Prop_shadowType 512 /* MSOSHADOWTYPE Type of effect */
-#define ESCHER_Prop_shadowColor 513 /* MSOCLR Foreground color */
-#define ESCHER_Prop_shadowHighlight 514 /* MSOCLR Embossed color */
-#define ESCHER_Prop_shadowCrMod 515 /* MSOCLR Modification for BW views */
-#define ESCHER_Prop_shadowOpacity 516 /* LONG Fixed 16.16 */
-#define ESCHER_Prop_shadowOffsetX 517 /* LONG Offset shadow */
-#define ESCHER_Prop_shadowOffsetY 518 /* LONG Offset shadow */
-#define ESCHER_Prop_shadowSecondOffsetX 519 /* LONG Double offset shadow */
-#define ESCHER_Prop_shadowSecondOffsetY 520 /* LONG Double offset shadow */
-#define ESCHER_Prop_shadowScaleXToX 521 /* LONG 16.16 */
-#define ESCHER_Prop_shadowScaleYToX 522 /* LONG 16.16 */
-#define ESCHER_Prop_shadowScaleXToY 523 /* LONG 16.16 */
-#define ESCHER_Prop_shadowScaleYToY 524 /* LONG 16.16 */
-#define ESCHER_Prop_shadowPerspectiveX 525 /* LONG 16.16 / weight */
-#define ESCHER_Prop_shadowPerspectiveY 526 /* LONG 16.16 / weight */
-#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 */
-// PerspectiveStyle
-#define ESCHER_Prop_perspectiveType 576 /* MSOXFORMTYPE Where transform applies */
-#define ESCHER_Prop_perspectiveOffsetX 577 /* LONG The LONG values define a */
-#define ESCHER_Prop_perspectiveOffsetY 578 /* LONG transformation matrix, */
-#define ESCHER_Prop_perspectiveScaleXToX 579 /* LONG effectively, each value */
-#define ESCHER_Prop_perspectiveScaleYToX 580 /* LONG is scaled by the */
-#define ESCHER_Prop_perspectiveScaleXToY 581 /* LONG perspectiveWeight parameter. */
-#define ESCHER_Prop_perspectiveScaleYToY 582 /* LONG */
-#define ESCHER_Prop_perspectivePerspectiveX 583 /* LONG */
-#define ESCHER_Prop_perspectivePerspectiveY 584 /* LONG */
-#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 */
-// 3D Object
-#define ESCHER_Prop_c3DSpecularAmt 640 /* LONG Fixed-point 16.16 */
-#define ESCHER_Prop_c3DDiffuseAmt 641 /* LONG Fixed-point 16.16 */
-#define ESCHER_Prop_c3DShininess 642 /* LONG Default gives OK results */
-#define ESCHER_Prop_c3DEdgeThickness 643 /* LONG Specular edge thickness */
-#define ESCHER_Prop_c3DExtrudeForward 644 /* LONG Distance of extrusion in EMUs */
-#define ESCHER_Prop_c3DExtrudeBackward 645 /* LONG */
-#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 */
-// 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 */
-#define ESCHER_Prop_c3DRotationAxisX 706 /* LONG These specify the rotation axis; */
-#define ESCHER_Prop_c3DRotationAxisY 707 /* LONG only their relative magnitudes */
-#define ESCHER_Prop_c3DRotationAxisZ 708 /* LONG matter. */
-#define ESCHER_Prop_c3DRotationAngle 709 /* LONG degrees (16.16) about axis */
-#define ESCHER_Prop_c3DRotationCenterX 710 /* LONG rotation center x (16.16 or g-units) */
-#define ESCHER_Prop_c3DRotationCenterY 711 /* LONG rotation center y (16.16 or g-units) */
-#define ESCHER_Prop_c3DRotationCenterZ 712 /* LONG rotation center z (absolute (emus)) */
-#define ESCHER_Prop_c3DRenderMode 713 /* MSO3DRENDERMODE Full,wireframe, or bcube */
-#define ESCHER_Prop_c3DTolerance 714 /* LONG pixels (16.16) */
-#define ESCHER_Prop_c3DXViewpoint 715 /* LONG X view point (emus) */
-#define ESCHER_Prop_c3DYViewpoint 716 /* LONG Y view point (emus) */
-#define ESCHER_Prop_c3DZViewpoint 717 /* LONG Z view distance (emus) */
-#define ESCHER_Prop_c3DOriginX 718 /* LONG */
-#define ESCHER_Prop_c3DOriginY 719 /* LONG */
-#define ESCHER_Prop_c3DSkewAngle 720 /* LONG degree (16.16) skew angle */
-#define ESCHER_Prop_c3DSkewAmount 721 /* LONG Percentage skew amount */
-#define ESCHER_Prop_c3DAmbientIntensity 722 /* LONG Fixed point intensity */
-#define ESCHER_Prop_c3DKeyX 723 /* LONG Key light source direc- */
-#define ESCHER_Prop_c3DKeyY 724 /* LONG tion; only their relative */
-#define ESCHER_Prop_c3DKeyZ 725 /* LONG magnitudes matter */
-#define ESCHER_Prop_c3DKeyIntensity 726 /* LONG Fixed point intensity */
-#define ESCHER_Prop_c3DFillX 727 /* LONG Fill light source direc- */
-#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? */
-// 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. */
-// Callout
-#define ESCHER_Prop_spcot 832 /* MSOSPCOT Callout type */
-#define ESCHER_Prop_dxyCalloutGap 833 /* LONG Distance from box to first point.(EMUs) */
-#define ESCHER_Prop_spcoa 834 /* MSOSPCOA Callout angle */
-#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 */
-// GroupShape
-#define ESCHER_Prop_wzName 896 /* WCHAR* Shape Name (present only if explicitly set) */
-#define ESCHER_Prop_wzDescription 897 /* WCHAR* alternate text */
-#define ESCHER_Prop_pihlShape 898 /* IHlink* The hyperlink in the shape. */
-#define ESCHER_Prop_pWrapPolygonVertices 899 /* IMsoArray The polygon that text will be wrapped around (Word) */
-#define ESCHER_Prop_dxWrapDistLeft 900 /* LONG Left wrapping distance from text (Word) */
-#define ESCHER_Prop_dyWrapDistTop 901 /* LONG Top wrapping distance from text (Word) */
-#define ESCHER_Prop_dxWrapDistRight 902 /* LONG Right wrapping distance from text (Word) */
-#define ESCHER_Prop_dyWrapDistBottom 903 /* LONG Bottom wrapping distance from text (Word) */
-#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_PERSISTENTRY_PREALLOCATE 64
-
-#define ESCHER_Persist_PrivateEntry 0x80000000
-#define ESCHER_Persist_Dgg 0x00010000
-#define ESCHER_Persist_Dgg_FIDCL 0x00010001
-#define ESCHER_Persist_Dg 0x00020000
-#define ESCHER_Persist_BlibStoreContainer 0x00030000
-#define ESCHER_Persist_CurrentPosition 0x00040000
-#define ESCHER_Persist_Grouping_Snap 0x00050000
-#define ESCHER_Persist_Grouping_Logic 0x00060000
-
-// ---------------------------------------------------------------------------------------------
-
-namespace com { namespace sun { namespace star {
- namespace awt {
- struct Gradient;
- }
- namespace drawing {
- struct EnhancedCustomShapeAdjustmentValue;
- class XShape;
- }
-}}}
-
-struct SVX_DLLPUBLIC EscherConnectorListEntry
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnector;
- ::com::sun::star::awt::Point maPointA;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToA;
- ::com::sun::star::awt::Point maPointB;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToB;
-
- sal_uInt32 GetConnectorRule( sal_Bool bFirst );
-
- EscherConnectorListEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rC,
- const ::com::sun::star::awt::Point& rPA,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSA ,
- const ::com::sun::star::awt::Point& rPB,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSB ) :
- mXConnector ( rC ),
- maPointA ( rPA ),
- mXConnectToA( rSA ),
- maPointB ( rPB ),
- mXConnectToB( rSB ) {}
-
- sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP );
-};
-
-struct SVX_DLLPUBLIC EscherExContainer
-{
- sal_uInt32 nContPos;
- SvStream& rStrm;
-
- EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0 );
- ~EscherExContainer();
-};
-struct SVX_DLLPUBLIC EscherExAtom
-{
- sal_uInt32 nContPos;
- SvStream& rStrm;
-
- EscherExAtom( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0, const sal_uInt8 nVersion = 0 );
- ~EscherExAtom();
-};
-
-struct EscherPropertyValueHelper
-{
- static sal_Bool GetPropertyValue(
- ::com::sun::star::uno::Any& rAny,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
- const String& rPropertyName,
- sal_Bool bTestPropertyAvailability = sal_False );
-
- static ::com::sun::star::beans::PropertyState GetPropertyState(
- const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &,
- const String& rPropertyName );
-};
-
-// ---------------------------------------------------------------------------------------------
-
-struct EscherPersistEntry
-{
- UINT32 mnID;
- UINT32 mnOffset;
- EscherPersistEntry( UINT32 nId, UINT32 nOffset ) { mnID = nId; mnOffset = nOffset; };
-
-};
-
-// ---------------------------------------------------------------------------------------------
-
-class SvMemoryStream;
-class EscherBlibEntry
-{
-
- friend class EscherGraphicProvider;
- friend class EscherEx;
- friend class _EscherEx;
-
- protected:
-
- UINT32 mnIdentifier[ 4 ];
- UINT32 mnPictureOffset; // offset auf die grafik im PictureStreams
- UINT32 mnSize; // size of real graphic
-
- UINT32 mnRefCount; // !! reference count
- UINT32 mnSizeExtra; // !! size of preceding header
-
- ESCHER_BlibType meBlibType;
-
- Size maPrefSize;
- MapMode maPrefMapMode;
-
- sal_Bool mbIsEmpty;
- sal_Bool mbIsNativeGraphicPossible;
-
- public:
-
- EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObj,
- const ByteString& rId, const GraphicAttr* pAttr = NULL );
-
- ~EscherBlibEntry();
-
- void WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0 );
- sal_Bool IsEmpty() const { return mbIsEmpty; };
-
- BOOL operator==( const EscherBlibEntry& ) const;
-};
-
-// ---------------------------------------------------------------------------------------------
-
-#define _E_GRAPH_PROV_USE_INSTANCES 1
-#define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2
-
-class SVX_DLLPUBLIC EscherGraphicProvider
-{
- sal_uInt32 mnFlags;
-
- EscherBlibEntry** mpBlibEntrys;
- sal_uInt32 mnBlibBufSize;
- sal_uInt32 mnBlibEntrys;
-
- protected :
-
- UINT32 ImplInsertBlib( EscherBlibEntry* p_EscherBlibEntry );
-
- public :
-
- sal_uInt32 GetBlibStoreContainerSize( SvStream* pMergePicStreamBSE = NULL ) const;
- void WriteBlibStoreContainer( SvStream& rStrm, SvStream* pMergePicStreamBSE = NULL );
- sal_Bool WriteBlibStoreEntry(SvStream& rStrm, sal_uInt32 nBlipId,
- sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0);
- sal_uInt32 GetBlibID( SvStream& rPicOutStream, const ByteString& rGraphicId, const Rectangle& rBoundRect,
- const com::sun::star::awt::Rectangle* pVisArea = NULL, const GraphicAttr* pGrafikAttr = NULL );
- sal_Bool HasGraphics() const { return mnBlibEntrys != 0; };
-
- void SetNewBlipStreamOffset( sal_Int32 nOffset );
-
- sal_Bool GetPrefSize( const sal_uInt32 nBlibId, Size& rSize, MapMode& rMapMode );
-
- EscherGraphicProvider( sal_uInt32 nFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
- ~EscherGraphicProvider();
-
-};
-
-class SVX_DLLPUBLIC EscherSolverContainer
-{
- List maShapeList;
- List maConnectorList;
-
-public:
-
- sal_uInt32 GetShapeId( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape ) const;
-
- void AddShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt32 nId );
- void AddConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &,
- const ::com::sun::star::awt::Point& rA,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &,
- const ::com::sun::star::awt::Point& rB,
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConB );
-
- void WriteSolver( SvStream& );
-
- EscherSolverContainer(){};
- ~EscherSolverContainer();
-};
-
-// ---------------------------------------------------------------------------------------------
-
-#define ESCHER_CREATEPOLYGON_LINE 1
-#define ESCHER_CREATEPOLYGON_POLYLINE 2
-#define ESCHER_CREATEPOLYGON_POLYPOLYGON 4
-
-class GraphicAttr;
-class SdrObjCustomShape;
-
-struct EscherPropSortStruct
-{
- sal_uInt8* pBuf;
- sal_uInt32 nPropSize;
- sal_uInt32 nPropValue;
- sal_uInt16 nPropId;
-};
-
-typedef std::vector< EscherPropSortStruct > EscherProperties;
-
-class SVX_DLLPUBLIC EscherPropertyContainer
-{
- EscherGraphicProvider* pGraphicProvider;
- SvStream* pPicOutStrm;
- Rectangle* pShapeBoundRect;
-
- EscherPropSortStruct* pSortStruct;
-
- sal_uInt32 nSortCount;
- sal_uInt32 nSortBufSize;
- sal_uInt32 nCountCount;
- sal_uInt32 nCountSize;
-
- sal_Bool bHasComplexData;
- sal_Bool bSuppressRotation;
-
-
- sal_uInt32 ImplGetColor( const sal_uInt32 rColor, sal_Bool bSwap = sal_True );
- void ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes );
- sal_Bool ImplCreateEmbeddedBmp( const ByteString& rUniqueId );
- void ImplInit();
-
- public :
-
- EscherPropertyContainer();
- EscherPropertyContainer(
- EscherGraphicProvider& rGraphicProvider, // the PropertyContainer needs to know
- SvStream* pPicOutStrm, // the GraphicProvider to be able to write
- Rectangle& rShapeBoundRect ); // FillBitmaps or GraphicObjects.
- // under some cirumstances the ShapeBoundRect is adjusted
- // this will happen when rotated GraphicObjects
- // are saved to PowerPoint
- ~EscherPropertyContainer();
-
- void AddOpt( sal_uInt16 nPropertyID, const rtl::OUString& rString );
-
- void AddOpt( sal_uInt16 nPropertyID, sal_uInt32 nPropValue,
- sal_Bool bBlib = sal_False );
-
- void AddOpt( sal_uInt16 nPropertyID, sal_Bool bBlib, sal_uInt32 nPropValue,
- sal_uInt8* pProp, sal_uInt32 nPropSize );
-
- sal_Bool GetOpt( sal_uInt16 nPropertyID, sal_uInt32& rPropValue ) const;
-
- sal_Bool GetOpt( sal_uInt16 nPropertyID, EscherPropSortStruct& rPropValue ) const;
-
- EscherProperties GetOpts() const;
-
- void Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT );
-
- sal_Bool CreateOLEGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject );
-
- /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */
- sal_Bool CreateEmbeddedBitmapProperties( const ::rtl::OUString& rBitmapUrl,
- ::com::sun::star::drawing::BitmapMode eBitmapMode );
- /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */
- sal_Bool CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch,
- const Color& rBackColor, bool bFillBackground );
-
- // the GraphicProperties will only be created if a GraphicProvider and PicOutStrm is known
- // DR: #99897# if no GraphicProvider is present, a complex ESCHER_Prop_fillBlip
- // will be created, containing the BLIP directly (e.g. for Excel charts).
- sal_Bool CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- const String& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes = sal_False,
- const sal_Bool bFillBitmapModeAllowed = sal_True );
-
- sal_Bool CreatePolygonProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- sal_uInt32 nFlags, sal_Bool bBezier, ::com::sun::star::awt::Rectangle& rGeoRect, Polygon* pPolygon = NULL );
-
- static sal_uInt32 GetGradientColor( const ::com::sun::star::awt::Gradient* pGradient, sal_uInt32 nStartColor );
-
- void CreateGradientProperties( const ::com::sun::star::awt::Gradient & rGradient );
- void CreateGradientProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & );
- void CreateLineProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge );
- void CreateFillProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge );
- void CreateTextProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_uInt32 nText,
- const sal_Bool bIsCustomShape = sal_False, const sal_Bool bIsTextFrame = sal_True );
-
- sal_Bool CreateConnectorProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
- EscherSolverContainer& rSolver, ::com::sun::star::awt::Rectangle& rGeoRect,
- sal_uInt16& rShapeType, sal_uInt16& rShapeFlags );
-
- // Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last.
- // It activ only when at least a FillStyle or LineStyle is set.
- sal_Bool CreateShadowProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & );
-
- // creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties
- void CreateCustomShapeProperties( const MSO_SPT eShapeType, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & );
- sal_Bool IsFontWork() const;
-
- // helper functions which are also used by the escher import
- static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape );
- static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource );
- static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags );
- static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags, rtl::OUString& rShapeType );
-
- // helper functions which are also used in ooxml export
- static sal_Bool GetLineArrow( const sal_Bool bLineStart,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
- ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth );
- static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape );
- static void LookForPolarHandles( const MSO_SPT eShapeType, sal_Int32& nAdjustmentsWhichNeedsToBeConverted );
- static sal_Bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue );
-};
-
-// ---------------------------------------------------------------------------------------------
-
-class SVX_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(); };
-
- EscherPersistTable();
- virtual ~EscherPersistTable();
-};
-
-// ---------------------------------------------------------------------------------------------
-
-class EscherEx;
-
-/// abstract base class for ESCHER_ClientTextbox, ESCHER_ClientData
-class SVX_DLLPUBLIC EscherExClientRecord_Base
-{
-public:
- EscherExClientRecord_Base() {}
- virtual ~EscherExClientRecord_Base();
-
- /// Application writes the record header
- /// using rEx.AddAtom(...) followed by
- /// record data written to rEx.GetStream()
- virtual void WriteData( EscherEx& rEx ) const = 0;
-};
-
-
-/// abstract base class for ESCHER_ClientAnchor
-class SVX_DLLPUBLIC EscherExClientAnchor_Base
-{
-public:
- EscherExClientAnchor_Base() {}
- virtual ~EscherExClientAnchor_Base();
-
- /// Application writes the record header
- /// using rEx.AddAtom(...) followed by
- /// record data written to rEx.GetStream()
- virtual void WriteData( EscherEx& rEx,
- const Rectangle& rRect ) = 0;
-};
-
-
-class EscherExHostAppData
-{
-private:
- EscherExClientAnchor_Base* pClientAnchor;
- EscherExClientRecord_Base* pClientData;
- EscherExClientRecord_Base* pClientTextbox;
- // ignore single shape if entire pages are written
- BOOL bDontWriteShape;
-
-public:
- EscherExHostAppData() : pClientAnchor(0), pClientData(0),
- pClientTextbox(0), bDontWriteShape(FALSE)
- {}
-
- void SetClientAnchor( EscherExClientAnchor_Base* p )
- { pClientAnchor = p; }
- void SetClientData( EscherExClientRecord_Base* p )
- { pClientData = p; }
- void SetClientTextbox( EscherExClientRecord_Base* p )
- { pClientTextbox = p; }
- void SetDontWriteShape( BOOL b )
- { bDontWriteShape = b; }
- EscherExClientAnchor_Base* GetClientAnchor() const
- { return pClientAnchor; }
- EscherExClientRecord_Base* GetClientData() const
- { return pClientData; }
- EscherExClientRecord_Base* GetClientTextbox() const
- { return pClientTextbox; }
-
- void WriteClientAnchor( EscherEx& rEx, const Rectangle& rRect )
- { if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); }
- void WriteClientData( EscherEx& rEx )
- { if( pClientData ) pClientData->WriteData( rEx ); }
- void WriteClientTextbox( EscherEx& rEx )
- { if( pClientTextbox ) pClientTextbox->WriteData( rEx ); }
-
- BOOL DontWriteShape() const { return bDontWriteShape; }
-};
-
-
-// ---------------------------------------------------------------------------------------------
-
-class SdrObject;
-class SdrPage;
-class ImplEscherExSdr;
-class Color;
-
-class Graphic;
-class SvMemoryStream;
-class SvStream;
-
-class SVX_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider
-{
- protected :
-
- SvStream* mpOutStrm;
- ImplEscherExSdr* mpImplEscherExSdr;
- UINT32 mnStrmStartOfs;
- std::vector< sal_uInt32 > mOffsets;
- std::vector< sal_uInt16 > mRecTypes;
-
- UINT32 mnDrawings;
- UINT32 mnFIDCLs; // anzahl der cluster ID's
-
- UINT32 mnCurrentDg;
- UINT32 mnCurrentShapeID; // die naechste freie ID
- UINT32 mnCurrentShapeMaximumID; // die hoechste und auch benutzte ID
- UINT32 mnTotalShapesDg; // anzahl der shapes im Dg
- UINT32 mnTotalShapeIdUsedDg; // anzahl der benutzten shape Id's im Dg
- UINT32 mnTotalShapesDgg; // anzahl der shapes im Dgg
- UINT32 mnCountOfs;
-
- UINT32 mnGroupLevel;
- UINT16 mnHellLayerId;
-
- BOOL mbEscherSpgr;
- BOOL mbEscherDgg;
- BOOL mbEscherDg;
- BOOL mbOleEmf; // OLE is EMF instead of WMF
-
-
- virtual BOOL DoSeek( UINT32 nKey );
-
- public:
-
- EscherEx( SvStream& rOut, UINT32 nDrawings );
-
- /// Fuegt in den EscherStream interne Daten ein, dieser Vorgang
- /// darf und muss nur einmal ausgefuehrt werden.
- /// Wenn pPicStreamMergeBSE angegeben ist, werden die BLIPs
- /// aus diesem Stream in die MsofbtBSE Records des EscherStream
- /// gemerged, wie es fuer Excel (und Word?) benoetigt wird.
- virtual void Flush( SvStream* pPicStreamMergeBSE = NULL );
-
- virtual ~EscherEx();
-
- // Application may overload this function to maintain an offset
- // table for specific regions but MUST call this function too.
- virtual void InsertAtCurrentPos( UINT32 nBytes, BOOL bCont = FALSE );// es werden nBytes an der aktuellen Stream Position eingefuegt,
- // die PersistantTable und interne Zeiger angepasst
-
- void InsertPersistOffset( UINT32 nKey, UINT32 nOffset ); // Es wird nicht geprueft, ob sich jener schluessel schon in der PersistantTable befindet
- BOOL SeekToPersistOffset( UINT32 nKey );
- virtual BOOL InsertAtPersistOffset( UINT32 nKey, UINT32 nValue );// nValue wird im Stream an entrsprechender Stelle eingefuegt(overwrite modus), ohne dass sich die
- // aktuelle StreamPosition aendert
-
- SvStream& GetStream() const { return *mpOutStrm; }
- ULONG GetStreamPos() const { return mpOutStrm->Tell(); }
-
- virtual BOOL SeekBehindRecHeader( UINT16 nRecType ); // der stream muss vor einem gueltigen Record Header oder Atom stehen
-
- // features beim erzeugen folgender Container:
- //
- // ESCHER_DggContainer: ein EscherDgg Atom wird automatisch erzeugt und verwaltet
- // ESCHER_DgContainer: ein EscherDg Atom wird automatisch erzeugt und verwaltet
- // ESCHER_SpgrContainer:
- // ESCHER_SpContainer:
-
- virtual void OpenContainer( 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 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 void LeaveGroup();
-
- // ein ESCHER_Sp wird geschrieben ( Ein ESCHER_DgContainer muss dazu geoeffnet sein !!)
- virtual void AddShape( UINT32 nShpInstance, UINT32 nFlagIds, UINT32 nShapeID = 0 );
- // reserviert eine ShapeId
- UINT32 GetShapeID();
-
- virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect );
-
- UINT32 GetColor( const UINT32 nColor, BOOL bSwap = TRUE );
- UINT32 GetColor( const Color& rColor, BOOL bSwap = TRUE );
-
- // OLE is written as EMF instead of WMF (default WMF)
- void SetOleEmf( BOOL bVal ) { mbOleEmf = bVal; }
- BOOL IsOleEmf() const { return mbOleEmf; }
-
- // ...Sdr... implemented in eschesdo.cxx
-
- void AddSdrPage( const SdrPage& rPage );
-
- /// returns the ShapeID
- UINT32 AddSdrObject( const SdrObject& rObj );
-
- /// If objects are written through AddSdrObject the
- /// SolverContainer has to be written, and maybe some
- /// maintenance to be done.
- void EndSdrObjectPage();
-
- /// Called before a shape is written, application supplies
- /// ClientRecords. May set AppData::bDontWriteShape so the
- /// shape is ignored.
- virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape );
-
- /// Called after a shape is written to inform the application
- /// of the resulted shape type and ID.
- virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID );
-
- /// Called before an AdditionalText EnterGroup occurs.
- /// The current shape will be written in three parts:
- /// a group shape, the shape itself, and an extra textbox shape.
- /// The complete flow is:
- /// StartShape sets HostData1.
- /// EnterAdditionalTextGroup sets HostData2, App may modify
- /// HostData1 and keep track of the change.
- /// The group shape is written with HostData2.
- /// Another StartShape with the same (!) object sets HostData3.
- /// The current shape is written with HostData3.
- /// EndShape is called for the current shape.
- /// Another StartShape with the same (!) object sets HostData4.
- /// The textbox shape is written with HostData4.
- /// EndShape is called for the textbox shape.
- /// EndShape is called for the group shape, this provides
- /// the same functionality as an ordinary recursive group.
- virtual EscherExHostAppData* EnterAdditionalTextGroup();
-
- /// Called if a picture shall be written and no PicStream is
- /// set at ImplEscherExSdr
- virtual SvStream* QueryPicStream();
-
- /// Called if an ESCHER_Prop_lTxid shall be written
- virtual UINT32 QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, UINT32 nShapeId );
- // add an dummy rectangle shape into the escher stream
- 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; }
-};
-
-
-#endif // _SVX_ESCHEREX_HXX
diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx
index ed18f2bfab..a75e157ef3 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/svx/inc/svx/escpitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/source/cui/multifil.hxx b/svx/inc/svx/exthelpid.hrc
index 33c844ddc7..fbbea43260 100644
--- a/svx/source/cui/multifil.hxx
+++ b/svx/inc/svx/exthelpid.hrc
@@ -6,8 +6,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: multifil.hxx,v $
- * $Revision: 1.5 $
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
*
* This file is part of OpenOffice.org.
*
@@ -27,36 +27,32 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SVX_MULTIFIL_HXX
-#define _SVX_MULTIFIL_HXX
-
+#ifndef _SVX_EXTHELPID_HRC
+#define _SVX_EXTHELPID_HRC
// include ---------------------------------------------------------------
-#include "multipat.hxx"
-
-// #97807# ----------------------------------------------------
-#include <ucbhelper/content.hxx>
-#include <map>
+#include <svl/solar.hrc>
-// class SvxMultiFileDialog ----------------------------------------------
+// these HIDs are used in SVX and also in other modules, mainly CUI
+// the reason is that different controls have the same help texts assigned
+// but are implemented in different libraries
+// to avoid "exporting" the whole HID list only those few ones that are shared
+// are moved to this exported (delivered) hrc file
-class SvxMultiFileDialog : public SvxMultiPathDialog
-{
-private:
- // #97807# -------------------------------------
- std::map< String, ::ucbhelper::Content > aFileContentMap;
-
- DECL_LINK( AddHdl_Impl, PushButton * );
- DECL_LINK( DelHdl_Impl, PushButton * );
+// Help-Ids --------------------------------------------------------------
+#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0)
+#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
-public:
- SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
- ~SvxMultiFileDialog();
+// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
- String GetFiles() const { return SvxMultiPathDialog::GetPath(); }
- void SetFiles( const String& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); }
-};
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1)
+#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END
+#error Resource-Ueberlauf in #line, #file
+#endif
#endif
diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx
index 3dd2489b30..cc98e695ce 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/svx/inc/svx/fhgtitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index e36b6b3502..61a1cbe353 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -31,7 +31,7 @@
#ifndef _FILLCTRL_HXX
#define _FILLCTRL_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx
index 0957d8554f..4e1f301aea 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/svx/inc/svx/flditem.hxx
@@ -33,7 +33,7 @@
#include <i18npool/lang.h>
#include <tools/time.hxx>
#include <tools/date.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <tools/pstm.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 8eccd5be30..a24b5a5cab 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
diff --git a/svx/source/inc/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 757c970dba..977c84ce05 100644
--- a/svx/source/inc/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -65,6 +65,8 @@
#include <com/sun/star/awt/FontStrikeout.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <svl/svstdarr.hxx>
+//#include "fmprop.hrc"
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/io/XObjectInputStream.hpp>
#include <com/sun/star/io/XObjectOutputStream.hpp>
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index 03435c4e96..b88ba95bf8 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
#include <sfx2/mnuitem.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx
index 9cb082031a..e50298f551 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/svx/inc/svx/forbiddenruleitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx
index 3e68978b1b..70df9f75d5 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/svx/inc/svx/frmdiritem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <svx/frmdir.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 6c508c2311..fc47bfca35 100644
--- a/svx/inc/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -34,9 +34,9 @@
#include <tools/string.hxx>
#include <tools/list.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include "svx/svxdllapi.h"
-#include "gallery.hrc"
+//#include "gallery.hrc"
#include <cstdio>
#include <list>
@@ -81,7 +81,7 @@ public:
BOOL IsImported() const { return bImported; }
BOOL IsReadOnly() const { return bReadOnly; }
- BOOL IsDefault() const { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
+ BOOL IsDefault() const;
BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
diff --git a/svx/inc/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index d19fac542e..e028acee26 100644
--- a/svx/inc/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -34,15 +34,43 @@
#include <sot/storage.hxx>
#include <tools/urlobj.hxx>
#include <svtools/imap.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#include <svtools/transfer.hxx>
#include <svx/svdobj.hxx>
-#include "galobj.hxx"
#include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_AWT_XPROGRESSMONITOR_HPP
#include <com/sun/star/awt/XProgressMonitor.hpp>
-#endif
#include "svx/svxdllapi.h"
+#include <tools/date.hxx>
+#include <tools/time.hxx>
+
+// ------------
+// - Forwards -
+// ------------
+
+class GalleryTheme;
+
+// ----------------
+// - ExchangeData -
+// ----------------
+
+struct ExchangeData
+{
+ GalleryTheme* pTheme;
+ String aEditedTitle;
+ Date aThemeChangeDate;
+ Time aThemeChangeTime;
+};
+
+enum SgaObjKind
+{
+ SGA_OBJ_NONE = 0, // Abstraktes Objekt
+ SGA_OBJ_BMP = 1, // Bitmap-Objekt
+ SGA_OBJ_SOUND = 2, // Sound-Objekt
+ SGA_OBJ_VIDEO = 3, // Video-Objekt
+ SGA_OBJ_ANIM = 4, // Animations-Objekt
+ SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt
+ SGA_OBJ_INET = 6 // Grafik aus dem Internet
+};
// -----------
// - Defines -
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index 8a969eb6d3..b717aed3b5 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -30,7 +30,7 @@
#ifndef _SVX_GRFCROP_HXX
#define _SVX_GRFCROP_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx
index cfb0e3a30e..770fafb8a1 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/svx/inc/svx/hngpnctitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx
index 133f7bd1e3..97fffef06e 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/svx/inc/svx/hyznitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/impgrf.hxx b/svx/inc/svx/impgrf.hxx
index b12068e958..b12068e958 100644
--- a/svx/inc/impgrf.hxx
+++ b/svx/inc/svx/impgrf.hxx
diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx
index a17c608759..321e53fdbe 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/svx/inc/svx/itemtype.hxx
@@ -41,7 +41,7 @@
#include <tools/resid.hxx>
#include <tools/bigint.hxx>
#include <svx/dialmgr.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <tools/shl.hxx>
#include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx
index cd2eb35fb7..19f6b17f9a 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/svx/inc/svx/keepitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx
index d909434804..dc4d43c9f0 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/svx/inc/svx/kernitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx
index 87a26e1df1..1513c15e2b 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/svx/inc/svx/langitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <i18npool/lang.h>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx
index 708e59aab9..57ee9cb29c 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/svx/inc/svx/lrspitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
#endif
diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx
index b99411663d..5723dd113e 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/svx/inc/svx/lspcitem.hxx
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/svxenum.hxx>
#ifndef _SVX_SVXIDS_HRC
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 4205b23393..e3f65a5022 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1223,97 +1223,4 @@ BYTE m_bTag;
void *m_pvBits; // raster bits of the blip.
#endif
-class SVX_DLLPUBLIC DffRecordHeader
-{
-
-public:
- BYTE nRecVer; // may be DFF_PSFLAG_CONTAINER
- UINT16 nRecInstance;
- UINT16 nImpVerInst;
- UINT16 nRecType;
- UINT32 nRecLen;
- ULONG nFilePos;
-public:
- DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {}
- FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
- ULONG GetRecBegFilePos() const { return nFilePos; }
- 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 ); }
-
- SVX_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec);
-
-};
-
-struct DffPropFlags
-{
- BYTE bSet : 1;
- BYTE bComplex : 1;
- BYTE bBlip : 1;
- BYTE bSoftAttr : 1;
-};
-
-class SvxMSDffManager;
-
-class SVX_DLLPUBLIC DffPropSet : public Table
-{
- protected :
-
- UINT32 mpContents[ 1024 ];
- DffPropFlags mpFlags[ 1024 ];
-
- public :
-
- DffPropSet( BOOL bInitialize = 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;
- /** Returns a boolean property by its real identifier. */
- bool GetPropertyBool( 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;
- void Merge( DffPropSet& rMasterPropSet ) const;
- void InitializePropSet() const;
- friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet );
-};
-
-class SfxItemSet;
-class SdrObject;
-struct DffObjData;
-
-class SVX_DLLPUBLIC DffPropertyReader : public DffPropSet
-{
- const SvxMSDffManager& rManager;
- DffPropSet* pDefaultPropSet;
-