summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 22:29:16 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 22:29:16 -0600
commitaf12942f68dba5d0d2b6fd39f63566d5fc3af4b8 (patch)
tree6281404187125ec3eed2ec404d1fb10ab1138f5c
parent2b7a540e4cebb4bfcc5b09fe5c5122220aa69869 (diff)
merge non-conflicting changes in svx
-rw-r--r--svx/inc/dgdefs_.hxx3
-rw-r--r--svx/inc/dialdll.hxx2
-rw-r--r--svx/inc/dragmt3d.hxx11
-rw-r--r--svx/inc/drawuiks.hxx3
-rw-r--r--svx/inc/float3d.hrc73
-rw-r--r--svx/inc/fontworkgallery.hrc10
-rw-r--r--svx/inc/galbrws2.hxx3
-rw-r--r--svx/inc/gallery.hrc2
-rw-r--r--svx/inc/galobj.hxx3
-rw-r--r--svx/inc/galtheme.hrc108
-rw-r--r--svx/inc/globlmn_tmpl.hrc6
-rw-r--r--svx/inc/lightdlg.hxx8
-rw-r--r--svx/inc/pch/precompiled_svx.cxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx5
-rw-r--r--svx/inc/sjctrl.hxx224
-rw-r--r--svx/inc/svdibrow.hxx22
-rw-r--r--svx/inc/svdpomv.hxx2
-rw-r--r--svx/inc/svdshort.hxx2
-rw-r--r--svx/inc/svx/AccessibleControlShape.hxx3
-rw-r--r--svx/inc/svx/AccessibleGraphicShape.hxx3
-rw-r--r--svx/inc/svx/AccessibleOLEShape.hxx7
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/AccessibleShape.hxx3
-rw-r--r--svx/inc/svx/AccessibleShapeInfo.hxx3
-rw-r--r--svx/inc/svx/AccessibleShapeTreeInfo.hxx3
-rw-r--r--svx/inc/svx/AccessibleTableShape.hxx3
-rw-r--r--svx/inc/svx/AccessibleTextHelper.hxx3
-rw-r--r--svx/inc/svx/ActionDescriptionProvider.hxx3
-rw-r--r--svx/inc/svx/ChildrenManager.hxx3
-rw-r--r--svx/inc/svx/DescriptionGenerator.hxx2
-rw-r--r--svx/inc/svx/EnhancedCustomShape2d.hxx2
-rw-r--r--svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx3
-rw-r--r--svx/inc/svx/EnhancedCustomShapeGeometry.hxx3
-rw-r--r--svx/inc/svx/IAccessibleParent.hxx3
-rw-r--r--svx/inc/svx/IAccessibleViewForwarder.hxx3
-rw-r--r--svx/inc/svx/IAccessibleViewForwarderListener.hxx3
-rw-r--r--svx/inc/svx/ParseContext.hxx2
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/ShapeTypeHandler.hxx3
-rw-r--r--svx/inc/svx/SmartTagCtl.hxx3
-rw-r--r--svx/inc/svx/SmartTagItem.hxx6
-rw-r--r--svx/inc/svx/SmartTagMgr.hxx3
-rw-r--r--svx/inc/svx/SpellDialogChildWindow.hxx3
-rw-r--r--svx/inc/svx/SvxShapeTypes.hxx5
-rw-r--r--svx/inc/svx/UnoNamespaceMap.hxx3
-rw-r--r--svx/inc/svx/XPropertyTable.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx81
-rw-r--r--svx/inc/svx/anchorid.hxx13
-rw-r--r--svx/inc/svx/bmpmask.hxx5
-rw-r--r--svx/inc/svx/camera3d.hxx21
-rw-r--r--svx/inc/svx/charmap.hxx6
-rw-r--r--svx/inc/svx/checklbx.hxx7
-rw-r--r--svx/inc/svx/chrtitem.hxx13
-rw-r--r--svx/inc/svx/clipboardctl.hxx2
-rw-r--r--svx/inc/svx/clipfmtitem.hxx8
-rw-r--r--svx/inc/svx/colrctrl.hxx6
-rw-r--r--svx/inc/svx/connctrl.hxx4
-rw-r--r--svx/inc/svx/contdlg.hxx19
-rw-r--r--svx/inc/svx/ctredlin.hxx20
-rw-r--r--svx/inc/svx/cube3d.hxx21
-rw-r--r--svx/inc/svx/dataaccessdescriptor.hxx2
-rw-r--r--svx/inc/svx/databaselocationinput.hxx3
-rw-r--r--svx/inc/svx/databaseregistrationui.hxx3
-rw-r--r--svx/inc/svx/dbaexchange.hxx2
-rw-r--r--svx/inc/svx/dbaobjectex.hxx2
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/dbcharsethelper.hxx2
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/dbtoolsclient.hxx4
-rw-r--r--svx/inc/svx/def3d.hxx5
-rw-r--r--svx/inc/svx/deflt3d.hxx31
-rw-r--r--svx/inc/svx/dialcontrol.hxx2
-rw-r--r--svx/inc/svx/dialmgr.hxx2
-rwxr-xr-xsvx/inc/svx/dialogs.hrc79
-rw-r--r--svx/inc/svx/dlgctl3d.hxx17
-rw-r--r--svx/inc/svx/dlgctrl.hxx25
-rw-r--r--svx/inc/svx/drawitem.hxx26
-rw-r--r--svx/inc/svx/dstribut_enum.hxx6
-rw-r--r--svx/inc/svx/e3ditem.hxx6
-rw-r--r--svx/inc/svx/e3dsceneupdater.hxx3
-rw-r--r--svx/inc/svx/e3dundo.hxx9
-rw-r--r--svx/inc/svx/exthelpid.hrc17
-rw-r--r--svx/inc/svx/exthelpid.hrc.orig55
-rw-r--r--svx/inc/svx/extrud3d.hxx7
-rw-r--r--svx/inc/svx/extrusionbar.hxx3
-rw-r--r--svx/inc/svx/f3dchild.hxx4
-rw-r--r--svx/inc/svx/fillctrl.hxx6
-rw-r--r--svx/inc/svx/flagsdef.hxx5
-rw-r--r--svx/inc/svx/float3d.hxx28
-rw-r--r--svx/inc/svx/fmdmod.hxx2
-rw-r--r--svx/inc/svx/fmdpage.hxx14
-rw-r--r--svx/inc/svx/fmglob.hxx4
-rw-r--r--svx/inc/svx/fmgridcl.hxx14
-rw-r--r--svx/inc/svx/fmgridif.hxx10
-rw-r--r--svx/inc/svx/fmmodel.hxx8
-rw-r--r--svx/inc/svx/fmobjfac.hxx2
-rw-r--r--svx/inc/svx/fmpage.hxx8
-rw-r--r--svx/inc/svx/fmresids.hrc1
-rw-r--r--svx/inc/svx/fmsearch.hxx27
-rw-r--r--svx/inc/svx/fmshell.hxx18
-rw-r--r--svx/inc/svx/fmsrccfg.hxx2
-rw-r--r--svx/inc/svx/fmsrcimp.hxx4
-rw-r--r--svx/inc/svx/fmview.hxx2
-rw-r--r--svx/inc/svx/fntctl.hxx4
-rw-r--r--svx/inc/svx/fntctrl.hxx6
-rw-r--r--svx/inc/svx/fntszctl.hxx4
-rw-r--r--svx/inc/svx/fontlb.hxx4
-rw-r--r--svx/inc/svx/fontwork.hxx13
-rw-r--r--svx/inc/svx/fontworkbar.hxx3
-rw-r--r--svx/inc/svx/formatpaintbrushctrl.hxx3
-rw-r--r--svx/inc/svx/framebordertype.hxx2
-rw-r--r--svx/inc/svx/framelink.hxx27
-rw-r--r--svx/inc/svx/framelinkarray.hxx2
-rw-r--r--svx/inc/svx/frmdirlbox.hxx4
-rw-r--r--svx/inc/svx/frmsel.hxx9
-rw-r--r--svx/inc/svx/galbrws.hxx3
-rw-r--r--svx/inc/svx/galctrl.hxx3
-rw-r--r--svx/inc/svx/gallery.hxx115
-rw-r--r--svx/inc/svx/gallery1.hxx42
-rw-r--r--svx/inc/svx/galmisc.hxx3
-rw-r--r--svx/inc/svx/galtheme.hxx38
-rw-r--r--svx/inc/svx/globl3d.hxx4
-rw-r--r--svx/inc/svx/grafctrl.hxx3
-rw-r--r--svx/inc/svx/graphctl.hxx23
-rw-r--r--svx/inc/svx/grfcrop.hxx13
-rw-r--r--svx/inc/svx/grfflt.hxx5
-rw-r--r--svx/inc/svx/gridctrl.hxx134
-rw-r--r--svx/inc/svx/hdft.hxx10
-rw-r--r--svx/inc/svx/helperhittest3d.hxx3
-rw-r--r--svx/inc/svx/hlnkitem.hxx6
-rw-r--r--svx/inc/svx/htmlmode.hxx.orig (renamed from svx/inc/svx/extrusioncolorcontrol.hxx)37
-rw-r--r--svx/inc/svx/hyperdlg.hxx2
-rw-r--r--svx/inc/svx/hyprlink.hxx2
-rw-r--r--svx/inc/svx/ifaceids.hxx2
-rw-r--r--svx/inc/svx/imapdlg.hxx18
-rw-r--r--svx/inc/svx/insctrl.hxx2
-rw-r--r--svx/inc/svx/ipolypolygoneditorcontroller.hxx26
-rw-r--r--svx/inc/svx/itemwin.hxx11
-rw-r--r--svx/inc/svx/langbox.hxx13
-rw-r--r--svx/inc/svx/lathe3d.hxx16
-rw-r--r--svx/inc/svx/layctrl.hxx6
-rw-r--r--svx/inc/svx/lboxctrl.hxx2
-rw-r--r--svx/inc/svx/linectrl.hxx2
-rw-r--r--svx/inc/svx/measctrl.hxx4
-rw-r--r--svx/inc/svx/modctrl.hxx14
-rw-r--r--svx/inc/svx/msdffdef.hxx15
-rw-r--r--svx/inc/svx/numfmtsh.hxx11
-rw-r--r--svx/inc/svx/numinf.hxx5
-rw-r--r--svx/inc/svx/numvset.hxx14
-rw-r--r--svx/inc/svx/obj3d.hxx61
-rw-r--r--svx/inc/svx/objfac3d.hxx5
-rw-r--r--svx/inc/svx/ofaitem.hxx3
-rw-r--r--svx/inc/svx/optgenrl.hxx5
-rw-r--r--svx/inc/svx/optgrid.hxx5
-rw-r--r--svx/inc/svx/orienthelper.hxx2
-rw-r--r--svx/inc/svx/pagectrl.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx44
-rw-r--r--svx/inc/svx/paraprev.hxx12
-rw-r--r--svx/inc/svx/passwd.hxx8
-rw-r--r--svx/inc/svx/pfiledlg.hxx2
-rw-r--r--svx/inc/svx/polygn3d.hxx3
-rw-r--r--svx/inc/svx/polypolygoneditor.hxx3
-rw-r--r--svx/inc/svx/polysc3d.hxx5
-rw-r--r--svx/inc/svx/postattr.hxx13
-rw-r--r--svx/inc/svx/prtqry.hxx3
-rw-r--r--svx/inc/svx/pszctrl.hxx2
-rw-r--r--svx/inc/svx/rectenum.hxx3
-rw-r--r--svx/inc/svx/relfld.hxx10
-rw-r--r--svx/inc/svx/rotmodit.hxx8
-rw-r--r--svx/inc/svx/rubydialog.hxx6
-rw-r--r--svx/inc/svx/ruler.hxx60
-rw-r--r--svx/inc/svx/rulritem.hxx70
-rw-r--r--svx/inc/svx/scene3d.hxx27
-rw-r--r--svx/inc/svx/sdangitm.hxx3
-rw-r--r--svx/inc/svx/sdasaitm.hxx6
-rw-r--r--svx/inc/svx/sdasitm.hxx6
-rw-r--r--svx/inc/svx/sderitm.hxx3
-rw-r--r--svx/inc/svx/sdgcoitm.hxx3
-rw-r--r--svx/inc/svx/sdgcpitm.hxx3
-rw-r--r--svx/inc/svx/sdggaitm.hxx7
-rw-r--r--svx/inc/svx/sdginitm.hxx3
-rw-r--r--svx/inc/svx/sdgluitm.hxx3
-rw-r--r--svx/inc/svx/sdgmoitm.hxx3
-rw-r--r--svx/inc/svx/sdgtritm.hxx3
-rw-r--r--svx/inc/svx/sdmetitm.hxx11
-rw-r--r--svx/inc/svx/sdooitm.hxx7
-rw-r--r--svx/inc/svx/sdprcitm.hxx7
-rw-r--r--svx/inc/svx/sdr/animation/animationstate.hxx3
-rw-r--r--svx/inc/svx/sdr/animation/objectanimator.hxx3
-rw-r--r--svx/inc/svx/sdr/animation/scheduler.hxx7
-rw-r--r--svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx3
-rw-r--r--svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx3
-rw-r--r--svx/inc/svx/sdr/attribute/sdrtextattribute.hxx4
-rw-r--r--svx/inc/svx/sdr/contact/displayinfo.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/objectcontact.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/objectcontactofpageview.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/objectcontacttools.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontact.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3d.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofgroup.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx5
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontact.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx3
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx2
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx3
-rw-r--r--svx/inc/svx/sdr/event/eventhandler.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaybitmapex.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaycrosshair.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayhatchrect.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayhelpline.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayline.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaymanager.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayobject.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayobjectcell.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayobjectlist.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlayselection.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaytools.hxx3
-rw-r--r--svx/inc/svx/sdr/overlay/overlaytriangle.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx15
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx44
-rw-r--r--svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/attributeproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/captionproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/circleproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/connectorproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/customshapeproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/defaultproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dlatheproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dsceneproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/e3dsphereproperties.hxx2
-rw-r--r--svx/inc/svx/sdr/properties/emptyproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/graphicproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/groupproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/itemsettools.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/measureproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/pageproperties.hxx2
-rw-r--r--svx/inc/svx/sdr/properties/properties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/rectangleproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/properties/textproperties.hxx3
-rw-r--r--svx/inc/svx/sdr/table/tabledesign.hxx3
-rw-r--r--svx/inc/svx/sdrcomment.hxx3
-rw-r--r--svx/inc/svx/sdrhittesthelper.hxx3
-rw-r--r--svx/inc/svx/sdrmasterpagedescriptor.hxx3
-rw-r--r--svx/inc/svx/sdrobjectfilter.hxx.orig58
-rw-r--r--svx/inc/svx/sdrobjectuser.hxx3
-rw-r--r--svx/inc/svx/sdrpageuser.hxx3
-rw-r--r--svx/inc/svx/sdrpagewindow.hxx4
-rw-r--r--svx/inc/svx/sdrpaintwindow.hxx4
-rw-r--r--svx/inc/svx/sdshcitm.hxx4
-rw-r--r--svx/inc/svx/sdshitm.hxx5
-rw-r--r--svx/inc/svx/sdshtitm.hxx3
-rw-r--r--svx/inc/svx/sdsxyitm.hxx3
-rw-r--r--svx/inc/svx/sdtaaitm.hxx7
-rw-r--r--svx/inc/svx/sdtacitm.hxx5
-rw-r--r--svx/inc/svx/sdtaditm.hxx9
-rw-r--r--svx/inc/svx/sdtagitm.hxx3
-rw-r--r--svx/inc/svx/sdtaiitm.hxx3
-rw-r--r--svx/inc/svx/sdtaitm.hxx34
-rw-r--r--svx/inc/svx/sdtakitm.hxx7
-rw-r--r--svx/inc/svx/sdtayitm.hxx3
-rw-r--r--svx/inc/svx/sdtcfitm.hxx3
-rw-r--r--svx/inc/svx/sdtditm.hxx3
-rw-r--r--svx/inc/svx/sdtfchim.hxx7
-rw-r--r--svx/inc/svx/sdtfsitm.hxx33
-rw-r--r--svx/inc/svx/sdtmfitm.hxx3
-rw-r--r--svx/inc/svx/sdynitm.hxx3
-rw-r--r--svx/inc/svx/selctrl.hxx2
-rw-r--r--svx/inc/svx/selectioncontroller.hxx2
-rw-r--r--[-rwxr-xr-x]svx/inc/svx/shapeproperty.hxx3
-rw-r--r--svx/inc/svx/shapepropertynotifier.hxx3
-rw-r--r--svx/inc/svx/simptabl.hxx8
-rw-r--r--svx/inc/svx/sphere3d.hxx3
-rw-r--r--svx/inc/svx/splitcelldlg.hxx3
-rw-r--r--svx/inc/svx/srchdlg.hxx22
-rw-r--r--svx/inc/svx/stddlg.hxx2
-rw-r--r--svx/inc/svx/strarray.hxx4
-rw-r--r--svx/inc/svx/subtoolboxcontrol.hxx2
-rw-r--r--svx/inc/svx/svdattr.hxx12
-rw-r--r--svx/inc/svx/svdattrx.hxx11
-rw-r--r--svx/inc/svx/svdcrtv.hxx2
-rw-r--r--svx/inc/svx/svddef.hxx2
-rw-r--r--svx/inc/svx/svddrag.hxx70
-rw-r--r--svx/inc/svx/svddrgmt.hxx5
-rw-r--r--svx/inc/svx/svddrgv.hxx2
-rw-r--r--svx/inc/svx/svdedtv.hxx2
-rw-r--r--svx/inc/svx/svdedxv.hxx2
-rw-r--r--svx/inc/svx/svdetc.hxx19
-rw-r--r--svx/inc/svx/svdfield.hxx2
-rw-r--r--svx/inc/svx/svdglev.hxx2
-rw-r--r--svx/inc/svx/svdglob.hxx16
-rw-r--r--svx/inc/svx/svdglue.hxx32
-rw-r--r--svx/inc/svx/svdhdl.hxx14
-rw-r--r--svx/inc/svx/svdhlpln.hxx6
-rw-r--r--svx/inc/svx/svditer.hxx8
-rw-r--r--svx/inc/svx/svditext.hxx2
-rw-r--r--svx/inc/svx/svdlayer.hxx14
-rw-r--r--svx/inc/svx/svdmark.hxx3
-rw-r--r--svx/inc/svx/svdmodel.hxx146
-rw-r--r--svx/inc/svx/svdmrkv.hxx2
-rw-r--r--svx/inc/svx/svdoashp.hxx26
-rw-r--r--svx/inc/svx/svdoattr.hxx2
-rw-r--r--svx/inc/svx/svdobj.hxx50
-rw-r--r--svx/inc/svx/svdocapt.hxx10
-rw-r--r--svx/inc/svx/svdocirc.hxx14
-rw-r--r--svx/inc/svx/svdoedge.hxx36
-rw-r--r--svx/inc/svx/svdograf.hxx6
-rw-r--r--svx/inc/svx/svdogrp.hxx14
-rw-r--r--svx/inc/svx/svdomeas.hxx20
-rw-r--r--svx/inc/svx/svdomedia.hxx5
-rw-r--r--svx/inc/svx/svdoole2.hxx12
-rw-r--r--svx/inc/svx/svdopage.hxx2
-rw-r--r--svx/inc/svx/svdopath.hxx12
-rw-r--r--svx/inc/svx/svdorect.hxx8
-rw-r--r--svx/inc/svx/svdotable.hxx25
-rw-r--r--svx/inc/svx/svdotext.hxx98
-rw-r--r--svx/inc/svx/svdouno.hxx4
-rw-r--r--svx/inc/svx/svdoutl.hxx2
-rw-r--r--svx/inc/svx/svdovirt.hxx20
-rw-r--r--svx/inc/svx/svdpage.hxx26
-rw-r--r--svx/inc/svx/svdpagv.hxx3
-rw-r--r--svx/inc/svx/svdpntv.hxx2
-rw-r--r--svx/inc/svx/svdpoev.hxx2
-rw-r--r--svx/inc/svx/svdpool.hxx3
-rw-r--r--svx/inc/svx/svdsnpv.hxx10
-rw-r--r--svx/inc/svx/svdsob.hxx2
-rw-r--r--svx/inc/svx/svdstr.hrc77
-rw-r--r--svx/inc/svx/svdtext.hxx2
-rw-r--r--svx/inc/svx/svdtrans.hxx60
-rw-r--r--svx/inc/svx/svdtypes.hxx4
-rw-r--r--svx/inc/svx/svdundo.hxx44
-rw-r--r--svx/inc/svx/svdview.hxx2
-rw-r--r--svx/inc/svx/svdviter.hxx72
-rw-r--r--svx/inc/svx/svdxcgv.hxx5
-rw-r--r--svx/inc/svx/svimbase.hxx14
-rw-r--r--svx/inc/svx/svx3ditems.hxx31
-rw-r--r--svx/inc/svx/svxdlg.hxx6
-rw-r--r--svx/inc/svx/svxdllapi.h3
-rw-r--r--svx/inc/svx/svxerr.hxx2
-rw-r--r--svx/inc/svx/svxgrahicitem.hxx3
-rwxr-xr-xsvx/inc/svx/svxids.hrc12
-rw-r--r--svx/inc/svx/swframeexample.hxx3
-rw-r--r--svx/inc/svx/swframeposstrings.hxx6
-rw-r--r--svx/inc/svx/swframevalidation.hxx10
-rw-r--r--svx/inc/svx/sxallitm.hxx3
-rw-r--r--svx/inc/svx/sxcaitm.hxx5
-rw-r--r--svx/inc/svx/sxcecitm.hxx3
-rw-r--r--svx/inc/svx/sxcgitm.hxx3
-rw-r--r--svx/inc/svx/sxciaitm.hxx3
-rw-r--r--svx/inc/svx/sxcikitm.hxx7
-rw-r--r--svx/inc/svx/sxcllitm.hxx3
-rw-r--r--svx/inc/svx/sxctitm.hxx3
-rw-r--r--svx/inc/svx/sxekitm.hxx7
-rw-r--r--svx/inc/svx/sxelditm.hxx15
-rw-r--r--svx/inc/svx/sxenditm.hxx19
-rw-r--r--svx/inc/svx/sxfiitm.hxx3
-rw-r--r--svx/inc/svx/sxlayitm.hxx3
-rw-r--r--svx/inc/svx/sxlogitm.hxx3
-rw-r--r--svx/inc/svx/sxmbritm.hxx5
-rw-r--r--svx/inc/svx/sxmfsitm.hxx3
-rw-r--r--svx/inc/svx/sxmkitm.hxx7
-rw-r--r--svx/inc/svx/sxmlhitm.hxx3
-rw-r--r--svx/inc/svx/sxmoitm.hxx3
-rw-r--r--svx/inc/svx/sxmovitm.hxx3
-rw-r--r--svx/inc/svx/sxmsitm.hxx3
-rw-r--r--svx/inc/svx/sxmspitm.hxx3
-rw-r--r--svx/inc/svx/sxmsuitm.hxx3
-rw-r--r--svx/inc/svx/sxmtaitm.hxx3
-rw-r--r--svx/inc/svx/sxmtfitm.hxx3
-rw-r--r--svx/inc/svx/sxmtpitm.hxx11
-rw-r--r--svx/inc/svx/sxmtritm.hxx3
-rw-r--r--svx/inc/svx/sxmuitm.hxx7
-rw-r--r--svx/inc/svx/sxoneitm.hxx3
-rw-r--r--svx/inc/svx/sxonitm.hxx3
-rw-r--r--svx/inc/svx/sxopitm.hxx3
-rw-r--r--svx/inc/svx/sxraitm.hxx3
-rw-r--r--svx/inc/svx/sxreaitm.hxx5
-rw-r--r--svx/inc/svx/sxreoitm.hxx5
-rw-r--r--svx/inc/svx/sxroaitm.hxx3
-rw-r--r--svx/inc/svx/sxrooitm.hxx3
-rw-r--r--svx/inc/svx/sxsaitm.hxx3
-rw-r--r--svx/inc/svx/sxsalitm.hxx3
-rw-r--r--svx/inc/svx/sxsiitm.hxx5
-rw-r--r--svx/inc/svx/sxsoitm.hxx3
-rw-r--r--svx/inc/svx/sxtraitm.hxx3
-rw-r--r--svx/inc/svx/tabarea.hxx3
-rw-r--r--svx/inc/svx/tabline.hxx3
-rw-r--r--svx/inc/svx/tbcontrl.hxx3
-rw-r--r--svx/inc/svx/tbxalign.hxx3
-rw-r--r--svx/inc/svx/tbxcolor.hxx2
-rw-r--r--svx/inc/svx/tbxcolorupdate.hxx3
-rw-r--r--svx/inc/svx/tbxctl.hxx4
-rw-r--r--svx/inc/svx/tbxcustomshapes.hxx2
-rw-r--r--svx/inc/svx/tbxdraw.hxx2
-rw-r--r--svx/inc/svx/txencbox.hxx4
-rw-r--r--svx/inc/svx/txenctab.hxx4
-rw-r--r--svx/inc/svx/ucsubset.hxx3
-rw-r--r--svx/inc/svx/unoapi.hxx2
-rw-r--r--svx/inc/svx/unofill.hxx2
-rw-r--r--svx/inc/svx/unomaster.hxx2
-rw-r--r--svx/inc/svx/unomid.hxx3
-rw-r--r--svx/inc/svx/unomod.hxx2
-rw-r--r--svx/inc/svx/unomodel.hxx2
-rw-r--r--svx/inc/svx/unopage.hxx7
-rw-r--r--svx/inc/svx/unopool.hxx3
-rw-r--r--svx/inc/svx/unoprov.hxx27
-rw-r--r--svx/inc/svx/unoshape.hxx19
-rw-r--r--svx/inc/svx/unoshcol.hxx2
-rw-r--r--svx/inc/svx/unoshprp.hxx2
-rw-r--r--svx/inc/svx/unoshtxt.hxx3
-rw-r--r--svx/inc/svx/verttexttbxctrl.hxx13
-rw-r--r--svx/inc/svx/view3d.hxx3
-rw-r--r--svx/inc/svx/viewlayoutitem.hxx8
-rw-r--r--svx/inc/svx/viewpt3d.hxx3
-rw-r--r--svx/inc/svx/volume3d.hxx3
-rw-r--r--svx/inc/svx/wrapfield.hxx2
-rw-r--r--svx/inc/svx/xattr.hxx17
-rw-r--r--svx/inc/svx/xbitmap.hxx3
-rw-r--r--svx/inc/svx/xbtmpit.hxx7
-rw-r--r--svx/inc/svx/xcolit.hxx6
-rw-r--r--svx/inc/svx/xdash.hxx3
-rw-r--r--svx/inc/svx/xdef.hxx3
-rw-r--r--svx/inc/svx/xenum.hxx2
-rw-r--r--svx/inc/svx/xexch.hxx6
-rw-r--r--svx/inc/svx/xfillit.hxx5
-rw-r--r--svx/inc/svx/xfillit0.hxx6
-rw-r--r--svx/inc/svx/xflasit.hxx3
-rw-r--r--svx/inc/svx/xflbckit.hxx3
-rw-r--r--svx/inc/svx/xflbmpit.hxx3
-rw-r--r--svx/inc/svx/xflbmsli.hxx3
-rw-r--r--svx/inc/svx/xflbmsxy.hxx7
-rw-r--r--svx/inc/svx/xflbmtit.hxx3
-rw-r--r--svx/inc/svx/xflboxy.hxx3
-rw-r--r--svx/inc/svx/xflbstit.hxx3
-rw-r--r--svx/inc/svx/xflbtoxy.hxx3
-rw-r--r--svx/inc/svx/xflclit.hxx6
-rw-r--r--svx/inc/svx/xflftrit.hxx7
-rw-r--r--svx/inc/svx/xflgrit.hxx6
-rw-r--r--svx/inc/svx/xflhtit.hxx10
-rw-r--r--svx/inc/svx/xfltrit.hxx3
-rw-r--r--svx/inc/svx/xftadit.hxx7
-rw-r--r--svx/inc/svx/xftdiit.hxx3
-rw-r--r--svx/inc/svx/xftmrit.hxx3
-rw-r--r--svx/inc/svx/xftouit.hxx2
-rw-r--r--svx/inc/svx/xftsfit.hxx6
-rw-r--r--svx/inc/svx/xftshcit.hxx3
-rw-r--r--svx/inc/svx/xftshit.hxx6
-rw-r--r--svx/inc/svx/xftshtit.hxx3
-rw-r--r--svx/inc/svx/xftshxy.hxx2
-rw-r--r--svx/inc/svx/xftstit.hxx3
-rw-r--r--svx/inc/svx/xgrad.hxx3
-rw-r--r--svx/inc/svx/xgrscit.hxx3
-rw-r--r--svx/inc/svx/xhatch.hxx3
-rw-r--r--svx/inc/svx/xit.hxx3
-rw-r--r--svx/inc/svx/xlineit.hxx2
-rw-r--r--svx/inc/svx/xlineit0.hxx6
-rw-r--r--svx/inc/svx/xlinjoit.hxx7
-rw-r--r--svx/inc/svx/xlnasit.hxx3
-rw-r--r--svx/inc/svx/xlnclit.hxx7
-rw-r--r--svx/inc/svx/xlndsit.hxx12
-rw-r--r--svx/inc/svx/xlnedcit.hxx7
-rw-r--r--svx/inc/svx/xlnedit.hxx7
-rw-r--r--svx/inc/svx/xlnedwit.hxx6
-rw-r--r--svx/inc/svx/xlnstcit.hxx6
-rw-r--r--svx/inc/svx/xlnstit.hxx7
-rw-r--r--svx/inc/svx/xlnstwit.hxx7
-rw-r--r--svx/inc/svx/xlntrit.hxx3
-rw-r--r--svx/inc/svx/xlnwtit.hxx7
-rw-r--r--svx/inc/svx/xmleohlp.hxx3
-rw-r--r--svx/inc/svx/xmlexchg.hxx2
-rw-r--r--svx/inc/svx/xmlgrhlp.hxx3
-rw-r--r--svx/inc/svx/xmlsecctrl.hxx2
-rw-r--r--svx/inc/svx/xoutbmp.hxx3
-rw-r--r--svx/inc/svx/xpoly.hxx3
-rw-r--r--svx/inc/svx/xpool.hxx3
-rw-r--r--svx/inc/svx/xsetit.hxx4
-rw-r--r--svx/inc/svx/xsflclit.hxx2
-rw-r--r--svx/inc/svx/xtable.hxx9
-rw-r--r--svx/inc/svx/xtextit.hxx2
-rw-r--r--svx/inc/svx/xtextit0.hxx7
-rw-r--r--svx/inc/svx/zoom_def.hxx3
-rw-r--r--svx/inc/svx/zoomctrl.hxx2
-rw-r--r--svx/inc/svx/zoomitem.hxx10
-rw-r--r--svx/inc/svx/zoomsliderctrl.hxx2
-rw-r--r--svx/inc/svx/zoomslideritem.hxx8
-rw-r--r--svx/inc/svxempty.hxx3
-rw-r--r--svx/inc/tbunocontroller.hxx3
-rw-r--r--svx/inc/uiks.hxx4
-rw-r--r--svx/inc/unomlstr.hxx2
-rw-r--r--svx/inc/xpolyimp.hxx29
-rw-r--r--svx/prj/d.lst8
-rw-r--r--svx/prj/target_module_svx.mk.orig52
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx11
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx3
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx2
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx64
-rw-r--r--svx/source/accessibility/AccessibleGraphicShape.cxx3
-rw-r--r--svx/source/accessibility/AccessibleOLEShape.cxx2
-rw-r--r--[-rwxr-xr-x]svx/source/accessibility/AccessibleShape.cxx30
-rw-r--r--svx/source/accessibility/AccessibleShapeInfo.cxx3
-rw-r--r--svx/source/accessibility/AccessibleShapeTreeInfo.cxx3
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.cxx3
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.hxx3
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx57
-rw-r--r--svx/source/accessibility/ChildrenManager.cxx8
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx8
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx4
-rw-r--r--svx/source/accessibility/DGColorNameLookUp.cxx19
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx54
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx74
-rw-r--r--[-rwxr-xr-x]svx/source/accessibility/ShapeTypeHandler.cxx13
-rw-r--r--svx/source/accessibility/SvxShapeTypes.cxx74
-rw-r--r--svx/source/accessibility/charmapacc.cxx2
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx24
-rw-r--r--svx/source/core/makefile.mk5
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx10
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.hxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx8
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.hxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx90
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.hxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeGeometry.cxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeHandle.cxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeHandle.hxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx3
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx14
-rw-r--r--svx/source/dialog/SpellDialogChildWindow.cxx9
-rw-r--r--svx/source/dialog/_bmpmask.cxx10
-rw-r--r--svx/source/dialog/_contdlg.cxx21
-rw-r--r--svx/source/dialog/bmpmask.hrc3
-rw-r--r--svx/source/dialog/bmpmask.src13
-rw-r--r--svx/source/dialog/charmap.cxx3
-rw-r--r--svx/source/dialog/checklbx.cxx8
-rw-r--r--svx/source/dialog/connctrl.cxx2
-rw-r--r--svx/source/dialog/contdlg.hrc1
-rw-r--r--svx/source/dialog/contdlg.src11
-rw-r--r--svx/source/dialog/contimp.hxx5
-rw-r--r--svx/source/dialog/contwnd.cxx3
-rw-r--r--svx/source/dialog/contwnd.hxx2
-rw-r--r--svx/source/dialog/ctredlin.cxx6
-rw-r--r--svx/source/dialog/ctredlin.hrc2
-rw-r--r--svx/source/dialog/ctredlin.src5
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx12
-rw-r--r--svx/source/dialog/dialcontrol.cxx6
-rw-r--r--svx/source/dialog/dialmgr.cxx3
-rw-r--r--svx/source/dialog/dlgctl3d.cxx3
-rw-r--r--svx/source/dialog/dlgctrl.cxx5
-rw-r--r--svx/source/dialog/dlgutil.cxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx56
-rw-r--r--svx/source/dialog/docrecovery.hrc3
-rw-r--r--svx/source/dialog/docrecovery.src12
-rw-r--r--svx/source/dialog/fntctrl.cxx15
-rw-r--r--svx/source/dialog/fontlb.cxx2
-rw-r--r--svx/source/dialog/fontwork.cxx26
-rw-r--r--svx/source/dialog/fontwork.hrc1
-rw-r--r--svx/source/dialog/fontwork.src55
-rw-r--r--svx/source/dialog/framelink.cxx204
-rw-r--r--svx/source/dialog/framelinkarray.cxx2
-rw-r--r--svx/source/dialog/frmdirlbox.cxx2
-rw-r--r--svx/source/dialog/frmsel.cxx45
-rw-r--r--svx/source/dialog/graphctl.cxx9
-rw-r--r--svx/source/dialog/grfflt.cxx484
-rw-r--r--svx/source/dialog/hdft.cxx26
-rw-r--r--svx/source/dialog/hyperdlg.cxx7
-rw-r--r--svx/source/dialog/hyprdlg.hxx6
-rw-r--r--svx/source/dialog/hyprlink.cxx72
-rw-r--r--svx/source/dialog/imapdlg.cxx35
-rw-r--r--svx/source/dialog/imapdlg.hrc1
-rw-r--r--svx/source/dialog/imapdlg.src7
-rw-r--r--svx/source/dialog/imapimp.hxx5
-rw-r--r--svx/source/dialog/imapwnd.cxx58
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/langbox.cxx17
-rw-r--r--svx/source/dialog/langbox.src6
-rw-r--r--svx/source/dialog/linkwarn.cxx150
-rw-r--r--svx/source/dialog/linkwarn.hrc60
-rw-r--r--svx/source/dialog/linkwarn.src85
-rw-r--r--svx/source/dialog/makefile.mk1
-rw-r--r--svx/source/dialog/measctrl.cxx2
-rw-r--r--svx/source/dialog/optgrid.cxx24
-rw-r--r--svx/source/dialog/orienthelper.cxx3
-rw-r--r--svx/source/dialog/pagectrl.cxx11
-rw-r--r--svx/source/dialog/paraprev.cxx2
-rw-r--r--svx/source/dialog/passwd.cxx4
-rw-r--r--svx/source/dialog/pfiledlg.cxx11
-rw-r--r--svx/source/dialog/prtqry.cxx8
-rw-r--r--svx/source/dialog/relfld.cxx2
-rw-r--r--svx/source/dialog/rlrcitem.cxx2
-rw-r--r--svx/source/dialog/rlrcitem.hxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx59
-rw-r--r--svx/source/dialog/ruler.hrc3
-rw-r--r--svx/source/dialog/ruler.src12
-rw-r--r--svx/source/dialog/rulritem.cxx74
-rw-r--r--svx/source/dialog/sendreportgen.cxx3
-rw-r--r--svx/source/dialog/sendreportunx.cxx3
-rw-r--r--svx/source/dialog/sendreportw32.cxx8
-rw-r--r--svx/source/dialog/simptabl.cxx11
-rw-r--r--svx/source/dialog/srchctrl.cxx2
-rw-r--r--svx/source/dialog/srchctrl.hxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx122
-rw-r--r--svx/source/dialog/stddlg.cxx6
-rw-r--r--svx/source/dialog/strarray.cxx2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx35
-rw-r--r--svx/source/dialog/svxdlg.cxx1
-rw-r--r--svx/source/dialog/svxgrahicitem.cxx3
-rw-r--r--svx/source/dialog/svxruler.cxx41
-rw-r--r--svx/source/dialog/swframeexample.cxx2
-rw-r--r--svx/source/dialog/swframeposstrings.cxx9
-rw-r--r--svx/source/dialog/txencbox.cxx2
-rw-r--r--svx/source/dialog/txenctab.cxx2
-rw-r--r--svx/source/dialog/wrapfield.cxx2
-rw-r--r--svx/source/engine3d/camera3d.cxx3
-rw-r--r--svx/source/engine3d/cube3d.cxx3
-rw-r--r--svx/source/engine3d/deflt3d.cxx3
-rw-r--r--svx/source/engine3d/dragmt3d.cxx3
-rw-r--r--svx/source/engine3d/e3dsceneupdater.cxx3
-rw-r--r--svx/source/engine3d/e3dundo.cxx2
-rw-r--r--svx/source/engine3d/extrud3d.cxx3
-rw-r--r--svx/source/engine3d/float3d.cxx273
-rw-r--r--svx/source/engine3d/float3d.src249
-rw-r--r--svx/source/engine3d/helperhittest3d.cxx3
-rw-r--r--svx/source/engine3d/helperminimaldepth3d.cxx3
-rw-r--r--svx/source/engine3d/helperminimaldepth3d.hxx3
-rw-r--r--svx/source/engine3d/lathe3d.cxx3
-rw-r--r--svx/source/engine3d/obj3d.cxx3
-rw-r--r--svx/source/engine3d/objfac3d.cxx2
-rw-r--r--svx/source/engine3d/polygn3d.cxx3
-rw-r--r--svx/source/engine3d/polysc3d.cxx3
-rw-r--r--svx/source/engine3d/scene3d.cxx12
-rw-r--r--svx/source/engine3d/sphere3d.cxx3
-rw-r--r--svx/source/engine3d/svx3ditems.cxx325
-rw-r--r--svx/source/engine3d/view3d.cxx7
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/engine3d/viewpt3d2.cxx3
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx6
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx6
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx29
-rw-r--r--svx/source/fmcomp/fmgridif.cxx68
-rw-r--r--svx/source/fmcomp/gridcell.cxx16
-rw-r--r--svx/source/fmcomp/gridcols.cxx6
-rw-r--r--svx/source/fmcomp/gridctrl.cxx156
-rw-r--r--svx/source/fmcomp/trace.cxx31
-rw-r--r--svx/source/fmcomp/xmlexchg.cxx2
-rw-r--r--svx/source/form/ParseContext.cxx10
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx3
-rw-r--r--svx/source/form/datalistener.cxx2
-rw-r--r--svx/source/form/datanavi.cxx37
-rw-r--r--svx/source/form/datanavi.src12
-rw-r--r--svx/source/form/dbcharsethelper.cxx2
-rw-r--r--svx/source/form/dbtoolsclient.cxx10
-rw-r--r--svx/source/form/delayedevent.cxx3
-rw-r--r--svx/source/form/filtnav.cxx62
-rw-r--r--svx/source/form/fmPropBrw.cxx13
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx6
-rw-r--r--svx/source/form/fmcontrollayout.cxx9
-rw-r--r--svx/source/form/fmdmod.cxx25
-rw-r--r--svx/source/form/fmdocumentclassification.cxx4
-rw-r--r--svx/source/form/fmdpage.cxx6
-rw-r--r--svx/source/form/fmexch.cxx2
-rw-r--r--svx/source/form/fmexpl.cxx94
-rw-r--r--svx/source/form/fmexpl.src7
-rw-r--r--svx/source/form/fmitems.cxx2
-rw-r--r--svx/source/form/fmmodel.cxx9
-rw-r--r--svx/source/form/fmobj.cxx7
-rw-r--r--svx/source/form/fmobjfac.cxx12
-rw-r--r--svx/source/form/fmpage.cxx20
-rw-r--r--svx/source/form/fmpgeimp.cxx5
-rw-r--r--svx/source/form/fmscriptingenv.cxx32
-rw-r--r--svx/source/form/fmservs.cxx3
-rw-r--r--svx/source/form/fmshell.cxx13
-rw-r--r--svx/source/form/fmshimp.cxx63
-rw-r--r--svx/source/form/fmsrccfg.cxx48
-rw-r--r--svx/source/form/fmsrcimp.cxx39
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx3
-rw-r--r--svx/source/form/fmtextcontrolfeature.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx7
-rw-r--r--svx/source/form/fmtools.cxx8
-rw-r--r--svx/source/form/fmundo.cxx15
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx3
-rw-r--r--svx/source/form/formcontrolfactory.cxx5
-rw-r--r--svx/source/form/formcontroller.cxx24
-rw-r--r--svx/source/form/formcontrolling.cxx12
-rw-r--r--svx/source/form/formfeaturedispatcher.cxx3
-rw-r--r--svx/source/form/formtoolbars.cxx4
-rw-r--r--svx/source/form/navigatortree.cxx77
-rw-r--r--svx/source/form/navigatortreemodel.cxx70
-rw-r--r--svx/source/form/sdbdatacolumn.cxx3
-rw-r--r--svx/source/form/sqlparserclient.cxx2
-rw-r--r--svx/source/form/stringlistresource.cxx3
-rw-r--r--svx/source/form/tabwin.cxx8
-rw-r--r--svx/source/form/tbxform.cxx13
-rw-r--r--svx/source/form/typeconversionclient.cxx2
-rw-r--r--svx/source/form/typemap.cxx2
-rw-r--r--svx/source/form/xfm_addcondition.cxx6
-rw-r--r--svx/source/gallery2/codec.cxx3
-rw-r--r--svx/source/gallery2/codec.hxx3
-rw-r--r--svx/source/gallery2/galbrws.cxx3
-rw-r--r--svx/source/gallery2/galbrws1.cxx31
-rw-r--r--svx/source/gallery2/galbrws1.hxx3
-rw-r--r--svx/source/gallery2/galbrws2.cxx74
-rw-r--r--svx/source/gallery2/galctrl.cxx3
-rw-r--r--svx/source/gallery2/galexpl.cxx3
-rw-r--r--svx/source/gallery2/gallery.src13
-rw-r--r--svx/source/gallery2/gallery1.cxx88
-rw-r--r--svx/source/gallery2/gallerydrawmodel.hxx2
-rw-r--r--svx/source/gallery2/galmisc.cxx15
-rw-r--r--svx/source/gallery2/galobj.cxx3
-rw-r--r--svx/source/gallery2/galtheme.cxx163
-rw-r--r--svx/source/gallery2/galtheme.src690
-rw-r--r--svx/source/gengal/gengal.cxx32
-rw-r--r--svx/source/inc/AccessibleFrameSelector.hxx2
-rw-r--r--svx/source/inc/DGColorNameLookUp.hxx3
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx8
-rw-r--r--svx/source/inc/charmapacc.hxx6
-rw-r--r--svx/source/inc/clonelist.hxx3
-rw-r--r--svx/source/inc/datalistener.hxx2
-rw-r--r--svx/source/inc/datanavi.hrc10
-rw-r--r--svx/source/inc/datanavi.hxx5
-rw-r--r--svx/source/inc/delayedevent.hxx3
-rw-r--r--svx/source/inc/docrecovery.hxx95
-rw-r--r--svx/source/inc/filtnav.hxx2
-rw-r--r--svx/source/inc/fmPropBrw.hxx3
-rw-r--r--svx/source/inc/fmcontrolbordermanager.hxx3
-rw-r--r--svx/source/inc/fmcontrollayout.hxx4
-rw-r--r--svx/source/inc/fmdocumentclassification.hxx2
-rw-r--r--svx/source/inc/fmexch.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx30
-rw-r--r--svx/source/inc/fmitems.hxx2
-rw-r--r--svx/source/inc/fmobj.hxx4
-rw-r--r--svx/source/inc/fmpgeimp.hxx2
-rw-r--r--svx/source/inc/fmscriptingenv.hxx2
-rw-r--r--svx/source/inc/fmservs.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx4
-rw-r--r--svx/source/inc/fmslotinvalidator.hxx2
-rw-r--r--svx/source/inc/fmtextcontroldialogs.hxx2
-rw-r--r--svx/source/inc/fmtextcontrolfeature.hxx2
-rw-r--r--svx/source/inc/fmtextcontrolshell.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/fmurl.hxx3
-rw-r--r--svx/source/inc/fmvwimp.hxx2
-rw-r--r--svx/source/inc/formcontrolfactory.hxx3
-rw-r--r--svx/source/inc/formcontrolling.hxx3
-rw-r--r--svx/source/inc/formfeaturedispatcher.hxx3
-rw-r--r--svx/source/inc/formtoolbars.hxx2
-rw-r--r--svx/source/inc/frmselimpl.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx2
-rw-r--r--svx/source/inc/gridcols.hxx2
-rw-r--r--svx/source/inc/recoveryui.hxx3
-rw-r--r--svx/source/inc/sdbdatacolumn.hxx3
-rw-r--r--svx/source/inc/sqlparserclient.hxx4
-rw-r--r--svx/source/inc/stringlistresource.hxx3
-rw-r--r--svx/source/inc/svdoimp.hxx5
-rw-r--r--svx/source/inc/svdoutlinercache.hxx2
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx8
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/tbxform.hxx4
-rw-r--r--svx/source/inc/trace.hxx11
-rw-r--r--svx/source/inc/treevisitor.hxx3
-rw-r--r--svx/source/inc/typeconversionclient.hxx2
-rw-r--r--svx/source/inc/unogalthemeprovider.hxx3
-rw-r--r--svx/source/inc/unopolyhelper.hxx2
-rw-r--r--svx/source/inc/xfm_addcondition.hxx2
-rw-r--r--svx/source/inc/xmlxtexp.hxx2
-rw-r--r--svx/source/inc/xmlxtimp.hxx2
-rw-r--r--svx/source/intro/intro_tmpl.hrc1
-rw-r--r--svx/source/intro/iso.src54
-rw-r--r--svx/source/intro/ooo.src25
-rw-r--r--svx/source/items/SmartTagItem.cxx15
-rw-r--r--svx/source/items/algitem.cxx351
-rw-r--r--svx/source/items/chrtitem.cxx22
-rw-r--r--svx/source/items/clipfmtitem.cxx12
-rw-r--r--svx/source/items/customshapeitem.cxx24
-rw-r--r--svx/source/items/drawitem.cxx63
-rw-r--r--svx/source/items/e3ditem.cxx13
-rw-r--r--svx/source/items/grfitem.cxx12
-rw-r--r--svx/source/items/hlnkitem.cxx57
-rw-r--r--svx/source/items/numfmtsh.cxx12
-rw-r--r--svx/source/items/numinf.cxx2
-rw-r--r--svx/source/items/ofaitem.cxx3
-rw-r--r--svx/source/items/pageitem.cxx12
-rw-r--r--svx/source/items/postattr.cxx8
-rw-r--r--svx/source/items/rotmodit.cxx60
-rw-r--r--svx/source/items/svxempty.cxx2
-rw-r--r--svx/source/items/svxerr.cxx2
-rw-r--r--svx/source/items/viewlayoutitem.cxx28
-rw-r--r--svx/source/items/zoomitem.cxx29
-rw-r--r--svx/source/items/zoomslideritem.cxx38
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx10
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx2
-rw-r--r--svx/source/mnuctrls/fntctl.cxx2
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx2
-rw-r--r--svx/source/sdr/animation/animationstate.cxx3
-rw-r--r--svx/source/sdr/animation/objectanimator.cxx3
-rw-r--r--svx/source/sdr/animation/scheduler.cxx3
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx3
-rw-r--r--svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx24
-rw-r--r--svx/source/sdr/attribute/sdrtextattribute.cxx4
-rw-r--r--svx/source/sdr/contact/displayinfo.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontact.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontactofobjlistpainter.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx3
-rw-r--r--svx/source/sdr/contact/objectcontacttools.cxx3
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.cxx3
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.hxx2
-rw-r--r--svx/source/sdr/contact/viewcontact.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3d.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dcube.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dextrude.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dlathe.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dpolygon.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dscene.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dsphere.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofgroup.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofpageobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcircobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdredgeobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrole2obj.cxx9
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpage.cxx31
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpathobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrrectobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactoftextobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofvirtobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontact.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofe3d.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgraphic.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgroup.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx15
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx14
-rw-r--r--svx/source/sdr/contact/viewobjectcontactredirector.cxx3
-rw-r--r--svx/source/sdr/event/eventhandler.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayanimatedbitmapex.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaybitmapex.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaycrosshair.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayhatchrect.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayhelpline.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayline.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayobject.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayobjectcell.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayobjectlist.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaypolypolygon.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayrollingrectangle.cxx3
-rw-r--r--svx/source/sdr/overlay/overlayselection.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaytools.cxx3
-rw-r--r--svx/source/sdr/overlay/overlaytriangle.cxx3
-rw-r--r--svx/source/sdr/primitive2d/primitivefactory2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx7
-rw-r--r--svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrdecompositiontools.cxx8
-rw-r--r--svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrole2primitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx37
-rw-r--r--svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrprimitivetools.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx3
-rw-r--r--svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx54
-rw-r--r--svx/source/sdr/primitive3d/sdrattributecreator3d.cxx3
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx3
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx3
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx3
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx3
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx3
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx5
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dextrudeproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dlatheproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx3
-rw-r--r--svx/source/sdr/properties/e3dsphereproperties.cxx3
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx3
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx3
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx3
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx3
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx3
-rw-r--r--svx/source/sdr/properties/oleproperties.cxx1
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx3
-rw-r--r--svx/source/sdr/properties/properties.cxx3
-rw-r--r--svx/source/sdr/properties/rectangleproperties.cxx3
-rw-r--r--svx/source/sdr/properties/textproperties.cxx3
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx10
-rw-r--r--svx/source/src/app.hrc7
-rw-r--r--svx/source/src/app.src14
-rw-r--r--svx/source/stbctrls/insctrl.cxx3
-rw-r--r--svx/source/stbctrls/modctrl.cxx101
-rw-r--r--svx/source/stbctrls/pszctrl.cxx4
-rw-r--r--svx/source/stbctrls/selctrl.cxx3
-rw-r--r--svx/source/stbctrls/stbctrls.h2
-rw-r--r--svx/source/stbctrls/stbctrls.src51
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx20
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx8
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx14
-rw-r--r--svx/source/svdraw/ActionDescriptionProvider.cxx3
-rw-r--r--svx/source/svdraw/clonelist.cxx3
-rw-r--r--svx/source/svdraw/gradtrns.cxx3
-rw-r--r--svx/source/svdraw/gradtrns.hxx2
-rw-r--r--svx/source/svdraw/impgrfll.cxx3
-rw-r--r--svx/source/svdraw/polypolygoneditor.cxx9
-rw-r--r--svx/source/svdraw/sdrcomment.cxx3
-rw-r--r--svx/source/svdraw/sdrhittesthelper.cxx3
-rw-r--r--svx/source/svdraw/sdrmasterpagedescriptor.cxx3
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx11
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx3
-rw-r--r--svx/source/svdraw/selectioncontroller.cxx3
-rw-r--r--svx/source/svdraw/svdattr.cxx530
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svddrag.cxx8
-rw-r--r--svx/source/svdraw/svddrgm1.hxx3
-rw-r--r--svx/source/svdraw/svddrgmt.cxx3
-rw-r--r--svx/source/svdraw/svddrgv.cxx3
-rw-r--r--svx/source/svdraw/svdedtv.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx21
-rw-r--r--svx/source/svdraw/svdedtv2.cxx208
-rw-r--r--svx/source/svdraw/svdedxv.cxx19
-rw-r--r--svx/source/svdraw/svdetc.cxx19
-rw-r--r--svx/source/svdraw/svdfmtf.cxx16
-rw-r--r--svx/source/svdraw/svdfmtf.hxx9
-rw-r--r--svx/source/svdraw/svdglev.cxx2
-rw-r--r--svx/source/svdraw/svdglue.cxx23
-rw-r--r--svx/source/svdraw/svdhdl.cxx414
-rw-r--r--svx/source/svdraw/svdhlpln.cxx15
-rw-r--r--svx/source/svdraw/svdibrow.cxx124
-rw-r--r--svx/source/svdraw/svditer.cxx3
-rw-r--r--svx/source/svdraw/svdlayer.cxx16
-rw-r--r--svx/source/svdraw/svdmark.cxx3
-rw-r--r--svx/source/svdraw/svdmodel.cxx125
-rw-r--r--svx/source/svdraw/svdmrkv.cxx4
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx2
-rw-r--r--svx/source/svdraw/svdoashp.cxx41
-rw-r--r--svx/source/svdraw/svdoattr.cxx5
-rw-r--r--svx/source/svdraw/svdobj.cxx100
-rw-r--r--svx/source/svdraw/svdocapt.cxx35
-rw-r--r--svx/source/svdraw/svdocirc.cxx34
-rw-r--r--svx/source/svdraw/svdoedge.cxx295
-rw-r--r--svx/source/svdraw/svdograf.cxx31
-rw-r--r--svx/source/svdraw/svdogrp.cxx35
-rw-r--r--svx/source/svdraw/svdomeas.cxx87
-rw-r--r--svx/source/svdraw/svdomedia.cxx7
-rw-r--r--svx/source/svdraw/svdoole2.cxx63
-rw-r--r--svx/source/svdraw/svdopage.cxx3
-rw-r--r--svx/source/svdraw/svdopath.cxx201
-rw-r--r--svx/source/svdraw/svdorect.cxx15
-rw-r--r--svx/source/svdraw/svdotext.cxx226
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx141
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx7
-rw-r--r--svx/source/svdraw/svdotxat.cxx26
-rw-r--r--svx/source/svdraw/svdotxdr.cxx36
-rw-r--r--svx/source/svdraw/svdotxed.cxx31
-rw-r--r--svx/source/svdraw/svdotxfl.cxx6
-rw-r--r--svx/source/svdraw/svdotxln.cxx12
-rw-r--r--svx/source/svdraw/svdotxtr.cxx34
-rw-r--r--svx/source/svdraw/svdouno.cxx15
-rw-r--r--svx/source/svdraw/svdoutl.cxx5
-rw-r--r--svx/source/svdraw/svdoutlinercache.cxx2
-rw-r--r--svx/source/svdraw/svdovirt.cxx23
-rw-r--r--svx/source/svdraw/svdpage.cxx32
-rw-r--r--svx/source/svdraw/svdpagv.cxx31
-rw-r--r--svx/source/svdraw/svdpntv.cxx101
-rw-r--r--svx/source/svdraw/svdpoev.cxx7
-rw-r--r--svx/source/svdraw/svdsnpv.cxx5
-rw-r--r--svx/source/svdraw/svdstr.src102
-rw-r--r--svx/source/svdraw/svdtext.cxx5
-rw-r--r--svx/source/svdraw/svdtrans.cxx188
-rw-r--r--svx/source/svdraw/svdundo.cxx40
-rw-r--r--svx/source/svdraw/svdview.cxx10
-rw-r--r--svx/source/svdraw/svdviter.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx3
-rw-r--r--svx/source/table/accessiblecell.cxx21
-rw-r--r--svx/source/table/accessiblecell.hxx3
-rw-r--r--svx/source/table/accessibletableshape.cxx49
-rw-r--r--svx/source/table/cell.cxx22
-rw-r--r--svx/source/table/cell.hxx3
-rw-r--r--svx/source/table/cellcursor.cxx3
-rw-r--r--svx/source/table/cellcursor.hxx3
-rw-r--r--svx/source/table/celleditsource.cxx8
-rw-r--r--svx/source/table/celleditsource.hxx3
-rw-r--r--svx/source/table/cellrange.cxx3
-rw-r--r--svx/source/table/cellrange.hxx3
-rw-r--r--svx/source/table/celltypes.hxx2
-rw-r--r--svx/source/table/propertyset.cxx3
-rw-r--r--svx/source/table/propertyset.hxx3
-rw-r--r--svx/source/table/svdotable.cxx42
-rw-r--r--svx/source/table/tablecolumn.cxx5
-rw-r--r--svx/source/table/tablecolumn.hxx3
-rw-r--r--svx/source/table/tablecolumns.cxx3
-rw-r--r--svx/source/table/tablecolumns.hxx3
-rw-r--r--svx/source/table/tablecontroller.cxx3
-rw-r--r--svx/source/table/tablecontroller.hxx2
-rw-r--r--svx/source/table/tabledesign.cxx38
-rw-r--r--svx/source/table/tablehandles.cxx3
-rw-r--r--svx/source/table/tablehandles.hxx3
-rw-r--r--svx/source/table/tablelayouter.cxx10
-rw-r--r--svx/source/table/tablelayouter.hxx8
-rw-r--r--svx/source/table/tablemodel.cxx32
-rw-r--r--svx/source/table/tablemodel.hxx3
-rw-r--r--svx/source/table/tablerow.cxx4
-rw-r--r--svx/source/table/tablerow.hxx3
-rw-r--r--svx/source/table/tablerows.cxx3
-rw-r--r--svx/source/table/tablerows.hxx3
-rw-r--r--svx/source/table/tablertfexporter.cxx3
-rw-r--r--svx/source/table/tablertfimporter.cxx2
-rw-r--r--svx/source/table/tableundo.cxx3
-rw-r--r--svx/source/table/tableundo.hxx5
-rw-r--r--svx/source/table/viewcontactoftableobj.cxx15
-rw-r--r--svx/source/table/viewcontactoftableobj.hxx3
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx3
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx3
-rw-r--r--svx/source/tbxctrls/colrctrl.src3
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx54
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hrc25
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.src273
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx17
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.src68
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx3
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx224
-rw-r--r--svx/source/tbxctrls/itemwin.cxx37
-rw-r--r--svx/source/tbxctrls/layctrl.cxx500
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx11
-rw-r--r--svx/source/tbxctrls/lboxctrl.src13
-rw-r--r--svx/source/tbxctrls/linectrl.cxx13
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx3
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx65
-rw-r--r--svx/source/tbxctrls/tbcontrl.src57
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx15
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.src.orig33
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx21
-rw-r--r--svx/source/tbxctrls/tbxcolor.cxx2
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx3
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx2
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx12
-rw-r--r--svx/source/toolbars/extrusionbar.cxx13
-rw-r--r--svx/source/toolbars/fontworkbar.cxx5
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx21
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx5
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx23
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx3
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx22
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx5
-rw-r--r--svx/source/unodialogs/textconversiondlgs/resid.cxx3
-rw-r--r--svx/source/unodialogs/textconversiondlgs/resid.hxx3
-rw-r--r--svx/source/unodialogs/textconversiondlgs/services.cxx3
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx9
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.hxx3
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx24
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx3
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx5
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx20
-rw-r--r--svx/source/unodraw/gluepts.cxx5
-rw-r--r--svx/source/unodraw/recoveryui.cxx19
-rw-r--r--svx/source/unodraw/shapeimpl.hxx2
-rw-r--r--svx/source/unodraw/shapepropertynotifier.cxx3
-rw-r--r--svx/source/unodraw/tableshape.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx1
-rw-r--r--svx/source/unodraw/unoctabl.cxx3
-rw-r--r--svx/source/unodraw/unodtabl.cxx2
-rw-r--r--svx/source/unodraw/unogtabl.cxx2
-rw-r--r--svx/source/unodraw/unohtabl.cxx2
-rw-r--r--svx/source/unodraw/unomlstr.cxx6
-rw-r--r--svx/source/unodraw/unomod.cxx55
-rw-r--r--svx/source/unodraw/unomtabl.cxx23
-rw-r--r--svx/source/unodraw/unopage.cxx46
-rw-r--r--svx/source/unodraw/unopool.cxx19
-rw-r--r--svx/source/unodraw/unoprov.cxx175
-rw-r--r--svx/source/unodraw/unoshap2.cxx67
-rw-r--r--svx/source/unodraw/unoshap3.cxx16
-rw-r--r--svx/source/unodraw/unoshap4.cxx20
-rw-r--r--svx/source/unodraw/unoshape.cxx249
-rw-r--r--svx/source/unodraw/unoshcol.cxx3
-rw-r--r--svx/source/unodraw/unoshtxt.cxx4
-rw-r--r--svx/source/unodraw/unottabl.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx17
-rw-r--r--svx/source/unogallery/unogalitem.hxx5
-rw-r--r--svx/source/unogallery/unogaltheme.cxx51
-rw-r--r--svx/source/unogallery/unogaltheme.hxx3
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx11
-rw-r--r--svx/source/xml/xmleohlp.cxx8
-rw-r--r--svx/source/xml/xmlexport.cxx7
-rw-r--r--svx/source/xml/xmlgrhlp.cxx11
-rw-r--r--svx/source/xml/xmlxtexp.cxx5
-rw-r--r--svx/source/xml/xmlxtimp.cxx16
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx3
-rw-r--r--svx/source/xoutdev/_xpoly.cxx377
-rw-r--r--svx/source/xoutdev/xattr.cxx838
-rw-r--r--svx/source/xoutdev/xattr2.cxx655
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx97
-rw-r--r--svx/source/xoutdev/xexch.cxx3
-rw-r--r--svx/source/xoutdev/xpool.cxx3
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx3
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx7
-rw-r--r--svx/source/xoutdev/xtabdash.cxx3
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx3
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx3
-rw-r--r--svx/source/xoutdev/xtable.cxx4
-rw-r--r--svx/source/xoutdev/xtablend.cxx4
-rw-r--r--svx/util/svxpch.cxx2
-rw-r--r--svx/workben/makefile.mk72
-rw-r--r--svx/workben/msview/msview.cxx51
-rw-r--r--svx/workben/msview/xmlconfig.cxx4
-rw-r--r--svx/workben/msview/xmlconfig.hxx3
1172 files changed, 10515 insertions, 10828 deletions
diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx
index 2965587f2e..18436c3ac4 100644
--- a/svx/inc/dgdefs_.hxx
+++ b/svx/inc/dgdefs_.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -339,3 +340,5 @@
#define layctrl_0c SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE)
#define layctrl_0f SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE)
#define layctrl_10 SEG_SEGCLASS(UNUSED_SEG002,UNUSED_CODE)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx
index f5b3532603..7d01b3cc9c 100644
--- a/svx/inc/dialdll.hxx
+++ b/svx/inc/dialdll.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index a8ad139bae..5226f35838 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,7 @@ class E3dScene;
/*************************************************************************
|*
-|* Parameter fuer Interaktion eines 3D-Objektes
+|* Parameters for the interaction of a 3D object
|*
\************************************************************************/
class E3dDragMethodUnit
@@ -67,7 +68,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod fuer 3D-Objekte
+|* Derivative of SdrDragMethod for 3D objects
|*
\************************************************************************/
@@ -104,7 +105,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod zum Drehen von 3D-Objekten
+|* Derivative of SdrDragMethod for spinning 3D objects
|*
\************************************************************************/
@@ -127,7 +128,7 @@ public:
/*************************************************************************
|*
-|* Ableitung von SdrDragMethod zum Verschieben von 3D-Subobjekten
+|* Derivative of SdrDragMethod for moving 3D sub-objects
|*
\************************************************************************/
@@ -151,3 +152,5 @@ public:
#endif // _E3D_DRAGMT3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx
index 1f6c84efb0..84bc939055 100644
--- a/svx/inc/drawuiks.hxx
+++ b/svx/inc/drawuiks.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@
#define SD_UIK_PRESENTATION_STYLES UIK_DRAWING(60)
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index aa1c142d79..2c7c7860ba 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -26,8 +26,6 @@
************************************************************************/
#include <svx/dialogs.hrc>
-//#define FLT_WIN_3D 827
-
#define BTN_GEO 2
#define BTN_REPRESENTATION 3
#define BTN_LIGHT 4
@@ -43,12 +41,12 @@
#define CTL_PREVIEW 12
#define CTL_LIGHT_PREVIEW 13
-// Geometrie
+// Geomerty
#define FT_HORIZONTAL 24
#define NUM_HORIZONTAL 25
#define FT_VERTICAL 26
#define NUM_VERTICAL 27
-#define FL_SEGMENTS 28
+#define FL_SEGMENTS 28
#define FT_PERCENT_DIAGONAL 29
#define MTR_PERCENT_DIAGONAL 30
#define FT_BACKSCALE 31
@@ -57,32 +55,32 @@
#define MTR_END_ANGLE 34
#define FT_DEPTH 35
#define MTR_DEPTH 36
-#define FL_GEOMETRIE 37
+#define FL_GEOMETRIE 37
#define BTN_NORMALS_OBJ 38
#define BTN_NORMALS_FLAT 39
#define BTN_NORMALS_SPHERE 40
#define BTN_TWO_SIDED_LIGHTING 41
#define BTN_NORMALS_INVERT 42
-#define FL_NORMALS 43
+#define FL_NORMALS 43
#define BTN_DOUBLE_SIDED 44
-// Darstellung
+// Depiction/Appearance
#define FT_SHADEMODE 45
#define LB_SHADEMODE 46
#define BTN_SHADOW_3D 47
#define FT_SLANT 48
#define MTR_SLANT 49
-#define FL_SHADOW 50
+#define FL_SHADOW 50
#define FT_DISTANCE 51
#define MTR_DISTANCE 52
#define FT_FOCAL_LENGTH 53
#define MTR_FOCAL_LENGTH 54
-#define FL_CAMERA 55
-#define FL_REPRESENTATION 56
+#define FL_CAMERA 55
+#define FL_REPRESENTATION 56
-// Beleuchtung
+// Lighting
#define BTN_LIGHT_1 60
#define BTN_LIGHT_2 61
#define BTN_LIGHT_3 62
@@ -100,13 +98,13 @@
#define LB_LIGHT_7 74
#define LB_LIGHT_8 75
#define BTN_LIGHT_COLOR 76
-#define FT_LIGHTSOURCE 77
+#define FT_LIGHTSOURCE 77
#define LB_AMBIENTLIGHT 78
#define BTN_AMBIENT_COLOR 79
-#define FT_AMBIENTLIGHT 80
-#define FL_LIGHT 81
+#define FT_AMBIENTLIGHT 80
+#define FL_LIGHT 81
-// Texturen
+// Textures
#define FT_TEX_KIND 90
#define BTN_TEX_LUMINANCE 91
#define BTN_TEX_COLOR 92
@@ -124,11 +122,10 @@
#define BTN_TEX_OBJECT_Y 104
#define FT_TEX_FILTER 105
#define BTN_TEX_FILTER 106
-#define FL_TEXTURE 107
+#define FL_TEXTURE 107
// Material
-//#define CTL_MATERIAL 110
-#define FL_MATERIAL 111
+#define FL_MATERIAL 111
#define FT_MAT_COLOR 112
#define LB_MAT_COLOR 113
@@ -141,44 +138,6 @@
#define BTN_SPECULAR_COLOR 120
#define FT_MAT_SPECULAR_INTENSITY 121
#define MTR_MAT_SPECULAR_INTENSITY 122
-#define FL_MAT_SPECULAR 123
+#define FL_MAT_SPECULAR 123
#define FT_MAT_FAVORITES 124
#define LB_MAT_FAVORITES 125
-
-
-//#define BTN_MAT_FAVORITES 125
-//#define BTN_MAT_EDITOR 126
-
-
-// high contrast
-#define BMP_GEO_H 130
-#define BMP_REPRESENTATION_H 131
-#define BMP_LIGHT_H 132
-#define BMP_TEXTURE_H 133
-#define BMP_MATERIAL_H 134
-#define BMP_UPDATE_H 135
-#define BMP_ASSIGN_H 136
-#define BMP_CHANGE_TO_3D_H 137
-#define BMP_LATHE_OBJ_H 138
-#define BMP_PERSPECTIVE_H 139
-#define BMP_NORMALS_OBJ_H 142
-#define BMP_NORMALS_FLAT_H 143
-#define BMP_NORMALS_SPHERE_H 144
-#define BMP_NORMALS_INVERT_H 145
-#define BMP_TWO_SIDED_LIGHTING_H 146
-#define BMP_DOUBLE_SIDED_H 147
-#define BMP_SHADOW_3D_H 148
-#define BMP_3DLIGHT_H 149
-#define BMP_LIGHT_COLOR_H 150
-#define BMP_AMBIENT_COLOR_H 151
-#define BMP_TEX_LUMINANCE_H 152
-#define BMP_TEX_COLOR_H 153
-#define BMP_TEX_REPLACE_H 154
-#define BMP_TEX_MODULATE_H 155
-#define BMP_TEX_BLEND_H 156
-#define BMP_TEX_OBJECT_H 157
-#define BMP_TEX_PARALLEL_H 158
-#define BMP_TEX_CIRCLE_H 159
-#define BMP_TEX_FILTER_H 160
-#define BMP_COLORDLG_H 161
-
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 13912923c1..37a59a8d03 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -51,22 +51,12 @@
#define STR_CHARS_SPACING_KERN_PAIRS 12
#define IMG_FONTWORK_ALIGN_LEFT_16 1
-#define IMG_FONTWORK_ALIGN_LEFT_16_H 2
#define IMG_FONTWORK_ALIGN_LEFT_26 3
-#define IMG_FONTWORK_ALIGN_LEFT_26_H 4
#define IMG_FONTWORK_ALIGN_CENTER_16 5
-#define IMG_FONTWORK_ALIGN_CENTER_16_H 6
#define IMG_FONTWORK_ALIGN_CENTER_26 7
-#define IMG_FONTWORK_ALIGN_CENTER_26_H 8
#define IMG_FONTWORK_ALIGN_RIGHT_16 9
-#define IMG_FONTWORK_ALIGN_RIGHT_16_H 10
#define IMG_FONTWORK_ALIGN_RIGHT_26 11
-#define IMG_FONTWORK_ALIGN_RIGHT_26_H 12
#define IMG_FONTWORK_ALIGN_WORD_16 13
-#define IMG_FONTWORK_ALIGN_WORD_16_H 14
#define IMG_FONTWORK_ALIGN_WORD_26 15
-#define IMG_FONTWORK_ALIGN_WORD_26_H 16
#define IMG_FONTWORK_ALIGN_STRETCH_16 17
-#define IMG_FONTWORK_ALIGN_STRETCH_16_H 18
#define IMG_FONTWORK_ALIGN_STRETCH_26 19
-#define IMG_FONTWORK_ALIGN_STRETCH_26_H 20
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 65ca239e5a..23b8cd42f4 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -179,3 +180,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index a22cce8e3a..5bd548855b 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -81,8 +81,6 @@
#define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54)
#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)
-#define RID_SVXIMG_GALLERY_VIEW_LIST_HC (RID_SVX_GALLERY_START + 59)
// Gallery-Bitmaps fuer Sounds
#define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61)
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 3dd7994848..91de8cf4cf 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -236,3 +237,5 @@ public:
virtual SgaObjKind GetObjKind() const { return SGA_OBJ_INET; }
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 63866a8e0f..adf0837dbb 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -68,10 +68,116 @@
#define RID_GALLERYSTR_THEME_SCREENBEANS (RID_GALLERYSTR_THEME_START + 35)
#define RID_GALLERYSTR_THEME_DUMMY5 (RID_GALLERYSTR_THEME_START + 36)
+
#define RID_GALLERYSTR_THEME_FONTWORK (RID_GALLERYSTR_THEME_START + 37)
#define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL (RID_GALLERYSTR_THEME_START + 38)
+#define RID_GALLERYSTR_THEME_SHAPES_POLYGONS (RID_GALLERYSTR_THEME_START + 39)
+#define RID_GALLERYSTR_THEME_SHAPES_1 (RID_GALLERYSTR_THEME_START + 40)
+#define RID_GALLERYSTR_THEME_SHAPES_2 (RID_GALLERYSTR_THEME_START + 41)
+#define RID_GALLERYSTR_THEME_ANIMALS (RID_GALLERYSTR_THEME_START + 42)
+#define RID_GALLERYSTR_THEME_CARS (RID_GALLERYSTR_THEME_START + 43)
+#define RID_GALLERYSTR_THEME_BUGS (RID_GALLERYSTR_THEME_START + 44)
+#define RID_GALLERYSTR_THEME_CISCO_OTHER (RID_GALLERYSTR_THEME_START + 45)
+#define RID_GALLERYSTR_THEME_CISCO_MEDIA (RID_GALLERYSTR_THEME_START + 46)
+#define RID_GALLERYSTR_THEME_CISCO_PRODUCTS (RID_GALLERYSTR_THEME_START + 47)
+#define RID_GALLERYSTR_THEME_CISCO_WAN_LAN (RID_GALLERYSTR_THEME_START + 48)
+#define RID_GALLERYSTR_THEME_DOMINO_USUAL (RID_GALLERYSTR_THEME_START + 49)
+#define RID_GALLERYSTR_THEME_DOMINO_NUMBERED (RID_GALLERYSTR_THEME_START + 50)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_1 (RID_GALLERYSTR_THEME_START + 51)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_2 (RID_GALLERYSTR_THEME_START + 52)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_3 (RID_GALLERYSTR_THEME_START + 53)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_4 (RID_GALLERYSTR_THEME_START + 54)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_CIRCUIT (RID_GALLERYSTR_THEME_START + 55)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_SIGNS (RID_GALLERYSTR_THEME_START + 56)
+#define RID_GALLERYSTR_THEME_ELECTRONICS_GAUGES (RID_GALLERYSTR_THEME_START + 57)
+#define RID_GALLERYSTR_THEME_PEOPLE_1 (RID_GALLERYSTR_THEME_START + 58)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_OVERLAY (RID_GALLERYSTR_THEME_START + 59)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES (RID_GALLERYSTR_THEME_START + 60)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS (RID_GALLERYSTR_THEME_START + 61)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_BATHROOM_KITCHEN (RID_GALLERYSTR_THEME_START + 62)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_KITCHEN (RID_GALLERYSTR_THEME_START + 63)
+#define RID_GALLERYSTR_THEME_ARCHITECTURE_WINDOWS_DOORS (RID_GALLERYSTR_THEME_START + 64)
+#define RID_GALLERYSTR_THEME_FLOWCHARTS_1 (RID_GALLERYSTR_THEME_START + 65)
+#define RID_GALLERYSTR_THEME_FLOWCHARTS_2 (RID_GALLERYSTR_THEME_START + 66)
+#define RID_GALLERYSTR_THEME_FORALSTUDIOA (RID_GALLERYSTR_THEME_START + 67)
+#define RID_GALLERYSTR_THEME_PHOTOS_FAUNA (RID_GALLERYSTR_THEME_START + 68)
+#define RID_GALLERYSTR_THEME_PHOTOS_BUILDINGS (RID_GALLERYSTR_THEME_START + 69)
+#define RID_GALLERYSTR_THEME_PHOTOS_PLANTS (RID_GALLERYSTR_THEME_START + 70)
+#define RID_GALLERYSTR_THEME_PHOTOS_STATUES (RID_GALLERYSTR_THEME_START + 71)
+#define RID_GALLERYSTR_THEME_PHOTOS_LANDSCAPES (RID_GALLERYSTR_THEME_START + 72)
+#define RID_GALLERYSTR_THEME_PHOTOS_CITIES (RID_GALLERYSTR_THEME_START + 73)
+#define RID_GALLERYSTR_THEME_PHOTOS_FLOWERS (RID_GALLERYSTR_THEME_START + 74)
+#define RID_GALLERYSTR_THEME_THERAPEUTICS_GENERAL (RID_GALLERYSTR_THEME_START + 75)
+#define RID_GALLERYSTR_THEME_WEATHER (RID_GALLERYSTR_THEME_START + 76)
+#define RID_GALLERYSTR_THEME_VECHILES (RID_GALLERYSTR_THEME_START + 77)
+#define RID_GALLERYSTR_THEME_SIGNS (RID_GALLERYSTR_THEME_START + 78)
+#define RID_GALLERYSTR_THEME_BLUE_MAN (RID_GALLERYSTR_THEME_START + 79)
+#define RID_GALLERYSTR_THEME_CHEMISTRY_AMINO_ACIDS (RID_GALLERYSTR_THEME_START + 80)
+#define RID_GALLERYSTR_THEME_LOGICAL_SIGNS (RID_GALLERYSTR_THEME_START + 81)
+#define RID_GALLERYSTR_THEME_LOGICAL_GATES (RID_GALLERYSTR_THEME_START + 82)
+#define RID_GALLERYSTR_THEME_LOGOS (RID_GALLERYSTR_THEME_START + 83)
+#define RID_GALLERYSTR_THEME_SMILES (RID_GALLERYSTR_THEME_START + 84)
+#define RID_GALLERYSTR_THEME_ARROWS_1 (RID_GALLERYSTR_THEME_START + 85)
+#define RID_GALLERYSTR_THEME_CLOCK_01_CLOCK (RID_GALLERYSTR_THEME_START + 86)
+#define RID_GALLERYSTR_THEME_CLOCK_02_CLOCK (RID_GALLERYSTR_THEME_START + 87)
+#define RID_GALLERYSTR_THEME_CLOCK_03_CLOCK (RID_GALLERYSTR_THEME_START + 88)
+#define RID_GALLERYSTR_THEME_CLOCK_04_CLOCK (RID_GALLERYSTR_THEME_START + 89)
+#define RID_GALLERYSTR_THEME_CLOCK_05_CLOCK (RID_GALLERYSTR_THEME_START + 90)
+#define RID_GALLERYSTR_THEME_CLOCK_06_CLOCK (RID_GALLERYSTR_THEME_START + 91)
+#define RID_GALLERYSTR_THEME_CLOCK_07_CLOCK (RID_GALLERYSTR_THEME_START + 92)
+#define RID_GALLERYSTR_THEME_CLOCK_08_CLOCK (RID_GALLERYSTR_THEME_START + 93)
+#define RID_GALLERYSTR_THEME_CLOCK_09_CLOCK (RID_GALLERYSTR_THEME_START + 94)
+#define RID_GALLERYSTR_THEME_CLOCK_10_CLOCK (RID_GALLERYSTR_THEME_START + 95)
+#define RID_GALLERYSTR_THEME_CLOCK_11_CLOCK (RID_GALLERYSTR_THEME_START + 96)
+#define RID_GALLERYSTR_THEME_CLOCK_12_CLOCK (RID_GALLERYSTR_THEME_START + 97)
+#define RID_GALLERYSTR_THEME_PNEUMATIC_PARTS (RID_GALLERYSTR_THEME_START + 98)
+#define RID_GALLERYSTR_THEME_COMPUTER_GENERAL (RID_GALLERYSTR_THEME_START + 99)
+#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK (RID_GALLERYSTR_THEME_START + 100)
+#define RID_GALLERYSTR_THEME_COMPUTER_NETWORK_DEVICES (RID_GALLERYSTR_THEME_START + 101)
+#define RID_GALLERYSTR_THEME_COMPUTER_WIFI (RID_GALLERYSTR_THEME_START + 102)
+#define RID_GALLERYSTR_THEME_NUMBERS (RID_GALLERYSTR_THEME_START + 103)
+#define RID_GALLERYSTR_THEME_SIGNS_DANGER (RID_GALLERYSTR_THEME_START + 104)
+#define RID_GALLERYSTR_THEME_OBJECTS (RID_GALLERYSTR_THEME_START + 105)
+#define RID_GALLERYSTR_THEME_MAPS_AFRICA (RID_GALLERYSTR_THEME_START + 106)
+#define RID_GALLERYSTR_THEME_MAPS_UNITED_STATES_OF_AMERICA (RID_GALLERYSTR_THEME_START + 107)
+#define RID_GALLERYSTR_THEME_MAPS_AUSTRALIA (RID_GALLERYSTR_THEME_START + 108)
+#define RID_GALLERYSTR_THEME_MAPS_ASIA (RID_GALLERYSTR_THEME_START + 109)
+#define RID_GALLERYSTR_THEME_MAPS_SOUTH_AMERICA (RID_GALLERYSTR_THEME_START + 110)
+#define RID_GALLERYSTR_THEME_MAPS_EUROPE (RID_GALLERYSTR_THEME_START + 111)
+#define RID_GALLERYSTR_THEME_MAPS_EUROPE_1 (RID_GALLERYSTR_THEME_START + 112)
+#define RID_GALLERYSTR_THEME_MAPS_FRANCE (RID_GALLERYSTR_THEME_START + 113)
+#define RID_GALLERYSTR_THEME_MAPS_FRANCE_COUNTRIES (RID_GALLERYSTR_THEME_START + 114)
+#define RID_GALLERYSTR_THEME_MAPS_SIGNS (RID_GALLERYSTR_THEME_START + 115)
+#define RID_GALLERYSTR_THEME_MAPS_CANADA (RID_GALLERYSTR_THEME_START + 116)
+#define RID_GALLERYSTR_THEME_MAPS_CONTINENTS (RID_GALLERYSTR_THEME_START + 117)
+#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_EAST (RID_GALLERYSTR_THEME_START + 118)
+#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AMERICA (RID_GALLERYSTR_THEME_START + 119)
+#define RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES (RID_GALLERYSTR_THEME_START + 120)
+#define RID_GALLERYSTR_THEME_MAPS_MEXICO (RID_GALLERYSTR_THEME_START + 121)
+#define RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES (RID_GALLERYSTR_THEME_START + 122)
+#define RID_GALLERYSTR_THEME_MAPS_SYMBOLS (RID_GALLERYSTR_THEME_START + 123)
+#define RID_GALLERYSTR_THEME_MAPS_HISTORY_1900 (RID_GALLERYSTR_THEME_START + 124)
+#define RID_GALLERYSTR_THEME_MAPS_WORLD (RID_GALLERYSTR_THEME_START + 125)
+#define RID_GALLERYSTR_THEME_CROPS (RID_GALLERYSTR_THEME_START + 126)
+#define RID_GALLERYSTR_THEME_FRACTIONS (RID_GALLERYSTR_THEME_START + 127)
+#define RID_GALLERYSTR_THEME_FLAGS_1 (RID_GALLERYSTR_THEME_START + 128)
+#define RID_GALLERYSTR_THEME_MUSIC_INSTRUMENTS (RID_GALLERYSTR_THEME_START + 129)
+#define RID_GALLERYSTR_THEME_MUSIC_SHEET_MUSIC (RID_GALLERYSTR_THEME_START + 130)
+#define RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM (RID_GALLERYSTR_THEME_START + 131)
+#define RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION (RID_GALLERYSTR_THEME_START + 132)
+#define RID_GALLERYSTR_THEME_PHOTOS_FOODSANDDRINKS (RID_GALLERYSTR_THEME_START + 133)
+#define RID_GALLERYSTR_THEME_PHOTOS_HUMANS (RID_GALLERYSTR_THEME_START + 134)
+#define RID_GALLERYSTR_THEME_PHOTOS_OBJECTS (RID_GALLERYSTR_THEME_START + 135)
+#define RID_GALLERYSTR_THEME_PHOTOS_SPACE (RID_GALLERYSTR_THEME_START + 136)
+#define RID_GALLERYSTR_THEME_PHOTOS_TRAVEL (RID_GALLERYSTR_THEME_START + 137)
+#define RID_GALLERYSTR_THEME_OPENOFFICEORG_LOGOS (RID_GALLERYSTR_THEME_START + 138)
+#define RID_GALLERYSTR_THEME_RELIGION (RID_GALLERYSTR_THEME_START + 139)
+#define RID_GALLERYSTR_THEME_BUILDINGS (RID_GALLERYSTR_THEME_START + 140)
+#define RID_GALLERYSTR_THEME_HOMEPAGE2 (RID_GALLERYSTR_THEME_START + 141)
+#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2 (RID_GALLERYSTR_THEME_START + 142)
+
#define RID_GALLERYSTR_THEME_FIRST RID_GALLERYSTR_THEME_3D
-#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_FONTWORK_VERTICAL
+#define RID_GALLERYSTR_THEME_LAST RID_GALLERYSTR_THEME_ELEMENTSBULLETS2
#endif
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 09cc85f8bc..6cb5d4fe4c 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -958,15 +958,15 @@
};\
MenuItem\
{\
- ITEM_HELP_SUPPORTPAGE\
+ ITEM_SHOW_LICENSE\
};\
MenuItem\
{\
- ITEM_HELP_ONLINE_REGISTRATION\
+ Separator = TRUE ; \
};\
MenuItem\
{\
- Separator = TRUE ; \
+ ITEM_SHOW_CREDITS\
};\
MenuItem\
{\
diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index fe00bcf0e5..b179163289 100644
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,14 +36,12 @@
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <svx/dlgctrl.hxx>
/*************************************************************************
|*
-|* 3D-Tab-Dialog
+|* 3D TabDialog
|*
\************************************************************************/
@@ -58,7 +57,7 @@ public:
/*************************************************************************
|*
-|* 3D-SingleTab-Dialog
+|* 3D SingleTabDialog
|*
\************************************************************************/
class Svx3DSingleTabDialog : public SfxSingleTabDialog
@@ -73,3 +72,4 @@ public:
#endif // _SVX_LIGHT3D_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx
index 52e0e91754..88354384ce 100644
--- a/svx/inc/pch/precompiled_svx.cxx
+++ b/svx/inc/pch/precompiled_svx.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_svx.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index e5d10ec002..aeacde6f1f 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -689,6 +690,7 @@
#include "osl/nlsupport.h"
#include "osl/process.h"
#include "osl/security.hxx"
+#include "osl/thread.hxx"
#include "rsc/rscsfx.hxx"
#include "rtl/bootstrap.hxx"
#include "rtl/cipher.h"
@@ -698,6 +700,7 @@
#include "rtl/logfile.hxx"
#include "rtl/math.hxx"
#include "rtl/memory.h"
+#include "rtl/ref.hxx"
#include "rtl/tencinfo.h"
#include "rtl/textenc.h"
#include "rtl/ustrbuf.hxx"
@@ -706,6 +709,7 @@
#include "sal/config.h"
#include "sal/main.h"
#include "sal/types.h"
+#include "salhelper/simplereferenceobject.hxx"
#include "sfx2/bindings.hxx"
#include "sfx2/ctrlitem.hxx"
#include "sfx2/dispatch.hxx"
@@ -960,3 +964,4 @@
//---MARKER---
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 19e735265b..42af07adde 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,33 +28,22 @@
#ifdef SOLAR_JAVA
-#ifndef _SFXSFXJS_HXX
#include <sfx2/sfxjs.hxx>
-#endif
class VCControl;
class VCForm;
class VCManager;
class VCRadioManager;
-
-// Basis-Klasse aller VCControl-Wrapper-Klassen
-// Haelt Verweis auf das Control und handelt einige gemeinsame Properties
+// Base class of all VCControl wrapper classes
+// Keeps reference to the Control and handles some common properties
class ImpSjJScriptControlBase
{
protected:
VCControl* pControl;
public:
- // Beibehalten bis zum Vollupdate
- /*
- String getName() const;
- void setName( const String & aStrg );
- String getValue() const;
- String getType() const;
- */
-
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
String ImpGetName() const;
void ImpSetName( const String & aStrg );
@@ -61,7 +51,7 @@ class ImpSjJScriptControlBase
void ImpSetValue( const String & aStrg );
String ImpGetType() const;
- // Konstruktor
+ // Constructor
ImpSjJScriptControlBase::ImpSjJScriptControlBase( VCControl* _pControl );
};
@@ -71,40 +61,40 @@ class ImpSjJScriptControlBase
class ImpSjJScriptButtonObject : public SjJScriptButtonObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // constructor
ImpSjJScriptButtonObject( VCControl* _pControl, SjJSbxObject * p );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// PasswordControl (Edit-Control zur Password-Eingabe)
+// PasswordControl (edit control for entering password)
class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -114,16 +104,16 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC
virtual void setDefaultValue( const String & aStrg );
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none!
- // Konstruktor
+ // construktor
ImpSjJScriptPasswordObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -132,9 +122,9 @@ class ImpSjJScriptPasswordObject : public SjJScriptPasswordObject, ImpSjJScriptC
class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -144,28 +134,27 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC
virtual void setChecked( BOOL bCheck );
virtual BOOL getDefaultChecked() const;
virtual void setDefaultChecked( BOOL bCheck );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // construktor
ImpSjJScriptCheckboxObject( VCControl* _pControl, SjJSbxObject * p );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Wrapper-Klasse fuer RadioArray
+// Wrapper class for RadioArray
class ImpSjJScriptRadioArray: public SjJSbxArrayObject
{
VCRadioManager* pMgr;
@@ -174,7 +163,7 @@ public:
SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const;
SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const;
- // Konstruktor
+ // construktor
ImpSjJScriptRadioArray::ImpSjJScriptRadioArray( VCRadioManager* _pMgr, SjJSbxObject * p );
};
@@ -183,37 +172,33 @@ public:
class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // Properties von SjJScriptCheckboxObject
+ // Properties of SjJScriptCheckboxObject
virtual BOOL getChecked() const;
virtual void setChecked( BOOL bCheck );
virtual BOOL getDefaultChecked() const;
virtual void setDefaultChecked( BOOL bCheck );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // yyy Raus zum inkompatiblen
- //virtual INT32 getLength();
-
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptRadioObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -222,9 +207,9 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -234,17 +219,13 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
virtual INT32 getSelectedIndex() const;
virtual void setSelectedIndex( INT32 nNo );
- // liefert eine Array von Option-Objekten
- //yyy Raus zum inkompatiblen
- //virtual SjJSbxArrayObject * getOptions();
-
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -261,23 +242,20 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
virtual void setOnFocus( const String & aSourceStrg );
void onFocus();
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
virtual INT32 getLength() const;
- // Zugriff "uber den Index
+ // Access through the index
virtual SjJSbxObject * getElement( INT32 nIndex ) const;
- // Zugriff "uber den Namen
- // native Java-Methoden k"onnen (noch) nicht "uberladen werden
- //virtual SjJSbxObject * getElement_String( const String & aName ) const;
- // Konstruktor
+ // Constructor
ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p );
- // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997
+ // for setting entries of the object (to be called from Java)
virtual void setOption( INT32 nIndex, const String & aOptionText,
const String & aOptionValue,
BOOL bDefaultSelected, BOOL bSelected );
- // Schnittstelle fuer die Properties der Option-Objekte
+ // interface for the properties of the option objects
virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const;
virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex );
virtual BOOL getOptionSelected( INT32 nIndex ) const;
@@ -290,13 +268,11 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Wieso von Controlbase abgeleitet?
-
class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase
{
USHORT nListBoxIndex;
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
virtual BOOL getdefaultSelected() const;
virtual void setdefaultSelected( BOOL bSelected );
@@ -304,53 +280,44 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr
virtual BOOL getSelected() const;
virtual void setSelected( BOOL bSelected );
-
- //yyy Zum Vollupdate raus:
- /*
- virtual INT32 getSelectedIndex() const;
- virtual void setSelectedIndex( INT32 nNo );
- */
-
-
virtual String getText() const;
virtual void setText( const String & sText );
- // getValue() wird in der Basisklasse definiert
virtual String getValue() const;
virtual void setValue( const String & aStrg );
- // DUMMY-Methoden
+ // DUMMY methods
virtual String getName() const { return "";}
virtual void setName( const String &s) { }
virtual String getType() const { return "";}
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Eigene Klasse fuer forms-Array anlegen
+// Separate class for forms array
class SjJSbxFormsArray: public SfxJSArray
{
VCManager* pManager;
public:
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
virtual INT32 getLength() const;
- // Zugriff "uber den Index
+ // access through the index
virtual SjJSbxObject * getElement( INT32 nIndex ) const;
- // Zugriff "uber den Namen
- // native Java-Methoden k"onnen (noch) nicht "uberladen werden
+ // access through the name
+ // cannot overload native java methods (yet)
virtual SjJSbxObject * getElement_String( const String & aName ) const;
- // Konstruktor
+ // Constructor
SjJSbxFormsArray( VCManager * _pManager, SjJSbxObject * p );
};
@@ -359,9 +326,9 @@ class SjJSbxFormsArray: public SfxJSArray
class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -369,17 +336,16 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
virtual String getDefaultValue() const;
virtual void setDefaultValue( const String & aStrg );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -401,7 +367,7 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
virtual void setOnSelect( const String & aSourceStrg );
void onSelect();
- // Konstruktor
+ // Constructor
ImpSjJScriptTextObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -410,9 +376,9 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
@@ -420,17 +386,16 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
virtual String getDefaultValue() const;
virtual void setDefaultValue( const String & aStrg );
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
+ // Methods of the object
virtual void focus();
virtual void blur();
virtual void select();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnChange_Fct() const;
@@ -452,7 +417,7 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
virtual void setOnSelect( const String & aSourceStrg );
void onSelect();
- // Konstruktor
+ // Constructor
ImpSjJScriptTextareaObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -460,30 +425,30 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptControlBase
{
- // Identisch mit ButtonObject
+ // identically equal to ButtonObject
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptSubmitObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -491,30 +456,30 @@ class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptContr
class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControlBase
{
- // Identisch mit ButtonObject
+ // identically equal to ButtonObject
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual void setValue( const String & aStrg );
virtual String getType() const;
- // Methoden des Objektes
+ // Methods of the object
virtual void click();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnClick_Fct() const;
virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual String getOnClick() const;
virtual void setOnClick( const String & aSourceStrg );
void onClick();
- // Konstruktor
+ // Constructor
ImpSjJScriptResetObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -523,25 +488,24 @@ class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControl
class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptHiddenObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -550,22 +514,22 @@ class ImpSjJScriptHiddenObject : public SjJScriptHiddenObject, ImpSjJScriptContr
class ImpSjJScriptFileUploadObject : public SjJScriptFileUploadObject, ImpSjJScriptControlBase
{
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
- // Basisklassen-Properties, werden an ImpSjJScriptControlBase durchgereicht
+ // Base class properties, are passed through to ImpSjJScriptControlBase
virtual String getName() const;
virtual void setName( const String & aStrg );
virtual String getValue() const;
virtual String getType() const;
- // Methoden des Objektes
- // keine !
+ // Methods of the object
+ // none !
// Events (C++ --> Java)
//----------------------
- // keine !
+ // none !
- // Konstruktor
+ // Constructor
ImpSjJScriptFileUploadObject( VCControl* _pControl, SjJSbxObject * p );
};
@@ -576,7 +540,7 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
VCForm* pVCForm;
public:
- // Methoden von Java --> C++ (f"ur Properties)
+ // Methods from Java --> C++ (for properties)
//--------------------------------------------
virtual String getName() const;
virtual void setName( const String & aStrg );
@@ -592,26 +556,18 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
virtual String getTarget() const;
virtual void setTarget( const String & sValue );
- // SjJSbxArrayObject-Methoden
+ // SjJSbxArrayObject methods
INT32 getLength() const;
SjJSbxObject* getElement( INT32 nIndex ) const;
SjJSbxObject* getElement_String( const String & aName ) const;
- // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject
- // yyy Raus zum inkompatiblen
- //virtual SjJSbxArrayObject * getElements();
-
- // Zugriff ueber den Namen eines Controls (falls ein Name zugeordnet ist)
- // yyy Raus zum inkompatiblen
- //virtual SjJSbxObject * getElement( const String & aName );
-
- // Methoden des Objektes
+ // Methods of the object
virtual void submit();
virtual void reset();
// Events (C++ --> Java)
//----------------------
- // Neue Event-Schnittstelle mit Function-Objekten
+ // New event interface with function objects
virtual SjJScriptFunctionObject* getOnSubmit_Fct() const;
virtual void setOnSubmit_Fct( SjJScriptFunctionObject* pFunctionObject );
virtual SjJScriptFunctionObject* getOnReset_Fct() const;
@@ -623,8 +579,10 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
virtual void setOnReset( const String & aSourceStrg );
void onReset();
- // Konstruktor
+ // Constructor
ImpSjJScriptFormObject( VCForm* _pVCForm, SjJSbxObject * p );
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index a48f552f88..b46d695f3f 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,11 +51,11 @@ friend class ImpItemEdit;
USHORT nLastWhich;
USHORT nLastWhichOben;
USHORT nLastWhichUnten;
- FASTBOOL bWhichesButNames;
- FASTBOOL bDontHideIneffectiveItems;
- FASTBOOL bDontSortItems;
- FASTBOOL bShowWhichIds;
- FASTBOOL bShowRealValues;
+ bool bWhichesButNames;
+ bool bDontHideIneffectiveItems;
+ bool bDontSortItems;
+ bool bShowWhichIds;
+ bool bShowRealValues;
private:
#if _SOLAR__PRIVATE
void ImpCtor();
@@ -70,7 +71,7 @@ protected:
virtual void DoubleClick(const BrowserMouseEvent&);
virtual void KeyInput(const KeyEvent& rEvt);
virtual void Select();
- virtual void SetDirty(); // wird z.B. bei Modusumschaltungen gerufen
+ virtual void SetDirty(); // is called for example in mode switches
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
public:
@@ -80,8 +81,8 @@ public:
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
ULONG GetCurrentPos() const;
USHORT GetCurrentWhich() const;
- virtual FASTBOOL BegChangeEntry(ULONG nPos);
- virtual FASTBOOL EndChangeEntry();
+ virtual bool BegChangeEntry(ULONG nPos);
+ virtual bool EndChangeEntry();
virtual void BrkChangeEntry();
/** GetCellText returns the text at the given position
@@ -114,7 +115,7 @@ public:
virtual void GetFocus();
void Clear() { aBrowse.Clear(); }
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); }
- void SetFloatingMode(FASTBOOL /*bOn*/) {}
+ void SetFloatingMode(bool /*bOn*/) {}
const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; }
_SdrItemBrowserControl& GetBrowserControl() { return aBrowse; }
};
@@ -124,7 +125,7 @@ class SdrView;
class SdrItemBrowser: public _SdrItemBrowserWindow {
Timer aIdleTimer;
SdrView* pView;
- FASTBOOL bDirty;
+ bool bDirty;
private:
static Window* ImpGetViewWin(SdrView& rView);
DECL_LINK(IdleHdl,Timer*);
@@ -142,3 +143,4 @@ public:
#endif //_SVDIBROW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx
index 74c33052b4..8a35638621 100644
--- a/svx/inc/svdpomv.hxx
+++ b/svx/inc/svdpomv.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ public:
#endif //_SVDPOMV_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx
index f0f9789d77..f2b21b37b7 100644
--- a/svx/inc/svdshort.hxx
+++ b/svx/inc/svdshort.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,4 @@
#endif //_SVDSHORT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx
index d7049043de..42518561c8 100644
--- a/svx/inc/svx/AccessibleControlShape.hxx
+++ b/svx/inc/svx/AccessibleControlShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,3 +215,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx
index c1131fa746..efd568138f 100644
--- a/svx/inc/svx/AccessibleGraphicShape.hxx
+++ b/svx/inc/svx/AccessibleGraphicShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx
index c8136ca4b9..77aead6fd3 100644
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/svx/inc/svx/AccessibleOLEShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,13 +29,9 @@
#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
#define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX
#include <svx/AccessibleShape.hxx>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
#include "svx/svxdllapi.h"
namespace accessibility {
@@ -131,3 +128,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index 59a601c5a4..edd01a314f 100755..100644
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -408,3 +409,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx
index 23f4eb0085..15271ef95a 100644
--- a/svx/inc/svx/AccessibleShapeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeInfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
index 2610a58a2f..1ba7fa48bd 100644
--- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,3 +215,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx
index 0f89805d9f..2da3859c44 100644
--- a/svx/inc/svx/AccessibleTableShape.hxx
+++ b/svx/inc/svx/AccessibleTableShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx
index c577b8d2f7..ae52362029 100644
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/svx/inc/svx/AccessibleTextHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -429,3 +430,5 @@ namespace accessibility
} // end of namespace accessibility
#endif /* _SVX_ACCESSILE_TEXT_HELPER_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx
index 70f466b6eb..95e61a649f 100644
--- a/svx/inc/svx/ActionDescriptionProvider.hxx
+++ b/svx/inc/svx/ActionDescriptionProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx
index 0fefc121cf..8230d566df 100644
--- a/svx/inc/svx/ChildrenManager.hxx
+++ b/svx/inc/svx/ChildrenManager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,3 +215,5 @@ private:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx
index 1ab616b7a6..4b951aaee0 100644
--- a/svx/inc/svx/DescriptionGenerator.hxx
+++ b/svx/inc/svx/DescriptionGenerator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -215,3 +216,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index 9853b5f1b7..568f533385 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -219,3 +220,4 @@ class EnhancedCustomShape2d : public SfxItemSet
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
index 4e83dd757a..7383bfa5f5 100644
--- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -212,3 +213,5 @@ private:
}
#endif /* _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
index 1961227844..4c16eb1bf7 100644
--- a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ SVX_DLLPUBLIC sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType );
SVX_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx
index b817e611ab..2f07103ef5 100644
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/svx/inc/svx/IAccessibleParent.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ public:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx
index 5291a7f8f4..ee787a9a8e 100644
--- a/svx/inc/svx/IAccessibleViewForwarder.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarder.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,5 @@ public:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index 4a49e4fe7c..db771fa8b3 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ public:
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx
index fc589e3586..fa90223515 100644
--- a/svx/inc/svx/ParseContext.hxx
+++ b/svx/inc/svx/ParseContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,4 @@ namespace svxform
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index dbbca94edc..55bd2df172 100755..100644
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -235,3 +236,5 @@ private:
} // end of namespace accessible
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index 08e80c153e..e0c12228f6 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index d6ad34ee74..898d2407aa 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,8 +79,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const; // leer
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; // leer
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; }
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; }
@@ -94,3 +95,4 @@ public:
#endif // #ifndef _SVX_SMARTTAGITEM_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 6dc8e484de..1559cad536 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -232,3 +233,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index f050ed2ac1..af440c0e8a 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ protected:
} // end of namespace ::svx
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index 403ad6726e..1f7f08faf2 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
#define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
#include <svx/ShapeTypeHandler.hxx>
-#endif
#include <com/sun/star/accessibility/XAccessible.hpp>
namespace accessibility {
@@ -86,3 +85,5 @@ extern ShapeTypeDescriptor aSvxShapeTypeList[];
} // end of namespace accessibility
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx
index 05a92f7c06..eaa7712863 100644
--- a/svx/inc/svx/UnoNamespaceMap.hxx
+++ b/svx/inc/svx/UnoNamespaceMap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
}
#endif // _SVX_UNONAMESPACEMAP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index 13d870991c..45d8db0f25 100644
--- a/svx/inc/svx/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,4 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index faf381d8a2..cb14fa25f0 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,77 +40,6 @@ class SvStream;
//------------------------------------------------------------------------
-
-
-class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
-{
-public:
- TYPEINFO();
-
- SvxHorJustifyItem( const USHORT nId );
-
- SvxHorJustifyItem(
- const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/,
- const USHORT nId );
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
-
- inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
- {
- SetValue( rHorJustify.GetValue() );
- return *this;
- }
-};
-
-
-//------------------------------------------------------------------------
-
-
-class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
-{
-public:
- TYPEINFO();
-
- SvxVerJustifyItem( const USHORT nId );
-
- SvxVerJustifyItem(
- const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/,
- const USHORT nId );
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
-
- inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
- {
- SetValue( rVerJustify.GetValue() );
- return *this;
- }
-};
-
-
-//------------------------------------------------------------------------
-
class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem
{
public:
@@ -128,8 +58,8 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual USHORT GetValueCount() const;
virtual String GetValueText( USHORT nVal ) const;
@@ -176,8 +106,8 @@ public:
virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
INT16 GetLeftMargin() const {return nLeftMargin; }
BOOL SetLeftMargin(INT16 nLeft);
@@ -200,3 +130,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/anchorid.hxx b/svx/inc/svx/anchorid.hxx
index a7c814b8f4..516aebd18b 100644
--- a/svx/inc/svx/anchorid.hxx
+++ b/svx/inc/svx/anchorid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,13 +31,15 @@
enum SvxAnchorIds
{
- SVX_OBJ_AT_CNTNT = 0x01, //Absatzgebundener Rahmen
- SVX_OBJ_IN_CNTNT = 0x02, //Zeichengebundener Rahmen
- SVX_OBJ_PAGE = 0x04, //Seitengebundener Rahmen
- SVX_OBJ_AT_FLY = 0x08 //Rahmengebundener Rahmen
-// SVX_OBJ_AUTO_CNTNT = 0x10 //Automatisch positionierter, absatzgebundener Rahmen
+ SVX_OBJ_AT_CNTNT = 0x01, // Frame bound to paragraph
+ SVX_OBJ_IN_CNTNT = 0x02, // Frame bound to character
+ SVX_OBJ_PAGE = 0x04, // Frame bound to page
+ SVX_OBJ_AT_FLY = 0x08 // Frame bound to other frame
+// SVX_OBJ_AUTO_CNTNT = 0x10 // Automatically positioned frame bound to paragraph
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 8a8241323a..59ce59b860 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,7 +61,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als 'Beh"alter' f"ur Float
+|* Derivative from SfxChildWindow as 'container' for Float
|*
\************************************************************************/
@@ -127,7 +128,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
SvxBmpMaskSelectItem aSelItem;
Image maImgPipette;
- Image maImgPipetteH;
virtual BOOL Close();
@@ -198,3 +198,4 @@ private:
#endif // _BMPMASK_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index ee4bd71039..0f1a8aba37 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
/*************************************************************************
|*
-|* Kamera-Ableitung
+|* Camera derivative
|*
\************************************************************************/
@@ -50,14 +51,14 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
double fFocalLength;
double fBankAngle;
- FASTBOOL bAutoAdjustProjection;
+ bool bAutoAdjustProjection;
public:
Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
double fFocalLen = 35.0, double fBankAng = 0);
Camera3D();
- // Anfangswerte wieder herstellen
+ // Reset to default values
void Reset();
void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
@@ -71,24 +72,26 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
const basegfx::B3DPoint& GetLookAt() const { return aLookAt; }
void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt);
- // Brennweite in mm
+ // Focal length in mm
void SetFocalLength(double fLen);
void SetFocalLengthWithCorrect(double fLen);
double GetFocalLength() const { return fFocalLength; }
- // Neigung links/rechts
+ // Bank angle links/rechts
void SetBankAngle(double fAngle);
double GetBankAngle() const { return fBankAngle; }
- // Um die Kameraposition drehen, LookAt wird dabei veraendert
+ // For rotating the camera position. Changes LookAt.
void Rotate(double fHAngle, double fVAngle);
- // Um den Blickpunkt drehen, Position wird dabei veraendert
+ // For changing the point of view. Changes the position.
void RotateAroundLookAt(double fHAngle, double fVAngle);
- void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE)
+ void SetAutoAdjustProjection(bool bAdjust = true)
{ bAutoAdjustProjection = bAdjust; }
- FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
+ bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
};
#endif // _CAMERA3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 43d5272719..ba66b9df30 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,8 +34,8 @@
#include <vcl/metric.hxx>
#include <vcl/scrbar.hxx>
#include <map>
-#include <tools/shl.hxx> //add CHINA001
-#include <tools/debug.hxx> //add CHINA001
+#include <tools/shl.hxx>
+#include <tools/debug.hxx>
#include "svx/svxdllapi.h"
// define ----------------------------------------------------------------
@@ -138,3 +139,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index 4aefcf2791..c69f9bd390 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <svtools/svtreebx.hxx>
#include <svtools/svlbitm.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include "svx/svxdllapi.h"
// class SvxCheckListBox -------------------------------------------------
@@ -62,8 +61,7 @@ public:
SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 );
SvxCheckListBox( Window* pParent, const ResId& rResId );
SvxCheckListBox( Window* pParent, const ResId& rResId,
- const Image& rNormalStaticImage,
- const Image& rHighContrastStaticImage );
+ const Image& rNormalStaticImage );
~SvxCheckListBox();
void InsertEntry ( const String& rStr,
@@ -92,3 +90,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 129e7e747f..4ce6daea7b 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -274,8 +275,8 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
SvxChartTextOrder GetValue() const
@@ -355,11 +356,8 @@ public:
SvxDoubleItem(SvStream& rIn, USHORT nId );
SvxDoubleItem(const SvxDoubleItem& rItem);
-
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
@@ -383,3 +381,4 @@ public:
#endif // _SVX_CHRTITEM_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 4ad3933603..48651a9e26 100644
--- a/svx/inc/svx/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index a55b929610..03b9bc6aee 100644
--- a/svx/inc/svx/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,9 @@ public:
SvxClipboardFmtItem( const SvxClipboardFmtItem& );
virtual ~SvxClipboardFmtItem();
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
-
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+
void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX );
void AddClipbrdFormat( ULONG nId, const String& rName,
USHORT nPos = USHRT_MAX );
@@ -65,3 +66,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 5ffcab526d..e37363a95b 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,7 +76,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller
+|* Derivation from SfxChildWindow as "container" for Controller
|*
\************************************************************************/
@@ -109,7 +110,6 @@ private:
Size aColorSize;
Size aItemSize;
-//#if 0 // _SOLAR__PRIVATE
void FillValueSet();
void SetSize();
DECL_LINK( SelectHdl, void * );
@@ -119,7 +119,6 @@ private:
the keyboard.
*/
virtual void GetFocus (void);
-//#endif
protected:
virtual BOOL Close();
@@ -143,3 +142,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 6ba07e23ae..5bd0160031 100644
--- a/svx/inc/svx/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
// include ---------------------------------------------------------------
-#ifndef _CTRL_HXX //autogen
#include <vcl/ctrl.hxx>
-#endif
#include "svx/svxdllapi.h"
class SfxItemSet;
@@ -75,3 +74,4 @@ public:
#endif // _SVX_CONNCTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 17c31d6d5e..742e16b66e 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float
+|* Derivation from SfxChildWindow as "container" for Float
|*
\************************************************************************/
@@ -59,12 +60,6 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
class SvxSuperContourDlg;
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class SvxContourDlgItem : public SfxControllerItem
{
SvxSuperContourDlg& rDlg;
@@ -78,26 +73,17 @@ public:
SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
};
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow
{
using Window::Update;
SvxSuperContourDlg* pSuperClass;
-//#if 0 // _SOLAR__PRIVATE
protected:
void SetSuperClass( SvxSuperContourDlg& rSuperClass ) { pSuperClass = &rSuperClass; }
-//#endif // __PRIVATE
-
public:
SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW,
@@ -140,3 +126,4 @@ public:
#endif // _REDUCED_CONTDLG_HXX_
#endif // _CONTDLG_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 853fd75470..56a561b1ac 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,12 +29,8 @@
#ifndef _SVX_CTREDLIN_HXX
#define _SVX_CTREDLIN_HXX
-#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/lstbox.hxx>
@@ -57,7 +54,7 @@
#define FLT_DATE_SAVE 5
-// Struct fuer Datums-Sortierung
+// Struct for sorting data
class SVX_DLLPUBLIC RedlinData
{
@@ -76,7 +73,7 @@ public:
virtual ~SvxRedlinEntry();
};
-// Klasse fuer die Darstellung von schriftabhaengigen Strings
+// Class for the representation of Strings depending on the font
class SvLBoxColorString : public SvLBoxString
{
private:
@@ -147,7 +144,7 @@ public:
BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData);
BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData);
- // keine NULL-Ptr. ueberpruefung {
+ // no NULL-pointer checking {
BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
BOOL IsValidComment(const String* pComment);
@@ -250,13 +247,13 @@ public:
String GetComment()const;
- // Methoden fuer Calc {
+ // Methods for Calc {
void SetRange(const String& rString);
String GetRange() const;
void HideRange(BOOL bHide=TRUE);
void DisableRange(BOOL bFlag=TRUE);
void SetFocusToRange();
- // } Methoden fuer Calc
+ // } Methods for Calc
void HideClocks(BOOL bHide=TRUE);
void DisableRef(BOOL bFlag);
@@ -293,7 +290,7 @@ public:
const Link& GetModifyCommentHdl() const { return aModifyComLink; }
- // Methoden fuer Calc {
+ // Methods for Calc {
void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; }
const Link& GetModifyRangeHdl() const { return aModifyRefLink; }
@@ -303,7 +300,7 @@ public:
void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true );
- // } Methoden fuer Calc
+ // } Methods for Calc
};
@@ -429,3 +426,4 @@ public:
#endif // _SVX_CTREDLIN_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index 39be134f0d..5049bda27c 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,13 +35,13 @@
/*************************************************************************
|*
|* |
-|* 3D-Quader erzeugen; aPos: Zentrum oder links, unten, hinten |__
-|* (abhaengig von bPosIsCenter) /
-|* Mit nSideFlags kann angegeben werden, ob nur ein Teil der
-|* Quaderflaechen erzeugt werden kann; die entsprechenden Bits
-|* sind in dem enum definiert. Das Flag bDblSided legt fest,
-|* ob die erzeugten Flaechen doppelseitig sind (nur sinnvoll,
-|* wenn nicht alle Flaechen erzeugt wurden).
+|* Create a 3D cuboid; aPos: Center oder left, bottom, behind |__
+|* (depending on bPosIsCenter) /
+|* nSideFlags indicates, if only some of the cuboid surfaces can
+|* be created; the corresponding bits are defined in the enum.
+|* The flag bDblSided indicates whether the created surfaces are
+|* two-sided (which only makes sense if not all of the surfaces were
+|* created).
|*
\************************************************************************/
@@ -74,7 +75,7 @@ public:
virtual void operator=(const SdrObject&);
- // Lokale Parameter setzen mit Geometrieneuerzeugung
+ // Set local parameters with geometry recreation
void SetCubePos(const basegfx::B3DPoint& rNew);
const basegfx::B3DPoint& GetCubePos() { return aCubePos; }
@@ -87,9 +88,11 @@ public:
void SetSideFlags(UINT16 nNew);
UINT16 GetSideFlags() { return nSideFlags; }
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
};
#endif // _E3D_CUBE3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx
index b73432b6c5..ec972e0dd8 100644
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/svx/inc/svx/dataaccessdescriptor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,4 @@ namespace svx
#endif // _SVX_DATACCESSDESCRIPTOR_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index 77e93297e6..adbaf9ed5a 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ namespace svx
//........................................................................
#endif // SVX_DATABASELOCATIONINPUT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 736dee6e72..352913bf5e 100644
--- a/svx/inc/svx/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ namespace svx
//........................................................................
#endif // SVX_DATABASE_REGISTRATION_UI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx
index 003a07ae2b..7a6ce675f3 100644
--- a/svx/inc/svx/dbaexchange.hxx
+++ b/svx/inc/svx/dbaexchange.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -297,3 +298,4 @@ namespace svx
#endif // _SVX_DBAEXCHANGE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx
index b82fa273f0..446822a2e4 100644
--- a/svx/inc/svx/dbaobjectex.hxx
+++ b/svx/inc/svx/dbaobjectex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,4 @@ namespace svx
#endif // SVX_DBAOBJECTEX_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index 8d1c4b7f5c..ce6bffd3a9 100755..100644
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,4 @@ namespace svxform
#endif // SVX_DBCHARSETCLIENT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 22e2ab820e..9144f64cda 100755..100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,7 +57,7 @@ namespace svxform
static oslModule s_hDbtoolsModule;
static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc;
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
+
mutable BOOL m_bCreateAlready;
private:
@@ -233,3 +234,4 @@ namespace svxform
#endif // SVX_DBTOOLSCLIENT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx
index 056291f8ad..93931feca6 100644
--- a/svx/inc/svx/def3d.hxx
+++ b/svx/inc/svx/def3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@ const double EPSILON = 1e-06;
#define DEG2RAD(fAngle) (fPiDiv180 * (fAngle))
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++ 3D-Hilfsfunktionen +++++++++++++++++++++++++++++++++++++++++++++++++
+//+++ 3D helper functions ++++++++++++++++++++++++++++++++++++++++++++++++
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001,
@@ -52,3 +53,5 @@ enum E3dDragConstraint { E3DDRAG_CONSTR_X = 0x0001,
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 2c95c76c06..41e8754e68 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,29 +36,29 @@
/*************************************************************************
|*
-|* Klasse zum verwalten der 3D-Default Attribute
+|* Class for managing the 3D default attributes
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dDefaultAttributes
{
private:
- // Compound-Objekt
+ // Compound object
Color aDefaultAmbientColor;
BOOL bDefaultCreateNormals;
BOOL bDefaultCreateTexture;
- // Cube-Objekt
+ // Cube object
basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize;
UINT16 nDefaultCubeSideFlags;
BOOL bDefaultCubePosIsCenter;
- // Sphere-Objekt
+ // Sphere object
basegfx::B3DPoint aDefaultSphereCenter;
basegfx::B3DVector aDefaultSphereSize;
- // Lathe-Objekt
+ // Lathe object
long nDefaultLatheEndAngle;
BOOL bDefaultLatheSmoothed;
BOOL bDefaultLatheSmoothFrontBack;
@@ -65,7 +66,7 @@ private:
BOOL bDefaultLatheCloseFront;
BOOL bDefaultLatheCloseBack;
- // Extrude-Objekt
+ // Extrude object
BOOL bDefaultExtrudeSmoothed;
BOOL bDefaultExtrudeSmoothFrontBack;
BOOL bDefaultExtrudeCharacterMode;
@@ -73,14 +74,14 @@ private:
BOOL bDefaultExtrudeCloseBack;
public:
- // Konstruktor
+ // Construktor
E3dDefaultAttributes();
- // Defaults zuruecksetzen
+ // Reset to defaults
void Reset();
- // Getter/Setter fuer Default-Werte aller 3D-Objekte
- // Compound-Objekt
+ // Getter/Setter for default values of all 3D objects
+ // Compound object
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
@@ -89,7 +90,7 @@ public:
BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
- // Cube-Objekt
+ // Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
@@ -99,13 +100,13 @@ public:
BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
- // Sphere-Objekt
+ // Sphere object
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
void SetDefaultSphereCenter(const basegfx::B3DPoint& rNew) { aDefaultSphereCenter = rNew; }
const basegfx::B3DVector& GetDefaultSphereSize() { return aDefaultSphereSize; }
void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; }
- // Lathe-Objekt
+ // Lathe object
long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
@@ -119,7 +120,7 @@ public:
BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
- // Extrude-Objekt
+ // Extrude object
BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
@@ -133,3 +134,5 @@ public:
};
#endif // _E3D_DEFLT3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx
index 23da0627fc..5ead2c2b68 100644
--- a/svx/inc/svx/dialcontrol.hxx
+++ b/svx/inc/svx/dialcontrol.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,3 +137,4 @@ typedef sfx::ItemControlConnection< sfx::Int32ItemWrapper, DialControlWrapper >
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 94c2a238b0..0cc242191c 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,4 @@ struct SVX_DLLPUBLIC DialogsResMgr
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 07d56108b7..d7522d3e40 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -189,10 +189,7 @@
#define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210)
#define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211)
-#define RID_SVXIMAGE_LIGHT_ON_H (RID_SVX_START + 212)
-#define RID_SVXIMAGE_LIGHT_OFF_H (RID_SVX_START + 213)
#define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214)
-#define RID_SVXIMAGE_COLORDLG_H (RID_SVX_START + 215)
#define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73)
#define RID_SVXFLOAT3D_FIX_X (RID_SVX_START + 74)
@@ -202,35 +199,31 @@
#define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78)
#define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84)
-// Ids fuer FrameBitmaps durch ImageList ersetzt
-// 67 bis 72 frei
+// 67 to 72 free
-// ResId fuer den Gitter- und Raster-Dialog
+// ResId for the grid dialog
#define RID_SVXDLG_GRID (RID_SVX_START + 79)
-// ResId's fuer FontMenu-Controls
+// ResId's for the FontMenu controls
#define RID_MN_FONTSIZE (RID_SVX_START + 80)
-// ResId's fuer Undo-TbxControls
+// ResId's for Undo-TbxControls
#define RID_SVXTBX_UNDO (RID_SVX_START + 81)
-// ResId fuer Zoom-Popup-Menue
+// ResId for zoom popup menu
#define RID_SVXMNU_ZOOM (RID_SVX_START + 82)
-// ResId fuer Funktions-Popup-Menue
+// ResId for funktion popup menue
#define RID_SVXMNU_PSZ_FUNC (RID_SVX_START + 83)
#define RID_SVXMNU_XMLSECSTATBAR (RID_SVX_START + 84)
-// ResId fuer Position- und Size-Bitmap
+// ResId for position and size bitmap
#define RID_SVXBMP_POSITION (RID_SVX_START + 85)
#define RID_SVXBMP_SIZE (RID_SVX_START + 86)
#define RID_SVXBMP_SIGNET (RID_SVX_START + 87)
-#define RID_SVXBMP_SIGNET_H (RID_SVX_START + 88)
#define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89)
-#define RID_SVXBMP_SIGNET_BROKEN_H (RID_SVX_START + 90)
#define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91)
-#define RID_SVXBMP_SIGNET_NOTVALIDATED_H (RID_SVX_START + 92)
#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67)
#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68)
@@ -242,13 +235,13 @@
// Resource mit Bitmaps fuer die CheckListBox
#define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91)
-// Menu fuers Lineal
+// Menu for the ruler
#define RID_SVXMN_RULER (RID_SVX_START + 92)
-// FontWork-Dialog
+// FontWork dialog
#define RID_SVXDLG_FONTWORK (RID_SVX_START + 93)
-// FontWork-ValueSet-Bitmaps
+// FontWork ValueSet bitmaps
#define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94)
#define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95)
#define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96)
@@ -269,7 +262,7 @@
#define RID_SVXCTRL_COLOR (RID_SVX_START + 117)
-// fuer ToolboxControl-Style
+// for Toolbox-Control style
#define RID_SVXTBX_STYLE (RID_SVX_START + 120)
#define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
@@ -320,20 +313,20 @@
// Ids fuer Autokorrektur
#define RID_SVX_AUTOCORR (RID_SVX_START + 192)
-// Auswahl ext. Linguitik
+// Choice for external linguistics
#define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193)
// TabPage und Dialog f"ur LDAP-Server
#define RID_SVXPAGE_LDAP (RID_SVX_START + 204)
#define RID_SVXDLG_LDAP (RID_SVX_START + 205)
-// Dialog fuer Funktionen
+// Dialog for functions
#define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206)
// QueryBox for Exit Recovery Wizard
#define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215)
-// ResId fuer den ImportGraphic-Dialog
+// ResId for the ImportGraphic dialog
#define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499)
@@ -380,11 +373,11 @@
// Strings ------------------------------------------------------------------
-// Strings fuer die Sprachen (HM-Abhaengig)
+// Strings for the language
#define RID_SVXSTR_LANGUAGE_BEGIN (RID_SVX_START + 0)
#define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15)
-// Messages im DBMgr-Bereich
+// Messages for the DBMgr
#define RID_SVXSTR_DBINI (RID_SVX_START + 60)
#define RID_SVXSTR_DBDRV (RID_SVX_START + 61)
#define RID_SVXSTR_NODBDRV (RID_SVX_START + 62)
@@ -399,14 +392,14 @@
#define RID_SVXSTR_INVALID_RECORD (RID_SVX_START + 71)
#define RID_SVXSTR_NOSET_MATCHING (RID_SVX_START + 72)
-// Strings aus dem Suchen-Dialog
+// Strings from the search dialog
#define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80)
#define RID_SVXSTR_SEARCH (RID_SVX_START + 81)
#define RID_SVXSTR_REPLACE (RID_SVX_START + 82)
#define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144)
-// ResIds fuer die verschiedenen Strings des PageDlgs
+// ResIds for the PageDialog
#define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146)
#define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147)
@@ -420,17 +413,17 @@
#define RID_SVXSTR_MORE (RID_SVX_START + 198)
-// Strings der UndoTbxControls
+// Strings for the UndoTbxControls
#define RID_SVXSTR_UNDO (RID_SVX_START + 200)
#define RID_SVXSTR_REDO (RID_SVX_START + 201)
#define RID_SVXSTR_ACTION (RID_SVX_START + 202)
#define RID_SVXSTR_ACTIONS (RID_SVX_START + 203)
-// Strings fuer Insert/Overwrite
+// Strings for insert/overwrite
#define RID_SVXSTR_INSERT_TEXT (RID_SVX_START + 210)
#define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 211)
-// Strings fuer Selection Mode
+// Strings for the selection mode
#define RID_SVXSTR_SELMODE_STD (RID_SVX_START + 212)
#define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213)
#define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214)
@@ -443,10 +436,10 @@
// weitere ID bei 219
-// String-ResId fuer den ImportGraphic-Dialog
+// String-ResId for the ImportGraphic dialog
#define RID_SVXSTR_ALL_FILES (RID_SVX_START + 241)
-// Strings des Lineals
+// Strings for the ruler
#define RID_SVXSTR_RULER_START (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245)
#define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246)
@@ -471,7 +464,7 @@
#define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272)
#define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273)
-// Farben-Strings
+// Color strings
#define RID_SVXSTR_BLACK (RID_SVX_START + 275)
#define RID_SVXSTR_BLUE (RID_SVX_START + 276)
#define RID_SVXSTR_GREEN (RID_SVX_START + 277)
@@ -491,7 +484,7 @@
#define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291)
#define RID_SVXSTR_ORANGE (RID_SVX_START + 292)
-// Linienenden-Strings
+// Line endings strings
#define RID_SVXSTR_ARROW (RID_SVX_START + 300)
#define RID_SVXSTR_SQUARE (RID_SVX_START + 301)
#define RID_SVXSTR_CIRCLE (RID_SVX_START + 302)
@@ -505,7 +498,7 @@
// Hyperlink-Dlg
#define RID_SVXMN_HYPERLINK (RID_SVX_START + 321)
-// Hyperlink-QueryBoxen
+// Hyperlink query boxes
#define RID_SVXQB_NOCONNECT (RID_SVX_START + 322)
#define RID_SVXQB_DONTEXIST (RID_SVX_START + 323)
//color configuration
@@ -523,18 +516,18 @@
#define RID_SVXSTR_MEM_ERROR (RID_SVX_START + 415)
#define RID_SVXSTR_DLG_TITLE_INFO (RID_SVX_START + 416)
-// Define - Bereich fuer BmpMaskierung
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for bitmap masking
+// !!! don't use defines from this region !!!
#define RID_SVX_BMPMASK_START (RID_SVX_START + 420)
#define RID_SVX_BMPMASK_END (RID_SVX_START + 440)
-// Define - Bereich fuer IMAP-Editor
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for IMAP editor
+// !!! don't use defines from this region !!!
#define RID_SVX_IMAP_START (RID_SVX_START + 450)
#define RID_SVX_IMAP_END (RID_SVX_START + 460)
-// Define - Bereich fuer Contour-Editor
-// !!! aus diesem Bereich keine Defines benutzen !!!
+// Define - Region for contour editor
+// !!! don't use defines from this region !!!
#define RID_SVX_CONTOUR_START (RID_SVX_START + 461)
#define RID_SVX_CONTOUR_END (RID_SVX_START + 471)
@@ -1049,5 +1042,11 @@
#define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245)
#define OFA_TP_HELPERPROG (RID_OFA_START + 249)
-#endif
+#define SVX_OOO_BUILD_START (RID_SVX_START + 1200)
+
+#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1)
+#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2)
+#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 3)
+#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 4)
+#endif
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index fe06fdfc2d..d56a3991f8 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,7 +131,7 @@ public:
virtual void SetObjectType(sal_uInt16 nType);
- // User Callback eintragen
+ // register user callback
void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
void SetChangeCallback(Link aNew) { maChangeCallback = aNew; }
@@ -169,7 +170,7 @@ private:
ScrollBar maVerScroller;
PushButton maSwitcher;
- // Callback bei interaktiven Aenderungen
+ // callback for interactive changes
Link maUserInteractiveChangeCallback;
Link maUserSelectionChangeCallback;
@@ -178,17 +179,17 @@ public:
SvxLightCtl3D( Window* pParent, WinBits nStyle = 0);
~SvxLightCtl3D();
- // Reagiere auf Groessenaenderungen
+ // react to size changes
virtual void Resize();
void NewLayout();
- // Selektion auf Gueltigkeit pruefen
+ // check the selection for validity
void CheckSelection();
- // Um weitere Einstellungen nach Aussen zu bringen...
+ // bring further settings to the outside world
Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; }
- // User Callback eintragen
+ // register user callback
void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; }
void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; }
@@ -203,7 +204,7 @@ protected:
DECL_LINK( ScrollBarMove, void*);
DECL_LINK( ButtonPress, void*);
- // Lokale Parameter Initialisieren
+ // initialize local parameters
void Init();
void move( double fDeltaHor, double fDeltaVer );
@@ -213,3 +214,5 @@ protected:
//////////////////////////////////////////////////////////////////////////////
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index a6c2d52f41..9c4fffd326 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,8 +63,8 @@ namespace com { namespace sun { namespace star { namespace awt {
/*************************************************************************
|*
-|* Von SfxTabPage abgeleitet, um vom Control ueber virtuelle Methode
-|* benachrichtigt werden zu koennen.
+|* Derived from SfxTabPage for being able to get notified through the
+|* virtual method from the control.
|*
\************************************************************************/
class SvxTabPage : public SfxTabPage
@@ -78,8 +79,8 @@ public:
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl der Eckpunkte (und Mittelpunkt)
-|* eines Objekts
+|* Control for display and selection of the corner and center points of
+|* an object
|*
\************************************************************************/
typedef UINT16 CTL_STATE;
@@ -110,7 +111,6 @@ protected:
Bitmap* pBitmap;
CTL_STATE m_nState;
- // #103516# Added a possibility to completely disable this control
sal_Bool mbCompleteDisable;
RECT_POINT GetRPFromPoint( Point ) const;
@@ -149,15 +149,14 @@ public:
RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const;
- // #103516# Added a possibility to completely disable this control
sal_Bool IsCompletelyDisabled() const { return mbCompleteDisable; }
void DoCompletelyDisable(sal_Bool bNew);
};
/*************************************************************************
|*
-|* Control zur Darstellung und Auswahl des Winkels der Eckpunkte
-|* eines Objekts
+|* Control for display and selecton of the angle of the corner points
+|* of an object
|*
\************************************************************************/
class SvxAngleCtl : public SvxRectCtl
@@ -181,7 +180,7 @@ public:
/*************************************************************************
|*
-|* Preview-Control zur Darstellung von Bitmaps
+|* Preview control for the display of bitmaps
|*
\************************************************************************/
@@ -207,7 +206,7 @@ public:
/*************************************************************************
|*
-|* Control zum Editieren von Bitmaps
+|* Control for editing bitmaps
|*
\************************************************************************/
class SVX_DLLPUBLIC SvxPixelCtl : public Control
@@ -253,7 +252,7 @@ public:
/*************************************************************************
|*
-|* ColorLB kann mit Farben und Namen gefuellt werden
+|* ColorLB can be filled with colors and names
|*
\************************************************************************/
class SVX_DLLPUBLIC ColorLB : public ColorListBox
@@ -348,7 +347,7 @@ private:
/*************************************************************************
|*
-|* FillAttrLB vereint alle Fuellattribute in einer ListBox
+|* FillAttrLB unites all fill attributes an a ListBox
|*
\************************************************************************/
class FillAttrLB : public ColorListBox
@@ -474,7 +473,6 @@ private:
SdrObject* mpLineObjB;
SdrObject* mpLineObjC;
- //#58425# Symbole auf einer Linie (z.B. StarChart)
Graphic* mpGraphic;
sal_Bool mbWithSymbol;
Size maSymbolSize;
@@ -537,3 +535,4 @@ public:
#endif // _SVX_DLG_CTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 2a816bc13c..cac8a37b87 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,8 +59,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XColorTable* GetColorTable() const { return pColorTable; }
void SetColorTable( XColorTable* pTable ) {
@@ -92,8 +93,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XGradientList* GetGradientList() const { return pGradientList; }
void SetGradientList( XGradientList* pList ) {
@@ -127,8 +128,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XHatchList* GetHatchList() const { return pHatchList; }
void SetHatchList( XHatchList* pList ) {
@@ -162,8 +163,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XBitmapList* GetBitmapList() const { return pBitmapList; }
void SetBitmapList( XBitmapList* pList ) {
@@ -197,8 +198,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XDashList* GetDashList() const { return pDashList; }
void SetDashList( XDashList* pList );
@@ -231,8 +232,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
XLineEndList* GetLineEndList() const { return pLineEndList; }
void SetLineEndList( XLineEndList* pList ) {
@@ -244,3 +245,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx
index e9e3dfce04..6238bf991f 100644
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/svx/inc/svx/dstribut_enum.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,10 +28,6 @@
#ifndef _SVX_DSTRIBUT_ENUM_HXX
#define _SVX_DSTRIBUT_ENUM_HXX
-/*************************************************************************
-|*
-\************************************************************************/
-
enum SvxDistributeHorizontal
{
SvxDistributeHorizontalNone = 0,
@@ -51,3 +48,4 @@ enum SvxDistributeVertical
#endif // _SVX_DSTRIBUT_ENUM_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 5d22acf2ac..266cdbaeda 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,8 +55,8 @@ public:
virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
const basegfx::B3DVector& GetValue() const { return aVal; }
void SetValue( const basegfx::B3DVector& rNewVal ) {
@@ -71,3 +72,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx
index d395bceaef..473ca1f230 100644
--- a/svx/inc/svx/e3dsceneupdater.hxx
+++ b/svx/inc/svx/e3dsceneupdater.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ public:
};
#endif // _E3D_SCENEUPDATER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index 1c5e595fde..131c4aac6d 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,7 @@ class E3dView;
/************************************************************************\
|*
-|* Basisklasse fuer alle 3D-Undo-Aktionen.
+|* Base class for all 3D undo actions.
|*
\************************************************************************/
class E3dUndoAction : public SdrUndoAction
@@ -62,7 +63,7 @@ class E3dUndoAction : public SdrUndoAction
/************************************************************************\
|*
-|* Undo fuer 3D-Rotation ueber die Rotationsmatrizen (ob das wohl klappt ?)
+|* Undo for 3D rotation through the rotation matrices
|*
\************************************************************************/
class E3dRotateUndoAction : public E3dUndoAction
@@ -91,7 +92,7 @@ class E3dRotateUndoAction : public E3dUndoAction
/************************************************************************\
|*
-|* Undo fuer 3D-Attribute (Implementiert ueber Set3DAttributes())
+|* Undo for 3D attributes (implemented using Set3DAttributes())
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
@@ -122,3 +123,5 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
};
#endif // _E3D_CUBE3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc
index 828ed6c124..2008375dde 100644
--- a/svx/inc/svx/exthelpid.hrc
+++ b/svx/inc/svx/exthelpid.hrc
@@ -28,6 +28,8 @@
#define _SVX_EXTHELPID_HRC
// include ---------------------------------------------------------------
+#include <svl/solar.hrc>
+
// 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
@@ -35,8 +37,19 @@
// are moved to this exported (delivered) hrc file
// Help-Ids --------------------------------------------------------------
-#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE"
-#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE"
+#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0)
+#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
+
+// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// 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/exthelpid.hrc.orig b/svx/inc/svx/exthelpid.hrc.orig
new file mode 100644
index 0000000000..2008375dde
--- /dev/null
+++ b/svx/inc/svx/exthelpid.hrc.orig
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SVX_EXTHELPID_HRC
+#define _SVX_EXTHELPID_HRC
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// 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
+
+// Help-Ids --------------------------------------------------------------
+#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0)
+#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
+
+// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// 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/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index 73a4fc7645..8454acf04d 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,18 +94,18 @@ public:
virtual void operator=(const SdrObject&);
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI (for example "3 frames selected")
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung
+ // set/get local parameters with geometry regeneration
void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; }
- // Aufbrechen
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
#endif // _E3D_EXTRUD3D_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx
index 87b93ccd38..f33748836b 100644
--- a/svx/inc/svx/extrusionbar.hxx
+++ b/svx/inc/svx/extrusionbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ public:
}
#endif // _SVX_EXTRUSION_BAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index 4e0b001950..bcfc8dcc05 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer 3D Window
+|* Derived from SfxChildWindow as "container" for 3D Window
|*
\************************************************************************/
@@ -49,3 +50,4 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
#endif // _SVX_F3DCHILD_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 1e2bcc5fab..73b5c69a54 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@ class ListBox;
/*************************************************************************
|*
-|* Klassen fuer Flaechenattribute (Controls und Controller)
+|* Class for surface attributes (controls and controller)
|*
\************************************************************************/
@@ -91,11 +92,9 @@ private:
Size aLogicalAttrSize;
Timer aDelayTimer;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( DelayHdl, Timer * );
DECL_LINK( SelectFillTypeHdl, ListBox * );
DECL_LINK( SelectFillAttrHdl, ListBox * );
-//#endif
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
FillControl( Window* pParent, WinBits nStyle = 0 );
@@ -106,3 +105,4 @@ public:
#endif // _FILLCTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index b56d69fd02..0be00e027f 100644
--- a/svx/inc/svx/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,7 +82,7 @@ enum SvxModeType
// define ----------------------------------------------------------------
// 1/2 cm in TWIPS
-// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt
+// Is also used for minimum size of LayFrms of any kind
#define MM50 283 //from original svx/inc/paragrph.hxx
//--------------from original svx/inc/tabstpge.hxx
@@ -101,3 +102,5 @@ enum SvxModeType
//-----
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 3b3793b1d0..6697d08714 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,12 +30,8 @@
#define _SVX_FLOAT3D_HXX
#include <sfx2/ctrlitem.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <sfx2/dockwin.hxx>
#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/button.hxx>
@@ -84,7 +81,7 @@ private:
ImageButton aBtnUpdate;
ImageButton aBtnAssign;
-// Geometrie
+// geometry
FixedText aFtPercentDiagonal;
MetricField aMtrPercentDiagonal;
FixedText aFtBackscale;
@@ -110,7 +107,7 @@ private:
ImageButton aBtnDoubleSided;
-// Darstellung
+// presentation
FixedText aFtShademode;
ListBox aLbShademode;
ImageButton aBtnShadow3d;
@@ -124,7 +121,7 @@ private:
FixedLine aFLCamera;
FixedLine aFLRepresentation;
-// Beleuchtung
+// lighting
ImageButton aBtnLight1;
ImageButton aBtnLight2;
ImageButton aBtnLight3;
@@ -153,7 +150,7 @@ private:
FixedLine aFLLight;
-// Texturen
+// Textures
FixedText aFtTexKind;
ImageButton aBtnTexLuminance;
ImageButton aBtnTexColor;
@@ -173,8 +170,8 @@ private:
ImageButton aBtnTexFilter;
FixedLine aFLTexture;
-// Material
-// Materialeditor
+// material
+// material editor
FixedText aFtMatFavorites;
ListBox aLbMatFavorites;
FixedText aFtMatColor;
@@ -191,21 +188,21 @@ private:
FixedLine aFLMatSpecular;
FixedLine aFLMaterial;
-// Unterer Teil
+// bottom part
ImageButton aBtnConvertTo3D;
ImageButton aBtnLatheObject;
ImageButton aBtnPerspective;
Svx3DPreviewControl aCtlPreview;
SvxLightCtl3D aCtlLightPreview;
-// der Rest ...
+// the rest ...
Image aImgLightOn;
Image aImgLightOff;
BOOL bUpdate;
ViewType3D eViewType;
Size aSize;
- // Model, Page, View etc. fuer Favoriten
+ // Model, Page, View etc. for favourites
FmFormModel* pModel;
FmFormPage* pFmPage;
VirtualDevice* pVDev;
@@ -274,7 +271,7 @@ public:
/*************************************************************************
|*
-|* ControllerItem fuer 3D-Window (Floating/Docking)
+|* Controller item for 3D Window (Floating/Docking)
|*
\************************************************************************/
@@ -292,7 +289,7 @@ class Svx3DCtrlItem : public SfxControllerItem
/*************************************************************************
|*
-|* ControllerItem fuer Status eines Slots
+|* ControllerItem for State of a Slot
|* (SID_CONVERT_TO_3D, SID_CONVERT_TO_3D_LATHE_FAST)
|*
\************************************************************************/
@@ -311,3 +308,4 @@ public:
#endif // _SVX_FLOAT3D_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx
index 4926d1ecb2..a38f561d6d 100644
--- a/svx/inc/svx/fmdmod.hxx
+++ b/svx/inc/svx/fmdmod.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,4 @@ public:
#endif // _SVX_FMDMOD_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index 29931235df..990c90c4be 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,21 +41,19 @@ class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage
{
protected:
- // Erzeugen eines SdrObjects anhand einer Description. Kann von
- // abgeleiteten Klassen dazu benutzt werden, eigene ::com::sun::star::drawing::Shapes zu
- // unterstuetzen (z.B. Controls)
+ // Creating a SdrObject based on a Description. Cann be used by derived classes to
+ // support own ::com::sun::star::drawing::Shapes (for example Controls)
virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )throw ();
- // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt
- // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder
- // ein ein SvxShape aggregierendes Objekt anlegen.
+ // The following method is called when a SvxShape object should be created.
+ // Derived classes can create a derivation or an object aggregating SvxShape.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw ();
public:
SvxFmDrawPage( SdrPage* pPage );
virtual ~SvxFmDrawPage() throw ();
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage);
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
@@ -74,3 +73,4 @@ public:
#endif // _SVX_FMDPAGE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx
index c07362f37d..c2289cbe51 100644
--- a/svx/inc/svx/fmglob.hxx
+++ b/svx/inc/svx/fmglob.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,7 @@ const sal_uInt32 FmFormInventor = sal_uInt32('F')*0x00000001+
sal_uInt32('1')*0x01000000;
const sal_uInt16 OBJ_FM_CONTROL = ::com::sun::star::form::FormComponentType::CONTROL;
- // fuer FormularKomponenten
+ // for form components
const sal_uInt16 OBJ_FM_EDIT = ::com::sun::star::form::FormComponentType::TEXTFIELD;
const sal_uInt16 OBJ_FM_BUTTON = ::com::sun::star::form::FormComponentType::COMMANDBUTTON;
const sal_uInt16 OBJ_FM_FIXEDTEXT = ::com::sun::star::form::FormComponentType::FIXEDTEXT;
@@ -64,3 +65,4 @@ const sal_uInt16 OBJ_FM_NAVIGATIONBAR = ::com::sun::star::form::FormComponen
#endif // _FM_FMGLOB_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index e9bf83ad12..f7f969e91b 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,23 +142,23 @@ public:
sal_Int32 GetSelectedColumn() const;
- /** return the name of the specified object.
+ /** return the name of the specified object.
@param eObjType
The type to ask for
@param _nPosition
The position of a tablecell (index position), header bar colum/row cell
- @return
- The name of the specified object.
+ @return
+ The name of the specified object.
*/
virtual ::rtl::OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const;
- /** return the description of the specified object.
+ /** return the description of the specified object.
@param eObjType
The type to ask for
@param _nPosition
The position of a tablecell (index position), header bar colum/row cell
- @return
- The description of the specified object.
+ @return
+ The description of the specified object.
*/
virtual ::rtl::OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const;
@@ -214,3 +215,4 @@ protected:
#endif // _SVX_FMGRIDCL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 4ee8aa89c9..c6a9d2d967 100644
--- a/svx/inc/svx/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -232,7 +233,7 @@ public:
FmXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
virtual ~FmXGridControl();
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl);
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
@@ -317,12 +318,12 @@ public:
protected:
virtual FmXGridPeer* imp_CreatePeer(Window* pParent);
- // ImplCreatePeer waere besser ;) geht aber nicht, da dann nicht exportiert
+ // ImplCreatePeer would be better, but doesn't work because it's not exported
};
//==================================================================
-// FmXGridPeer -> Peer fuers Gridcontrol
+// FmXGridPeer -> Peer for the Gridcontrol
//==================================================================
typedef ::comphelper::ImplHelper19 < ::com::sun::star::form::XGridPeer,
::com::sun::star::form::XBoundComponent,
@@ -385,7 +386,7 @@ public:
// spaeter Constructor, immer nach dem realen Constructor zu rufen !
void Create(Window* pParent, WinBits nStyle);
-// UNO Anbindung
+// UNO connection
DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow);
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
@@ -549,3 +550,4 @@ protected:
#endif // _SVX_FMGRID_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index ee5c157d47..d4dfef4951 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,13 +61,13 @@ public:
FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL,
SfxObjectShell* pPers=NULL );
- FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable);
+ FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable);
FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
- FASTBOOL bUseExtColorTable);
+ bool bUseExtColorTable);
virtual ~FmFormModel();
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(bool bMasterPage);
virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
virtual void MovePage(USHORT nPgNum, USHORT nNewPos);
@@ -100,3 +101,4 @@ private:
#endif // _FM_FMMODEL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index 7e59fa175b..b2767b6258 100644
--- a/svx/inc/svx/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ public:
#endif // _FM_FMOBJFAC_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 12296f64c1..0160e22c50 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,7 @@
class StarBASIC;
class FmFormModel;
-class FmFormPageImpl; // haelt die Liste aller Forms
+class FmFormPageImpl; // contains a list of all forms
FORWARD_DECLARE_INTERFACE(container,XNameContainer)
@@ -52,7 +53,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
public:
TYPEINFO();
- FmFormPage(FmFormModel& rModel,StarBASIC*, FASTBOOL bMasterPage=sal_False);
+ FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False);
FmFormPage(const FmFormPage& rPage);
~FmFormPage();
@@ -66,7 +67,7 @@ public:
virtual SdrObject* RemoveObject(ULONG nObjNum);
- // Zugriff auf alle Formulare
+ // access to all forms
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
#ifndef SVX_LIGHT
@@ -85,3 +86,4 @@ public:
#endif // _SVX_FMPAGE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc
index 08982d8444..158ed6c1f5 100644
--- a/svx/inc/svx/fmresids.hrc
+++ b/svx/inc/svx/fmresids.hrc
@@ -35,7 +35,6 @@
// ImageList-Id's -----------------------------------------------------------
#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2)
// Image-Id's -----------------------------------------------------------
//#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 63ab4b85e7..b943e452af 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,21 +34,13 @@
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
#include <tools/link.hxx>
@@ -71,25 +64,27 @@ SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Referen
struct FmFoundRecordInformation
{
- ::com::sun::star::uno::Any aPosition; // Bookmark des Datensatzes, in dem der Text gefunden wurde
- sal_Int16 nFieldPos; // dito : die relative Position der Spalte (im Stringnamen in Feldliste im Constructor)
- sal_Int16 nContext; // Kontext, in dem gesucht und gefunden wurde (falls die aktuelle Suche verschiedene solche kennt)
+ ::com::sun::star::uno::Any aPosition; // bookmark of the record in which the text was found
+ sal_Int16 nFieldPos; // ditto : the relative position of the column (in the string name of the field list in the constructor)
+ sal_Int16 nContext; // the context in which was searched and found (if the current search knows several contexts)
};
// ===================================================================================================
-// = struct FmSearchContext - Informationen fuer Suche in verschiedenen Kontexten
+// = struct FmSearchContext - informations for the search in different contexts
// ===================================================================================================
struct FmSearchContext
{
// [in]
- sal_Int16 nContext; // die Nummer des Kontextes
+ sal_Int16 nContext; // the number of the context
// [out]
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // der Iterator fuer diesen Kontext
- String strUsedFields; // eine Liste von durch ';' getrennten Feldnamen
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // the iterator for the context
+ String strUsedFields; // a list of field names separeted by ';'
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
- arrFields; // die korrespondierenden Text-Interfaces fuer die Felder in strUsedFields
+ arrFields; // the corresponding text interfaces for the fields in strUsedFields
String sFieldDisplayNames; // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !)
};
#endif // _FMSEARCH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index 911ac0a78b..9f7380e031 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
#include <sfx2/module.hxx>
#include <vcl/event.hxx>
-#ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <svx/fmview.hxx>
#include "svx/svxdllapi.h"
@@ -91,14 +90,13 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
sal_uInt16 m_nLastSlot;
sal_Bool m_bDesignMode : 1;
- sal_Bool m_bHasForms : 1; // Flag welches festhaelt, ob Formulare auf einer Seite
- // vorhanden sind, nur für den DesignMode, siehe UIFeatureChanged!
+ sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist,
+ // only for the DesignMode, see UIFeatureChanged!
- // die Markierungen einer FormView haben sich geaendert ...
+ // the marks of a FormView have changed...
void NotifyMarkListChanged(FmFormView*);
- // (die FormView selber ist kein Broadcaster, deshalb kann sie den Formular-Explorer, den dieses
- // Ereignis interesiert, nicht sauber verstaendigen (sie koennte sich lediglich von der Application
- // das Navigator-Fenster geben lassen, aber das wollen wir ja nicht, ge ? ...))
+ // (the FormView itself is not a broadcaster, therefore it can't always correctly notify the
+ // form explorer who is interested in the event)
class FormShellWaitObject
{
@@ -179,7 +177,7 @@ public:
protected:
void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich);
- // gibt es ein Formular auf der aktuellen Seite?
+ // is there a form on the current page?
void DetermineForms(sal_Bool bInvalidate);
void impl_setDesignMode( sal_Bool bDesign);
};
@@ -189,3 +187,5 @@ protected:
// ***************************************************************************************************
#endif // _SVX_FMSHELL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 743dbfa378..6ba0bd062f 100644
--- a/svx/inc/svx/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -154,3 +155,4 @@ namespace svxform
#endif // _FMSRCCF_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 8621ac19e0..15d3becc5a 100644
--- a/svx/inc/svx/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,7 @@
// ===================================================================================================
class FmSearchEngine;
-class FmSearchThread : public ::vos::OThread
+class FmSearchThread : public ::osl::Thread
{
FmSearchEngine* m_pEngine;
Link m_aTerminationHdl;
@@ -399,3 +400,4 @@ private:
#endif // _FMSRCIMP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index cccc48b8bf..dda53d3ab5 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,3 +165,4 @@ private:
#endif // _FML_FMVIEW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index 5ba448e344..e94329ef52 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,13 +47,11 @@ private:
FontNameMenu* pMenu;
Menu& rParent;
-//#if 0 // _SOLAR__PRIVATE
SVX_DLLPRIVATE void FillMenu();
DECL_LINK( MenuSelect, FontNameMenu * );
SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-//#endif
public:
SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& );
@@ -67,3 +66,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 20badbeb75..3690d291e8 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <editeng/svxfont.hxx>
#include "svx/svxdllapi.h"
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
// forward ---------------------------------------------------------------
@@ -58,7 +57,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- // Aus Effizienz-gr"unden nicht const
+ // for reasons of efficiency not const
SvxFont& GetFont();
const SvxFont& GetFont() const;
void SetFont( const SvxFont& rFont );
@@ -88,3 +87,4 @@ public:
#endif // #ifndef _SVX_FNTCTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index 5b46d28ab5..1413e39751 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,9 +47,7 @@ private:
Menu& rParent;
SfxStatusForwarder aFontNameForwarder;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( MenuSelect, FontSizeMenu * );
-//#endif
protected:
virtual void StateChanged( USHORT nSID, SfxItemState eState,
@@ -67,3 +66,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index e8bcd3777c..6cbcee90dd 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef SVX_FONTLB_HXX
#define SVX_FONTLB_HXX
-#ifndef _SVTABBOX_HXX
#include <svtools/svtabbx.hxx>
-#endif
#include <vcl/virdev.hxx>
#include "svx/svxdllapi.h"
#include <layout/layout.hxx>
@@ -136,3 +135,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 756b76c868..10f311ed04 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,12 +30,8 @@
// include ---------------------------------------------------------------
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/valueset.hxx>
#include <sfx2/dockwin.hxx>
#include <sfx2/ctrlitem.hxx>
@@ -62,7 +59,7 @@ class XFormTextShadowYValItem;
/*************************************************************************
|*
-|* ControllerItem fuer Fontwork
+|* ControllerItem for Fontwork
|*
\************************************************************************/
@@ -82,7 +79,7 @@ public:
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Fontwork-Dialog
+|* Derived from SfxChildWindow as "container" for fontwork dialog
|*
\************************************************************************/
@@ -95,7 +92,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
/*************************************************************************
|*
-|* Floating Window zur Attributierung von Texteffekten
+|* Floating window for setting attributes of text effects
|*
\************************************************************************/
@@ -137,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
long nSaveShadowSize;
ImageList maImageList;
- ImageList maImageListH;
const XColorTable* pColorTable;
@@ -195,3 +191,4 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
#endif // _SVX_FONTWORK_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx
index 8b63d0ee79..24ed76812e 100644
--- a/svx/inc/svx/fontworkbar.hxx
+++ b/svx/inc/svx/fontworkbar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ public:
}
#endif // _SVX_FONTWORK_BAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index 81e7031a37..6f73ecd1a4 100644
--- a/svx/inc/svx/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ private:
} //namespace svx
//.............................................................................
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx
index ffd4ce06ce..e35cdd19a4 100644
--- a/svx/inc/svx/framebordertype.hxx
+++ b/svx/inc/svx/framebordertype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,4 @@ size_t GetIndexFromFrameBorderType( FrameBorderType eBorder );
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index 660fd17ab0..5e30028ce4 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,10 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include "svx/svxdllapi.h"
+#include <vcl/outdev.hxx>
+#include <editeng/borderline.hxx>
class OutputDevice;
-class SvxBorderLine;
namespace svx {
namespace frame {
@@ -112,20 +114,20 @@ class SVX_DLLPUBLIC Style
{
public:
/** Constructs an invisible frame style. */
- inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mbDotted( false ) {}
+ inline explicit Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mnDashing( SOLID ) {}
/** Constructs a frame style with passed line widths. */
inline explicit Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) :
- meRefMode( REFMODE_CENTERED ), mbDotted( false )
+ meRefMode( REFMODE_CENTERED ), mnDashing( SOLID )
{ Set( nP, nD, nS ); }
/** Constructs a frame style with passed color and line widths. */
- inline explicit Style( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS ) :
- meRefMode( REFMODE_CENTERED ), mbDotted( false )
+ inline explicit Style( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, SvxBorderStyle nDashing = SOLID ) :
+ meRefMode( REFMODE_CENTERED ), mnDashing( nDashing )
{ Set( rColor, nP, nD, nS ); }
/** Constructs a frame style from the passed SvxBorderLine struct. */
- inline explicit Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) :
+ inline explicit Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); }
/** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
- inline explicit Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false ) :
+ inline explicit Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); }
inline RefMode GetRefMode() const { return meRefMode; }
@@ -133,7 +135,7 @@ public:
inline sal_uInt16 Prim() const { return mnPrim; }
inline sal_uInt16 Dist() const { return mnDist; }
inline sal_uInt16 Secn() const { return mnSecn; }
- inline bool Dotted() const { return mbDotted; }
+ inline SvxBorderStyle Dashing() const { return mnDashing; }
/** Returns the total width of this frame style. */
inline sal_uInt16 GetWidth() const { return mnPrim + mnDist + mnSecn; }
@@ -146,16 +148,16 @@ public:
/** Sets the frame style to the passed line widths. */
void Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS );
/** Sets the frame style to the passed SvxBorderLine struct. */
- void Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false );
+ void Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
/** Sets the frame style to the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
- void Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16, bool /*bUseDots*/ = false );
+ void Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
/** Sets a new reference point handling mode, does not modify other settings. */
inline void SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; }
/** Sets a new color, does not modify other settings. */
inline void SetColor( const Color& rColor ) { maColor = rColor; }
/** Sets whether to use dotted style for single hair lines. */
- inline void SetDotted( bool bDotted ) { mbDotted = bDotted; }
+ inline void SetDashing( SvxBorderStyle nDashing ) { mnDashing = nDashing; }
/** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */
Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
@@ -173,7 +175,7 @@ private:
sal_uInt16 mnPrim; /// Width of primary (single, left, or top) line.
sal_uInt16 mnDist; /// Distance between primary and secondary line.
sal_uInt16 mnSecn; /// Width of secondary (right or bottom) line.
- bool mbDotted; /// true = Draw dotted lines; false = Draw solid lines.
+ SvxBorderStyle mnDashing;
};
bool operator==( const Style& rL, const Style& rR );
@@ -725,3 +727,4 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders(
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx
index fb36019d52..2b0e7b0c82 100644
--- a/svx/inc/svx/framelinkarray.hxx
+++ b/svx/inc/svx/framelinkarray.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -535,3 +536,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx
index c56b363d58..b9239ccfb5 100644
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/svx/inc/svx/frmdirlbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
#ifndef _SVX_FRMDIRLBOX_HXX
#define _SVX_FRMDIRLBOX_HXX
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
#include <sfx2/itemconnect.hxx>
#include <editeng/frmdir.hxx>
#include "svx/svxdllapi.h"
@@ -104,3 +103,4 @@ typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index 22100d3e0a..20a3fad699 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
#include <tools/color.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/bitmap.hxx>
+#include <editeng/borderline.hxx>
#include <svx/framebordertype.hxx>
#include "svx/svxdllapi.h"
@@ -128,7 +130,8 @@ public:
/** Returns true, if all visible frame borders have equal widths.
@descr Ignores hidden and "don't care" frame borders. On success,
returns the widths in the passed parameters. */
- bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec ) const;
+ bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec,
+ SvxBorderStyle& rnStyle ) const;
/** Returns true, if all visible frame borders have equal color.
@descr Ignores hidden and "don't care" frame borders. On success,
returns the color in the passed parameter. */
@@ -159,7 +162,8 @@ public:
void SelectAllVisibleBorders( bool bSelect = true );
/** Sets the passed line widths to all selected frame borders (in twips). */
- void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec );
+ void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec,
+ SvxBorderStyle nStyle );
/** Sets the passed color to all selected frame borders. */
void SetColorToSelection( const Color& rColor );
@@ -202,3 +206,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index 01ba5ce90b..a639fd7ac6 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ public:
};
#endif // _SVX_GALBRWS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index a5a74d5881..9352bfbc53 100644
--- a/svx/inc/svx/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -189,3 +190,5 @@ public:
};
#endif // _SVX_GALCTRL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index 2f42bc32fe..27fd7eeca6 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,10 +85,116 @@
#define GALLERY_THEME_EDUCATION 33
#define GALLERY_THEME_TROUBLE 34
#define GALLERY_THEME_SCREENBEANS 35
-#define GALLERY_THEME_FONTWORK 36
-#define GALLERY_THEME_FONTWORK_VERTICAL 37
-#define GALLERY_THEME_DUMMY5 38
+#define GALLERY_THEME_DUMMY5 36
+
+#define GALLERY_THEME_FONTWORK 37
+#define GALLERY_THEME_FONTWORK_VERTICAL 38
+
+#define GALLERY_THEME_SHAPES_POLYGONS 39
+#define GALLERY_THEME_SHAPES_1 40
+#define GALLERY_THEME_SHAPES_2 41
+#define GALLERY_THEME_ANIMALS 42
+#define GALLERY_THEME_CARS 43
+#define GALLERY_THEME_BUGS 44
+#define GALLERY_THEME_CISCO_OTHER 45
+#define GALLERY_THEME_CISCO_MEDIA 46
+#define GALLERY_THEME_CISCO_PRODUCTS 47
+#define GALLERY_THEME_CISCO_WAN_LAN 48
+#define GALLERY_THEME_DOMINO_USUAL 49
+#define GALLERY_THEME_DOMINO_NUMBERED 50
+#define GALLERY_THEME_ELECTRONICS_PARTS_1 51
+#define GALLERY_THEME_ELECTRONICS_PARTS_2 52
+#define GALLERY_THEME_ELECTRONICS_PARTS_3 53
+#define GALLERY_THEME_ELECTRONICS_PARTS_4 54
+#define GALLERY_THEME_ELECTRONICS_CIRCUIT 55
+#define GALLERY_THEME_ELECTRONICS_SIGNS 56
+#define GALLERY_THEME_ELECTRONICS_GAUGES 57
+#define GALLERY_THEME_PEOPLE_1 58
+#define GALLERY_THEME_ARCHITECTURE_OVERLAY 59
+#define GALLERY_THEME_ARCHITECTURE_FURNITURES 60
+#define GALLERY_THEME_ARCHITECTURE_BUILDINGS 61
+#define GALLERY_THEME_ARCHITECTURE_BATHROOM_KITCHEN 62
+#define GALLERY_THEME_ARCHITECTURE_KITCHEN 63
+#define GALLERY_THEME_ARCHITECTURE_WINDOWS_DOORS 64
+#define GALLERY_THEME_FLOWCHARTS_1 65
+#define GALLERY_THEME_FLOWCHARTS_2 66
+#define GALLERY_THEME_FORALSTUDIOA 67
+#define GALLERY_THEME_PHOTOS_FAUNA 68
+#define GALLERY_THEME_PHOTOS_BUILDINGS 69
+#define GALLERY_THEME_PHOTOS_PLANTS 70
+#define GALLERY_THEME_PHOTOS_STATUES 71
+#define GALLERY_THEME_PHOTOS_LANDSCAPES 72
+#define GALLERY_THEME_PHOTOS_CITIES 73
+#define GALLERY_THEME_PHOTOS_FLOWERS 74
+#define GALLERY_THEME_THERAPEUTICS_GENERAL 75
+#define GALLERY_THEME_WEATHER 76
+#define GALLERY_THEME_VECHILES 77
+#define GALLERY_THEME_SIGNS 78
+#define GALLERY_THEME_BLUE_MAN 79
+#define GALLERY_THEME_CHEMISTRY_AMINO_ACIDS 80
+#define GALLERY_THEME_LOGICAL_SIGNS 81
+#define GALLERY_THEME_LOGICAL_GATES 82
+#define GALLERY_THEME_LOGOS 83
+#define GALLERY_THEME_SMILES 84
+#define GALLERY_THEME_ARROWS_1 85
+#define GALLERY_THEME_CLOCK_01_CLOCK 86
+#define GALLERY_THEME_CLOCK_02_CLOCK 87
+#define GALLERY_THEME_CLOCK_03_CLOCK 88
+#define GALLERY_THEME_CLOCK_04_CLOCK 89
+#define GALLERY_THEME_CLOCK_05_CLOCK 90
+#define GALLERY_THEME_CLOCK_06_CLOCK 91
+#define GALLERY_THEME_CLOCK_07_CLOCK 92
+#define GALLERY_THEME_CLOCK_08_CLOCK 93
+#define GALLERY_THEME_CLOCK_09_CLOCK 94
+#define GALLERY_THEME_CLOCK_10_CLOCK 95
+#define GALLERY_THEME_CLOCK_11_CLOCK 96
+#define GALLERY_THEME_CLOCK_12_CLOCK 97
+#define GALLERY_THEME_PNEUMATIC_PARTS 98
+#define GALLERY_THEME_COMPUTER_GENERAL 99
+#define GALLERY_THEME_COMPUTER_NETWORK 100
+#define GALLERY_THEME_COMPUTER_NETWORK_DEVICES 101
+#define GALLERY_THEME_COMPUTER_WIFI 102
+#define GALLERY_THEME_NUMBERS 103
+#define GALLERY_THEME_SIGNS_DANGER 104
+#define GALLERY_THEME_OBJECTS 105
+#define GALLERY_THEME_MAPS_AFRICA 106
+#define GALLERY_THEME_MAPS_UNITED_STATES_OF_AMERICA 107
+#define GALLERY_THEME_MAPS_AUSTRALIA 108
+#define GALLERY_THEME_MAPS_ASIA 109
+#define GALLERY_THEME_MAPS_SOUTH_AMERICA 110
+#define GALLERY_THEME_MAPS_EUROPE 111
+#define GALLERY_THEME_MAPS_EUROPE_1 112
+#define GALLERY_THEME_MAPS_FRANCE 113
+#define GALLERY_THEME_MAPS_FRANCE_COUNTRIES 114
+#define GALLERY_THEME_MAPS_SIGNS 115
+#define GALLERY_THEME_MAPS_CANADA 116
+#define GALLERY_THEME_MAPS_CONTINENTS 117
+#define GALLERY_THEME_MAPS_MIDDLE_EAST 118
+#define GALLERY_THEME_MAPS_MIDDLE_AMERICA 119
+#define GALLERY_THEME_MAPS_MIDDLE_AGES 120
+#define GALLERY_THEME_MAPS_MEXICO 121
+#define GALLERY_THEME_MAPS_ANCIENT_TIMES 122
+#define GALLERY_THEME_MAPS_SYMBOLS 123
+#define GALLERY_THEME_MAPS_HISTORY_1900 124
+#define GALLERY_THEME_MAPS_WORLD 125
+#define GALLERY_THEME_CROPS 126
+#define GALLERY_THEME_FRACTIONS 127
+#define GALLERY_THEME_FLAGS_1 128
+#define GALLERY_THEME_MUSIC_INSTRUMENTS 129
+#define GALLERY_THEME_MUSIC_SHEET_MUSIC 130
+#define GALLERY_THEME_SPECIAL_PICTOGRAMM 131
+#define GALLERY_THEME_PHOTOS_CELEBRATION 132
+#define GALLERY_THEME_PHOTOS_FOODSANDDRINKS 133
+#define GALLERY_THEME_PHOTOS_HUMANS 134
+#define GALLERY_THEME_PHOTOS_OBJECTS 135
+#define GALLERY_THEME_PHOTOS_SPACE 136
+#define GALLERY_THEME_PHOTOS_TRAVEL 137
+#define GALLERY_THEME_OPENOFFICEORG_LOGOS 138
+#define GALLERY_THEME_RELIGION 139
+#define GALLERY_THEME_BUILDINGS 140
+#define GALLERY_THEME_HOMEPAGE2 141
+#define GALLERY_THEME_ELEMENTSBULLETS2 142
// -------------------
// - GalleryExplorer -
@@ -172,3 +279,5 @@ public:
};
#endif // _GALLERY_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 6cd5ca8589..7ab2c3a711 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,6 +38,7 @@
#include <cstdio>
#include <list>
+#include <vector>
// ---------------------
// - GalleryThemeEntry -
@@ -58,17 +60,17 @@ private:
BOOL bImported;
BOOL bModified;
BOOL bThemeNameFromResource;
-
+
GalleryThemeEntry();
INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
-
-public:
-
+
+public:
+
GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported,
BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource );
~GalleryThemeEntry() {};
-
+
const String& GetThemeName() const { return aName; }
UINT32 GetFileNumber() const { return nFileNumber; }
@@ -81,18 +83,18 @@ public:
BOOL IsDefault() const;
BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
-
+
BOOL IsModified() const { return bModified; }
void SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
-
+
void SetName( const String& rNewName );
BOOL IsNameFromResource() const { return bThemeNameFromResource; }
-
+
UINT32 GetId() const { return nId; }
void SetId( UINT32 nNewId, BOOL bResetThemeName );
};
-DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* )
+typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList;
// ---------------------------
// - GalleryImportThemeEntry -
@@ -105,7 +107,8 @@ struct GalleryImportThemeEntry
INetURLObject aURL;
String aImportName;
};
-DECLARE_LIST( GalleryImportThemeList, GalleryImportThemeEntry* )
+
+typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList;
// -----------------------------------------------------------------------------
@@ -135,12 +138,12 @@ private:
rtl_TextEncoding nReadTextEncoding;
ULONG nLastFileNumber;
BOOL bMultiPath;
-
+
void ImplLoad( const String& rMultiPath );
void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
void ImplLoadImports();
void ImplWriteImportList();
-
+
SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName );
GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId );
GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName );
@@ -154,11 +157,12 @@ private:
public:
SVX_DLLPUBLIC static Gallery* GetGalleryInstance();
-
- ULONG GetThemeCount() const { return aThemeList.Count(); }
- const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); }
+
+ size_t GetThemeCount() const { return aThemeList.size(); }
+ const GalleryThemeEntry* GetThemeInfo( size_t nPos )
+ { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; }
const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
-
+
SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName );
String GetThemeName( ULONG nThemeId ) const;
@@ -173,11 +177,13 @@ public:
public:
INetURLObject GetImportURL( const String& rThemeName );
-
+
const INetURLObject& GetUserURL() const { return aUserURL; }
const INetURLObject& GetRelativeURL() const { return aRelURL; }
-
+
BOOL IsMultiPath() const { return bMultiPath; }
};
#endif // _SVX_GALLERY1_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index 57f98ccca9..0ddeb41bf5 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -260,3 +261,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index 6a51190ce6..8ddb7e0968 100644
--- a/svx/inc/svx/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,12 @@ struct GalleryObject
BOOL bDummy;
};
-DECLARE_LIST( GalleryObjectList, GalleryObject* )
+typedef ::std::vector< GalleryObject* > GalleryObjectList;
+
+class GalleryThemeEntry;
+class SgaObject;
+class FmFormModel;
+class ListBox;
class GalleryThemeEntry;
class SgaObject;
@@ -85,8 +91,8 @@ struct GalDragParams
class Gallery;
class GalleryProgress;
-namespace unogallery
-{
+namespace unogallery
+{
class GalleryTheme;
class GalleryItem;
}
@@ -114,12 +120,20 @@ private:
void ImplCreateSvDrawStorage();
SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry );
- BOOL ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry );
+ BOOL ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry );
void ImplRead();
void ImplWrite();
- const GalleryObject* ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); }
+ const GalleryObject* ImplGetGalleryObject( size_t nPos ) const
+ { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; }
SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL );
- ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
+
+ size_t ImplGetGalleryObjectPos( const GalleryObject* pObj ) const
+ {
+ for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
+ if ( pObj == aObjectList[ i ] )
+ return i;
+ return size_t(-1);
+ }
INetURLObject ImplGetURL( const GalleryObject* pObject ) const;
INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
void ImplSetModified( BOOL bModified );
@@ -133,14 +147,14 @@ public:
static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly );
- ULONG GetObjectCount() const { return aObjectList.Count(); }
+ size_t GetObjectCount() const { return aObjectList.size(); }
- SVX_DLLPUBLIC SgaObject* AcquireObject( ULONG nPos );
+ SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos );
SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj );
SVX_DLLPUBLIC BOOL InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND );
- SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos );
- BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos );
+ SVX_DLLPUBLIC BOOL RemoveObject( size_t nPos );
+ BOOL ChangeObjectPos( size_t nOldPos, size_t nNewPos );
SVX_DLLPUBLIC const String& GetName() const;
const String& GetRealName() const;
@@ -166,7 +180,7 @@ public:
void LockBroadcaster() { mnBroadcasterLockCount++; }
SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 );
BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
-
+
void SetDragPos( ULONG nPos ) { nDragPos = nPos; }
ULONG GetDragPos() const { return nDragPos; }
@@ -229,3 +243,5 @@ SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme );
SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 0d965bdd2a..4ec9f1ba2d 100644
--- a/svx/inc/svx/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,6 @@
#include <tools/solar.h>
-//#define ESODEBUG
#define E3D_STREAMING
const double PrecisionLimit = 1.0e-14;
@@ -51,3 +51,5 @@ const UINT16 E3D_COMPOUNDOBJ_ID = 8;
const UINT16 E3D_POLYGONOBJ_ID = 9;
#endif // _E3D_GLOBL3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 97d8de5782..f621e9ddd5 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -189,3 +190,5 @@ public:
};
#endif // _SVX_GRAFCTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index ade161ab2c..6a19b85bfc 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,12 +37,6 @@
#include <svx/svdview.hxx>
#include <svx/svdobj.hxx>
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class GraphCtrlUserCall;
class SvxGraphCtrlAccessibleContext;
@@ -140,13 +135,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
};
-//#if 0 // _SOLAR__PRIVATE
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
class GraphCtrlUserCall : public SdrObjUserCall
{
@@ -160,12 +148,6 @@ public:
virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect );
};
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
class GraphCtrlView : public SdrView
{
GraphCtrl& rGraphCtrl;
@@ -187,7 +169,6 @@ public:
virtual ~GraphCtrlView() {};
};
-//#endif // __PRIVATE
-
#endif // _GRAPHCTL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index f25d37c8e4..8d42a26cda 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@ public:
USHORT );
virtual ~SvxGrfCrop();
- // "pure virtual Methoden" vom SfxPoolItem
+ // "pure virtual methods" from SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &, USHORT nIVer) const;
@@ -53,10 +54,10 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
- BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
- BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ BYTE nMemberId = 0 );
void SetLeft( sal_Int32 nVal ) { nLeft = nVal; }
void SetRight( sal_Int32 nVal ) { nRight = nVal; }
@@ -78,3 +79,5 @@ public:
#endif // _GRFATR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index e754b32ced..599261c3ad 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/dialog.hxx>
#include <vcl/group.hxx>
@@ -67,3 +66,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 496891c758..df211e56e7 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,16 +39,15 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <tools/date.hxx>
#include <tools/ref.hxx>
#include <svtools/editbrowsebox.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <comphelper/propmultiplex.hxx>
#include <svtools/transfer.hxx>
#include "svx/svxdllapi.h"
+#include <vector>
class DbGridControl;
class CursorWrapper;
@@ -58,7 +58,7 @@ namespace svxform
{
class DataColumn;
}
-DECLARE_LIST(DbDataColumns, ::svxform::DataColumn*)
+typedef ::std::vector< ::svxform::DataColumn* > DbDataColumns;
enum GridRowStatus
{
@@ -69,17 +69,17 @@ enum GridRowStatus
};
//==================================================================
-// DbGridRow, Zeilenbeschreibung
+// DbGridRow, description of rows
//==================================================================
class DbGridRow : public SvRefBase
{
- ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark der Zeile, kann gesetzt sein
- DbDataColumns m_aVariants;
+ ::com::sun::star::uno::Any m_aBookmark; // ::com::sun::star::text::Bookmark of the row, can be set
+ DbDataColumns m_aVariants;
GridRowStatus m_eStatus;
- sal_Bool m_bIsNew;
- // Zeile ist nicht mehr gueltig,
- // wird bei der naechsten positionierung entfernt
+ sal_Bool m_bIsNew;
+ // row is no longer valid
+ // is removed on the next positioning
public:
DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(sal_True) { }
DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor);
@@ -87,9 +87,8 @@ public:
~DbGridRow();
- // da GetField auf Geschwindigkeit getuned ist vorher immer noch hasField verwenden
- sal_Bool HasField(sal_uInt32 nPos) const {return nPos < m_aVariants.Count();}
- const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants.GetObject(nPos); }
+ sal_Bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); }
+ const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; }
void SetStatus(GridRowStatus _eStat) { m_eStatus = _eStat; }
GridRowStatus GetStatus() const { return m_eStatus; }
@@ -108,7 +107,7 @@ SV_DECL_REF(DbGridRow)
// DbGridControl
//==================================================================
class DbGridColumn;
-DECLARE_LIST(DbGridColumns, DbGridColumn*)
+typedef ::std::vector< DbGridColumn* > DbGridColumns;
//==================================================================
class FmGridListener
@@ -161,23 +160,23 @@ public:
// zusaetzliche Controls
FixedText m_aRecordText;
- AbsolutePos m_aAbsolute; // AbsolutePositionierung
+ AbsolutePos m_aAbsolute; // absolute positioning
FixedText m_aRecordOf;
FixedText m_aRecordCount;
- ImageButton m_aFirstBtn; // ImageButton fuer 'gehe zum ersten Datensatz'
- ImageButton m_aPrevBtn; // ImageButton fuer 'gehe zum vorhergehenden Datensatz'
- ImageButton m_aNextBtn; // ImageButton fuer 'gehe zum naechsten Datensatz'
- ImageButton m_aLastBtn; // ImageButton fuer 'gehe zum letzten Datensatz'
- ImageButton m_aNewBtn; // ImageButton fuer 'gehe zum neuen Datensatz'
+ ImageButton m_aFirstBtn; // ImageButton for 'go to the first record'
+ ImageButton m_aPrevBtn; // ImageButton for 'go to the previous record'
+ ImageButton m_aNextBtn; // ImageButton for 'go to the next record'
+ ImageButton m_aLastBtn; // ImageButton for 'go to the last record'
+ ImageButton m_aNewBtn; // ImageButton for 'go to a new record'
sal_uInt16 m_nDefaultWidth;
sal_Int32 m_nCurrentPos;
sal_Bool m_bPositioning; // protect PositionDataSource against recursion
public:
- // StatusIds fuer Controls der Bar
- // wichtig fuers Invalidieren
+ // StatusIds for Controls of the Bar
+ // important for invalidation
enum State
{
RECORD_TEXT = 1,
@@ -193,7 +192,7 @@ public:
NavigationBar(Window* pParent, WinBits nStyle = 0);
- // Status Methoden fuer Controls
+ // Status methods for Controls
void InvalidateAll(sal_Int32 nCurrentPos = -1, sal_Bool bAll = sal_False);
void InvalidateState(sal_uInt16 nWhich) {SetState(nWhich);}
void SetState(sal_uInt16 nWhich);
@@ -215,8 +214,8 @@ public:
friend class DbGridControl::NavigationBar;
public:
- // diese Optionen werden verodert und geben an, welche der einzelnen feature
- // freigegeben werden koennen, default ist readonly also 0
+ // these options are or'ed and indicate, which of the single
+ // features can be released, default is readonly which means 0
enum Option
{
OPT_READONLY = 0x00,
@@ -233,14 +232,14 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
- DbGridColumns m_aColumns; // Spaltenbeschreibung
+ DbGridColumns m_aColumns; // Column description
NavigationBar m_aBar;
- DbGridRowRef m_xDataRow; // Zeile die modifiziert werden kann
- // kommt vom DatenCursor
- DbGridRowRef m_xSeekRow, // Zeile die von Iterator gesetzt wird
- // kommt vom DatenCursor
+ DbGridRowRef m_xDataRow; // Row which can be modified
+ // comes from the data cursor
+ DbGridRowRef m_xSeekRow, // Row to which the iterator can set
+ // comes from the data cursor
- m_xEmptyRow; // Datensatz zum einfuegen
+ m_xEmptyRow; // record set to insert
sal_uInt32 m_nAsynAdjustEvent;
@@ -263,17 +262,16 @@ private:
FmGridListener* m_pGridListener;
protected:
- CursorWrapper* m_pDataCursor; // Cursor fuer Updates
- CursorWrapper* m_pSeekCursor; // Cursor zum Seeken
+ CursorWrapper* m_pDataCursor; // Cursor for Updates
+ CursorWrapper* m_pSeekCursor; // Cursor for Seeking
private:
- // dieses sind Laufvariablen
- DbGridRowRef m_xCurrentRow; // Row an der aktuellen Zeile
- DbGridRowRef m_xPaintRow; // Row die gerade drgestellt werden soll
- sal_Int32 m_nSeekPos; // Position des SeekCursors
- sal_Int32 m_nTotalCount; // wird gesetzt, wenn der DatenCursor mit dem Zählen der
- // Datensätze fertig ist
- // initial Wert ist -1
+ // iteration variables
+ DbGridRowRef m_xCurrentRow;
+ DbGridRowRef m_xPaintRow; // Row to be displayed
+ sal_Int32 m_nSeekPos; // Position of the SeekCursor
+ sal_Int32 m_nTotalCount; // is set when the data cursor finished counting the
+ // records. Initial value is -1
osl::Mutex m_aDestructionSafety;
osl::Mutex m_aAdjustSafety;
@@ -281,9 +279,9 @@ private:
m_aNullDate; // NullDate of the Numberformatter;
BrowserMode m_nMode;
- sal_Int32 m_nCurrentPos; // Aktuelle Position;
- sal_uInt32 m_nDeleteEvent; // EventId fuer asychrone Loeschen von Zeilen
- sal_uInt16 m_nOptions; // Was kann das Control (Insert, Update, Delete)
+ sal_Int32 m_nCurrentPos; // Current position;
+ sal_uInt32 m_nDeleteEvent; // EventId for asychronous deletion of rows
+ sal_uInt16 m_nOptions; // What is the able to do (Insert, Update, Delete)
// default readonly
sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource
// (with respect to the data source capabilities)
@@ -306,7 +304,7 @@ private:
sal_Bool m_bHideScrollbars : 1;
protected:
- sal_Bool m_bUpdating : 1; // werden gerade updates durchgefuehrt
+ sal_Bool m_bUpdating : 1; // are any updates being executed right now?
protected:
virtual sal_Bool SeekRow(long nRow);
@@ -401,8 +399,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& getNumberFormatter() const {return m_xFormatter;}
- // die Datenquelle
- // die Optionen koennen die Updatefaehigkeiten noch einschraenken, nicht erweitern
+ // the data source
+ // the options can restrict but not extend the update abilities
virtual void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor,
sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE);
virtual void Dispatch(sal_uInt16 nId);
@@ -414,18 +412,18 @@ public:
sal_Bool HasHandle() const {return m_bHandle;}
void InsertHandleColumn();
- /// welche Position hat die Spalte mit der Id in der ::com::sun::star::sdbcx::View, die Handle-Column zahelt nicht mit
+ // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the handle column doesn't count
sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId); return (nPos==(sal_uInt16)-1) ? GRID_COLUMN_NOT_FOUND : nPos-1; }
- /** welche Position hat die Spalte mit der Id in m_aColumns, also dem von GetColumns gelieferten ::com::sun::star::sdbcx::Container ?
- (unterscheidet sich u.U. von der von GetViewColumnPos gelieferten, wenn es versteckt Spalten gibt)
- */
+ // which position does the column with the id in m_aColumns have, that means the ::com::sun::star::sdbcx::Container
+ // returned from the GetColumns (may be different from the position returned by GetViewColumnPos
+ // if there are hidden columns)
sal_uInt16 GetModelColumnPos( sal_uInt16 nId ) const;
- /// Anzahl der Spalten im Model
+ // the number of columns in the model
sal_uInt16 GetViewColCount() const { return ColCount() - 1; }
- sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.Count(); }
- /// umgekehrt zu GetViewColumnPos : Id zu Position, die erste Nicht-Handle-Column hat die Position 0
+ sal_uInt16 GetModelColCount() const { return (sal_uInt16)m_aColumns.size(); }
+ // reverse to GetViewColumnPos: Id of position, the first non-handle column has position 0
sal_uInt16 GetColumnIdFromViewPos( sal_uInt16 nPos ) const { return GetColumnId(nPos + 1); }
sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
@@ -452,7 +450,7 @@ public:
const com::sun::star::util::Date& getNullDate() const {return m_aNullDate;}
- // Positionierung
+ // positioning
void MoveToPosition(sal_uInt32 nPos);
void MoveToFirst();
void MoveToNext();
@@ -460,15 +458,17 @@ public:
void MoveToLast();
void AppendNew();
- // Abgleich der Cursor falls von außen der DatenCursor verschoben wurde
- // Flag bedeutet ob ein Abgleich es Rowcounts vorgenommen werden soll
+ // adjustment of the cursors in case the data cursor has been
+ // moved from the outside.
+ // the flag indicates if an adjustment of the row count should be
+ // done as well
void AdjustDataSource(sal_Bool bFull = sal_False);
void Undo();
virtual void BeginCursorAction();
virtual void EndCursorAction();
- // wird die aktuelle Zeile neu gesetzt
+ // is the current line being updated
sal_Bool IsUpdating() const {return m_bUpdating;}
virtual void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True );
@@ -480,15 +480,16 @@ public:
sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; }
void setDisplaySynchron(sal_Bool bSync);
void forceSyncDisplay();
- // wenn das auf sal_False gesetzt wird, laeuft die Anzeige nicht mehr mit der aktuellen Cursor-Position synchron
- // (soll heissen, in AdjustDataSource wird nicht in die zur CursorPosition gehoerenden Zeile gesprungen)
- // wer das benutzt, sollte bitte wissen, was er tut, da zum Beispiel die Eingabe von Daten in einer Zeile auf der Anzeige,
- // die gar nicht mit der Position des Cursors synchron ist, ziemlich kritisch sein koennte
+ // when set to sal_False, the display is no longer in sync with the current cursor position
+ // (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition)
+ // when using this, you should know what you are doing, because for example entering data
+ // in a row in the display that is not in sync with the position of the cursor can be very critical
sal_Bool isForcedROController() const { return m_bForceROController; }
void forceROController(sal_Bool bForce);
- // Setzt man das auf sal_True, hat das GridControl immer einen ::com::sun::star::frame::Controller, der allerdings read-only ist. Ausserdem
- // wird die Edit-Zeile des Controllers so eingestellt, dass sie ihre Selektion bei Fokus-Verlust weiterhin anzeigt.
+ // when set to sal_True, the GridControl always has a ::com::sun::star::frame::Controler which is
+ // read-only though. Additionally, the edit row of the controller is configured in a way
+ // that its selection stays displayed on focus loss.
const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;}
@@ -570,7 +571,7 @@ public:
protected:
void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor);
sal_Bool SeekCursor(long nRow, sal_Bool bAbsolute = sal_False);
- void RemoveColumns(); // aufraeumen eigener strukturen
+ void RemoveColumns(); // cleaning of own structures
void AdjustRows();
sal_Int32 AlignSeekCursor();
sal_Bool SetCurrent(long nNewRow);
@@ -579,10 +580,10 @@ protected:
virtual void DeleteSelectedRows();
sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
- // Zeile an der gerade eingefuegt wird
+ // row which is currently being appended
sal_Bool IsCurrentAppending() const;
- // Leerzeile zum Einfuegen
+ // empty row for insertion
sal_Bool IsInsertionRow(long nRow) const;
void SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;}
@@ -621,3 +622,4 @@ SV_IMPL_REF(DbGridRow);
#endif // _SVX_GRIDCTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index 7efa978285..fb1087370d 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,17 +32,11 @@
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include <svx/pagectrl.hxx>
#include "svx/svxdllapi.h"
@@ -90,7 +85,7 @@ protected:
SfxItemSet* pBBSet;
BOOL bDisableQueryBox;
BOOL bEnableBackgroundSelector;
- FASTBOOL bInReset;
+ bool bInReset;
void InitHandler();
DECL_LINK( TurnOnHdl, CheckBox*);
@@ -134,3 +129,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx
index 15550281b6..630f6cd4f8 100644
--- a/svx/inc/svx/helperhittest3d.hxx
+++ b/svx/inc/svx/helperhittest3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ bool checkHitSingle3DObject(
#endif // INCLUDED_SVX_HELPERHITTEST_HXX
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index 1beecda742..13b6b1d8d7 100644
--- a/svx/inc/svx/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,8 +75,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
const String& GetName() const { return sName; }
void SetName(const String& rName) { sName = rName; }
@@ -108,3 +109,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/htmlmode.hxx.orig
index ca106ba8ee..a701d03d39 100644
--- a/svx/inc/svx/extrusioncolorcontrol.hxx
+++ b/svx/inc/svx/htmlmode.hxx.orig
@@ -24,33 +24,28 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+#ifndef _SVX_HTMLMODE_HXX
+#define _SVX_HTMLMODE_HXX
+
+#include <sfx2/htmlmode.hxx>
+
+#endif
+
+
+
+
+
+
+
+
+
+
-#ifndef _SVX_EXTRUSIONCOLORCONTROL_HXX
-#define _SVX_EXTRUSIONCOLORCONTROL_HXX
-#include <sfx2/tbxctrl.hxx>
-#include "svx/svxdllapi.h"
-#include "svx/tbxcolorupdate.hxx"
-namespace svx {
-class SVX_DLLPUBLIC ExtrusionColorControl : public SfxToolBoxControl
-{
-private:
- ToolboxButtonColorUpdater* mpBtnUpdater;
-public:
- SFX_DECL_TOOLBOX_CONTROL();
- ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
- ~ExtrusionColorControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
- const SfxPoolItem* pState );
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
-};
-}
-#endif // _SVX_EXTRUSIONCOLORCONTROL_HXX
diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index 457cb7c5e6..fc286e2389 100644
--- a/svx/inc/svx/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ public:
#endif // _SVX_TAB_HYPERLINK_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index 0a1f5ad95a..b37c2cf2b2 100644
--- a/svx/inc/svx/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ public:
#endif // _SVX_DLG_HYPERLINK_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx
index dfa106a9d4..58001a9b9b 100644
--- a/svx/inc/svx/ifaceids.hxx
+++ b/svx/inc/svx/ifaceids.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index dc587513b8..fbe4ba36c5 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,26 +35,17 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
-#ifndef _STATUS_HXX //autogen
#include <vcl/status.hxx>
-#endif
#include "svx/svxdllapi.h"
+#include <vector>
#ifndef _GOMISC_HXX
@@ -63,12 +55,12 @@ class ImageMap;
/*************************************************************************
|*
-|* Ableitung vom SfxChildWindow als "Behaelter" fuer Float
+|* Derivation from SfxChildWindow as "container" for float
|*
\************************************************************************/
class Graphic;
-class TargetList;
+typedef ::std::vector< String* > TargetList;
class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow
{
@@ -135,7 +127,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
ComboBox maCbbTarget;
StatusBar aStbStatus;
ImageList maImageList;
- ImageList maImageListH;
Size aLastSize;
IMapWindow* pIMapWnd;
@@ -209,3 +200,4 @@ public:
#endif // _IMAPDLG_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index c1e43e59fa..139b0197e2 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index b81e74e2d6..a35f29c44d 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,20 +36,20 @@
// Defines
//************************************************************
-enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // nur fuer Statusabfrage
- SDRPATHSMOOTH_ANGULAR, // Eckig
- SDRPATHSMOOTH_ASYMMETRIC, // unsymmetrisch, normales Smooth
- SDRPATHSMOOTH_SYMMETRIC}; // symmetrisch
+enum SdrPathSmoothKind {SDRPATHSMOOTH_DONTCARE, // only for status query
+ SDRPATHSMOOTH_ANGULAR, // angular
+ SDRPATHSMOOTH_ASYMMETRIC, // asymmetric, normal Smooth
+ SDRPATHSMOOTH_SYMMETRIC}; // symmetric
-enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // nur fuer Statusabfrage
- SDRPATHSEGMENT_LINE, // gerader Streckenabschnitt
- SDRPATHSEGMENT_CURVE, // Kurvenabschnitt (Bezier)
- SDRPATHSEGMENT_TOGGLE}; // nur fuer Set: Toggle
+enum SdrPathSegmentKind {SDRPATHSEGMENT_DONTCARE, // only for status query
+ SDRPATHSEGMENT_LINE, // straight path segment
+ SDRPATHSEGMENT_CURVE, // curve path segment (Bezier)
+ SDRPATHSEGMENT_TOGGLE}; // only for Set: Toggle
-enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // nur fuer Statusabfrage
- SDROBJCLOSED_OPEN, // Objekte geoeffnet (Linie, Polyline, ...)
- SDROBJCLOSED_CLOSED, // Objekte geschlossen (Polygon, ...)
- SDROBJCLOSED_TOGGLE}; // nur fuer Set: Toggle (not implemented yet)
+enum SdrObjClosedKind {SDROBJCLOSED_DONTCARE, // only for status query
+ SDROBJCLOSED_OPEN, // non-closed object (line, polyline, ...)
+ SDROBJCLOSED_CLOSED, // closed object (polygon, ...)
+ SDROBJCLOSED_TOGGLE}; // only for Set: Toggle (not implemented yet)
class IPolyPolygonEditorController
{
@@ -74,3 +75,4 @@ public:
#endif //_SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 85d67a6ca6..4aaa636ef1 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,6 @@ class SfxObjectShell;
class SvxLineBox : public LineLB
{
- BmpColorMode meBmpMode;
USHORT nCurPos;
Timer aDelayTimer;
Size aLogicalSize;
@@ -56,7 +56,7 @@ class SvxLineBox : public LineLB
void ReleaseFocus_Impl();
#endif
public:
- SvxLineBox( Window* pParent,
+ SvxLineBox( Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
~SvxLineBox();
@@ -92,7 +92,7 @@ class SvxColorBox : public ColorLB
#endif
public:
- SvxColorBox( Window* pParent,
+ SvxColorBox( Window* pParent,
const rtl::OUString& rCommand,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
@@ -127,14 +127,14 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
protected:
virtual void Modify();
virtual void Down();
- virtual void Up(); // Nur zur Sicherheit
+ virtual void Up(); // just to be sure
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
- SvxMetricField( Window* pParent,
+ SvxMetricField( Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT );
~SvxMetricField();
@@ -195,3 +195,4 @@ private:
#endif // #ifndef _SVX_ITEMWIN_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index a1f78a6a04..30a394befd 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,9 +52,9 @@ class SvtLanguageTable;
#define LANG_LIST_SPELL_USED 0x0200
#define LANG_LIST_HYPH_USED 0x0400
#define LANG_LIST_THES_USED 0x0800
-#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only
- // languages that do not form a
- // locale, such as Arabic as
+#define LANG_LIST_ALSO_PRIMARY_ONLY 0x1000 // Do not exclude primary-only
+ // languages that do not form a
+ // locale, such as Arabic as
// opposed to Arabic-Egypt.
@@ -67,7 +68,6 @@ public:
private:
Image m_aNotCheckedImage;
Image m_aCheckedImage;
- Image m_aCheckedImageHC;
String m_aAllString;
com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang;
SvtLanguageTable* m_pLangTable;
@@ -105,10 +105,6 @@ namespace layout
class SvxLanguageBoxImpl;
class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
{
- /*DECL_GET_IMPL( SvxLanguageBox );
- DECL_CONSTRUCTORS( SvxLanguageBox, ListBox, WB_BORDER );
- DECL_GET_WINDOW (SvxLanguageBox);*/
-
public:
SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE );
~SvxLanguageBox ();
@@ -126,3 +122,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index eb1ce3e118..00e6fe829e 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,11 +34,11 @@
/*************************************************************************
|*
-|* 3D-Rotationsobjekt aus uebergebenem 2D-Polygon erzeugen
+|* Create a 3D rotation object from a passed 2D polygon
|*
-|* Das aPolyPoly3D wird in nHSegments-Schritten um die Achse rotiert.
-|* nVSegments gibt die Anzahl der Linien von aPolyPoly3D an und stellt damit
-|* quasi eine vertikale Segmentierung dar.
+|* The aPolyPoly3D is rotated around its axis in nHSegments steps.
+|* nVSegments contains the number of lines of aPolyPoly3D and therefore
+|* is effectively a vertical segmentation.
|*
\************************************************************************/
@@ -105,18 +106,19 @@ private:
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Lokale Parameter setzen/lesen mit Geometrieneuerzeugung
+ // set/get local parameters with geometry recreation
void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew);
const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; }
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
#endif // _E3D_LATHE3D_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 26e3f1fc74..37beb62cb3 100644
--- a/svx/inc/svx/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,7 +39,7 @@
class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl
{
private:
- FASTBOOL bEnabled;
+ bool bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
@@ -58,7 +59,7 @@ public:
class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl
{
- FASTBOOL bEnabled;
+ bool bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -77,3 +78,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 0a699a72aa..8483146ab4 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 3daef66ffd..3045a55141 100644
--- a/svx/inc/svx/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -173,3 +174,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/measctrl.hxx b/svx/inc/svx/measctrl.hxx
index 00e061b08e..79efb8e1d6 100644
--- a/svx/inc/svx/measctrl.hxx
+++ b/svx/inc/svx/measctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
// include ---------------------------------------------------------------
-#ifndef _CTRL_HXX //autogen
#include <vcl/ctrl.hxx>
-#endif
#include "svx/svxdllapi.h"
@@ -68,3 +67,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index c03617ed55..fd4133083c 100644
--- a/svx/inc/svx/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,8 @@
#include <sfx2/stbitem.hxx>
#include "svx/svxdllapi.h"
+#include <boost/shared_ptr.hpp>
+
// class SvxModifyControl ------------------------------------------------
class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
@@ -39,7 +42,8 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
public:
virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );
- virtual void Paint( const UserDrawEvent& rEvt );
+ virtual void Paint( const UserDrawEvent& rUsrEvt );
+ virtual void DoubleClick();
SFX_DECL_STATUSBAR_CONTROL();
@@ -48,13 +52,11 @@ public:
static ULONG GetDefItemWidth(const StatusBar& rStb);
private:
- BOOL bState;
-
-#ifdef _SVX_MODCTRL_CXX
- SVX_DLLPRIVATE void DrawItemText_Impl();
-#endif
+ struct ImplData;
+ ::boost::shared_ptr<ImplData> mpImpl;
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index a20eecf424..ca5d8ccc8d 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <tools/solar.h>
#include <tools/stream.hxx>
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
#include <tools/string.hxx>
#include <tools/gen.hxx>
#include "svx/svxdllapi.h"
@@ -249,7 +248,7 @@
#define DFF_msofbtSelection 0xF119 // an FDGSL followed by the SPIDs of the shapes in the selection X 0
-// Werte fuer den ULONG im DFF_PST_TextHeaderAtom
+// Values for the ULONG in DFF_PST_TextHeaderAtom
enum DFF_TextHeader {
DFFTH_TITLE,
DFFTH_BODY,
@@ -580,7 +579,7 @@ enum DFF_TextHeader {
#define DFF_PBit_Print 0x00000001
//---------------------------------------------------------------------------
-// Dreh- und Angelpunkt: der Shape-Typ
+// linchpin: the shape type
//---------------------------------------------------------------------------
typedef enum
{
@@ -792,10 +791,10 @@ typedef enum
mso_sptNil = mso_sptMax
} MSO_SPT;
-// verschiedene enums aus der OfficeDraw-Doku, Appendix D - Anfang
+// different enums from the OfficeDraw documentation, Appendix D - beginning
//
-// beachte: in Abweichung von der MS-Doku beginnen alle
-// mit "mso_" statt mit "mso"
+// note: in opposite to the MS documentation, they all
+// start with "mso_" instead of "mso"
//
enum MSO_ShapePath {
mso_shapeLines, // A line of straight segments
@@ -1098,7 +1097,7 @@ typedef enum {
} MSO_BLIPUSAGE;
typedef enum { // GEL provided types...
- mso_blipERROR = 0, // An error occured during loading
+ mso_blipERROR = 0, // An error occurred during loading
mso_blipUNKNOWN, // An unknown blip type
mso_blipEMF, // Windows Enhanced Metafile
mso_blipWMF, // Windows Metafile
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 94e4660a13..bf69daaa18 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,8 +65,9 @@ enum SvxNumberValueType
// define ----------------------------------------------------------------
-#define CAT_ALL 0 // Reihenfolge der Kategorie-
-#define CAT_USERDEFINED 1 // ListBox-Eintraege in der TabPage
+// sort order of the category ListBox entries in the TabPage
+#define CAT_ALL 0
+#define CAT_USERDEFINED 1
#define CAT_NUMBER 2
#define CAT_PERCENT 3
#define CAT_CURRENCY 4
@@ -171,7 +173,7 @@ public:
String& rPreviewStr,
Color*& rpFontColor );
- void MakePrevStringFromVal( const String& rFormatStr, //@ 19.09.97
+ void MakePrevStringFromVal( const String& rFormatStr,
String& rPreviewStr,
Color*& rpFontColor,
double nValue);
@@ -218,7 +220,7 @@ public:
void GetCurrencyFormats(SvStrings& rList);
private:
- static const double DEFAULT_NUMVALUE; // 123456789
+ static const double DEFAULT_NUMVALUE;
SvNumberFormatter* pFormatter;
SvNumberFormatTable* pCurFmtTable;
@@ -265,3 +267,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 94177b5928..0ecde44dc5 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,8 +39,7 @@
/*
-[Beschreibung]
-Dieses Item dient als Transport-Medium fuer einen Number-Formatter.
+This item is used as a transport medium for a number formatter
*/
class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
@@ -98,3 +98,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 63915d0500..69600123d4 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,9 +59,6 @@ struct SvxBmpItemInfo
USHORT nItemId;
};
-/*-----------------09/09/97 01:05pm-----------------
-
---------------------------------------------------*/
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
Color aLineColor;
@@ -101,10 +99,6 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
const com::sun::star::lang::Locale& rLocale);
};
-/*-----------------13.02.97 09.32-------------------
-
---------------------------------------------------*/
-
class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{
String sBullets;
@@ -120,15 +114,12 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
Timer& GetFormatTimer() {return aFormatTimer;}
public:
- SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/);
+ SvxBmpNumValueSet( Window* pParent, const ResId& rResId);
~SvxBmpNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
-/*-----------------02.12.97 10:31-------------------
-
---------------------------------------------------*/
class SvxNumberingPreview : public Window
{
@@ -163,3 +154,4 @@ class SvxNumberingPreview : public Window
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 775c3fbb58..c5b4378e1a 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,7 @@
#include "svx/svxdllapi.h"
//************************************************************
-// Vorausdeklarationen
+// Forward declaration
//************************************************************
class SfxPoolItem;
@@ -65,22 +66,22 @@ namespace sdr { namespace properties {
/*************************************************************************
|*
-|* GeoData relevant fuer Undo-Actions
+|* GeoData relevant for undo actions
|*
\************************************************************************/
class E3DObjGeoData : public SdrObjGeoData
{
public:
- basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts
- basegfx::B3DHomMatrix maTransformation; // lokale Transformation
+ basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object
+ basegfx::B3DHomMatrix maTransformation; // lokal transformations
E3DObjGeoData() {}
};
/*************************************************************************
|*
-|* Liste fuer 3D-Objekte
+|* List for 3D objects
|*
\************************************************************************/
@@ -100,7 +101,7 @@ public:
/*************************************************************************
|*
-|* Basisklasse fuer 3D-Objekte
+|* Base class for 3D objects
|*
\************************************************************************/
@@ -110,7 +111,7 @@ private:
// to allow sdr::properties::E3dProperties access to StructureChanged()
friend class sdr::properties::E3dProperties;
- // Aus der E3dObjList und E3dDragMethod alles erlauben
+ // Allow everything for E3dObjList and E3dDragMethod
friend class E3dObjList;
friend class E3dDragMethod;
@@ -119,9 +120,9 @@ private:
E3dObjList maSubList; // Subliste (Childobjekte)
- basegfx::B3DRange maLocalBoundVol; // umschliessendes Volumen des Objekts (aus geometrieerzeugung)
- basegfx::B3DHomMatrix maTransformation; // lokale Transformation
- basegfx::B3DHomMatrix maFullTransform; // globale Transformation (inkl. Parents)
+ basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation)
+ basegfx::B3DHomMatrix maTransformation; // local transformation
+ basegfx::B3DHomMatrix maFullTransform; // global transformation (including. parents)
// Flags
unsigned mbTfHasChanged : 1;
@@ -164,7 +165,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual SdrObjList* GetSubList() const;
- // 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang!
+ // Insert 3D object into the group; transfer to other owner!
virtual void Insert3DObj(E3dObject* p3DObj);
void Remove3DObj(E3dObject* p3DObj);
@@ -174,23 +175,24 @@ public:
const basegfx::B3DRange& GetBoundVolume() const;
void InvalidateBoundVolume();
- // komplette Transformation inklusive aller Parents berechnen
+ // calculate complete transformation including all parents
const basegfx::B3DHomMatrix& GetFullTransform() const;
- // Transformationsmatrix abfragen bzw. (zurueck)setzen
+ // get and (re)set transformation matrix
const basegfx::B3DHomMatrix& GetTransform() const;
virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix);
virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix);
- // [FG] 2D-Rotationen, werden hier als Rotationen um die Z-Achse, die in den Bildschirm zeigt,
- // implementiert plus eine Verschiebung der Scene. Dies bedeutet auch die Scene (E3dScene)
- // muss diese Routine in der Klasse als virtual definieren.
+ // 2D rotations, are implemented as a rotation around the Z axis
+ // which is vertical to the screen, plus a shift of the scene.
+ // This means that also the scene (E3dScene) must define this
+ // routine as virtual in its class.
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
// get wireframe polygon for local object. No transform is applied.
basegfx::B3DPolyPolygon CreateWireframe() const;
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
USHORT GetLogicalGroup() { return 0; }
@@ -200,22 +202,22 @@ public:
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
- // Selektion Setzen/Lesen
+ // get/set the selection
bool GetSelected() const { return mbIsSelected; }
void SetSelected(bool bNew);
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
/*************************************************************************
|*
-|* Klasse fuer alle zusammengesetzen Objekte (Cube, Lathe, Scene, Extrude)
-|* Diese Klasse erspart ein paar ISA-Abfragen und sie beschleunigt das
-|* Verhalten ungemein, da alle Attribute usw. fuer die untergeordneten
-|* Polygone hierueber gehalten werden. Die Polygone duerfen nur Attribute
-|* halten, wenn sie direkt einer Szene untergeordnet sind.
+|* Class for all compound objects (Cube, Lathe, Scene, Extrude)
+|* This class saves some ISA queries and accelerates the behaviour
+|* significantly, because all the attributes etc. are kept through this.
+|* The polygons may only keep attributes if they are directly
+|* subordinated to the scene.
|*
\************************************************************************/
@@ -234,7 +236,7 @@ protected:
// Material des Objektes
Color aMaterialAmbientColor;
- // Attribute zur Geometrieerzeugung
+ // attributes for geometry creation
unsigned bCreateNormals : 1;
unsigned bCreateTexture : 1;
@@ -307,22 +309,23 @@ public :
virtual UINT16 GetObjIdentifier() const;
virtual void RecalcSnapRect();
- // Parameter Geometrieerzeugung setzen/lesen
+ // set/get parameters for geometry creation
BOOL GetCreateNormals() const { return bCreateNormals; }
void SetCreateNormals(BOOL bNew);
BOOL GetCreateTexture() const { return bCreateTexture; }
void SetCreateTexture(BOOL bNew);
- // Copy-Operator
+ // copy operator
virtual void operator=(const SdrObject&);
- // Material des Objektes
+ // material of the object
const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
void SetMaterialAmbientColor(const Color& rColor);
- // #110988#
sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
};
#endif // _E3D_OBJ3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx
index 34dcb8b094..9cb7ecb526 100644
--- a/svx/inc/svx/objfac3d.hxx
+++ b/svx/inc/svx/objfac3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
/*************************************************************************
|*
-|* Factory fuer Chart-spezifische Objekte
+|* Factory for chart-specific objects
|*
\************************************************************************/
@@ -54,3 +55,5 @@ public:
#endif // _OBJFAC3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 668990b383..766c8ee776 100644
--- a/svx/inc/svx/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index c3afa9c847..85efb6104a 100644
--- a/svx/inc/svx/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
#ifndef _SVX_OPTGENRL_HXX
#define _SVX_OPTGENRL_HXX
-// Defines for setting the fokus of a Edit via a slot from external.
+// Defines for setting the focus of a Edit via a slot from external.
#define UNKNOWN_EDIT ((USHORT)0)
#define COMPANY_EDIT ((USHORT)1)
#define FIRSTNAME_EDIT ((USHORT)2)
@@ -47,4 +48,4 @@
#endif // #ifndef _SVX_OPTGENRL_HXX
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 9fbd0098e9..f10267b02f 100644
--- a/svx/inc/svx/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,7 +141,7 @@ private:
FixedText aDivisionPointY;
CheckBox aCbxSynchronize;
- FixedLine aGrpDrawGrid; // Neu
+ FixedLine aGrpDrawGrid;
protected:
//these controls are used in draw and impress
@@ -164,7 +165,6 @@ protected:
private:
BOOL bAttrModified;
-// BOOL bEqualGrid; // Neu
#ifdef _SVX_OPTGRID_CXX
DECL_LINK( ClickRotateHdl_Impl, void * );
@@ -178,3 +178,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx
index 1ffb1bb855..0b315add63 100644
--- a/svx/inc/svx/orienthelper.hxx
+++ b/svx/inc/svx/orienthelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -130,3 +131,4 @@ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper >
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 3fcdecfda1..0f35022d5c 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,4 @@ public:
#endif // #ifndef _SVX_PAGECTRL_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index d2921d1559..68d774674a 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,10 +35,6 @@
#include "svx/svxdllapi.h"
-/*--------------------------------------------------------------------
- Beschreibung: SvxNumType
- --------------------------------------------------------------------*/
-
enum SvxNumType
{
SVX_CHARS_UPPER_LETTER,
@@ -51,7 +48,7 @@ enum SvxNumType
};
/*--------------------------------------------------------------------
- Beschreibung: Benutzung der Seite
+ usage of the page
--------------------------------------------------------------------*/
enum SvxPageUsage
@@ -65,24 +62,21 @@ enum SvxPageUsage
};
/*--------------------------------------------------------------------
- Beschreibung: Teile der Seitenbeschreibung
+ parts of the page description
--------------------------------------------------------------------*/
-
-
/*
-[Beschreibung]
-Dieses Item beschreibt ein Seiten-Attribut (Name der Vorlage, Numerierung,
-Portrait oder Landscape, Layout).
+This item describes a page attribute (name of the template, enumeration,
+portait or landscape, layout)
*/
class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
{
private:
- String aDescName; // Name der Vorlage
- SvxNumType eNumType; // Numerierung
- BOOL bLandscape; // Portrait / Landscape
- USHORT eUse; // Layout
+ String aDescName; // name of the template
+ SvxNumType eNumType; // enumeration
+ BOOL bLandscape; // portrait / landscape
+ USHORT eUse; // layout
public:
@@ -98,23 +92,23 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem* Create( SvStream&, USHORT ) const;
virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const;
- // Ausrichtung
+ // orientation
USHORT GetPageUsage() const { return eUse; }
void SetPageUsage(USHORT eU) { eUse= eU; }
BOOL IsLandscape() const { return bLandscape; }
void SetLandscape(BOOL bL) { bLandscape = bL; }
- // Numerierung
+ // enumeration
SvxNumType GetNumType() const { return eNumType; }
void SetNumType(SvxNumType eNum) { eNumType = eNum; }
- // Name des Descriptors
+ // name of the descriptor
const String& GetDescName() const { return aDescName; }
void SetDescName(const String& rStr) { aDescName = rStr; }
};
@@ -122,16 +116,9 @@ public:
/*--------------------------------------------------------------------
- Beschreibung: Container fuer Header/Footer-Attribute
+ container for header/footer attributes
--------------------------------------------------------------------*/
-
-
-/*
-[Beschreibung]
-Dieses Item dient als Container fuer Header- und Footer-Attribute.
-*/
-
class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem
{
public:
@@ -155,3 +142,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index 3a40b616b1..70f5aa720d 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,18 +55,18 @@ private:
Size aWinSize;
Size aSize;
- // Einzuege
+ // indentation
long nLeftMargin;
long nRightMargin;
short nFirstLineOfst;
- // Abstaende
+ // distances
USHORT nUpper;
USHORT nLower;
- // Ausrichtung
+ // adjustment
SvxAdjust eAdjust;
- // Letzte Zeile im Blocksatz
+ // last line in justification
SvxAdjust eLastLine;
- // Zeilenabstand
+ // line distance
SvxPrevLineSpace eLine;
USHORT nLineVal;
@@ -111,3 +112,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx
index 617c89014d..5913851720 100644
--- a/svx/inc/svx/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,17 +32,11 @@
#include <sfx2/basedlgs.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include "svx/svxdllapi.h"
// class SvxPasswordDialog -----------------------------------------------
@@ -84,3 +79,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index b6f5ec7802..50dd94c5d1 100644
--- a/svx/inc/svx/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ public:
#endif // _SVX_PFILEDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 2078925c44..9fd19a225b 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ public:
};
#endif // _E3D_POLYGON3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx
index 28bd40e318..1fc8ba162e 100644
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/svx/inc/svx/polypolygoneditor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ private:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index f0f33110e3..0471fe9e46 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,7 @@
/*************************************************************************
|*
-|* 3D-Szene mit Darstellung durch 2D-Polygone
+|* 3D scene displayed through 2D polygons
|*
\************************************************************************/
@@ -48,3 +49,5 @@ public:
};
#endif // _E3D_POLYSC3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx
index 466baf121b..15d9456229 100644
--- a/svx/inc/svx/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,8 +38,7 @@
/*
-[Beschreibung]
-Dieses Item beschreibt das Autoren-Kuerzel eines Notizzettels.
+The author shorthand symbol of a note
*/
class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
@@ -69,8 +69,7 @@ public:
/*
-[Beschreibung]
-Dieses Item beschreibt das Datum eines Notizzettels.
+The date of a note
*/
class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
@@ -100,8 +99,7 @@ public:
/*
-[Beschreibung]
-Dieses Item beschreibt den Text eines Notizzettels.
+The text of a note
*/
class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
@@ -112,7 +110,7 @@ public:
SvxPostItTextItem( USHORT nWhich );
SvxPostItTextItem( const String& rText, USHORT nWhich );
- // "pure virtual Methoden" vom SfxPoolItem
+ // "pure virtual methods" vom SfxPoolItem
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -131,3 +129,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/prtqry.hxx b/svx/inc/svx/prtqry.hxx
index e3d7867a23..29d61a419c 100644
--- a/svx/inc/svx/prtqry.hxx
+++ b/svx/inc/svx/prtqry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index a0f3fa725f..08f49670f2 100644
--- a/svx/inc/svx/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,3 +61,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx
index 538a4f2738..d8edbc5511 100644
--- a/svx/inc/svx/rectenum.hxx
+++ b/svx/inc/svx/rectenum.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ enum CTL_STYLE
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx
index 15863f498e..1a5e9dd913 100644
--- a/svx/inc/svx/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,19 +30,11 @@
// include ---------------------------------------------------------------
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include "svx/svxdllapi.h"
// class SvxRelativeField ------------------------------------------------
-/*
- [Beschreibung]
-
- "Ahnlich der Klasse FontSizeBox. Abgeleitet von der Klasse MetricField.
- Zus"atzliche Funktionalit"at: relative Angaben.
-*/
class SVX_DLLPUBLIC SvxRelativeField : public MetricField
{
@@ -71,3 +64,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 6b281d3e80..157ab6e715 100644
--- a/svx/inc/svx/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
#include "svx/svxdllapi.h"
//----------------------------------------------------------------------------
-// Ausrichtung bei gedrehtem Text
+// Alignment with rotated text
enum SvxRotateMode
{
@@ -60,10 +61,11 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String& rText, const IntlWrapper * = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index 51f83c79ac..2a1453b5ea 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,12 +33,8 @@
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/scrbar.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -202,3 +199,4 @@ public:
#endif // _SVX_RUBYDLG_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index b82213e69a..67dc379f09 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,33 +53,33 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
using Window::Notify;
SvxRulerItem **pCtrlItem;
- SvxLongLRSpaceItem *pLRSpaceItem; //Linker und Rechter Rand
- SfxRectangleItem *pMinMaxItem; //Maxima fuers Draggen
- SvxLongULSpaceItem *pULSpaceItem; //Oberer und Unterer Rand
- SvxTabStopItem *pTabStopItem; //Tabstops
- SvxLRSpaceItem *pParaItem; //Absaetze
- SvxLRSpaceItem *pParaBorderItem; //Border distance
- SvxPagePosSizeItem *pPagePosItem; //Seitenabstaende zum Lineal
- SvxColumnItem *pColumnItem; //Spalten
- SvxObjectItem *pObjectItem; //Objekt
+ SvxLongLRSpaceItem *pLRSpaceItem; // left and right edge
+ SfxRectangleItem *pMinMaxItem; // maxima for dragging
+ SvxLongULSpaceItem *pULSpaceItem; // upper and lower edge
+ SvxTabStopItem *pTabStopItem; // tab stops
+ SvxLRSpaceItem *pParaItem; // paragraphs
+ SvxLRSpaceItem *pParaBorderItem; // border distance
+ SvxPagePosSizeItem *pPagePosItem; // page distance to the rule
+ SvxColumnItem *pColumnItem; // columns
+ SvxObjectItem *pObjectItem; // object
Window *pEditWin;
SvxRuler_Impl *pRuler_Imp;
BOOL bAppSetNullOffset :1;
BOOL bHorz :1;
- long lLogicNullOffset; // in logischen Koordinaten
- long lAppNullOffset; // in logischen Koordinaten
- long lMinFrame; // minimale Framebreite in Pixel
+ long lLogicNullOffset; // in logic coordinates
+ long lAppNullOffset; // in logic coordinates
+ long lMinFrame; // minimal frame width in pixels
long lInitialDragPos;
USHORT nFlags;
enum {
NONE = 0x0000,
DRAG_OBJECT = 0x0001,
- // letzte Spalte verkleinern, Shift
+ // reduce size of the last column, shift
DRAG_OBJECT_SIZE_LINEAR = 0x0002,
DRAG_OBJECT_SIZE_PROPORTIONAL = 0x0004, // proportional, Ctrl
- // nur aktuelle Zeile (Tabelle; Shift-Ctrl)
+ // only current line (table; Shift-Ctrl)
DRAG_OBJECT_ACTLINE_ONLY = 0x0008,
- // aktuell gleiche Tastenbelegung
+ // currently same key assignment
DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL
}
nDragType;
@@ -87,8 +88,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
USHORT nTabBufSize;
long lDefTabDist;
long lTabPos;
- RulerTab *pTabs; // Tabpositionen in Pixel
- RulerIndent *pIndents; // Absatzraender in Pixel
+ RulerTab *pTabs; // tab positions in pixel
+ RulerIndent *pIndents; // paragraph margins in pixel
RulerBorder *pBorders;
USHORT nBorderCount;
RulerBorder *pObjectBorders;
@@ -99,33 +100,32 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
BOOL bValid;
BOOL bListening;
BOOL bActive;
-//#if 0 // _SOLAR__PRIVATE
void StartListening_Impl();
long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE );
void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE);
USHORT GetObjectBordersOff(USHORT nIdx) const;
- // Seitenr"ander oder umgebender Rahmen
+ // page borders or surrounding frame
void UpdateFrame(const SvxLongLRSpaceItem *);
void UpdateFrame(const SvxLongULSpaceItem *);
void UpdateFrameMinMax(const SfxRectangleItem *);
- // Absatzeinzuege
+ // paragraph indentations
void UpdatePara(const SvxLRSpaceItem *);
// Border distance
void UpdateParaBorder(const SvxLRSpaceItem *);
// Tabs
void Update(const SvxTabStopItem *);
- // Seitenposition und -breite
+ // page position and width
void Update(const SvxPagePosSizeItem *);
- // Spalten
+ // columns
void Update(const SvxColumnItem *, USHORT nSID);
- // Object Selektion
+ // object selection
void Update(const SvxObjectItem *);
- // Protect
+ // protect
void Update( const SvxProtectItem* );
// left-to-right text
void UpdateTextRTL( const SfxBoolItem* );
- // Absatzeinzuege
+ // paragraph indentations
void UpdatePara();
void UpdateTabs();
void UpdatePage();
@@ -154,9 +154,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
long ConvertSizeLogic(long lSize) const;
long GetFirstLineIndent() const;
-// long GetLogicFirstLineIndent() const;
long GetLeftIndent() const;
-// long GetLogicLeftIndent() const;
long GetRightIndent() const;
long GetLogicRightIndent() const;
long GetPageWidth() const;
@@ -194,7 +192,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
USHORT GetNextVisible(USHORT nColumn);
USHORT GetPrevVisible(USHORT nColumn);
-//#endif
void Update();
@@ -215,8 +212,8 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- // Berechnung der Grenzwerte fuer Objectgrenzen
- // Werte sind bezogen auf die Seite
+ // calculation of boundary values for object borders
+ // values refer to the page
virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const;
BOOL IsActLastColumn(
BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ;
@@ -253,7 +250,7 @@ public:
void SetDefTabDist(long);
long GetDefTabDist() const;
- // Setzen / Erfragen NullOffset in logischen Einheiten
+ // set/get NullOffset in logic units
void SetNullOffsetLogic(long lOff = 0);
long GetNullOffsetLogic() const { return lAppNullOffset; }
@@ -268,3 +265,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index 7a3d42eebf..e7a9a43d8d 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,14 +39,14 @@
class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
{
- long lLeft; // nLeft oder der neg. Erstzeileneinzug
- long lRight; // der unproblematische rechte Rand
+ long lLeft; // nLeft or the negativ first-line indentation
+ long lRight; // the unproblematic right edge
protected:
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -74,14 +75,14 @@ public:
class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
{
- long lLeft; // nLeft oder der neg. Erstzeileneinzug
- long lRight; // der unproblematische rechte Rand
+ long lLeft; // nLeft or the negative first-line indentation
+ long lRight; // the unproblematic right edge
protected:
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -115,8 +116,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
long lHeight;
protected:
virtual int operator==( const SfxPoolItem& ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -143,9 +144,9 @@ public:
struct SvxColumnDescription
{
- long nStart; /* Spaltenbeginn */
- long nEnd; /* Spaltenende */
- BOOL bVisible; /* Sichtbarkeit */
+ long nStart; /* Start of the column */
+ long nEnd; /* End of the column */
+ BOOL bVisible; /* Visibility */
long nEndMin; //min. possible position of end
long nEndMax; //max. possible position of end
@@ -190,13 +191,13 @@ typedef SvPtrarr SvxColumns;
class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
{
- SvxColumns aColumns;// Spaltenarray
- long nLeft, // Linker Rand bei Tabelle
- nRight; // Rechter Rand bei Tabelle; bei Spalten immer gleich
- // zum umgebenden Rahmen
- USHORT nActColumn; // die aktuelle Spalte
- BOOL bTable; // Tabelle?
- BOOL bOrtho; // Gleichverteilte Spalten
+ SvxColumns aColumns;// Column array
+ long nLeft, // Left edge for the table
+ nRight; // Right edge for the table; for columns always
+ // equal to the surrounding frame
+ USHORT nActColumn; // the current column
+ BOOL bTable; // table?
+ BOOL bOrtho; // evenly spread columns
void DeleteAndDestroyColumns();
@@ -210,15 +211,15 @@ protected:
String &rText, const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
public:
TYPEINFO();
- // rechter Rand des umgebenden Rahmens
- // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen
- SvxColumnItem(USHORT nAct = 0); // Spalten
+ // right edge of the surrounding frame
+ // nLeft, nRight each the distance to the surrounding frame
+ SvxColumnItem(USHORT nAct = 0); // columns
SvxColumnItem(USHORT nActCol,
- USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern
+ USHORT nLeft, USHORT nRight = 0); // table with borders
SvxColumnItem(const SvxColumnItem &);
~SvxColumnItem();
@@ -251,7 +252,7 @@ public:
BOOL IsOrtho () const { return FALSE ; }
BOOL IsConsistent() const { return nActColumn < aColumns.Count(); }
- long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte
+ long GetVisibleRight() const;// right visible edge of the current column
};
// class SvxObjectItem ---------------------------------------------------
@@ -259,11 +260,11 @@ public:
class SVX_DLLPUBLIC SvxObjectItem : public SfxPoolItem
{
private:
- long nStartX; /* Beginn in X-Richtung */
- long nEndX; /* Ende in X-Richtung */
- long nStartY; /* Beginn in Y-Richtung */
- long nEndY; /* Ende in Y-Richtung */
- BOOL bLimits; /* Grenzwertkontrolle durch die Applikation */
+ long nStartX; /* Start in x direction */
+ long nEndX; /* End in x direction */
+ long nStartY; /* Start in y direction */
+ long nEndY; /* Ende in y direction */
+ BOOL bLimits; /* boundary limit control by the application */
protected:
virtual int operator==( const SfxPoolItem& ) const;
@@ -274,8 +275,8 @@ protected:
String &rText, const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
private:
SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
public:
@@ -301,3 +302,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 3021447ed6..bd0dc40091 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,7 +46,7 @@ namespace drawinglayer { namespace geometry {
/*************************************************************************
|*
-|* GeoData relevant fuer Undo-Actions
+|* GeoData relevant for undo actions
|*
\************************************************************************/
@@ -57,12 +58,11 @@ public:
E3DSceneGeoData() {}
};
-// #110988#
class Imp3DDepthRemapper;
/*************************************************************************
|*
-|* Basisklasse fuer 3D-Szenen
+|* base class for 3D scenes
|*
\************************************************************************/
@@ -80,7 +80,6 @@ protected:
B3dCamera aCameraSet;
Camera3D aCamera;
- // #110988#
Imp3DDepthRemapper* mp3DDepthRemapper;
// Flag to determine if only selected objects should be drawn
@@ -96,7 +95,6 @@ protected:
protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
- // #110988#
void ImpCleanup3DDepthMapper();
public:
@@ -112,7 +110,6 @@ public:
virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
- // #110988#
sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const;
// Perspective: enum ProjectionType { PR_PARALLEL, PR_PERSPECTIVE }
@@ -225,28 +222,30 @@ public:
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
void RotateScene(const Point& rRef, long nWink, double sn, double cs);
- // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
+ // TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- // Transformationen rausgeben
+ // get transformations
B3dCamera& GetCameraSet() { return aCameraSet; }
- // Aufbrechen
+ // break up
virtual BOOL IsBreakObjPossible();
basegfx::B3DVector GetShadowPlaneDirection() const;
void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
- // Polygon das waehrend des Erzeugens aufgezogen wird
+ // polygon which is built during creation
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
// create moves
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual bool BegCreate(SdrDragStat& rStat);
+ virtual bool MovCreate(SdrDragStat& rStat); // true=Xor muss repainted werden
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
};
#endif // _E3D_SCENE3D_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index 952664d6bf..7804858691 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 81abd5ec63..418023d60e 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,8 +65,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
#ifdef SDR_ISPOOLABLE
@@ -80,3 +81,4 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index c0a4aac44e..3f8a599ad9 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,8 +100,8 @@ private:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
@@ -144,3 +145,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx
index 0d09bb29a6..6f3d8b7bb3 100644
--- a/svx/inc/svx/sderitm.hxx
+++ b/svx/inc/svx/sderitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,3 +41,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index 69807c148c..7cf1431b77 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ public:
};
#endif // _SDGCOITM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index dd01de87f8..24fc7cf6ce 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ public:
};
#endif // _SDGCPITM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index 122e38c87e..e25e5beecf 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -1,3 +1,4 @@